diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..7692ac78b5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+# editorconfig tool configuration
+# see http://editorconfig.org for docs
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespaces = true
+indent_style = tab
diff --git a/.gitignore b/.gitignore
index 3c0570c67d..c78df3afc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,8 @@ addon
*~
robots.txt
-#ignore documentation, it should be newly built
-doc/api
+#ignore documentation, it should be newly built
+doc/html
#ignore reports, should be generted with every build
report/
@@ -23,7 +23,7 @@ report/
.buildpath
.externalToolBuilders
.settings
-#ignore OSX .DS_Store files
+#ignore OSX .DS_Store files
.DS_Store
/nbproject/private/
@@ -42,3 +42,12 @@ nbproject
#ignore local folder
/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
diff --git a/.htaccess b/.htaccess
index 1b63f9ad6f..2348cdc38b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,7 +4,14 @@ AddType audio/ogg .oga
#AddHandler php53-cgi .php
-Deny from all
+
+ #Apache 2.4
+ Require all denied
+
+
+ #Apache 2.2
+ Deny from all
+
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000000..b42998b861
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+
+[friendica.messagespo]
+file_filter = view/lang//messages.po
+source_file = util/messages.po
+source_lang = en
+type = PO
+
diff --git a/CHANGELOG b/CHANGELOG
index b393899df8..a3a974eb62 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,131 @@
-Version 3.4.3
+Version 3.5.1 (2017-03-12)
+ Friendica Core:
+ Updates to the translations (BG, CA, CS, DE, EO, ES, FR, IS, IT, NL, PL, PT-BR, RU, SV) [translation teams]
+ Fix for a potential XSS vector [heluecht, thanks to Vít Šesták 'v6ak' for reporting the problem]
+ Fix for ghost request notifications on single user instances [Hypolite]
+ Fix user language selection [tobiasd]
+ Fix a problem with communication to Diaspora with set posting locations [heluecht]
+ Fix schema handling of direct links to a original posting [Rabuzarus]
+ Fix a bug in notification handling [Rabuzarus]
+ Adjustments for the Vagrant VM settings [silke, eelcomaljaars]
+ Improvements to the unliking of prior likes [Hypolite]
+ Improvements to the API and Friendica specific extensions [gerhard6380]
+ Improvements to the Browser Notification functionality [Hypolite]
+ Improvements to the themes [Hypolite, rabuzarus, rebeka-catalina, tobiasd]
+ Improvements to the database handling [heluecht]
+ Improvements to the admin panel [tobiasd, Hypolite]
+ Improvements to the update process [heluecht]
+ Improvements to the handling of worker processes [heluecht]
+ Improvements to the performance [heluecht, Hypolite]
+ Improvements to the documentation [Hypolite, tobiasd, rabuzarus, beardyunixer, eelcomaljaars]
+ Improvements to the BBCode / Markdown conversation [Hypolite]
+ Improvements to the OStatus protocol implementation [heluecht]
+ Improvements to the installation wizzard [tobiasd]
+ Improvements to the Diaspora connectivity [heluecht, Hypolite]
+ Work on PHP7 compatibility [ddorian1]
+ Code cleanup [Hypolite, Quix0r]
+ Initial federation with Mastodon [heluecht]
+ The worker process can now also be started from the frontend [heluecht]
+ Deletion of postings is now done in the background [heluecht]
+ Extension of the DFRN transmitted information fields [heluecht]
+ Translations of the core are now in /view/lang [Hypolite, tobiasd]
+ Update of the fullCalendar library to 3.0.1 and adjusting the themes [rabuzarus]
+ ping now works with JSON as well [Hypolite]
+ On pending registrations, an email is now send to inform the user about it [tobiasd]
+ On systems where the registration needs approval, a note for the admin can now be written [tobiasd]
+ Meta Information for HTML descriptions is now limited to 160 character [rabuzarus]
+ Removed very old deprecated themes from the repository [silke]
+ Marked frost and frost mobile as deprecated [silke]
+ When creating new postings in the UI, focus is automatically put into the Title field [Hypolite]
+ We are now shipping config files for "tx" (the Transifex client) and the "EditorConfig" addon for many common editors [fabrixxm, tobiasd]
+ The TinyMCE richtext editor was removed [Hypolite]
+ We defined a coding style, PSR-2 with some adjustments
+ Various bugfixes
+
+ Friendica Addons:
+ Updates to the translations (DE, ES, FR, IT, PT-BR) [translation teams]
+ Improvements to the IFTTT addon [Hypolite]
+ Improvements to the language filter addon [strk]
+ Improvements to the pump.io bridge [heluecht]
+ Improvements to the jappixmini addon [heluecht]
+ Improvements to the gpluspost addon [heluecht]
+ Improvements to the performance of the Twitter bridge when using workers [heluecht]
+ Diaspora Export addon is now working again [heluecht]
+ Pledgie badge now uses https protocol for embedding [tobiasd]
+ Better posting loop prevention for the Google+/Twitter/GS connectors [heluecht]
+ One can now configure the message for wppost bridged blog postings [tobiasd]
+ On some pages the result of the Rendertime is not shown anymore [heluecht]
+ Twitter-bridge now supports quotes and long posts when importing tweets [heluecht]
+
+ Closed Issues
+ 1019, 1163, 1612, 1613, 2103, 2177, 2252, 2260, 2403, 2991, 2614,
+ 2751, 2752, 2772, 2791, 2800, 2804, 2813, 2814, 2816, 2817, 2823,
+ 2850, 2858, 2865, 2892, 2894, 2895, 2907, 2908, 2914, 2015, 2926,
+ 2948, 2955, 2958, 2963, 2964, 2968, 2987, 2993, 3020, 3052, 3062,
+ 3066, 3091, 3108, 3113, 3116, 3117, 3118, 3126, 3130, 3135, 3155,
+ 3160, 3163, 3187, 3196
+
+Version 3.5 (2016-09-13)
+ Friendica Core:
+ NEW Optional local directory with possible federated contacts [heluecht]
+ NEW Autocompletion for @-mentions and BBCode tags [rabuzarus]
+ NEW Added a composer derived autoloader which allows composer autoloaders in addons/libraries [fabrixxm]
+ NEW theme: frio [rabuzarus, heluecht, fabrixxm]
+ Enhance .htaccess file (nerdoc, dissolve)
+ Updates to the translations (DE, ES, IS, IT, RU) [translation teams]
+ Updates to the documentation [tobiasd, heluecht, mexcon, silke, rabuzarus, fabrixxm, Olivier Mehani, gerhard6380, ben utzer]
+ Extended the BBCode by [abstract] tag used for bridged postings to networks with limited character length [heluecht]
+ Code cleanup [heluecht, QuixOr]
+ Improvements to the API and Friendica specific extensions [heluecht, fabrixxm, gerhard6380]
+ Improvements to the RSS/Atom feed import [mexcon]
+ Improvements to the communication with federated networks (Diaspora, Hubzilla, OStatus) [heluecht]
+ Improvements on the themes (quattro, vier, frost) [rabuzarus, fabrixxm, stieben, heluecht, Quix0r, tobiasd]
+ Improvements to the ACL dialog [fabrixxm, rabuzarus]
+ Improvements to the database structure and optimization of queries [heluecht]
+ Improvements to the UI (contacts, hotkeys, remember me, ARIA, code hightlighting) [rabuzarus, heluecht, tobiasd]
+ Improvements to the background process (poller, worker) [heluecht]
+ Improvements to the admin panel [tobiasd, heluecht, fabrixxm]
+ Improvements to the performance [heluecht]
+ Improvements to the installation wizzard (language selection, RINO version, check required PHP modules, default theme is now vier) [tobiasd]
+ Improvements to the relocation of nodes and accounts [heluecht]
+ Improvements to the DDoS detection [heluecht]
+ Improvements to the calendar/events module [heluecht, rabuzarus]
+ Improvements to OpenID login [strk]
+ Improvements to the ShaShape font [andi]
+ Reworked the implementation of the DFRN, Diaspora protocols [heluecht]
+ Reworked the notifications code [fabrixxm, rabuzarus, heluecht]
+ Reworked the p/config code [fabrixxm, rabuzarus]
+ Reworked XML generation [heluecht]
+ Removed now unused simplepie from library [heluecht]
+
+ Friendica Addons
+ Updated to the translations (DE, ES, IS, NL, PT BR), [translation teams]
+ Piwik [tobiasd]
+ Twitter Connector [heluecht]
+ Pumpio Connector [heluecht]
+ Rendertime [heluecht]
+ wppost [heluecht]
+ showmore [rabuzarus]
+ fromgplus [heluecht]
+ app.net Connector [heluecht]
+ GNU Social Connector [heluecht]
+ LDAP [Olivier Mehani]
+ smileybutton [rabuzarus]
+ retriver [mexon]
+ mailstream [mexon]
+ forumdirectory [tobiasd]
+ NEW notifyall (port from Hubzilla) [rabuzarus, tobiasd]
+ DEPRECATED cal (now in core), FB Connector, FB Post Connector, FB Sync
+
+ Closed Issues
+ 683, 786, 796, 922, 1261, 1576, 1701, 1769, 1970, 1145, 1494,
+ 1728, 1877, 2063, 2059, 2078, 2079, 2133, 2165, 2194, 2229, 2230,
+ 2241, 2254, 2242, 2270, 2277, 2339, 2320, 2345, 2352, 2358, 2367,
+ 2373, 2376, 2378, 2385, 2395, 2402, 2406, 2433, 2472, 2485, 2492,
+ 2506, 2512, 2516, 2539, 2540, 2893, 2597, 2611, 2617, 2629, 2645,
+ 2687, 2716, 2757, 2764
+
+Version 3.4.3 (2015-12-22)
What's new for the users:
Updates to the documentation (silke, tobiasd, annando, rebeka-catalina)
Updated translations (tobiasd & translation teams)
@@ -77,7 +204,7 @@ Version 3.4.3
Fix bbcode conversion of the about text for the profile (issue #1607) (annando)
-Version 3.4.2
+Version 3.4.2 (2015-09-29)
Updates to the documentation (tobiasd, silke, annando)
Updates to the translations (tobiasd & translation teams)
@@ -122,7 +249,7 @@ Version 3.4.2
Parse BBCode in contact request notification email (annando)
-Version 3.4.1
+Version 3.4.1 (2015-07-06)
Implement server-to-server encryption (RINO) using php-encryption library as "RINO 2", deprecate "RINO 1" (issue #1655) (fabrixxm)
Fix connection with Diaspora "freelove" account (issue #1572) (annando)
@@ -174,7 +301,7 @@ Version 3.4.1
Update to German documentation (Frank Dieckmann, tobias)
Updated translations (translation teams, tobias)
-Version 3.4
+Version 3.4 (2015-04-05)
Optionally, "like" and "dislike" activities don't update thread timestamp (annando)
Updated markdown libraries (annando)
@@ -202,7 +329,7 @@ Version 3.4
Add help text to explain the options for approving contacts (issue #1349) (silke)
API set as unseen only posts returned by the call (issue #1063) (annando)
-Version 3.3.3
+Version 3.3.3 (2015-02-24)
More separation between php and html in photo album (issue #1258) (rabuzarus)
Enhanced community page shows public posts from public contacts of public profiles (annando)
@@ -236,7 +363,7 @@ Version 3.3.3
Fix email validation (ddorian1)
Better documentation for developers (silke)
-Version 3.3.2
+Version 3.3.2 (2014-12-26)
Set default value for all not-null fields (fixes SQL warinigs) (annando)
Fix item filters in network page (issue #1222) (fabrixxm)
@@ -248,7 +375,7 @@ Version 3.3.2
Better display of pictures in posts (annando)
Fix out of control gprobe process (annando)
-Version 3.3.1
+Version 3.3.1 (2014-11-06)
JSONP support for API (fabrixxm)
Fixed small bug in direct messages API (fabrixxm)
@@ -266,7 +393,7 @@ Version 3.3.1
Translation updates
Added CHANGELOG
-Version 3.3
+Version 3.3 (2014-10-06)
API
added support in the API to allow image uploads from Twidere
diff --git a/INSTALL.txt b/INSTALL.txt
index 7726bdb0d7..4c57064f6b 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -32,8 +32,7 @@ link if your cert is self-signed).
- Apache with mod-rewrite enabled and "Options All" so you can use a
local .htaccess file
- - PHP 5.2+. The later the better. PHP 5.3 is required for communications
-with the Diaspora network and improved security.
+ - PHP 5.4+.
- PHP *command line* access with register_argc_argv set to true in the
php.ini file [or see 'poormancron' in section 8]
@@ -42,7 +41,7 @@ php.ini file [or see 'poormancron' in section 8]
- some form of email server or email gateway such that PHP mail() works
- - Mysql 5.x
+ - Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
- ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks
(Windows) [Note: other options are presented in Section 8 of this document]
@@ -65,7 +64,7 @@ you wish to communicate with the Diaspora network.
password, database name).
- Friendica needs the permission to create and delete fields and tables in its own database.
-
+ - Please check the additional notes if running on MySQ 5.7.17 or newer
4. If you know in advance that it will be impossible for the web server to
write or create files in your web directory, create an empty file called
@@ -136,8 +135,25 @@ $a->config['system']['addon'] = 'js_upload,poormancron';
and save your changes.
+9. (Optional) Reverse-proxying and HTTPS
+
+Friendica looks for some well-known HTTP headers indicating a reverse-proxy
+terminating an HTTPS connection. While the standard from RFC 7239 specifies
+the use of the `Forwaded` header.
+
+ Forwarded: for=192.0.2.1; proto=https; by=192.0.2.2
+
+Friendica also supports a number on non-standard headers in common use.
+
+
+ X-Forwarded-Proto: https
+
+ Front-End-Https: on
+
+ X-Forwarded-Ssl: on
+
+It is however preferable to use the standard approach if configuring a new server.
-
#####################################################################
If things don't work...
@@ -275,3 +291,21 @@ This is obvious as soon as you notice that the friendica-cron uses proc_open to
execute php-scripts that also use proc_open, but it took me quite some time to
find that out. I hope this saves some time for other people using suhosin with
function blacklists.
+
+########################################################################
+Unable to create all mysql tables on MySQL 5.7.17 or newer
+#######################################################################
+
+If the setup fails to create all the database tables and/or manual
+creation from the command line fails, with this error:
+
+ERROR 1067 (42000) at line XX: Invalid default value for 'created'
+
+You need to adjust your my.cnf and add the following setting under
+the [mysqld] section :
+
+sql_mode = '';
+
+After that, restart mysql and try again.
+
+
diff --git a/LICENSE b/LICENSE
index 42897de4ab..2bbe2d1de7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
Friendica Communications Server
-Copyright (c) 2010-2013 the Friendica Project
+Copyright (c) 2010-2017 the Friendica Project
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
diff --git a/README.translate.md b/README.translate.md
index f434063614..696dec10b1 100644
--- a/README.translate.md
+++ b/README.translate.md
@@ -4,42 +4,32 @@ Friendica translations
Translation Process
-------------------
-The strings used in the UI of Friendica is translated at [Transifex] [1] and then
-included in the git repository at github. If you want to help with translation
-for any language, be it correcting terms or translating friendica to a
-currently not supported language, please register an account at transifex.com
-and contact the friendica translation team there.
+The strings used in the UI of Friendica is translated at [Transifex] [1] and then included in the git repository at github.
+If you want to help with translation for any language, be it correcting terms or translating friendica to a currently not supported language, please register an account at transifex.com and contact the friendica translation team there.
-Translating friendica is simple. Just use the online tool at transifex. If you
-don't want to deal with git & co. that is fine, we check the status of the
-translations regularly and import them into the source tree at github so that
-others can use them.
+Translating friendica is simple.
+Just use the online tool at transifex.
+If you don't want to deal with git & co. that is fine, we check the status of the translations regularly and import them into the source tree at github so that others can use them.
-We do not include every translation from transifex in the source tree to avoid
-a scattered and disturbed overall experience. As an uneducated guess we have a
-lower limit of 50% translated strings before we include the language (for the
-core message.po file, addon translation will be included once all strings of
-an addon are translated. This limit is judging only by the amount of translated
-strings under the assumption that the most prominent strings for the UI will be
-translated first by a translation team. If you feel your translation useable
-before this limit, please contact us and we will probably include your teams
-work in the source tree.
+We do not include every translation from transifex in the source tree to avoid a scattered and disturbed overall experience.
+As an uneducated guess we have a lower limit of 50% translated strings before we include the language (for the core messages.po file, addont translation will be included once all strings of an addon are translated.
+This limit is judging only by the amount of translated strings under the assumption that the most prominent strings for the UI will be translated first by a translation team.
+If you feel your translation useable before this limit, please contact us and we will probably include your teams work in the source tree.
-If you want to get your work into the source tree yourself, feel free to do so
-and contact us with and question that arises. The process is simple and
-friendica ships with all the tools necessary.
+If you want to help translating, please concentrate on the core messages.po file first.
+We will only include translations with a sufficient translated messages.po file.
+Translations of addons will only be included, when the core file is included as well.
+
+If you want to get your work into the source tree yourself, feel free to do so and contact us with and question that arises.
+The process is simple and friendica ships with all the tools necessary.
The location of the translated files in the source tree is
- /view/LNG-CODE/
+ /view/lang/LNG-CODE/
where LNG-CODE is the language code used, e.g. de for German or fr for French.
-For the email templates (the *.tpl files) just place them into the directory
-and you are done. The translated strings come as a "message.po" file from
-transifex which needs to be translated into the PHP file friendica uses. To do
-so, place the file in the directory mentioned above and use the "po2php"
-utility from the util directory of your friendica installation.
+The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses.
+To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation.
-Assuming you want to convert the German localization which is placed in
-view/de/message.po you would do the following.
+Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following.
1. Navigate at the command prompt to the base directory of your
friendica installation
@@ -47,20 +37,20 @@ view/de/message.po you would do the following.
2. Execute the po2php script, which will place the translation
in the strings.php file that is used by friendica.
- $> php util/po2php.php view/de/messages.po
+ $> php util/po2php.php view/lang/de/messages.po
- The output of the script will be placed at view/de/strings.php where
+ The output of the script will be placed at view/lang/de/strings.php where
friendica is expecting it, so you can test your translation immediately.
-
+
3. Visit your friendica page to check if it still works in the language you
just translated. If not try to find the error, most likely PHP will give
you a hint in the log/warnings.about the error.
-
+
For debugging you can also try to "run" the file with PHP. This should
not give any output if the file is ok but might give a hint for
searching the bug in the file.
- $> php view/de/strings.php
+ $> php view/lang/de/strings.php
4. commit the two files with a meaningful commit message to your git
repository, push it to your fork of the friendica repository at github and
@@ -69,30 +59,39 @@ view/de/message.po you would do the following.
Utilities
---------
-Additional to the po2php script there are some more utilities for translation
-in the "util" directory of the friendica source tree. If you only want to
-translate friendica into another language you won't need any of these tools most
-likely but it gives you an idea how the translation process of friendica
-works.
+Additional to the po2php script there are some more utilities for translation in the "util" directory of the friendica source tree.
+If you only want to translate friendica into another language you wont need any of these tools most likely but it gives you an idea how the translation process of friendica works.
For further information see the utils/README file.
-Known Problems
---------------
+Transifex-Client
+----------------
-Friendica uses the language setting of the visitors browser to determain the
-language for the UI. Most of the time this works, but there are some known
-quirks.
+Transifex has a client program which let you interact with the translation files in a similar way to git.
+Help for the client can be found at the [Transifex Help Center] [2].
+Here we will only cover basic usage.
-One is that some browsers, like Safari, do the setting to "de-de" but friendica
-only has a "de" localisation. A workaround would be to add a symbolic link
-from
- $friendica/view/de-de
-pointing to
- $friendica/view/de
+After installation of the client, you should have a `tx` command available on your system.
+To use it, first create a configuration file with your credentials.
+On Linux this file should be placed into your home directory `~/.transifexrc`.
+The content of the file should be something like the following:
-Links
------
+ [https://www.transifex.com]
+ username = user
+ token =
+ password = p@ssw0rd
+ hostname = https://www.transifex.com
+
+Since Friendica version 3.5.1 we ship configuration files for the Transifex client in the core repository and the addon repository.
+To update the translation files after you have translated strings of e.g. Esperanto in the web-UI of transifex you can use `tx` to download the file.
+
+ $> tx pull -l eo
+
+And then use the `po2php` utility described above to convert the `messages.po` file to the `strings.php` file Friendica is loading.
+
+ $> php util/po2php.php view/lang/eo/messages.po
+
+Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes.
[1]: https://www.transifex.com/projects/p/friendica/
-
+[2]: https://docs.transifex.com/client/introduction
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..d5c0c99142
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.5.1
diff --git a/Vagrantfile b/Vagrantfile
index 4f1181b822..ff38151520 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,31 +1,55 @@
-server_ip = "192.168.22.10"
-server_memory = "384" # MB
+server_ip_trusty = "192.168.22.10"
+server_ip_xenial = "192.168.22.11"
+server_memory = "1024" # MB
server_timezone = "UTC"
public_folder = "/vagrant"
Vagrant.configure(2) do |config|
-
+######################################################################
# Set server to Ubuntu 14.04
- config.vm.box = "ubuntu/trusty64"
+ config.vm.define "trusty" do |trusty|
+ trusty.vm.box = "ubuntu/trusty64"
- # Disable automatic box update checking. If you disable this, then
- # boxes will only be checked for updates when the user runs
- # `vagrant box outdated`. This is not recommended.
- # config.vm.box_check_update = false
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
- # Create a hostname, don't forget to put it to the `hosts` file
- # This will point to the server's default virtual host
- # TO DO: Make this work with virtualhost along-side xip.io URL
- config.vm.hostname = "friendica.dev"
+ # Create a hostname, don't forget to put it to the `hosts` file
+ # This will point to the server's default virtual host
+ # TO DO: Make this work with virtualhost along-side xip.io URL
+ trusty.vm.hostname = "friendica-trusty.dev"
- # Create a static IP
- config.vm.network :private_network, ip: server_ip
+ # Create a static IP
+ trusty.vm.network :private_network, ip: server_ip_trusty
+ end
+######################################################################
+ # Set server to Ubuntu 16.04
+ config.vm.define "xenial" do |xenial|
+ xenial.vm.box = "boxcutter/ubuntu1604"
+
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
+
+ # Create a hostname, don't forget to put it to the `hosts` file
+ # This will point to the server's default virtual host
+ # TO DO: Make this work with virtualhost along-side xip.io URL
+ xenial.vm.hostname = "friendica-xenial.dev"
+
+ # Create a static IP
+ xenial.vm.network :private_network, ip: server_ip_xenial
+ end
+
+######################################################################
# Share a folder between host and guest
config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
+
# Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options.
config.vm.provider "virtualbox" do |vb|
diff --git a/boot.php b/boot.php
index af40027b0d..c8e84e5c75 100644
--- a/boot.php
+++ b/boot.php
@@ -1,4 +1,25 @@
\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
/**
+ * @brief Image storage quality.
*
- * Image storage quality. Lower numbers save space at cost of image detail.
+ * Lower numbers save space at cost of image detail.
* For ease of upgrade, please do not change here. Change jpeg quality with
* $a->config['system']['jpeg_quality'] = n;
* in .htconfig.php, where n is netween 1 and 100, and with very poor results
@@ -66,61 +96,80 @@ define ( 'MAX_IMAGE_LENGTH', -1 );
define ( 'DEFAULT_DB_ENGINE', 'MyISAM' );
/**
+ * @name SSL Policy
+ *
* SSL redirection policies
+ * @{
*/
-
define ( 'SSL_POLICY_NONE', 0 );
define ( 'SSL_POLICY_FULL', 1 );
define ( 'SSL_POLICY_SELFSIGN', 2 );
-
+/* @}*/
/**
+ * @name Logger
+ *
* log levels
+ * @{
*/
-
define ( 'LOGGER_NORMAL', 0 );
define ( 'LOGGER_TRACE', 1 );
define ( 'LOGGER_DEBUG', 2 );
define ( 'LOGGER_DATA', 3 );
define ( 'LOGGER_ALL', 4 );
+/* @}*/
/**
- * cache levels
+ * @name Cache
+ *
+ * Cache levels
+ * @{
*/
-
define ( 'CACHE_MONTH', 0 );
define ( 'CACHE_WEEK', 1 );
define ( 'CACHE_DAY', 2 );
define ( 'CACHE_HOUR', 3 );
+define ( 'CACHE_HALF_HOUR', 4 );
+define ( 'CACHE_QUARTER_HOUR', 5 );
+define ( 'CACHE_FIVE_MINUTES', 6 );
+define ( 'CACHE_MINUTE', 7 );
+/* @}*/
/**
- * registration policies
+ * @name Register
+ *
+ * Registration policies
+ * @{
*/
-
define ( 'REGISTER_CLOSED', 0 );
define ( 'REGISTER_APPROVE', 1 );
define ( 'REGISTER_OPEN', 2 );
+/** @}*/
/**
- * relationship types
+ * @name Contact_is
+ *
+ * Relationship types
+ * @{
*/
-
define ( 'CONTACT_IS_FOLLOWER', 1);
define ( 'CONTACT_IS_SHARING', 2);
define ( 'CONTACT_IS_FRIEND', 3);
-
+/** @}*/
/**
+ * @name Update
+ *
* DB update return values
+ * @{
*/
-
define ( 'UPDATE_SUCCESS', 0);
define ( 'UPDATE_FAILED', 1);
+/** @}*/
/**
- *
- * page/profile types
+ * @name page/profile types
*
* PAGE_NORMAL is a typical personal profile account
* PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
@@ -128,24 +177,55 @@ define ( 'UPDATE_FAILED', 1);
* write access to wall and comments (no email and not included in page owner's ACL lists)
* PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
*
+ * @{
*/
-
define ( 'PAGE_NORMAL', 0 );
define ( 'PAGE_SOAPBOX', 1 );
define ( 'PAGE_COMMUNITY', 2 );
define ( 'PAGE_FREELOVE', 3 );
define ( 'PAGE_BLOG', 4 );
define ( 'PAGE_PRVGROUP', 5 );
+/** @}*/
-// Type of the community page
+/**
+ * @name account types
+ *
+ * ACCOUNT_TYPE_PERSON - the account belongs to a person
+ * Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
+ *
+ * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+ * Associated page type: PAGE_SOAPBOX
+ *
+ * ACCOUNT_TYPE_NEWS - the account is a news reflector
+ * Associated page type: PAGE_SOAPBOX
+ *
+ * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+ * Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+ * @{
+ */
+define ( 'ACCOUNT_TYPE_PERSON', 0 );
+define ( 'ACCOUNT_TYPE_ORGANISATION',1 );
+define ( 'ACCOUNT_TYPE_NEWS', 2 );
+define ( 'ACCOUNT_TYPE_COMMUNITY', 3 );
+/** @}*/
+
+/**
+ * @name CP
+ *
+ * Type of the community page
+ * @{
+ */
define ( 'CP_NO_COMMUNITY_PAGE', -1 );
define ( 'CP_USERS_ON_SERVER', 0 );
define ( 'CP_GLOBAL_COMMUNITY', 1 );
+/** @}*/
/**
+ * @name Network
+ *
* Network and protocol family types
+ * @{
*/
-
define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
define ( 'NETWORK_ZOT', 'zot!'); // Zot!
define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
@@ -165,7 +245,9 @@ define ( 'NETWORK_STATUSNET', 'stac'); // Statusnet connector
define ( 'NETWORK_APPNET', 'apdn'); // app.net
define ( 'NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol
define ( 'NETWORK_ICALENDAR', 'ical'); // iCalendar
+define ( 'NETWORK_PNUT', 'pnut'); // pnut.io
define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder
+/** @}*/
/**
* These numbers are used in stored permissions
@@ -193,6 +275,7 @@ $netgroup_ids = array(
NETWORK_APPNET => (-17),
NETWORK_NEWS => (-18),
NETWORK_ICALENDAR => (-19),
+ NETWORK_PNUT => (-20),
NETWORK_PHANTOM => (-127),
);
@@ -212,9 +295,11 @@ define ( 'ZCURL_TIMEOUT' , (-1));
/**
- * email notification options
+ * @name Notify
+ *
+ * Email notification options
+ * @{
*/
-
define ( 'NOTIFY_INTRO', 0x0001 );
define ( 'NOTIFY_CONFIRM', 0x0002 );
define ( 'NOTIFY_WALL', 0x0004 );
@@ -228,12 +313,15 @@ define ( 'NOTIFY_POKE', 0x0200 );
define ( 'NOTIFY_SHARE', 0x0400 );
define ( 'NOTIFY_SYSTEM', 0x8000 );
+/* @}*/
/**
+ * @name Term
+ *
* Tag/term types
+ * @{
*/
-
define ( 'TERM_UNKNOWN', 0 );
define ( 'TERM_HASHTAG', 1 );
define ( 'TERM_MENTION', 2 );
@@ -249,9 +337,11 @@ define ( 'TERM_OBJ_PHOTO', 2 );
/**
- * various namespaces we may need to parse
+ * @name Namespaces
+ *
+ * Various namespaces we may need to parse
+ * @{
*/
-
define ( 'NAMESPACE_ZOT', 'http://purl.org/zot' );
define ( 'NAMESPACE_DFRN' , 'http://purl.org/macgirvin/dfrn/1.0' );
define ( 'NAMESPACE_THREAD' , 'http://purl.org/syndication/thread/1.0' );
@@ -267,10 +357,14 @@ define ( 'NAMESPACE_FEED', 'http://schemas.google.com/g/2010#updates-
define ( 'NAMESPACE_OSTATUS', 'http://ostatus.org/schema/1.0' );
define ( 'NAMESPACE_STATUSNET', 'http://status.net/schema/api/1/' );
define ( 'NAMESPACE_ATOM1', 'http://www.w3.org/2005/Atom' );
-/**
- * activity stream defines
- */
+/* @}*/
+/**
+ * @name Activity
+ *
+ * Activity stream defines
+ * @{
+ */
define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' );
define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' );
define ( 'ACTIVITY_ATTEND', NAMESPACE_ZOT . '/activity/attendyes' );
@@ -309,14 +403,48 @@ define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' );
define ( 'ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question' );
+/* @}*/
/**
- * item weight for query ordering
+ * @name Gravity
+ *
+ * Item weight for query ordering
+ * @{
*/
-
define ( 'GRAVITY_PARENT', 0);
define ( 'GRAVITY_LIKE', 3);
define ( 'GRAVITY_COMMENT', 6);
+/* @}*/
+
+/**
+ * @name Priority
+ *
+ * Process priority for the worker
+ * @{
+ */
+define('PRIORITY_UNDEFINED', 0);
+define('PRIORITY_CRITICAL', 10);
+define('PRIORITY_HIGH', 20);
+define('PRIORITY_MEDIUM', 30);
+define('PRIORITY_LOW', 40);
+define('PRIORITY_NEGLIGIBLE',50);
+/* @}*/
+
+/**
+ * @name Social Relay settings
+ *
+ * See here: https://github.com/jaywink/social-relay
+ * and here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
+ * @{
+ */
+define('SR_SCOPE_NONE', '');
+define('SR_SCOPE_ALL', 'all');
+define('SR_SCOPE_TAGS', 'tags');
+/* @}*/
+
+// Normally this constant is defined - but not if "pcntl" isn't installed
+if (!defined("SIGTERM"))
+ define("SIGTERM", 15);
/**
*
@@ -358,7 +486,8 @@ function startup() {
*
* class: App
*
- * Our main application structure for the life of this page
+ * @brief Our main application structure for the life of this page.
+ *
* Primarily deals with the URL that got us here
* and tries to make some sense of it, and
* stores our page contents and config storage
@@ -366,667 +495,1075 @@ function startup() {
* before we spit the page out.
*
*/
-
-if(! class_exists('App')) {
- class App {
-
- public $module_loaded = false;
- public $query_string;
- public $config;
- public $page;
- public $profile;
- public $profile_uid;
- public $user;
- public $cid;
- public $contact;
- public $contacts;
- public $page_contact;
- public $content;
- public $data = array();
- public $error = false;
- public $cmd;
- public $argv;
- public $argc;
- public $module;
- public $pager;
- public $strings;
- public $path;
- public $hooks;
- public $timezone;
- public $interactive = true;
- public $plugins;
- public $apps = array();
- public $identities;
- public $is_mobile;
- public $is_tablet;
- public $is_friendica_app;
- public $performance = array();
-
- public $nav_sel;
-
- public $category;
-
-
- // Allow themes to control internal parameters
- // by changing App values in theme.php
-
- public $sourcename = '';
- public $videowidth = 425;
- public $videoheight = 350;
- public $force_max_items = 0;
- public $theme_thread_allow = true;
- public $theme_events_in_profile = true;
-
- // An array for all theme-controllable parameters
- // Mostly unimplemented yet. Only options 'stylesheet' and
- // beyond are used.
-
- public $theme = array(
- 'sourcename' => '',
- 'videowidth' => 425,
- 'videoheight' => 350,
- 'force_max_items' => 0,
- 'thread_allow' => true,
- 'stylesheet' => '',
- 'template_engine' => 'smarty3',
- );
-
- // array of registered template engines ('name'=>'class name')
- public $template_engines = array();
- // array of instanced template engines ('name'=>'instance')
- public $template_engine_instance = array();
-
- private $ldelim = array(
- 'internal' => '',
- 'smarty3' => '{{'
- );
- private $rdelim = array(
- 'internal' => '',
- 'smarty3' => '}}'
- );
-
- private $scheme;
- private $hostname;
- private $baseurl;
- private $db;
-
- private $curl_code;
- private $curl_content_type;
- private $curl_headers;
-
- private $cached_profile_image;
- private $cached_profile_picdate;
-
- function __construct() {
-
- global $default_timezone;
-
- $hostname = "";
-
- if (file_exists(".htpreconfig.php"))
- @include(".htpreconfig.php");
-
- $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
-
- date_default_timezone_set($this->timezone);
-
- $this->performance["start"] = microtime(true);
- $this->performance["database"] = 0;
- $this->performance["network"] = 0;
- $this->performance["file"] = 0;
- $this->performance["rendering"] = 0;
- $this->performance["parser"] = 0;
- $this->performance["marktime"] = 0;
- $this->performance["markstart"] = microtime(true);
-
- $this->config = array();
- $this->page = array();
- $this->pager= array();
-
- $this->query_string = '';
-
- startup();
-
- set_include_path(
- 'include' . PATH_SEPARATOR
- . 'library' . PATH_SEPARATOR
- . 'library/phpsec' . PATH_SEPARATOR
- . 'library/langdet' . PATH_SEPARATOR
- . '.' );
-
-
- $this->scheme = 'http';
- if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
- $this->scheme = 'https';
- elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
- $this->scheme = 'https';
-
- if(x($_SERVER,'SERVER_NAME')) {
- $this->hostname = $_SERVER['SERVER_NAME'];
-
- // See bug 437 - this didn't work so disabling it
- //if(stristr($this->hostname,'xn--')) {
- // PHP or webserver may have converted idn to punycode, so
- // convert punycode back to utf-8
- // require_once('library/simplepie/idn/idna_convert.class.php');
- // $x = new idna_convert();
- // $this->hostname = $x->decode($_SERVER['SERVER_NAME']);
- //}
-
- if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
- $this->hostname .= ':' . $_SERVER['SERVER_PORT'];
- /**
- * Figure out if we are running at the top of a domain
- * or in a sub-directory and adjust accordingly
- */
-
- $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
- if(isset($path) && strlen($path) && ($path != $this->path))
- $this->path = $path;
- }
-
- if ($hostname != "")
- $this->hostname = $hostname;
-
- if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
- $this->set_baseurl(array_pop($_SERVER["argv"]) );
- $_SERVER["argc"] --;
- }
-
- #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
-
- if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],9);
- // removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
- } elseif((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],2);
- // removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
- }
-
- if (x($_GET,'pagename'))
- $this->cmd = trim($_GET['pagename'],'/\\');
- elseif (x($_GET,'q'))
- $this->cmd = trim($_GET['q'],'/\\');
-
-
- // fix query_string
- $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
-
-
- // unix style "homedir"
-
- if(substr($this->cmd,0,1) === '~')
- $this->cmd = 'profile/' . substr($this->cmd,1);
-
- // Diaspora style profile url
-
- if(substr($this->cmd,0,2) === 'u/')
- $this->cmd = 'profile/' . substr($this->cmd,2);
-
-
- /**
- *
- * Break the URL path into C style argc/argv style arguments for our
- * modules. Given "http://example.com/module/arg1/arg2", $this->argc
- * will be 3 (integer) and $this->argv will contain:
- * [0] => 'module'
- * [1] => 'arg1'
- * [2] => 'arg2'
- *
- *
- * There will always be one argument. If provided a naked domain
- * URL, $this->argv[0] is set to "home".
- *
- */
-
- $this->argv = explode('/',$this->cmd);
- $this->argc = count($this->argv);
- if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
- $this->module = str_replace(".", "_", $this->argv[0]);
- $this->module = str_replace("-", "_", $this->module);
- }
- else {
- $this->argc = 1;
- $this->argv = array('home');
- $this->module = 'home';
- }
-
- /**
- * See if there is any page number information, and initialise
- * pagination
- */
-
- $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
- $this->pager['itemspage'] = 50;
- $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- if($this->pager['start'] < 0)
- $this->pager['start'] = 0;
- $this->pager['total'] = 0;
-
- /**
- * Detect mobile devices
- */
-
- $mobile_detect = new Mobile_Detect();
- $this->is_mobile = $mobile_detect->isMobile();
- $this->is_tablet = $mobile_detect->isTablet();
-
- // Friendica-Client
- $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == "Apache-HttpClient/UNAVAILABLE (java 1.4)");
-
- /**
- * register template engines
- */
- $dc = get_declared_classes();
- foreach ($dc as $k) {
- if (in_array("ITemplateEngine", class_implements($k))){
- $this->register_template_engine($k);
- }
- }
-
- }
-
- function get_basepath() {
-
- $basepath = get_config("system", "basepath");
-
- if ($basepath == "")
- $basepath = dirname(__FILE__);
-
- if ($basepath == "")
- $basepath = $_SERVER["DOCUMENT_ROOT"];
-
- if ($basepath == "")
- $basepath = $_SERVER["PWD"];
-
- return($basepath);
- }
-
- function get_scheme() {
- return($this->scheme);
- }
-
- function get_baseurl($ssl = false) {
-
- $scheme = $this->scheme;
-
- if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
- if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
- $scheme = 'https';
-
- // Basically, we have $ssl = true on any links which can only be seen by a logged in user
- // (and also the login link). Anything seen by an outsider will have it turned off.
-
- if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
- if($ssl)
- $scheme = 'https';
- else
- $scheme = 'http';
- }
- }
-
- if (get_config('config','hostname') != "")
- $this->hostname = get_config('config','hostname');
-
- $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
- return $this->baseurl;
- }
-
- function set_baseurl($url) {
- $parsed = @parse_url($url);
-
- $this->baseurl = $url;
-
- if($parsed) {
- $this->scheme = $parsed['scheme'];
-
- $hostname = $parsed['host'];
- if(x($parsed,'port'))
- $hostname .= ':' . $parsed['port'];
- if(x($parsed,'path'))
- $this->path = trim($parsed['path'],'\\/');
-
- if (file_exists(".htpreconfig.php"))
- @include(".htpreconfig.php");
-
- if (get_config('config','hostname') != "")
- $this->hostname = get_config('config','hostname');
-
- if (!isset($this->hostname) OR ($this->hostname == ""))
- $this->hostname = $hostname;
- }
-
- }
-
- function get_hostname() {
- if (get_config('config','hostname') != "")
- $this->hostname = get_config('config','hostname');
-
- return $this->hostname;
- }
-
- function set_hostname($h) {
- $this->hostname = $h;
- }
-
- function set_path($p) {
- $this->path = trim(trim($p),'/');
- }
-
- function get_path() {
- return $this->path;
- }
-
- function set_pager_total($n) {
- $this->pager['total'] = intval($n);
- }
-
- function set_pager_itemspage($n) {
- $this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
- $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- }
-
- function set_pager_page($n) {
- $this->pager['page'] = $n;
- $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- }
-
- function init_pagehead() {
- $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
-
- // If the update is "deactivated" set it to the highest integer number (~24 days)
- if ($interval < 0)
- $interval = 2147483647;
-
- if($interval < 10000)
- $interval = 40000;
-
- // compose the page title from the sitename and the
- // current module called
- if (!$this->module=='')
- {
- $this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
- } else {
- $this->page['title'] = $this->config['sitename'];
- }
-
- /* put the head template at the beginning of page['htmlhead']
- * since the code added by the modules frequently depends on it
- * being first
- */
- if(!isset($this->page['htmlhead']))
- $this->page['htmlhead'] = '';
-
- // If we're using Smarty, then doing replace_macros() will replace
- // any unrecognized variables with a blank string. Since we delay
- // replacing $stylesheet until later, we need to replace it now
- // with another variable name
- if($this->theme['template_engine'] === 'smarty3')
- $stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
- else
- $stylesheet = '$stylesheet';
-
- $shortcut_icon = get_config("system", "shortcut_icon");
- if ($shortcut_icon == "")
- $shortcut_icon = $this->get_baseurl()."/images/friendica-32.png";
-
- $touch_icon = get_config("system", "touch_icon");
- if ($touch_icon == "")
- $touch_icon = $this->get_baseurl()."/images/friendica-128.png";
-
- $tpl = get_markup_template('head.tpl');
- $this->page['htmlhead'] = replace_macros($tpl,array(
- '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
- '$local_user' => local_user(),
- '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
- '$delitem' => t('Delete this item?'),
- '$comment' => t('Comment'),
- '$showmore' => t('show more'),
- '$showfewer' => t('show fewer'),
- '$update_interval' => $interval,
- '$shortcut_icon' => $shortcut_icon,
- '$touch_icon' => $touch_icon,
- '$stylesheet' => $stylesheet
- )) . $this->page['htmlhead'];
- }
-
- function init_page_end() {
- if(!isset($this->page['end']))
- $this->page['end'] = '';
- $tpl = get_markup_template('end.tpl');
- $this->page['end'] = replace_macros($tpl,array(
- '$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
- )) . $this->page['end'];
- }
-
- function set_curl_code($code) {
- $this->curl_code = $code;
- }
-
- function get_curl_code() {
- return $this->curl_code;
- }
-
- function set_curl_content_type($content_type) {
- $this->curl_content_type = $content_type;
- }
-
- function get_curl_content_type() {
- return $this->curl_content_type;
- }
-
- function set_curl_headers($headers) {
- $this->curl_headers = $headers;
- }
-
- function get_curl_headers() {
- return $this->curl_headers;
- }
-
- function get_cached_avatar_image($avatar_image){
- if($this->cached_profile_image[$avatar_image])
- return $this->cached_profile_image[$avatar_image];
-
- $path_parts = explode("/",$avatar_image);
- $common_filename = $path_parts[count($path_parts)-1];
-
- if($this->cached_profile_picdate[$common_filename]){
- $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
- } else {
- $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
- $common_filename);
- if(! count($r)){
- $this->cached_profile_image[$avatar_image] = $avatar_image;
- } else {
- $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
- $this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
- }
- }
- return $this->cached_profile_image[$avatar_image];
- }
-
-
- /**
- * register template engine class
- * if $name is "", is used class static property $class::$name
- * @param string $class
- * @param string $name
- */
- function register_template_engine($class, $name = '') {
- if ($name===""){
- $v = get_class_vars( $class );
- if(x($v,"name")) $name = $v['name'];
- }
- if ($name===""){
- echo "template engine $class cannot be registered without a name.\n";
- killme();
- }
- $this->template_engines[$name] = $class;
- }
-
- /**
- * return template engine instance. If $name is not defined,
- * return engine defined by theme, or default
- *
- * @param strin $name Template engine name
- * @return object Template Engine instance
- */
- function template_engine($name = ''){
- if ($name!=="") {
- $template_engine = $name;
- } else {
- $template_engine = 'smarty3';
- if (x($this->theme, 'template_engine')) {
- $template_engine = $this->theme['template_engine'];
- }
- }
-
- if (isset($this->template_engines[$template_engine])){
- if(isset($this->template_engine_instance[$template_engine])){
- return $this->template_engine_instance[$template_engine];
- } else {
- $class = $this->template_engines[$template_engine];
- $obj = new $class;
- $this->template_engine_instance[$template_engine] = $obj;
- return $obj;
- }
- }
-
- echo "template engine $template_engine is not registered!\n"; killme();
- }
-
- function get_template_engine() {
- return $this->theme['template_engine'];
- }
-
- function set_template_engine($engine = 'smarty3') {
- $this->theme['template_engine'] = $engine;
+class App {
+
+ public $module_loaded = false;
+ public $query_string;
+ public $config;
+ public $page;
+ public $profile;
+ public $profile_uid;
+ public $user;
+ public $cid;
+ public $contact;
+ public $contacts;
+ public $page_contact;
+ public $content;
+ public $data = array();
+ public $error = false;
+ public $cmd;
+ public $argv;
+ public $argc;
+ public $module;
+ public $pager;
+ public $strings;
+ public $path;
+ public $hooks;
+ public $timezone;
+ public $interactive = true;
+ public $plugins;
+ public $apps = array();
+ public $identities;
+ public $is_mobile = false;
+ public $is_tablet = false;
+ public $is_friendica_app;
+ public $performance = array();
+ public $callstack = array();
+ public $theme_info = array();
+ public $backend = true;
+
+ public $nav_sel;
+
+ public $category;
+
+
+ // Allow themes to control internal parameters
+ // by changing App values in theme.php
+
+ public $sourcename = '';
+ public $videowidth = 425;
+ public $videoheight = 350;
+ public $force_max_items = 0;
+ public $theme_thread_allow = true;
+ public $theme_events_in_profile = true;
+
+ /**
+ * @brief An array for all theme-controllable parameters
+ *
+ * Mostly unimplemented yet. Only options 'template_engine' and
+ * beyond are used.
+ */
+ public $theme = array(
+ 'sourcename' => '',
+ 'videowidth' => 425,
+ 'videoheight' => 350,
+ 'force_max_items' => 0,
+ 'thread_allow' => true,
+ 'stylesheet' => '',
+ 'template_engine' => 'smarty3',
+ );
+
+ /**
+ * @brief An array of registered template engines ('name'=>'class name')
+ */
+ public $template_engines = array();
+ /**
+ * @brief An array of instanced template engines ('name'=>'instance')
+ */
+ public $template_engine_instance = array();
+
+ public $process_id;
+
+ private $ldelim = array(
+ 'internal' => '',
+ 'smarty3' => '{{'
+ );
+ private $rdelim = array(
+ 'internal' => '',
+ 'smarty3' => '}}'
+ );
+
+ private $scheme;
+ private $hostname;
+ private $db;
+
+ private $curl_code;
+ private $curl_content_type;
+ private $curl_headers;
+
+ private $cached_profile_image;
+ private $cached_profile_picdate;
+
+ private static $a;
+
+ /**
+ * @brief App constructor.
+ */
+ function __construct() {
+
+ global $default_timezone;
+
+ $hostname = "";
+
+ if (file_exists(".htpreconfig.php"))
+ @include(".htpreconfig.php");
+
+ $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
+
+ date_default_timezone_set($this->timezone);
+
+ $this->performance["start"] = microtime(true);
+ $this->performance["database"] = 0;
+ $this->performance["database_write"] = 0;
+ $this->performance["network"] = 0;
+ $this->performance["file"] = 0;
+ $this->performance["rendering"] = 0;
+ $this->performance["parser"] = 0;
+ $this->performance["marktime"] = 0;
+ $this->performance["markstart"] = microtime(true);
+
+ $this->callstack["database"] = array();
+ $this->callstack["database_write"] = array();
+ $this->callstack["network"] = array();
+ $this->callstack["file"] = array();
+ $this->callstack["rendering"] = array();
+ $this->callstack["parser"] = array();
+
+ $this->config = array();
+ $this->page = array();
+ $this->pager= array();
+
+ $this->query_string = '';
+
+ $this->process_id = uniqid("log", true);
+
+ startup();
+
+ set_include_path(
+ 'include' . PATH_SEPARATOR
+ . 'library' . PATH_SEPARATOR
+ . 'library/phpsec' . PATH_SEPARATOR
+ . 'library/langdet' . PATH_SEPARATOR
+ . '.' );
+
+
+ $this->scheme = 'http';
+ if((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
+ (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+ (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+ (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+ (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+ (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+ ) {
+ $this->scheme = 'https';
+ }
+
+ if(x($_SERVER,'SERVER_NAME')) {
+ $this->hostname = $_SERVER['SERVER_NAME'];
+
+ if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+ $this->hostname .= ':' . $_SERVER['SERVER_PORT'];
/*
- $this->theme['template_engine'] = 'smarty3';
+ * Figure out if we are running at the top of a domain
+ * or in a sub-directory and adjust accordingly
+ */
- switch($engine) {
- case 'smarty3':
- if(is_writable('view/smarty3/'))
- $this->theme['template_engine'] = 'smarty3';
- break;
- default:
- break;
- }
- */
+ $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
+ if(isset($path) && strlen($path) && ($path != $this->path))
+ $this->path = $path;
}
- function get_template_ldelim($engine = 'smarty3') {
- return $this->ldelim[$engine];
+ if ($hostname != "")
+ $this->hostname = $hostname;
+
+ if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
+ $this->set_baseurl(array_pop($_SERVER["argv"]) );
+ $_SERVER["argc"] --;
}
- function get_template_rdelim($engine = 'smarty3') {
- return $this->rdelim[$engine];
+ #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
+
+ if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'],9);
+ // removing trailing / - maybe a nginx problem
+ if (substr($this->query_string, 0, 1) == "/")
+ $this->query_string = substr($this->query_string, 1);
+ } elseif ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'],2);
+ // removing trailing / - maybe a nginx problem
+ if (substr($this->query_string, 0, 1) == "/")
+ $this->query_string = substr($this->query_string, 1);
}
- function save_timestamp($stamp, $value) {
- $duration = (float)(microtime(true)-$stamp);
-
- $this->performance[$value] += (float)$duration;
- $this->performance["marktime"] += (float)$duration;
+ if (x($_GET,'pagename')) {
+ $this->cmd = trim($_GET['pagename'],'/\\');
+ } elseif (x($_GET,'q')) {
+ $this->cmd = trim($_GET['q'],'/\\');
}
- function mark_timestamp($mark) {
- //$this->performance["markstart"] -= microtime(true) - $this->performance["marktime"];
- $this->performance["markstart"] = microtime(true) - $this->performance["markstart"] - $this->performance["marktime"];
+
+ // fix query_string
+ $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
+
+
+ // unix style "homedir"
+
+ if (substr($this->cmd,0,1) === '~') {
+ $this->cmd = 'profile/' . substr($this->cmd,1);
}
- function get_useragent() {
- return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+ // Diaspora style profile url
+
+ if (substr($this->cmd,0,2) === 'u/') {
+ $this->cmd = 'profile/' . substr($this->cmd,2);
}
- function is_friendica_app() {
- return($this->is_friendica_app);
- }
- }
-}
+ /*
+ *
+ * Break the URL path into C style argc/argv style arguments for our
+ * modules. Given "http://example.com/module/arg1/arg2", $this->argc
+ * will be 3 (integer) and $this->argv will contain:
+ * [0] => 'module'
+ * [1] => 'arg1'
+ * [2] => 'arg2'
+ *
+ *
+ * There will always be one argument. If provided a naked domain
+ * URL, $this->argv[0] is set to "home".
+ *
+ */
-// retrieve the App structure
-// useful in functions which require it but don't get it passed to them
-
-if(! function_exists('get_app')) {
- function get_app() {
- global $a;
- return $a;
- }
-};
-
-
-// Multi-purpose function to check variable state.
-// Usage: x($var) or $x($array,'key')
-// returns false if variable/key is not set
-// if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
-// e.g. x('') or x(0) returns 0;
-
-if(! function_exists('x')) {
- function x($s,$k = NULL) {
- if($k != NULL) {
- if((is_array($s)) && (array_key_exists($k,$s))) {
- if($s[$k])
- return (int) 1;
- return (int) 0;
- }
- return false;
+ $this->argv = explode('/',$this->cmd);
+ $this->argc = count($this->argv);
+ if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+ $this->module = str_replace(".", "_", $this->argv[0]);
+ $this->module = str_replace("-", "_", $this->module);
}
else {
- if(isset($s)) {
- if($s) {
- return (int) 1;
- }
- return (int) 0;
+ $this->argc = 1;
+ $this->argv = array('home');
+ $this->module = 'home';
+ }
+
+ /*
+ * See if there is any page number information, and initialise
+ * pagination
+ */
+
+ $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
+ $this->pager['itemspage'] = 50;
+ $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+ if($this->pager['start'] < 0)
+ $this->pager['start'] = 0;
+ $this->pager['total'] = 0;
+
+ /*
+ * Detect mobile devices
+ */
+
+ $mobile_detect = new Mobile_Detect();
+ $this->is_mobile = $mobile_detect->isMobile();
+ $this->is_tablet = $mobile_detect->isTablet();
+
+ // Friendica-Client
+ $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == "Apache-HttpClient/UNAVAILABLE (java 1.4)");
+
+ /*
+ * register template engines
+ */
+ $dc = get_declared_classes();
+ foreach ($dc as $k) {
+ if (in_array("ITemplateEngine", class_implements($k))){
+ $this->register_template_engine($k);
+ }
+ }
+
+ self::$a = $this;
+
+ }
+
+ public static function get_basepath() {
+
+ $basepath = get_config("system", "basepath");
+
+ if ($basepath == "")
+ $basepath = dirname(__FILE__);
+
+ if ($basepath == "")
+ $basepath = $_SERVER["DOCUMENT_ROOT"];
+
+ if ($basepath == "")
+ $basepath = $_SERVER["PWD"];
+
+ return($basepath);
+ }
+
+ function get_scheme() {
+ return($this->scheme);
+ }
+
+ /**
+ * @brief Retrieves the Friendica instance base URL
+ *
+ * This function assembles the base URL from multiple parts:
+ * - Protocol is determined either by the request or a combination of
+ * system.ssl_policy and the $ssl parameter.
+ * - Host name is determined either by system.hostname or inferred from request
+ * - Path is inferred from SCRIPT_NAME
+ *
+ * Note: $ssl parameter value doesn't directly correlate with the resulting protocol
+ *
+ * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
+ * @return string Friendica server base URL
+ */
+ function get_baseurl($ssl = false) {
+
+ // Is the function called statically?
+ if (!(isset($this) && get_class($this) == __CLASS__)) {
+ return self::$a->get_baseurl($ssl);
+ }
+
+ $scheme = $this->scheme;
+
+ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
+ $scheme = 'https';
+ }
+
+ // Basically, we have $ssl = true on any links which can only be seen by a logged in user
+ // (and also the login link). Anything seen by an outsider will have it turned off.
+
+ if (Config::get('system', 'ssl_policy') == SSL_POLICY_SELFSIGN) {
+ if ($ssl) {
+ $scheme = 'https';
+ } else {
+ $scheme = 'http';
+ }
+ }
+
+ if (Config::get('config', 'hostname') != '') {
+ $this->hostname = Config::get('config', 'hostname');
+ }
+
+ return $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+ }
+
+ /**
+ * @brief Initializes the baseurl components
+ *
+ * Clears the baseurl cache to prevent inconstistencies
+ *
+ * @param string $url
+ */
+ function set_baseurl($url) {
+ $parsed = @parse_url($url);
+
+ if($parsed) {
+ $this->scheme = $parsed['scheme'];
+
+ $hostname = $parsed['host'];
+ if (x($parsed, 'port')) {
+ $hostname .= ':' . $parsed['port'];
+ }
+ if (x($parsed, 'path')) {
+ $this->path = trim($parsed['path'], '\\/');
+ }
+
+ if (file_exists(".htpreconfig.php")) {
+ @include(".htpreconfig.php");
+ }
+
+ if (get_config('config', 'hostname') != '') {
+ $this->hostname = get_config('config', 'hostname');
+ }
+
+ if (!isset($this->hostname) OR ($this->hostname == '')) {
+ $this->hostname = $hostname;
}
- return false;
}
}
-}
-// called from db initialisation if db is dead.
+ function get_hostname() {
+ if (get_config('config','hostname') != "")
+ $this->hostname = get_config('config','hostname');
-if(! function_exists('system_unavailable')) {
- function system_unavailable() {
- include('system_unavailable.php');
- system_down();
- killme();
+ return $this->hostname;
+ }
+
+ function set_hostname($h) {
+ $this->hostname = $h;
+ }
+
+ function set_path($p) {
+ $this->path = trim(trim($p),'/');
+ }
+
+ function get_path() {
+ return $this->path;
+ }
+
+ function set_pager_total($n) {
+ $this->pager['total'] = intval($n);
+ }
+
+ function set_pager_itemspage($n) {
+ $this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
+ $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+ }
+
+ function set_pager_page($n) {
+ $this->pager['page'] = $n;
+ $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+ }
+
+ function init_pagehead() {
+ $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+
+ // If the update is "deactivated" set it to the highest integer number (~24 days)
+ if ($interval < 0)
+ $interval = 2147483647;
+
+ if($interval < 10000)
+ $interval = 40000;
+
+ // compose the page title from the sitename and the
+ // current module called
+ if (!$this->module=='')
+ {
+ $this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
+ } else {
+ $this->page['title'] = $this->config['sitename'];
+ }
+
+ /* put the head template at the beginning of page['htmlhead']
+ * since the code added by the modules frequently depends on it
+ * being first
+ */
+ if(!isset($this->page['htmlhead']))
+ $this->page['htmlhead'] = '';
+
+ // If we're using Smarty, then doing replace_macros() will replace
+ // any unrecognized variables with a blank string. Since we delay
+ // replacing $stylesheet until later, we need to replace it now
+ // with another variable name
+ if($this->theme['template_engine'] === 'smarty3')
+ $stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
+ else
+ $stylesheet = '$stylesheet';
+
+ $shortcut_icon = get_config("system", "shortcut_icon");
+ if ($shortcut_icon == "")
+ $shortcut_icon = "images/friendica-32.png";
+
+ $touch_icon = get_config("system", "touch_icon");
+ if ($touch_icon == "")
+ $touch_icon = "images/friendica-128.png";
+
+ // get data wich is needed for infinite scroll on the network page
+ $invinite_scroll = infinite_scroll_data($this->module);
+
+ $tpl = get_markup_template('head.tpl');
+ $this->page['htmlhead'] = replace_macros($tpl,array(
+ '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
+ '$local_user' => local_user(),
+ '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
+ '$delitem' => t('Delete this item?'),
+ '$showmore' => t('show more'),
+ '$showfewer' => t('show fewer'),
+ '$update_interval' => $interval,
+ '$shortcut_icon' => $shortcut_icon,
+ '$touch_icon' => $touch_icon,
+ '$stylesheet' => $stylesheet,
+ '$infinite_scroll' => $invinite_scroll,
+ )) . $this->page['htmlhead'];
+ }
+
+ function init_page_end() {
+ if(!isset($this->page['end']))
+ $this->page['end'] = '';
+ $tpl = get_markup_template('end.tpl');
+ $this->page['end'] = replace_macros($tpl,array(
+ '$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
+ )) . $this->page['end'];
+ }
+
+ function set_curl_code($code) {
+ $this->curl_code = $code;
+ }
+
+ function get_curl_code() {
+ return $this->curl_code;
+ }
+
+ function set_curl_content_type($content_type) {
+ $this->curl_content_type = $content_type;
+ }
+
+ function get_curl_content_type() {
+ return $this->curl_content_type;
+ }
+
+ function set_curl_headers($headers) {
+ $this->curl_headers = $headers;
+ }
+
+ function get_curl_headers() {
+ return $this->curl_headers;
+ }
+
+ function get_cached_avatar_image($avatar_image){
+ return $avatar_image;
+
+ // The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
+ /*
+ if($this->cached_profile_image[$avatar_image])
+ return $this->cached_profile_image[$avatar_image];
+
+ $path_parts = explode("/",$avatar_image);
+ $common_filename = $path_parts[count($path_parts)-1];
+
+ if($this->cached_profile_picdate[$common_filename]){
+ $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+ } else {
+ $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
+ $common_filename);
+ if (! dbm::is_result($r)) {
+ $this->cached_profile_image[$avatar_image] = $avatar_image;
+ } else {
+ $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
+ $this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
+ }
+ }
+ return $this->cached_profile_image[$avatar_image];
+ */
+ }
+
+
+ /**
+ * @brief Removes the baseurl from an url. This avoids some mixed content problems.
+ *
+ * @param string $orig_url
+ *
+ * @return string The cleaned url
+ */
+ function remove_baseurl($orig_url){
+
+ // Is the function called statically?
+ if (!(isset($this) && get_class($this) == __CLASS__)) {
+ return(self::$a->remove_baseurl($orig_url));
+ }
+
+ // Remove the hostname from the url if it is an internal link
+ $nurl = normalise_link($orig_url);
+ $base = normalise_link($this->get_baseurl());
+ $url = str_replace($base."/", "", $nurl);
+
+ // if it is an external link return the orignal value
+ if ($url == normalise_link($orig_url)) {
+ return $orig_url;
+ } else {
+ return $url;
+ }
+ }
+
+ /**
+ * @brief Register template engine class
+ *
+ * If $name is "", is used class static property $class::$name
+ *
+ * @param string $class
+ * @param string $name
+ */
+ function register_template_engine($class, $name = '') {
+ if ($name===""){
+ $v = get_class_vars( $class );
+ if(x($v,"name")) $name = $v['name'];
+ }
+ if ($name===""){
+ echo "template engine $class cannot be registered without a name.\n";
+ killme();
+ }
+ $this->template_engines[$name] = $class;
+ }
+
+ /**
+ * @brief Return template engine instance.
+ *
+ * If $name is not defined, return engine defined by theme,
+ * or default
+ *
+ * @param strin $name Template engine name
+ * @return object Template Engine instance
+ */
+ function template_engine($name = ''){
+ if ($name!=="") {
+ $template_engine = $name;
+ } else {
+ $template_engine = 'smarty3';
+ if (x($this->theme, 'template_engine')) {
+ $template_engine = $this->theme['template_engine'];
+ }
+ }
+
+ if (isset($this->template_engines[$template_engine])){
+ if(isset($this->template_engine_instance[$template_engine])){
+ return $this->template_engine_instance[$template_engine];
+ } else {
+ $class = $this->template_engines[$template_engine];
+ $obj = new $class;
+ $this->template_engine_instance[$template_engine] = $obj;
+ return $obj;
+ }
+ }
+
+ echo "template engine $template_engine is not registered!\n"; killme();
+ }
+
+ /**
+ * @brief Returns the active template engine.
+ *
+ * @return string
+ */
+ function get_template_engine() {
+ return $this->theme['template_engine'];
+ }
+
+ function set_template_engine($engine = 'smarty3') {
+ $this->theme['template_engine'] = $engine;
+ /*
+ $this->theme['template_engine'] = 'smarty3';
+
+ switch($engine) {
+ case 'smarty3':
+ if(is_writable('view/smarty3/'))
+ $this->theme['template_engine'] = 'smarty3';
+ break;
+ default:
+ break;
+ }
+ */
+ }
+
+ function get_template_ldelim($engine = 'smarty3') {
+ return $this->ldelim[$engine];
+ }
+
+ function get_template_rdelim($engine = 'smarty3') {
+ return $this->rdelim[$engine];
+ }
+
+ function save_timestamp($stamp, $value) {
+ if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler'])
+ return;
+
+ $duration = (float)(microtime(true)-$stamp);
+
+ if (!isset($this->performance[$value])) {
+ // Prevent ugly E_NOTICE
+ $this->performance[$value] = 0;
+ }
+
+ $this->performance[$value] += (float)$duration;
+ $this->performance["marktime"] += (float)$duration;
+
+ $callstack = $this->callstack();
+
+ if (!isset($this->callstack[$value][$callstack])) {
+ // Prevent ugly E_NOTICE
+ $this->callstack[$value][$callstack] = 0;
+ }
+
+ $this->callstack[$value][$callstack] += (float)$duration;
+
+ }
+
+ /**
+ * @brief Log active processes into the "process" table
+ */
+ function start_process() {
+ $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+
+ $command = basename($trace[0]["file"]);
+
+ $this->remove_inactive_processes();
+
+ q("START TRANSACTION");
+
+ $r = q("SELECT `pid` FROM `process` WHERE `pid` = %d", intval(getmypid()));
+ if (!dbm::is_result($r)) {
+ q("INSERT INTO `process` (`pid`,`command`,`created`) VALUES (%d, '%s', '%s')",
+ intval(getmypid()),
+ dbesc($command),
+ dbesc(datetime_convert()));
+ }
+ q("COMMIT");
+ }
+
+ /**
+ * @brief Remove inactive processes
+ */
+ function remove_inactive_processes() {
+ q("START TRANSACTION");
+
+ $r = q("SELECT `pid` FROM `process`");
+ if (dbm::is_result($r)) {
+ foreach ($r AS $process) {
+ if (!posix_kill($process["pid"], 0)) {
+ q("DELETE FROM `process` WHERE `pid` = %d", intval($process["pid"]));
+ }
+ }
+ }
+ q("COMMIT");
+ }
+
+ /**
+ * @brief Remove the active process from the "process" table
+ */
+ function end_process() {
+ q("DELETE FROM `process` WHERE `pid` = %d", intval(getmypid()));
+ }
+
+ /**
+ * @brief Returns a string with a callstack. Can be used for logging.
+ *
+ * @return string
+ */
+ function callstack() {
+ $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
+
+ // We remove the first two items from the list since they contain data that we don't need.
+ array_shift($trace);
+ array_shift($trace);
+
+ $callstack = array();
+ foreach ($trace AS $func)
+ $callstack[] = $func["function"];
+
+ return implode(", ", $callstack);
+ }
+
+ function get_useragent() {
+ return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+ }
+
+ function is_friendica_app() {
+ return($this->is_friendica_app);
+ }
+
+ /**
+ * @brief Checks if the site is called via a backend process
+ *
+ * This isn't a perfect solution. But we need this check very early.
+ * So we cannot wait until the modules are loaded.
+ *
+ * @return bool Is it a known backend?
+ */
+ function is_backend() {
+ $backend = array();
+ $backend[] = "_well_known";
+ $backend[] = "api";
+ $backend[] = "dfrn_notify";
+ $backend[] = "fetch";
+ $backend[] = "hcard";
+ $backend[] = "hostxrd";
+ $backend[] = "nodeinfo";
+ $backend[] = "noscrape";
+ $backend[] = "p";
+ $backend[] = "poco";
+ $backend[] = "post";
+ $backend[] = "proxy";
+ $backend[] = "pubsub";
+ $backend[] = "pubsubhubbub";
+ $backend[] = "receive";
+ $backend[] = "rsd_xml";
+ $backend[] = "salmon";
+ $backend[] = "statistics_json";
+ $backend[] = "xrd";
+
+ if (in_array($this->module, $backend))
+ return(true);
+ else
+ return($this->backend);
+ }
+
+ /**
+ * @brief Checks if the maximum number of database processes is reached
+ *
+ * @return bool Is the limit reached?
+ */
+ function max_processes_reached() {
+
+ if ($this->is_backend()) {
+ $process = "backend";
+ $max_processes = get_config('system', 'max_processes_backend');
+ if (intval($max_processes) == 0)
+ $max_processes = 5;
+ } else {
+ $process = "frontend";
+ $max_processes = get_config('system', 'max_processes_frontend');
+ if (intval($max_processes) == 0)
+ $max_processes = 20;
+ }
+
+ $processlist = dbm::processlist();
+ if ($processlist["list"] != "") {
+ logger("Processcheck: Processes: ".$processlist["amount"]." - Processlist: ".$processlist["list"], LOGGER_DEBUG);
+
+ if ($processlist["amount"] > $max_processes) {
+ logger("Processcheck: Maximum number of processes for ".$process." tasks (".$max_processes.") reached.", LOGGER_DEBUG);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @brief Checks if the maximum load is reached
+ *
+ * @return bool Is the load reached?
+ */
+ function maxload_reached() {
+
+ if ($this->is_backend()) {
+ $process = "backend";
+ $maxsysload = intval(get_config('system', 'maxloadavg'));
+ if ($maxsysload < 1)
+ $maxsysload = 50;
+ } else {
+ $process = "frontend";
+ $maxsysload = intval(get_config('system','maxloadavg_frontend'));
+ if ($maxsysload < 1)
+ $maxsysload = 50;
+ }
+
+ $load = current_load();
+ if ($load) {
+ if (intval($load) > $maxsysload) {
+ logger('system: load '.$load.' for '.$process.' tasks ('.$maxsysload.') too high.');
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @brief Checks if the process is already running
+ *
+ * @param string $taskname The name of the task that will be used for the name of the lockfile
+ * @param string $task The path and name of the php script
+ * @param int $timeout The timeout after which a task should be killed
+ *
+ * @return bool Is the process running?
+ */
+ function is_already_running($taskname, $task = "", $timeout = 540) {
+
+ $lockpath = get_lockpath();
+ if ($lockpath != '') {
+ $pidfile = new pidfile($lockpath, $taskname);
+ if ($pidfile->is_already_running()) {
+ logger("Already running");
+ if ($pidfile->running_time() > $timeout) {
+ $pidfile->kill();
+ logger("killed stale process");
+ // Calling a new instance
+ if ($task != "")
+ proc_run(PRIORITY_MEDIUM, $task);
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ function proc_run($args) {
+
+ if (!function_exists("proc_open")) {
+ return;
+ }
+
+ // Add the php path if it is a php call
+ if (count($args) && ($args[0] === 'php' OR !is_string($args[0]))) {
+
+ // If the last worker fork was less than 10 seconds before then don't fork another one.
+ // This should prevent the forking of masses of workers.
+ if (get_config("system", "worker")) {
+ $cachekey = "app:proc_run:started";
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ if ((time() - $result) < 10) {
+ return;
+ }
+ }
+ // Set the timestamp of the last proc_run
+ Cache::set($cachekey, time(), CACHE_MINUTE);
+ }
+
+ $args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
+ }
+
+ // add baseurl to args. cli scripts can't construct it
+ $args[] = $this->get_baseurl();
+
+ for($x = 0; $x < count($args); $x ++)
+ $args[$x] = escapeshellarg($args[$x]);
+
+ $cmdline = implode($args," ");
+
+ if(get_config('system','proc_windows'))
+ proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
+ else
+ proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
+
+ }
+
+ /**
+ * @brief Returns the system user that is executing the script
+ *
+ * This mostly returns something like "www-data".
+ *
+ * @return string system username
+ */
+ static function systemuser() {
+ if (!function_exists('posix_getpwuid') OR !function_exists('posix_geteuid')) {
+ return '';
+ }
+
+ $processUser = posix_getpwuid(posix_geteuid());
+ return $processUser['name'];
+ }
+
+ /**
+ * @brief Checks if a given directory is usable for the system
+ *
+ * @return boolean the directory is usable
+ */
+ static function directory_usable($directory) {
+
+ if ($directory == '') {
+ logger("Directory is empty. This shouldn't happen.", LOGGER_DEBUG);
+ return false;
+ }
+
+ if (!file_exists($directory)) {
+ logger('Path "'.$directory.'" does not exist for user '.self::systemuser(), LOGGER_DEBUG);
+ return false;
+ }
+ if (is_file($directory)) {
+ logger('Path "'.$directory.'" is a file for user '.self::systemuser(), LOGGER_DEBUG);
+ return false;
+ }
+ if (!is_dir($directory)) {
+ logger('Path "'.$directory.'" is not a directory for user '.self::systemuser(), LOGGER_DEBUG);
+ return false;
+ }
+ if (!is_writable($directory)) {
+ logger('Path "'.$directory.'" is not writable for user '.self::systemuser(), LOGGER_DEBUG);
+ return false;
+ }
+ return true;
}
}
+/**
+ * @brief Retrieve the App structure
+ *
+ * Useful in functions which require it but don't get it passed to them
+ */
+function get_app() {
+ global $a;
+ return $a;
+}
+
+
+/**
+ * @brief Multi-purpose function to check variable state.
+ *
+ * Usage: x($var) or $x($array, 'key')
+ *
+ * returns false if variable/key is not set
+ * if variable is set, returns 1 if has 'non-zero' value, otherwise returns 0.
+ * e.g. x('') or x(0) returns 0;
+ *
+ * @param string|array $s variable to check
+ * @param string $k key inside the array to check
+ *
+ * @return bool|int
+ */
+function x($s,$k = NULL) {
+ if($k != NULL) {
+ if((is_array($s)) && (array_key_exists($k,$s))) {
+ if($s[$k])
+ return (int) 1;
+ return (int) 0;
+ }
+ return false;
+ }
+ else {
+ if(isset($s)) {
+ if($s) {
+ return (int) 1;
+ }
+ return (int) 0;
+ }
+ return false;
+ }
+}
+
+
+/**
+ * @brief Called from db initialisation if db is dead.
+ */
+function system_unavailable() {
+ include('system_unavailable.php');
+ system_down();
+ killme();
+}
function clean_urls() {
- global $a;
- // if($a->config['system']['clean_urls'])
+ $a = get_app();
return true;
- // return false;
}
function z_path() {
- global $a;
- $base = $a->get_baseurl();
+ $base = App::get_baseurl();
+
if(! clean_urls())
$base .= '/?q=';
+
return $base;
}
+/**
+ * @brief Returns the baseurl.
+ *
+ * @see App::get_baseurl()
+ *
+ * @return string
+ * @TODO Maybe super-flous and deprecated? Seems to only wrap App::get_baseurl()
+ */
function z_root() {
- global $a;
- return $a->get_baseurl();
+ return App::get_baseurl();
}
+/**
+ * @brief Return absolut URL for given $path.
+ *
+ * @param string $path
+ *
+ * @return string
+ */
function absurl($path) {
if(strpos($path,'/') === 0)
return z_path() . $path;
return $path;
}
+/**
+ * @brief Function to check if request was an AJAX (xmlhttprequest) request.
+ *
+ * @return boolean
+ */
function is_ajax() {
return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
}
@@ -1039,202 +1576,194 @@ function check_db() {
$build = DB_UPDATE_VERSION;
}
if($build != DB_UPDATE_VERSION)
- proc_run('php', 'include/dbupdate.php');
+ proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
}
+/**
+ * Sets the base url for use in cmdline programs which don't have
+ * $_SERVER variables
+ */
+function check_url(App $a) {
+ $url = get_config('system','url');
-// Sets the base url for use in cmdline programs which don't have
-// $_SERVER variables
+ // if the url isn't set or the stored url is radically different
+ // than the currently visited url, store the current value accordingly.
+ // "Radically different" ignores common variations such as http vs https
+ // and www.example.com vs example.com.
+ // We will only change the url to an ip address if there is no existing setting
-if(! function_exists('check_url')) {
- function check_url(&$a) {
+ if(! x($url))
+ $url = set_config('system','url',App::get_baseurl());
+ if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+ $url = set_config('system','url',App::get_baseurl());
- $url = get_config('system','url');
-
- // if the url isn't set or the stored url is radically different
- // than the currently visited url, store the current value accordingly.
- // "Radically different" ignores common variations such as http vs https
- // and www.example.com vs example.com.
- // We will only change the url to an ip address if there is no existing setting
-
- if(! x($url))
- $url = set_config('system','url',$a->get_baseurl());
- if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
- $url = set_config('system','url',$a->get_baseurl());
-
- return;
- }
+ return;
}
-// Automatic database updates
+/**
+ * @brief Automatic database updates
+ */
+function update_db(App $a) {
+ $build = get_config('system','build');
+ if(! x($build))
+ $build = set_config('system','build',DB_UPDATE_VERSION);
-if(! function_exists('update_db')) {
- function update_db(&$a) {
- $build = get_config('system','build');
- if(! x($build))
- $build = set_config('system','build',DB_UPDATE_VERSION);
+ if($build != DB_UPDATE_VERSION) {
+ $stored = intval($build);
+ $current = intval(DB_UPDATE_VERSION);
+ if($stored < $current) {
+ Config::load('database');
- if($build != DB_UPDATE_VERSION) {
- $stored = intval($build);
- $current = intval(DB_UPDATE_VERSION);
- if($stored < $current) {
- load_config('database');
+ // We're reporting a different version than what is currently installed.
+ // Run any existing update scripts to bring the database up to current.
- // We're reporting a different version than what is currently installed.
- // Run any existing update scripts to bring the database up to current.
+ // make sure that boot.php and update.php are the same release, we might be
+ // updating right this very second and the correct version of the update.php
+ // file may not be here yet. This can happen on a very busy site.
- // make sure that boot.php and update.php are the same release, we might be
- // updating right this very second and the correct version of the update.php
- // file may not be here yet. This can happen on a very busy site.
+ if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+ // Compare the current structure with the defined structure
- if(DB_UPDATE_VERSION == UPDATE_VERSION) {
- // Compare the current structure with the defined structure
+ $t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
+ if($t !== false)
+ return;
- $t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
- if($t !== false)
- return;
+ set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
- set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
-
- // run old update routine (wich could modify the schema and
- // conflits with new routine)
- for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
- $r = run_update_function($x);
- if (!$r) break;
- }
- if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
+ // run old update routine (wich could modify the schema and
+ // conflits with new routine)
+ for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
+ $r = run_update_function($x);
+ if (!$r) break;
+ }
+ if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
- // run new update routine
- // it update the structure in one call
- $retval = update_structure(false, true);
- if($retval) {
- update_fail(
- DB_UPDATE_VERSION,
- $retval
- );
- return;
- } else {
- set_config('database','dbupdate_'.DB_UPDATE_VERSION, 'success');
- }
+ // run new update routine
+ // it update the structure in one call
+ $retval = update_structure(false, true);
+ if($retval) {
+ update_fail(
+ DB_UPDATE_VERSION,
+ $retval
+ );
+ return;
+ } else {
+ set_config('database','dbupdate_'.DB_UPDATE_VERSION, 'success');
+ }
- // run any left update_nnnn functions in update.php
- for($x = $stored; $x < $current; $x ++) {
- $r = run_update_function($x);
- if (!$r) break;
- }
+ // run any left update_nnnn functions in update.php
+ for($x = $stored; $x < $current; $x ++) {
+ $r = run_update_function($x);
+ if (!$r) break;
}
}
}
-
- return;
}
+
+ return;
}
-if(!function_exists('run_update_function')){
- function run_update_function($x) {
- if(function_exists('update_' . $x)) {
- // There could be a lot of processes running or about to run.
- // We want exactly one process to run the update command.
- // So store the fact that we're taking responsibility
- // after first checking to see if somebody else already has.
+function run_update_function($x) {
+ if(function_exists('update_' . $x)) {
- // If the update fails or times-out completely you may need to
- // delete the config entry to try again.
+ // There could be a lot of processes running or about to run.
+ // We want exactly one process to run the update command.
+ // So store the fact that we're taking responsibility
+ // after first checking to see if somebody else already has.
- $t = get_config('database','update_' . $x);
- if($t !== false)
- return false;
- set_config('database','update_' . $x, time());
+ // If the update fails or times-out completely you may need to
+ // delete the config entry to try again.
- // call the specific update
+ $t = get_config('database','update_' . $x);
+ if($t !== false)
+ return false;
+ set_config('database','update_' . $x, time());
- $func = 'update_' . $x;
- $retval = $func();
+ // call the specific update
- if($retval) {
- //send the administrator an e-mail
- update_fail(
- $x,
- sprintf(t('Update %s failed. See error logs.'), $x)
- );
- return false;
- } else {
- set_config('database','update_' . $x, 'success');
- set_config('system','build', $x + 1);
- return true;
- }
+ $func = 'update_' . $x;
+ $retval = $func();
+
+ if($retval) {
+ //send the administrator an e-mail
+ update_fail(
+ $x,
+ sprintf(t('Update %s failed. See error logs.'), $x)
+ );
+ return false;
} else {
set_config('database','update_' . $x, 'success');
set_config('system','build', $x + 1);
return true;
}
+ } else {
+ set_config('database','update_' . $x, 'success');
+ set_config('system','build', $x + 1);
return true;
}
+ return true;
}
+/**
+ * @brief Synchronise plugins:
+ *
+ * $a->config['system']['addon'] contains a comma-separated list of names
+ * of plugins/addons which are used on this system.
+ * Go through the database list of already installed addons, and if we have
+ * an entry, but it isn't in the config list, call the uninstall procedure
+ * and mark it uninstalled in the database (for now we'll remove it).
+ * Then go through the config list and if we have a plugin that isn't installed,
+ * call the install procedure and add it to the database.
+ *
+ * @param App $a
+ *
+ */
+function check_plugins(App $a) {
-if(! function_exists('check_plugins')) {
- function check_plugins(&$a) {
+ $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
+ if (dbm::is_result($r))
+ $installed = $r;
+ else
+ $installed = array();
- /**
- *
- * Synchronise plugins:
- *
- * $a->config['system']['addon'] contains a comma-separated list of names
- * of plugins/addons which are used on this system.
- * Go through the database list of already installed addons, and if we have
- * an entry, but it isn't in the config list, call the uninstall procedure
- * and mark it uninstalled in the database (for now we'll remove it).
- * Then go through the config list and if we have a plugin that isn't installed,
- * call the install procedure and add it to the database.
- *
- */
+ $plugins = get_config('system','addon');
+ $plugins_arr = array();
- $r = q("SELECT * FROM `addon` WHERE `installed` = 1");
- if(count($r))
- $installed = $r;
- else
- $installed = array();
+ if($plugins)
+ $plugins_arr = explode(',',str_replace(' ', '',$plugins));
- $plugins = get_config('system','addon');
- $plugins_arr = array();
+ $a->plugins = $plugins_arr;
- if($plugins)
- $plugins_arr = explode(',',str_replace(' ', '',$plugins));
+ $installed_arr = array();
- $a->plugins = $plugins_arr;
-
- $installed_arr = array();
-
- if(count($installed)) {
- foreach($installed as $i) {
- if(! in_array($i['name'],$plugins_arr)) {
- uninstall_plugin($i['name']);
- }
- else {
- $installed_arr[] = $i['name'];
- }
+ if(count($installed)) {
+ foreach($installed as $i) {
+ if(! in_array($i['name'],$plugins_arr)) {
+ uninstall_plugin($i['name']);
+ }
+ else {
+ $installed_arr[] = $i['name'];
}
}
-
- if(count($plugins_arr)) {
- foreach($plugins_arr as $p) {
- if(! in_array($p,$installed_arr)) {
- install_plugin($p);
- }
- }
- }
-
-
- load_hooks();
-
- return;
}
+
+ if(count($plugins_arr)) {
+ foreach($plugins_arr as $p) {
+ if(! in_array($p,$installed_arr)) {
+ install_plugin($p);
+ }
+ }
+ }
+
+
+ load_hooks();
+
+ return;
}
function get_guid($size=16, $prefix = "") {
@@ -1251,457 +1780,451 @@ function get_guid($size=16, $prefix = "") {
$prefix = substr($prefix, 0, $size - 22);
return(str_replace(".", "", uniqid($prefix, true)));
} else {
- $prefix = substr($prefix, 0, $size - 13);
+ $prefix = substr($prefix, 0, max($size - 13, 0));
return(uniqid($prefix));
}
}
-// wrapper for adding a login box. If $register == true provide a registration
-// link. This will most always depend on the value of $a->config['register_policy'].
-// returns the complete html for inserting into the page
+/**
+ * @brief Wrapper for adding a login box.
+ *
+ * @param bool $register
+ * If $register == true provide a registration link.
+ * This will most always depend on the value of $a->config['register_policy'].
+ * @param bool $hiddens
+ *
+ * @return string
+ * Returns the complete html for inserting into the page
+ *
+ * @hooks 'login_hook'
+ * string $o
+ */
+function login($register = false, $hiddens=false) {
+ $a = get_app();
+ $o = "";
+ $reg = false;
+ if ($register) {
+ $reg = array(
+ 'title' => t('Create a New Account'),
+ 'desc' => t('Register')
+ );
+ }
-if(! function_exists('login')) {
- function login($register = false, $hiddens=false) {
- $a = get_app();
- $o = "";
- $reg = false;
- if ($register) {
- $reg = array(
- 'title' => t('Create a New Account'),
- 'desc' => t('Register')
- );
- }
+ $noid = get_config('system','no_openid');
- $noid = get_config('system','no_openid');
-
- $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
-
- if(local_user()) {
- $tpl = get_markup_template("logout.tpl");
- }
- else {
- $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
- '$baseurl' => $a->get_baseurl(true)
- ));
-
- $tpl = get_markup_template("login.tpl");
- $_SESSION['return_url'] = $a->query_string;
- $a->module = 'login';
- }
-
- $o .= replace_macros($tpl, array(
-
- '$dest_url' => $dest_url,
- '$logout' => t('Logout'),
- '$login' => t('Login'),
-
- '$lname' => array('username', t('Nickname or Email address: ') , '', ''),
- '$lpassword' => array('password', t('Password: '), '', ''),
- '$lremember' => array('remember', t('Remember me'), 0, ''),
-
- '$openid' => !$noid,
- '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
-
- '$hiddens' => $hiddens,
-
- '$register' => $reg,
-
- '$lostpass' => t('Forgot your password?'),
- '$lostlink' => t('Password Reset'),
-
- '$tostitle' => t('Website Terms of Service'),
- '$toslink' => t('terms of service'),
-
- '$privacytitle' => t('Website Privacy Policy'),
- '$privacylink' => t('privacy policy'),
+ $dest_url = $a->query_string;
+ if(local_user()) {
+ $tpl = get_markup_template("logout.tpl");
+ }
+ else {
+ $a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
+ '$baseurl' => $a->get_baseurl(true)
));
- call_hooks('login_hook',$o);
-
- return $o;
+ $tpl = get_markup_template("login.tpl");
+ $_SESSION['return_url'] = $a->query_string;
+ $a->module = 'login';
}
-}
-// Used to end the current process, after saving session state.
+ $o .= replace_macros($tpl, array(
-if(! function_exists('killme')) {
- function killme() {
- session_write_close();
- exit;
- }
-}
+ '$dest_url' => $dest_url,
+ '$logout' => t('Logout'),
+ '$login' => t('Login'),
-// redirect to another URL and terminate this process.
+ '$lname' => array('username', t('Nickname or Email: ') , '', ''),
+ '$lpassword' => array('password', t('Password: '), '', ''),
+ '$lremember' => array('remember', t('Remember me'), 0, ''),
-if(! function_exists('goaway')) {
- function goaway($s) {
- header("Location: $s");
- killme();
- }
-}
+ '$openid' => !$noid,
+ '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
+ '$hiddens' => $hiddens,
-// Returns the uid of locally logged in user or false.
+ '$register' => $reg,
-if(! function_exists('local_user')) {
- function local_user() {
- if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
- return intval($_SESSION['uid']);
- return false;
- }
-}
+ '$lostpass' => t('Forgot your password?'),
+ '$lostlink' => t('Password Reset'),
-// Returns contact id of authenticated site visitor or false
+ '$tostitle' => t('Website Terms of Service'),
+ '$toslink' => t('terms of service'),
-if(! function_exists('remote_user')) {
- function remote_user() {
- if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
- return intval($_SESSION['visitor_id']);
- return false;
- }
-}
+ '$privacytitle' => t('Website Privacy Policy'),
+ '$privacylink' => t('privacy policy'),
-// contents of $s are displayed prominently on the page the next time
-// a page is loaded. Usually used for errors or alerts.
+ ));
-if(! function_exists('notice')) {
- /**
- * Show an error message to user.
- *
- * This function save text in session, to be shown to the user at next page load
- *
- * @param string $s - Text of notice
- */
- function notice($s) {
- $a = get_app();
- if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
- if($a->interactive)
- $_SESSION['sysmsg'][] = $s;
- }
-}
-if(! function_exists('info')) {
- /**
- * Show an info message to user.
- *
- * This function save text in session, to be shown to the user at next page load
- *
- * @param string $s - Text of notice
- */
- function info($s) {
- $a = get_app();
+ call_hooks('login_hook',$o);
- if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
- return;
-
- if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
- if($a->interactive)
- $_SESSION['sysmsg_info'][] = $s;
- }
-}
-
-
-// wrapper around config to limit the text length of an incoming message
-
-if(! function_exists('get_max_import_size')) {
- function get_max_import_size() {
- global $a;
- return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
- }
+ return $o;
}
/**
- *
- * Wrap calls to proc_close(proc_open()) and call hook
- * so plugins can take part in process :)
- *
- * args:
- * $cmd program to run
- * next args are passed as $cmd command line
- *
- * e.g.: proc_run("ls","-la","/tmp");
- *
- * $cmd and string args are surrounded with ""
+ * @brief Used to end the current process, after saving session state.
*/
+function killme() {
-if(! function_exists('proc_run')) {
- function proc_run($cmd){
+ if (!get_app()->is_backend())
+ session_write_close();
- $a = get_app();
-
- $args = func_get_args();
-
- $newargs = array();
- if(! count($args))
- return;
-
- // expand any arrays
-
- foreach($args as $arg) {
- if(is_array($arg)) {
- foreach($arg as $n) {
- $newargs[] = $n;
- }
- }
- else
- $newargs[] = $arg;
- }
-
- $args = $newargs;
-
- $arr = array('args' => $args, 'run_cmd' => true);
-
- call_hooks("proc_run", $arr);
- if(! $arr['run_cmd'])
- return;
-
- if(count($args) && $args[0] === 'php') {
-
- if (get_config("system", "worker")) {
- $argv = $args;
- array_shift($argv);
-
- $parameters = json_encode($argv);
- $found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
- dbesc($parameters));
-
- if (!$found)
- q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
- VALUES ('%s', '%s', %d)",
- dbesc($parameters),
- dbesc(datetime_convert()),
- intval(0));
-
- // Should we quit and wait for the poller to be called as a cronjob?
- if (get_config("system", "worker_dont_fork"))
- return;
-
- // Checking number of workers
- $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
-
- // Get number of allowed number of worker threads
- $queues = intval(get_config("system", "worker_queues"));
-
- if ($queues == 0)
- $queues = 4;
-
- // If there are already enough workers running, don't fork another one
- if ($workers[0]["workers"] >= $queues)
- return;
-
- // Now call the poller to execute the jobs that we just added to the queue
- $args = array("php", "include/poller.php", "no_cron");
- }
-
- $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
- }
-
- // add baseurl to args. cli scripts can't construct it
- $args[] = $a->get_baseurl();
-
- for($x = 0; $x < count($args); $x ++)
- $args[$x] = escapeshellarg($args[$x]);
-
- $cmdline = implode($args," ");
-
- if(get_config('system','proc_windows'))
- proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
- else
- proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
- }
+ exit;
}
-if(! function_exists('current_theme')) {
- function current_theme(){
- $app_base_themes = array('duepuntozero', 'dispy', 'quattro');
+/**
+ * @brief Redirect to another URL and terminate this process.
+ */
+function goaway($s) {
+ if (!strstr(normalise_link($s), "http://"))
+ $s = App::get_baseurl()."/".$s;
- $a = get_app();
+ header("Location: $s");
+ killme();
+}
- $page_theme = null;
- // Find the theme that belongs to the user whose stuff we are looking at
+/**
+ * @brief Returns the user id of locally logged in user or false.
+ *
+ * @return int|bool user id or false
+ */
+function local_user() {
+ if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
+ return intval($_SESSION['uid']);
+ return false;
+}
- if($a->profile_uid && ($a->profile_uid != local_user())) {
- $r = q("select theme from user where uid = %d limit 1",
- intval($a->profile_uid)
- );
- if($r)
- $page_theme = $r[0]['theme'];
+/**
+ * @brief Returns contact id of authenticated site visitor or false
+ *
+ * @return int|bool visitor_id or false
+ */
+function remote_user() {
+ if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+ return intval($_SESSION['visitor_id']);
+ return false;
+}
+
+/**
+ * @brief Show an error message to user.
+ *
+ * This function save text in session, to be shown to the user at next page load
+ *
+ * @param string $s - Text of notice
+ */
+function notice($s) {
+ $a = get_app();
+ if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
+ if($a->interactive)
+ $_SESSION['sysmsg'][] = $s;
+}
+
+/**
+ * @brief Show an info message to user.
+ *
+ * This function save text in session, to be shown to the user at next page load
+ *
+ * @param string $s - Text of notice
+ */
+function info($s) {
+ $a = get_app();
+
+ if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
+ return;
+
+ if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
+ if($a->interactive)
+ $_SESSION['sysmsg_info'][] = $s;
+}
+
+
+/**
+ * @brief Wrapper around config to limit the text length of an incoming message
+ *
+ * @return int
+ */
+function get_max_import_size() {
+ $a = get_app();
+ return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
+}
+
+/**
+ * @brief Wrap calls to proc_close(proc_open()) and call hook
+ * so plugins can take part in process :)
+ *
+ * @param (string|integer|array) $cmd program to run, priority or parameter array
+ *
+ * next args are passed as $cmd command line
+ * e.g.: proc_run("ls","-la","/tmp");
+ * or: proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+ * or: proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/create_shadowentry.php", $post_id);
+ *
+ * @note $cmd and string args are surrounded with ""
+ *
+ * @hooks 'proc_run'
+ * array $arr
+ */
+function proc_run($cmd){
+
+ $a = get_app();
+
+ $proc_args = func_get_args();
+
+ $args = array();
+ if (!count($proc_args)) {
+ return;
+ }
+
+ // Preserve the first parameter
+ // It could contain a command, the priority or an parameter array
+ // If we use the parameter array we have to protect it from the following function
+ $run_parameter = array_shift($proc_args);
+
+ // expand any arrays
+ foreach ($proc_args as $arg) {
+ if (is_array($arg)) {
+ foreach ($arg as $n) {
+ $args[] = $n;
+ }
+ } else {
+ $args[] = $arg;
}
+ }
- // Allow folks to over-rule user themes and always use their own on their own site.
- // This works only if the user is on the same server
+ // Now we add the run parameters back to the array
+ array_unshift($args, $run_parameter);
- if($page_theme && local_user() && (local_user() != $a->profile_uid)) {
- if(get_pconfig(local_user(),'system','always_my_theme'))
- $page_theme = null;
+ $arr = array('args' => $args, 'run_cmd' => true);
+
+ call_hooks("proc_run", $arr);
+ if (!$arr['run_cmd'] OR !count($args))
+ return;
+
+ if (!get_config("system", "worker") OR (is_string($run_parameter) AND ($run_parameter != 'php'))) {
+ $a->proc_run($args);
+ return;
+ }
+
+ $priority = PRIORITY_MEDIUM;
+ $dont_fork = get_config("system", "worker_dont_fork");
+
+ if (is_int($run_parameter)) {
+ $priority = $run_parameter;
+ } elseif (is_array($run_parameter)) {
+ if (isset($run_parameter['priority'])) {
+ $priority = $run_parameter['priority'];
}
+ if (isset($run_parameter['dont_fork'])) {
+ $dont_fork = $run_parameter['dont_fork'];
+ }
+ }
+
+ $argv = $args;
+ array_shift($argv);
+
+ $parameters = json_encode($argv);
+ $found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
+ dbesc($parameters));
+
+ if (!$found)
+ q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
+ VALUES ('%s', '%s', %d)",
+ dbesc($parameters),
+ dbesc(datetime_convert()),
+ intval($priority));
+
+ // Should we quit and wait for the poller to be called as a cronjob?
+ if ($dont_fork) {
+ return;
+ }
+
+ // Checking number of workers
+ $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+ // Get number of allowed number of worker threads
+ $queues = intval(get_config("system", "worker_queues"));
+
+ if ($queues == 0)
+ $queues = 4;
+
+ // If there are already enough workers running, don't fork another one
+ if ($workers[0]["workers"] >= $queues)
+ return;
+
+ // Now call the poller to execute the jobs that we just added to the queue
+ $args = array("php", "include/poller.php", "no_cron");
+
+ $a->proc_run($args);
+}
+
+function current_theme(){
+ $app_base_themes = array('duepuntozero', 'dispy', 'quattro');
+
+ $a = get_app();
+
+ $page_theme = null;
+
+ // Find the theme that belongs to the user whose stuff we are looking at
+
+ if($a->profile_uid && ($a->profile_uid != local_user())) {
+ $r = q("select theme from user where uid = %d limit 1",
+ intval($a->profile_uid)
+ );
+ if (dbm::is_result($r))
+ $page_theme = $r[0]['theme'];
+ }
+
+ // Allow folks to over-rule user themes and always use their own on their own site.
+ // This works only if the user is on the same server
+
+ if($page_theme && local_user() && (local_user() != $a->profile_uid)) {
+ if(get_pconfig(local_user(),'system','always_my_theme'))
+ $page_theme = null;
+ }
// $mobile_detect = new Mobile_Detect();
// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
- $is_mobile = $a->is_mobile || $a->is_tablet;
+ $is_mobile = $a->is_mobile || $a->is_tablet;
- $standard_system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
- $standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme);
+ $standard_system_theme = Config::get('system', 'theme', '');
+ $standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme);
- if($is_mobile) {
- if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
- $system_theme = $standard_system_theme;
- $theme_name = $standard_theme_name;
- }
- else {
- $system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : $standard_system_theme);
- $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
-
- if($theme_name === '---') {
- // user has selected to have the mobile theme be the same as the normal one
- $system_theme = $standard_system_theme;
- $theme_name = $standard_theme_name;
-
- if($page_theme)
- $theme_name = $page_theme;
- }
- }
- }
- else {
+ if ($is_mobile) {
+ if (isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
+ } else {
+ $system_theme = Config::get('system', 'mobile-theme', '');
+ if ($system_theme == '') {
+ $system_theme = $standard_system_theme;
+ }
+ $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
- if($page_theme)
- $theme_name = $page_theme;
- }
+ if($theme_name === '---') {
+ // user has selected to have the mobile theme be the same as the normal one
+ $system_theme = $standard_system_theme;
+ $theme_name = $standard_theme_name;
- if($theme_name &&
- (file_exists('view/theme/' . $theme_name . '/style.css') ||
- file_exists('view/theme/' . $theme_name . '/style.php')))
- return($theme_name);
-
- foreach($app_base_themes as $t) {
- if(file_exists('view/theme/' . $t . '/style.css')||
- file_exists('view/theme/' . $t . '/style.php'))
- return($t);
- }
-
- $fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
- if(count($fallback))
- return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
-
- }
-}
-
-/*
- * Return full URL to theme which is currently in effect.
-* Provide a sane default if nothing is chosen or the specified theme does not exist.
-*/
-if(! function_exists('current_theme_url')) {
- function current_theme_url() {
- global $a;
-
- $t = current_theme();
-
- $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
- if (file_exists('view/theme/' . $t . '/style.php'))
- return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss' . $opts);
-
- return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
- }
-}
-
-if(! function_exists('feed_birthday')) {
- function feed_birthday($uid,$tz) {
-
- /**
- *
- * Determine the next birthday, but only if the birthday is published
- * in the default profile. We _could_ also look for a private profile that the
- * recipient can see, but somebody could get mad at us if they start getting
- * public birthday greetings when they haven't made this info public.
- *
- * Assuming we are able to publish this info, we are then going to convert
- * the start time from the owner's timezone to UTC.
- *
- * This will potentially solve the problem found with some social networks
- * where birthdays are converted to the viewer's timezone and salutations from
- * elsewhere in the world show up on the wrong day. We will convert it to the
- * viewer's timezone also, but first we are going to convert it from the birthday
- * person's timezone to GMT - so the viewer may find the birthday starting at
- * 6:00PM the day before, but that will correspond to midnight to the birthday person.
- *
- */
-
-
- $birthday = '';
-
- if(! strlen($tz))
- $tz = 'UTC';
-
- $p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
- intval($uid)
- );
-
- if($p && count($p)) {
- $tmp_dob = substr($p[0]['dob'],5);
- if(intval($tmp_dob)) {
- $y = datetime_convert($tz,$tz,'now','Y');
- $bd = $y . '-' . $tmp_dob . ' 00:00';
- $t_dob = strtotime($bd);
- $now = strtotime(datetime_convert($tz,$tz,'now'));
- if($t_dob < $now)
- $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
- $birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+ if($page_theme)
+ $theme_name = $page_theme;
}
}
-
- return $birthday;
}
-}
+ else {
+ $system_theme = $standard_system_theme;
+ $theme_name = $standard_theme_name;
-if(! function_exists('is_site_admin')) {
- function is_site_admin() {
- $a = get_app();
-
- $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
-
- //if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
- if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
- return true;
- return false;
+ if($page_theme)
+ $theme_name = $page_theme;
}
-}
+ if($theme_name &&
+ (file_exists('view/theme/' . $theme_name . '/style.css') ||
+ file_exists('view/theme/' . $theme_name . '/style.php')))
+ return($theme_name);
-if(! function_exists('load_contact_links')) {
- function load_contact_links($uid) {
-
- $a = get_app();
-
- $ret = array();
-
- if(! $uid || x($a->contacts,'empty'))
- return;
-
- $r = q("SELECT `id`,`network`,`url`,`thumb`, `rel` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
- intval($uid)
- );
- if(count($r)) {
- foreach($r as $rr){
- $url = normalise_link($rr['url']);
- $ret[$url] = $rr;
- }
- } else
- $ret['empty'] = true;
-
- $a->contacts = $ret;
- return;
+ foreach($app_base_themes as $t) {
+ if(file_exists('view/theme/' . $t . '/style.css')||
+ file_exists('view/theme/' . $t . '/style.php'))
+ return($t);
}
+
+ $fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
+ if(count($fallback))
+ return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+
}
/**
-* returns querystring as string from a mapped array
-*
-* @param params Array
-* @return string
-*/
+ * @brief Return full URL to theme which is currently in effect.
+ *
+ * Provide a sane default if nothing is chosen or the specified theme does not exist.
+ *
+ * @return string
+ */
+function current_theme_url() {
+ $a = get_app();
+
+ $t = current_theme();
+
+ $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
+ if (file_exists('view/theme/' . $t . '/style.php'))
+ return('view/theme/'.$t.'/style.pcss'.$opts);
+
+ return('view/theme/'.$t.'/style.css');
+}
+
+function feed_birthday($uid,$tz) {
+
+ /**
+ *
+ * Determine the next birthday, but only if the birthday is published
+ * in the default profile. We _could_ also look for a private profile that the
+ * recipient can see, but somebody could get mad at us if they start getting
+ * public birthday greetings when they haven't made this info public.
+ *
+ * Assuming we are able to publish this info, we are then going to convert
+ * the start time from the owner's timezone to UTC.
+ *
+ * This will potentially solve the problem found with some social networks
+ * where birthdays are converted to the viewer's timezone and salutations from
+ * elsewhere in the world show up on the wrong day. We will convert it to the
+ * viewer's timezone also, but first we are going to convert it from the birthday
+ * person's timezone to GMT - so the viewer may find the birthday starting at
+ * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+ *
+ */
+
+
+ $birthday = '';
+
+ if(! strlen($tz))
+ $tz = 'UTC';
+
+ $p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
+ intval($uid)
+ );
+
+ if (dbm::is_result($p)) {
+ $tmp_dob = substr($p[0]['dob'],5);
+ if(intval($tmp_dob)) {
+ $y = datetime_convert($tz,$tz,'now','Y');
+ $bd = $y . '-' . $tmp_dob . ' 00:00';
+ $t_dob = strtotime($bd);
+ $now = strtotime(datetime_convert($tz,$tz,'now'));
+ if($t_dob < $now)
+ $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+ $birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
+ }
+ }
+
+ return $birthday;
+}
+
+/**
+ * @brief Check if current user has admin role.
+ *
+ * @return bool true if user is an admin
+ */
+function is_site_admin() {
+ $a = get_app();
+
+ $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+
+ //if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
+ if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
+ return true;
+ return false;
+}
+
+/**
+ * @brief Returns querystring as string from a mapped array.
+ *
+ * @param array $params mapped array with query parameters
+ * @param string $name of parameter, default null
+ *
+ * @return string
+ */
function build_querystring($params, $name=null) {
$ret = "";
foreach($params as $key=>$val) {
@@ -1843,8 +2366,9 @@ function get_itemcachepath() {
return "";
$itemcache = get_config('system','itemcache');
- if (($itemcache != "") AND is_dir($itemcache) AND is_writable($itemcache))
- return($itemcache);
+ if (($itemcache != "") AND App::directory_usable($itemcache)) {
+ return $itemcache;
+ }
$temppath = get_temppath();
@@ -1854,9 +2378,9 @@ function get_itemcachepath() {
mkdir($itemcache);
}
- if (is_dir($itemcache) AND is_writable($itemcache)) {
+ if (App::directory_usable($itemcache)) {
set_config("system", "itemcache", $itemcache);
- return($itemcache);
+ return $itemcache;
}
}
return "";
@@ -1864,52 +2388,112 @@ function get_itemcachepath() {
function get_lockpath() {
$lockpath = get_config('system','lockpath');
- if (($lockpath != "") AND is_dir($lockpath) AND is_writable($lockpath))
- return($lockpath);
+ if (($lockpath != "") AND App::directory_usable($lockpath)) {
+ // We have a lock path and it is usable
+ return $lockpath;
+ }
+ // We don't have a working preconfigured lock path, so we take the temp path.
$temppath = get_temppath();
if ($temppath != "") {
+ // To avoid any interferences with other systems we create our own directory
$lockpath = $temppath."/lock";
-
- if (!is_dir($lockpath))
+ if (!is_dir($lockpath)) {
mkdir($lockpath);
- elseif (!is_writable($lockpath))
- $lockpath = $temppath;
+ }
- if (is_dir($lockpath) AND is_writable($lockpath)) {
+ if (App::directory_usable($lockpath)) {
+ // The new path is usable, we are happy
set_config("system", "lockpath", $lockpath);
- return($lockpath);
+ return $lockpath;
+ } else {
+ // We can't create a subdirectory, strange.
+ // But the directory seems to work, so we use it but don't store it.
+ return $temppath;
}
}
+
+ // Reaching this point means that the operating system is configured badly.
+ return "";
+}
+
+/**
+ * @brief Returns the path where spool files are stored
+ *
+ * @return string Spool path
+ */
+function get_spoolpath() {
+ $spoolpath = get_config('system','spoolpath');
+ if (($spoolpath != "") AND App::directory_usable($spoolpath)) {
+ // We have a spool path and it is usable
+ return $spoolpath;
+ }
+
+ // We don't have a working preconfigured spool path, so we take the temp path.
+ $temppath = get_temppath();
+
+ if ($temppath != "") {
+ // To avoid any interferences with other systems we create our own directory
+ $spoolpath = $temppath."/spool";
+ if (!is_dir($spoolpath)) {
+ mkdir($spoolpath);
+ }
+
+ if (App::directory_usable($spoolpath)) {
+ // The new path is usable, we are happy
+ set_config("system", "spoolpath", $spoolpath);
+ return $spoolpath;
+ } else {
+ // We can't create a subdirectory, strange.
+ // But the directory seems to work, so we use it but don't store it.
+ return $temppath;
+ }
+ }
+
+ // Reaching this point means that the operating system is configured badly.
return "";
}
function get_temppath() {
$a = get_app();
- $temppath = get_config("system","temppath");
- if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath))
- return($temppath);
+ $temppath = get_config("system", "temppath");
+ if (($temppath != "") AND App::directory_usable($temppath)) {
+ // We have a temp path and it is usable
+ return $temppath;
+ }
+
+ // We don't have a working preconfigured temp path, so we take the system path.
$temppath = sys_get_temp_dir();
- if (($temppath != "") AND is_dir($temppath) AND is_writable($temppath)) {
- $temppath .= "/".$a->get_hostname();
- if (!is_dir($temppath))
- mkdir($temppath);
- if (is_dir($temppath) AND is_writable($temppath)) {
- set_config("system", "temppath", $temppath);
- return($temppath);
+ // Check if it is usable
+ if (($temppath != "") AND App::directory_usable($temppath)) {
+ // To avoid any interferences with other systems we create our own directory
+ $new_temppath .= "/".$a->get_hostname();
+ if (!is_dir($new_temppath))
+ mkdir($new_temppath);
+
+ if (App::directory_usable($new_temppath)) {
+ // The new path is usable, we are happy
+ set_config("system", "temppath", $new_temppath);
+ return $new_temppath;
+ } else {
+ // We can't create a subdirectory, strange.
+ // But the directory seems to work, so we use it but don't store it.
+ return $temppath;
}
}
- return("");
+ // Reaching this point means that the operating system is configured badly.
+ return '';
}
-function set_template_engine(&$a, $engine = 'internal') {
-// This function is no longer necessary, but keep it as a wrapper to the class method
-// to avoid breaking themes again unnecessarily
+/// @deprecated
+function set_template_engine(App $a, $engine = 'internal') {
+/// @note This function is no longer necessary, but keep it as a wrapper to the class method
+/// to avoid breaking themes again unnecessarily
$a->set_template_engine($engine);
}
@@ -1958,5 +2542,67 @@ function current_load() {
if (!is_array($load_arr))
return false;
- return max($load_arr);
+ return max($load_arr[0], $load_arr[1]);
+}
+
+/**
+ * @brief get c-style args
+ *
+ * @return int
+ */
+function argc() {
+ return get_app()->argc;
+}
+
+/**
+ * @brief Returns the value of a argv key
+ *
+ * @param int $x argv key
+ * @return string Value of the argv key
+ */
+function argv($x) {
+ if(array_key_exists($x,get_app()->argv))
+ return get_app()->argv[$x];
+
+ return '';
+}
+
+/**
+ * @brief Get the data which is needed for infinite scroll
+ *
+ * For invinite scroll we need the page number of the actual page
+ * and the the URI where the content of the next page comes from.
+ * This data is needed for the js part in main.js.
+ * Note: infinite scroll does only work for the network page (module)
+ *
+ * @param string $module The name of the module (e.g. "network")
+ * @return array Of infinite scroll data
+ * 'pageno' => $pageno The number of the actual page
+ * 'reload_uri' => $reload_uri The URI of the content we have to load
+ */
+function infinite_scroll_data($module) {
+
+ if (get_pconfig(local_user(),'system','infinite_scroll')
+ AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
+
+ // get the page number
+ if (is_string($_GET["page"]))
+ $pageno = $_GET["page"];
+ else
+ $pageno = 1;
+
+ $reload_uri = "";
+
+ // try to get the uri from which we load the content
+ foreach ($_GET AS $param => $value)
+ if (($param != "page") AND ($param != "q"))
+ $reload_uri .= "&".$param."=".urlencode($value);
+
+ if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
+ $reload_uri .= "&offset=".urlencode($a->page_offset);
+
+ $arr = array("pageno" => $pageno, "reload_uri" => $reload_uri);
+
+ return $arr;
+ }
}
diff --git a/convert_innodb.sql b/convert_innodb.sql
deleted file mode 100644
index 9eeb67fe85..0000000000
--- a/convert_innodb.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-ALTER TABLE `profile` DROP INDEX `pub_keywords` ;
-ALTER TABLE `profile` DROP INDEX `prv_keywords` ;
-
-ALTER TABLE `item` DROP INDEX `title` ;
-ALTER TABLE `item` DROP INDEX `body` ;
-ALTER TABLE `item` DROP INDEX `allow_cid` ;
-ALTER TABLE `item` DROP INDEX `allow_gid` ;
-ALTER TABLE `item` DROP INDEX `deny_cid` ;
-ALTER TABLE `item` DROP INDEX `deny_gid` ;
-ALTER TABLE `item` DROP INDEX `tag` ;
-ALTER TABLE `item` DROP INDEX `file` ;
-
-
-SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;')
-FROM information_schema.tables
-WHERE engine = 'MyISAM';
-
diff --git a/database.sql b/database.sql
index e3768c1efb..b133489e4e 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
-- ------------------------------------------
--- Friendica 3.4.2 (Lily of the valley)
--- DB_UPDATE_VERSION 1190
+-- Friendica 3.5.1-rc (Asparagus)
+-- DB_UPDATE_VERSION 1215
-- ------------------------------------------
@@ -8,20 +8,22 @@
-- TABLE addon
--
CREATE TABLE IF NOT EXISTS `addon` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
- `name` varchar(255) NOT NULL DEFAULT '',
+ `id` int(11) NOT NULL auto_increment,
+ `name` varchar(190) NOT NULL DEFAULT '',
`version` varchar(255) NOT NULL DEFAULT '',
`installed` tinyint(1) NOT NULL DEFAULT 0,
`hidden` tinyint(1) NOT NULL DEFAULT 0,
`timestamp` bigint(20) NOT NULL DEFAULT 0,
- `plugin_admin` tinyint(1) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `plugin_admin` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `name` (`name`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE attach
--
CREATE TABLE IF NOT EXISTS `attach` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`hash` varchar(64) NOT NULL DEFAULT '',
`filename` varchar(255) NOT NULL DEFAULT '',
@@ -30,74 +32,80 @@ CREATE TABLE IF NOT EXISTS `attach` (
`data` longblob NOT NULL,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `allow_cid` mediumtext NOT NULL,
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL
-) DEFAULT CHARSET=utf8;
+ `allow_cid` mediumtext,
+ `allow_gid` mediumtext,
+ `deny_cid` mediumtext,
+ `deny_gid` mediumtext,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE auth_codes
--
CREATE TABLE IF NOT EXISTS `auth_codes` (
- `id` varchar(40) NOT NULL PRIMARY KEY,
+ `id` varchar(40) NOT NULL,
`client_id` varchar(20) NOT NULL DEFAULT '',
`redirect_uri` varchar(200) NOT NULL DEFAULT '',
`expires` int(11) NOT NULL DEFAULT 0,
- `scope` varchar(250) NOT NULL DEFAULT ''
-) DEFAULT CHARSET=utf8;
+ `scope` varchar(250) NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE cache
--
CREATE TABLE IF NOT EXISTS `cache` (
- `k` varchar(255) NOT NULL PRIMARY KEY,
- `v` text NOT NULL,
+ `k` varbinary(255) NOT NULL,
+ `v` mediumtext,
`expire_mode` int(11) NOT NULL DEFAULT 0,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- INDEX `updated` (`updated`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`k`),
+ INDEX `expire_mode_updated` (`expire_mode`,`updated`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE challenge
--
CREATE TABLE IF NOT EXISTS `challenge` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`challenge` varchar(255) NOT NULL DEFAULT '',
`dfrn-id` varchar(255) NOT NULL DEFAULT '',
`expire` int(11) NOT NULL DEFAULT 0,
`type` varchar(255) NOT NULL DEFAULT '',
- `last_update` varchar(255) NOT NULL DEFAULT ''
-) DEFAULT CHARSET=utf8;
+ `last_update` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE clients
--
CREATE TABLE IF NOT EXISTS `clients` (
- `client_id` varchar(20) NOT NULL PRIMARY KEY,
+ `client_id` varchar(20) NOT NULL,
`pw` varchar(20) NOT NULL DEFAULT '',
`redirect_uri` varchar(200) NOT NULL DEFAULT '',
`name` text,
`icon` text,
- `uid` int(11) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `uid` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`client_id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE config
--
CREATE TABLE IF NOT EXISTS `config` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
- `cat` varchar(255) NOT NULL DEFAULT '',
- `k` varchar(255) NOT NULL DEFAULT '',
- `v` text NOT NULL,
- INDEX `cat_k` (`cat`(30),`k`(30))
-) DEFAULT CHARSET=utf8;
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `cat` varbinary(255) NOT NULL DEFAULT '',
+ `k` varbinary(255) NOT NULL DEFAULT '',
+ `v` mediumtext,
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `cat_k` (`cat`,`k`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE contact
--
CREATE TABLE IF NOT EXISTS `contact` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`self` tinyint(1) NOT NULL DEFAULT 0,
@@ -108,28 +116,30 @@ CREATE TABLE IF NOT EXISTS `contact` (
`name` varchar(255) NOT NULL DEFAULT '',
`nick` varchar(255) NOT NULL DEFAULT '',
`location` varchar(255) NOT NULL DEFAULT '',
- `about` text NOT NULL,
- `keywords` text NOT NULL,
+ `about` text,
+ `keywords` text,
`gender` varchar(32) NOT NULL DEFAULT '',
+ `xmpp` varchar(255) NOT NULL DEFAULT '',
`attag` varchar(255) NOT NULL DEFAULT '',
- `photo` text NOT NULL,
- `thumb` text NOT NULL,
- `micro` text NOT NULL,
- `site-pubkey` text NOT NULL,
+ `avatar` varchar(255) NOT NULL DEFAULT '',
+ `photo` text,
+ `thumb` text,
+ `micro` text,
+ `site-pubkey` text,
`issued-id` varchar(255) NOT NULL DEFAULT '',
`dfrn-id` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
`nurl` varchar(255) NOT NULL DEFAULT '',
`addr` varchar(255) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
- `pubkey` text NOT NULL,
- `prvkey` text NOT NULL,
+ `pubkey` text,
+ `prvkey` text,
`batch` varchar(255) NOT NULL DEFAULT '',
- `request` text NOT NULL,
- `notify` text NOT NULL,
- `poll` text NOT NULL,
- `confirm` text NOT NULL,
- `poco` text NOT NULL,
+ `request` text,
+ `notify` text,
+ `poll` text,
+ `confirm` text,
+ `poco` text,
`aes_allow` tinyint(1) NOT NULL DEFAULT 0,
`ret-aes` tinyint(1) NOT NULL DEFAULT 0,
`usehub` tinyint(1) NOT NULL DEFAULT 0,
@@ -149,62 +159,69 @@ CREATE TABLE IF NOT EXISTS `contact` (
`writable` tinyint(1) NOT NULL DEFAULT 0,
`forum` tinyint(1) NOT NULL DEFAULT 0,
`prv` tinyint(1) NOT NULL DEFAULT 0,
+ `contact-type` int(11) unsigned NOT NULL DEFAULT 0,
`hidden` tinyint(1) NOT NULL DEFAULT 0,
`archive` tinyint(1) NOT NULL DEFAULT 0,
`pending` tinyint(1) NOT NULL DEFAULT 1,
`rating` tinyint(1) NOT NULL DEFAULT 0,
- `reason` text NOT NULL,
+ `reason` text,
`closeness` tinyint(2) NOT NULL DEFAULT 99,
- `info` mediumtext NOT NULL,
+ `info` mediumtext,
`profile-id` int(11) NOT NULL DEFAULT 0,
`bdyear` varchar(4) NOT NULL DEFAULT '',
`bd` date NOT NULL DEFAULT '0000-00-00',
`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
- `ffi_keyword_blacklist` mediumtext NOT NULL,
- INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+ `ffi_keyword_blacklist` text,
+ PRIMARY KEY(`id`),
+ INDEX `uid_name` (`uid`,`name`),
+ INDEX `self_uid` (`self`,`uid`),
+ INDEX `alias_uid` (`alias`(32),`uid`),
+ INDEX `pending_uid` (`pending`,`uid`),
+ INDEX `blocked_uid` (`blocked`,`uid`),
+ INDEX `uid_rel_network_poll` (`uid`,`rel`,`network`,`poll`(64),`archive`),
+ INDEX `uid_network_batch` (`uid`,`network`,`batch`(64)),
+ INDEX `addr_uid` (`addr`(32),`uid`),
+ INDEX `nurl_uid` (`nurl`(32),`uid`),
+ INDEX `nick_uid` (`nick`(32),`uid`),
+ INDEX `dfrn-id` (`dfrn-id`),
+ INDEX `issued-id` (`issued-id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE conv
--
CREATE TABLE IF NOT EXISTS `conv` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`guid` varchar(64) NOT NULL DEFAULT '',
- `recips` mediumtext NOT NULL,
+ `recips` text,
`uid` int(11) NOT NULL DEFAULT 0,
`creator` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `subject` mediumtext NOT NULL,
+ `subject` text,
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE deliverq
--
CREATE TABLE IF NOT EXISTS `deliverq` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
- `cmd` varchar(32) NOT NULL DEFAULT '',
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `cmd` varbinary(32) NOT NULL DEFAULT '',
`item` int(11) NOT NULL DEFAULT 0,
- `contact` int(11) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
-
---
--- TABLE dsprphotoq
---
-CREATE TABLE IF NOT EXISTS `dsprphotoq` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
- `uid` int(11) NOT NULL DEFAULT 0,
- `msg` mediumtext NOT NULL,
- `attempt` tinyint(4) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `contact` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `cmd_item_contact` (`cmd`,`item`,`contact`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE event
--
CREATE TABLE IF NOT EXISTS `event` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
+ `guid` varchar(255) NOT NULL DEFAULT '',
`uid` int(11) NOT NULL DEFAULT 0,
`cid` int(11) NOT NULL DEFAULT 0,
`uri` varchar(255) NOT NULL DEFAULT '',
@@ -212,25 +229,27 @@ CREATE TABLE IF NOT EXISTS `event` (
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `summary` text NOT NULL,
- `desc` text NOT NULL,
- `location` text NOT NULL,
+ `summary` text,
+ `desc` text,
+ `location` text,
`type` varchar(255) NOT NULL DEFAULT '',
`nofinish` tinyint(1) NOT NULL DEFAULT 0,
`adjust` tinyint(1) NOT NULL DEFAULT 1,
`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
- `allow_cid` mediumtext NOT NULL,
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
- INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+ `allow_cid` mediumtext,
+ `allow_gid` mediumtext,
+ `deny_cid` mediumtext,
+ `deny_gid` mediumtext,
+ PRIMARY KEY(`id`),
+ INDEX `uid_start` (`uid`,`start`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fcontact
--
CREATE TABLE IF NOT EXISTS `fcontact` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `guid` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
`name` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
@@ -244,63 +263,69 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
`priority` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
`alias` varchar(255) NOT NULL DEFAULT '',
- `pubkey` text NOT NULL,
+ `pubkey` text,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- INDEX `addr` (`addr`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `addr` (`addr`(32)),
+ INDEX `url` (`url`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE ffinder
--
CREATE TABLE IF NOT EXISTS `ffinder` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`cid` int(10) unsigned NOT NULL DEFAULT 0,
- `fid` int(10) unsigned NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `fid` int(10) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fserver
--
CREATE TABLE IF NOT EXISTS `fserver` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`server` varchar(255) NOT NULL DEFAULT '',
`posturl` varchar(255) NOT NULL DEFAULT '',
- `key` text NOT NULL,
- INDEX `server` (`server`)
-) DEFAULT CHARSET=utf8;
+ `key` text,
+ PRIMARY KEY(`id`),
+ INDEX `server` (`server`(32))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE fsuggest
--
CREATE TABLE IF NOT EXISTS `fsuggest` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`cid` int(11) NOT NULL DEFAULT 0,
`name` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
`request` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
- `note` text NOT NULL,
- `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
-) DEFAULT CHARSET=utf8;
+ `note` text,
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gcign
--
CREATE TABLE IF NOT EXISTS `gcign` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`gcid` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `gcid` (`gcid`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gcontact
--
CREATE TABLE IF NOT EXISTS `gcontact` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`name` varchar(255) NOT NULL DEFAULT '',
`nick` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
@@ -312,66 +337,81 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
`last_contact` datetime DEFAULT '0000-00-00 00:00:00',
`last_failure` datetime DEFAULT '0000-00-00 00:00:00',
`location` varchar(255) NOT NULL DEFAULT '',
- `about` text NOT NULL,
- `keywords` text NOT NULL,
+ `about` text,
+ `keywords` text,
`gender` varchar(32) NOT NULL DEFAULT '',
+ `birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
`community` tinyint(1) NOT NULL DEFAULT 0,
+ `contact-type` tinyint(1) NOT NULL DEFAULT -1,
+ `hide` tinyint(1) NOT NULL DEFAULT 0,
+ `nsfw` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(255) NOT NULL DEFAULT '',
`addr` varchar(255) NOT NULL DEFAULT '',
+ `notify` text,
+ `alias` varchar(255) NOT NULL DEFAULT '',
`generation` tinyint(3) NOT NULL DEFAULT 0,
`server_url` varchar(255) NOT NULL DEFAULT '',
- INDEX `nurl` (`nurl`),
+ PRIMARY KEY(`id`),
+ INDEX `nurl` (`nurl`(64)),
+ INDEX `name` (`name`(64)),
+ INDEX `nick` (`nick`(32)),
+ INDEX `addr` (`addr`(64)),
+ INDEX `hide_network_updated` (`hide`,`network`,`updated`),
INDEX `updated` (`updated`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE glink
--
CREATE TABLE IF NOT EXISTS `glink` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`cid` int(11) NOT NULL DEFAULT 0,
`uid` int(11) NOT NULL DEFAULT 0,
`gcid` int(11) NOT NULL DEFAULT 0,
`zcid` int(11) NOT NULL DEFAULT 0,
`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
- INDEX `gcid` (`gcid`),
- INDEX `zcid` (`zcid`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
+ INDEX `gcid` (`gcid`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE group
--
CREATE TABLE IF NOT EXISTS `group` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`visible` tinyint(1) NOT NULL DEFAULT 0,
`deleted` tinyint(1) NOT NULL DEFAULT 0,
`name` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE group_member
--
CREATE TABLE IF NOT EXISTS `group_member` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`gid` int(10) unsigned NOT NULL DEFAULT 0,
`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
- INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `contactid` (`contact-id`),
+ INDEX `gid_contactid` (`gid`,`contact-id`),
+ UNIQUE INDEX `uid_gid_contactid` (`uid`,`gid`,`contact-id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE gserver
--
CREATE TABLE IF NOT EXISTS `gserver` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`url` varchar(255) NOT NULL DEFAULT '',
`nurl` varchar(255) NOT NULL DEFAULT '',
`version` varchar(255) NOT NULL DEFAULT '',
`site_name` varchar(255) NOT NULL DEFAULT '',
- `info` text NOT NULL,
+ `info` text,
`register_policy` tinyint(1) NOT NULL DEFAULT 0,
`poco` varchar(255) NOT NULL DEFAULT '',
`noscrape` varchar(255) NOT NULL DEFAULT '',
@@ -381,61 +421,51 @@ CREATE TABLE IF NOT EXISTS `gserver` (
`last_poco_query` datetime DEFAULT '0000-00-00 00:00:00',
`last_contact` datetime DEFAULT '0000-00-00 00:00:00',
`last_failure` datetime DEFAULT '0000-00-00 00:00:00',
- INDEX `nurl` (`nurl`)
-) DEFAULT CHARSET=utf8;
-
---
--- TABLE guid
---
-CREATE TABLE IF NOT EXISTS `guid` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
- `guid` varchar(255) NOT NULL DEFAULT '',
- `plink` varchar(255) NOT NULL DEFAULT '',
- `uri` varchar(255) NOT NULL DEFAULT '',
- `network` varchar(32) NOT NULL DEFAULT '',
- INDEX `guid` (`guid`),
- INDEX `plink` (`plink`),
- INDEX `uri` (`uri`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `nurl` (`nurl`(32))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE hook
--
CREATE TABLE IF NOT EXISTS `hook` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`hook` varchar(255) NOT NULL DEFAULT '',
`file` varchar(255) NOT NULL DEFAULT '',
`function` varchar(255) NOT NULL DEFAULT '',
`priority` int(11) unsigned NOT NULL DEFAULT 0,
- INDEX `hook_file_function` (`hook`(30),`file`(60),`function`(30))
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `hook_file_function` (`hook`(50),`file`(80),`function`(60))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE intro
--
CREATE TABLE IF NOT EXISTS `intro` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`fid` int(11) NOT NULL DEFAULT 0,
`contact-id` int(11) NOT NULL DEFAULT 0,
`knowyou` tinyint(1) NOT NULL DEFAULT 0,
`duplex` tinyint(1) NOT NULL DEFAULT 0,
- `note` text NOT NULL,
+ `note` text,
`hash` varchar(255) NOT NULL DEFAULT '',
`datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`blocked` tinyint(1) NOT NULL DEFAULT 1,
- `ignore` tinyint(1) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `ignore` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE item
--
CREATE TABLE IF NOT EXISTS `item` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`guid` varchar(255) NOT NULL DEFAULT '',
`uri` varchar(255) NOT NULL DEFAULT '',
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`contact-id` int(11) NOT NULL DEFAULT 0,
+ `gcontact-id` int(11) unsigned NOT NULL DEFAULT 0,
`type` varchar(255) NOT NULL DEFAULT '',
`wall` tinyint(1) NOT NULL DEFAULT 0,
`gravity` tinyint(1) NOT NULL DEFAULT 0,
@@ -448,34 +478,36 @@ CREATE TABLE IF NOT EXISTS `item` (
`commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `owner-id` int(11) NOT NULL DEFAULT 0,
`owner-name` varchar(255) NOT NULL DEFAULT '',
`owner-link` varchar(255) NOT NULL DEFAULT '',
`owner-avatar` varchar(255) NOT NULL DEFAULT '',
+ `author-id` int(11) NOT NULL DEFAULT 0,
`author-name` varchar(255) NOT NULL DEFAULT '',
`author-link` varchar(255) NOT NULL DEFAULT '',
`author-avatar` varchar(255) NOT NULL DEFAULT '',
`title` varchar(255) NOT NULL DEFAULT '',
- `body` mediumtext NOT NULL,
+ `body` mediumtext,
`app` varchar(255) NOT NULL DEFAULT '',
`verb` varchar(255) NOT NULL DEFAULT '',
`object-type` varchar(255) NOT NULL DEFAULT '',
- `object` text NOT NULL,
+ `object` text,
`target-type` varchar(255) NOT NULL DEFAULT '',
- `target` text NOT NULL,
- `postopts` text NOT NULL,
+ `target` text,
+ `postopts` text,
`plink` varchar(255) NOT NULL DEFAULT '',
`resource-id` varchar(255) NOT NULL DEFAULT '',
`event-id` int(11) NOT NULL DEFAULT 0,
- `tag` mediumtext NOT NULL,
- `attach` mediumtext NOT NULL,
- `inform` mediumtext NOT NULL,
- `file` mediumtext NOT NULL,
+ `tag` mediumtext,
+ `attach` mediumtext,
+ `inform` mediumtext,
+ `file` mediumtext,
`location` varchar(255) NOT NULL DEFAULT '',
`coord` varchar(255) NOT NULL DEFAULT '',
- `allow_cid` mediumtext NOT NULL,
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
+ `allow_cid` mediumtext,
+ `allow_gid` mediumtext,
+ `deny_cid` mediumtext,
+ `deny_gid` mediumtext,
`private` tinyint(1) NOT NULL DEFAULT 0,
`pubmail` tinyint(1) NOT NULL DEFAULT 0,
`moderated` tinyint(1) NOT NULL DEFAULT 0,
@@ -491,33 +523,27 @@ CREATE TABLE IF NOT EXISTS `item` (
`mention` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
`rendered-hash` varchar(32) NOT NULL DEFAULT '',
- `rendered-html` mediumtext NOT NULL,
+ `rendered-html` mediumtext,
`global` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
INDEX `guid` (`guid`),
INDEX `uri` (`uri`),
INDEX `parent` (`parent`),
INDEX `parent-uri` (`parent-uri`),
INDEX `extid` (`extid`),
INDEX `uid_id` (`uid`,`id`),
+ INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`),
INDEX `uid_created` (`uid`,`created`),
- INDEX `uid_unseen` (`uid`,`unseen`),
+ INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
INDEX `uid_network_received` (`uid`,`network`,`received`),
- INDEX `uid_received` (`uid`,`received`),
INDEX `uid_network_commented` (`uid`,`network`,`commented`),
- INDEX `uid_commented` (`uid`,`commented`),
- INDEX `uid_title` (`uid`,`title`),
INDEX `uid_thrparent` (`uid`,`thr-parent`),
INDEX `uid_parenturi` (`uid`,`parent-uri`),
INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
- INDEX `wall_body` (`wall`,`body`(6)),
- INDEX `uid_visible_moderated_created` (`uid`,`visible`,`moderated`,`created`),
+ INDEX `authorid_created` (`author-id`,`created`),
INDEX `uid_uri` (`uid`,`uri`),
- INDEX `uid_wall_created` (`uid`,`wall`,`created`),
INDEX `resource-id` (`resource-id`),
- INDEX `uid_type` (`uid`,`type`),
- INDEX `uid_starred` (`uid`,`starred`),
INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
- INDEX `uid_wall_parent_created` (`uid`,`wall`,`parent`,`created`),
INDEX `uid_type_changed` (`uid`,`type`,`changed`),
INDEX `contactid_verb` (`contact-id`,`verb`),
INDEX `deleted_changed` (`deleted`,`changed`),
@@ -525,38 +551,40 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `uid_eventid` (`uid`,`event-id`),
INDEX `uid_authorlink` (`uid`,`author-link`),
INDEX `uid_ownerlink` (`uid`,`owner-link`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE item_id
--
CREATE TABLE IF NOT EXISTS `item_id` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`iid` int(11) NOT NULL DEFAULT 0,
`uid` int(11) NOT NULL DEFAULT 0,
`sid` varchar(255) NOT NULL DEFAULT '',
`service` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `sid` (`sid`),
- INDEX `service` (`service`),
+ INDEX `service` (`service`(32)),
INDEX `iid` (`iid`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE locks
--
CREATE TABLE IF NOT EXISTS `locks` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`name` varchar(128) NOT NULL DEFAULT '',
`locked` tinyint(1) NOT NULL DEFAULT 0,
- `created` datetime DEFAULT '0000-00-00 00:00:00'
-) DEFAULT CHARSET=utf8;
+ `created` datetime DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE mail
--
CREATE TABLE IF NOT EXISTS `mail` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`guid` varchar(64) NOT NULL DEFAULT '',
`from-name` varchar(255) NOT NULL DEFAULT '',
@@ -565,7 +593,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`contact-id` varchar(255) NOT NULL DEFAULT '',
`convid` int(11) unsigned NOT NULL DEFAULT 0,
`title` varchar(255) NOT NULL DEFAULT '',
- `body` mediumtext NOT NULL,
+ `body` mediumtext,
`seen` tinyint(1) NOT NULL DEFAULT 0,
`reply` tinyint(1) NOT NULL DEFAULT 0,
`replied` tinyint(1) NOT NULL DEFAULT 0,
@@ -573,55 +601,56 @@ CREATE TABLE IF NOT EXISTS `mail` (
`uri` varchar(255) NOT NULL DEFAULT '',
`parent-uri` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- INDEX `uid` (`uid`),
- INDEX `guid` (`guid`),
+ PRIMARY KEY(`id`),
+ INDEX `uid_seen` (`uid`,`seen`),
INDEX `convid` (`convid`),
- INDEX `reply` (`reply`),
- INDEX `uri` (`uri`),
- INDEX `parent-uri` (`parent-uri`)
-) DEFAULT CHARSET=utf8;
+ INDEX `uri` (`uri`(64)),
+ INDEX `parent-uri` (`parent-uri`(64))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE mailacct
--
CREATE TABLE IF NOT EXISTS `mailacct` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`server` varchar(255) NOT NULL DEFAULT '',
`port` int(11) NOT NULL DEFAULT 0,
`ssltype` varchar(16) NOT NULL DEFAULT '',
`mailbox` varchar(255) NOT NULL DEFAULT '',
`user` varchar(255) NOT NULL DEFAULT '',
- `pass` text NOT NULL,
+ `pass` text,
`reply_to` varchar(255) NOT NULL DEFAULT '',
`action` int(11) NOT NULL DEFAULT 0,
`movetofolder` varchar(255) NOT NULL DEFAULT '',
`pubmail` tinyint(1) NOT NULL DEFAULT 0,
- `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00'
-) DEFAULT CHARSET=utf8;
+ `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE manage
--
CREATE TABLE IF NOT EXISTS `manage` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`mid` int(11) NOT NULL DEFAULT 0,
- INDEX `uid_mid` (`uid`,`mid`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `uid_mid` (`uid`,`mid`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE notify
--
CREATE TABLE IF NOT EXISTS `notify` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`hash` varchar(64) NOT NULL DEFAULT '',
`type` int(11) NOT NULL DEFAULT 0,
`name` varchar(255) NOT NULL DEFAULT '',
`url` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `msg` mediumtext NOT NULL,
+ `msg` mediumtext,
`uid` int(11) NOT NULL DEFAULT 0,
`link` varchar(255) NOT NULL DEFAULT '',
`iid` int(11) NOT NULL DEFAULT 0,
@@ -629,39 +658,69 @@ CREATE TABLE IF NOT EXISTS `notify` (
`seen` tinyint(1) NOT NULL DEFAULT 0,
`verb` varchar(255) NOT NULL DEFAULT '',
`otype` varchar(16) NOT NULL DEFAULT '',
- INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+ `name_cache` tinytext,
+ `msg_cache` mediumtext,
+ PRIMARY KEY(`id`),
+ INDEX `hash_uid` (`hash`,`uid`),
+ INDEX `seen_uid_date` (`seen`,`uid`,`date`),
+ INDEX `uid_date` (`uid`,`date`),
+ INDEX `uid_type_link` (`uid`,`type`,`link`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE notify-threads
--
CREATE TABLE IF NOT EXISTS `notify-threads` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`notify-id` int(11) NOT NULL DEFAULT 0,
`master-parent-item` int(10) unsigned NOT NULL DEFAULT 0,
`parent-item` int(10) unsigned NOT NULL DEFAULT 0,
`receiver-uid` int(11) NOT NULL DEFAULT 0,
- INDEX `master-parent-item` (`master-parent-item`),
- INDEX `receiver-uid` (`receiver-uid`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
+
+--
+-- TABLE oembed
+--
+CREATE TABLE IF NOT EXISTS `oembed` (
+ `url` varbinary(255) NOT NULL,
+ `content` mediumtext,
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`url`),
+ INDEX `created` (`created`)
+) DEFAULT CHARSET=utf8mb4;
+
+--
+-- TABLE parsed_url
+--
+CREATE TABLE IF NOT EXISTS `parsed_url` (
+ `url` varbinary(255) NOT NULL,
+ `guessing` tinyint(1) NOT NULL DEFAULT 0,
+ `oembed` tinyint(1) NOT NULL DEFAULT 0,
+ `content` mediumtext,
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`url`,`guessing`,`oembed`),
+ INDEX `created` (`created`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE pconfig
--
CREATE TABLE IF NOT EXISTS `pconfig` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
- `cat` varchar(255) NOT NULL DEFAULT '',
- `k` varchar(255) NOT NULL DEFAULT '',
- `v` mediumtext NOT NULL,
- INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
-) DEFAULT CHARSET=utf8;
+ `cat` varbinary(255) NOT NULL DEFAULT '',
+ `k` varbinary(255) NOT NULL DEFAULT '',
+ `v` mediumtext,
+ PRIMARY KEY(`id`),
+ UNIQUE INDEX `uid_cat_k` (`uid`,`cat`,`k`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE photo
--
CREATE TABLE IF NOT EXISTS `photo` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`contact-id` int(10) unsigned NOT NULL DEFAULT 0,
`guid` varchar(64) NOT NULL DEFAULT '',
@@ -669,7 +728,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`title` varchar(255) NOT NULL DEFAULT '',
- `desc` text NOT NULL,
+ `desc` text,
`album` varchar(255) NOT NULL DEFAULT '',
`filename` varchar(255) NOT NULL DEFAULT '',
`type` varchar(128) NOT NULL DEFAULT 'image/jpeg',
@@ -679,50 +738,66 @@ CREATE TABLE IF NOT EXISTS `photo` (
`data` mediumblob NOT NULL,
`scale` tinyint(3) NOT NULL DEFAULT 0,
`profile` tinyint(1) NOT NULL DEFAULT 0,
- `allow_cid` mediumtext NOT NULL,
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
- INDEX `uid` (`uid`),
- INDEX `resource-id` (`resource-id`),
- INDEX `guid` (`guid`)
-) DEFAULT CHARSET=utf8;
+ `allow_cid` mediumtext,
+ `allow_gid` mediumtext,
+ `deny_cid` mediumtext,
+ `deny_gid` mediumtext,
+ PRIMARY KEY(`id`),
+ INDEX `uid_contactid` (`uid`,`contact-id`),
+ INDEX `uid_profile` (`uid`,`profile`),
+ INDEX `uid_album_scale_created` (`uid`,`album`(32),`scale`,`created`),
+ INDEX `uid_album_resource-id_created` (`uid`,`album`(32),`resource-id`(64),`created`),
+ INDEX `resource-id` (`resource-id`(64))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE poll
--
CREATE TABLE IF NOT EXISTS `poll` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
- `q0` mediumtext NOT NULL,
- `q1` mediumtext NOT NULL,
- `q2` mediumtext NOT NULL,
- `q3` mediumtext NOT NULL,
- `q4` mediumtext NOT NULL,
- `q5` mediumtext NOT NULL,
- `q6` mediumtext NOT NULL,
- `q7` mediumtext NOT NULL,
- `q8` mediumtext NOT NULL,
- `q9` mediumtext NOT NULL,
+ `q0` text,
+ `q1` text,
+ `q2` text,
+ `q3` text,
+ `q4` text,
+ `q5` text,
+ `q6` text,
+ `q7` text,
+ `q8` text,
+ `q9` text,
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE poll_result
--
CREATE TABLE IF NOT EXISTS `poll_result` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`poll_id` int(11) NOT NULL DEFAULT 0,
`choice` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
INDEX `poll_id` (`poll_id`),
INDEX `choice` (`choice`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
+
+--
+-- TABLE process
+--
+CREATE TABLE IF NOT EXISTS `process` (
+ `pid` int(10) unsigned NOT NULL,
+ `command` varbinary(32) NOT NULL DEFAULT '',
+ `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`pid`),
+ INDEX `command` (`command`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE profile
--
CREATE TABLE IF NOT EXISTS `profile` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`profile-name` varchar(255) NOT NULL DEFAULT '',
`is-default` tinyint(1) NOT NULL DEFAULT 0,
@@ -738,148 +813,156 @@ CREATE TABLE IF NOT EXISTS `profile` (
`hometown` varchar(255) NOT NULL DEFAULT '',
`gender` varchar(32) NOT NULL DEFAULT '',
`marital` varchar(255) NOT NULL DEFAULT '',
- `with` text NOT NULL,
+ `with` text,
`howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`sexual` varchar(255) NOT NULL DEFAULT '',
`politic` varchar(255) NOT NULL DEFAULT '',
`religion` varchar(255) NOT NULL DEFAULT '',
- `pub_keywords` text NOT NULL,
- `prv_keywords` text NOT NULL,
- `likes` text NOT NULL,
- `dislikes` text NOT NULL,
- `about` text NOT NULL,
+ `pub_keywords` text,
+ `prv_keywords` text,
+ `likes` text,
+ `dislikes` text,
+ `about` text,
`summary` varchar(255) NOT NULL DEFAULT '',
- `music` text NOT NULL,
- `book` text NOT NULL,
- `tv` text NOT NULL,
- `film` text NOT NULL,
- `interest` text NOT NULL,
- `romance` text NOT NULL,
- `work` text NOT NULL,
- `education` text NOT NULL,
- `contact` text NOT NULL,
+ `music` text,
+ `book` text,
+ `tv` text,
+ `film` text,
+ `interest` text,
+ `romance` text,
+ `work` text,
+ `education` text,
+ `contact` text,
`homepage` varchar(255) NOT NULL DEFAULT '',
+ `xmpp` varchar(255) NOT NULL DEFAULT '',
`photo` varchar(255) NOT NULL DEFAULT '',
`thumb` varchar(255) NOT NULL DEFAULT '',
`publish` tinyint(1) NOT NULL DEFAULT 0,
`net-publish` tinyint(1) NOT NULL DEFAULT 0,
- INDEX `hometown` (`hometown`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `uid_is-default` (`uid`,`is-default`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE profile_check
--
CREATE TABLE IF NOT EXISTS `profile_check` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`cid` int(10) unsigned NOT NULL DEFAULT 0,
`dfrn_id` varchar(255) NOT NULL DEFAULT '',
`sec` varchar(255) NOT NULL DEFAULT '',
- `expire` int(11) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
+ `expire` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE push_subscriber
--
CREATE TABLE IF NOT EXISTS `push_subscriber` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`callback_url` varchar(255) NOT NULL DEFAULT '',
`topic` varchar(255) NOT NULL DEFAULT '',
`nickname` varchar(255) NOT NULL DEFAULT '',
`push` int(11) NOT NULL DEFAULT 0,
`last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `secret` varchar(255) NOT NULL DEFAULT ''
-) DEFAULT CHARSET=utf8;
+ `secret` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE queue
--
CREATE TABLE IF NOT EXISTS `queue` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`cid` int(11) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- `content` mediumtext NOT NULL,
+ `content` mediumtext,
`batch` tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`),
INDEX `cid` (`cid`),
INDEX `created` (`created`),
INDEX `last` (`last`),
INDEX `network` (`network`),
INDEX `batch` (`batch`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE register
--
CREATE TABLE IF NOT EXISTS `register` (
- `id` int(11) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) unsigned NOT NULL auto_increment,
`hash` varchar(255) NOT NULL DEFAULT '',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`uid` int(11) unsigned NOT NULL DEFAULT 0,
`password` varchar(255) NOT NULL DEFAULT '',
- `language` varchar(16) NOT NULL DEFAULT ''
-) DEFAULT CHARSET=utf8;
+ `language` varchar(16) NOT NULL DEFAULT '',
+ `note` text,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE search
--
CREATE TABLE IF NOT EXISTS `search` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`term` varchar(255) NOT NULL DEFAULT '',
- INDEX `uid` (`uid`),
- INDEX `term` (`term`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `uid` (`uid`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE session
--
CREATE TABLE IF NOT EXISTS `session` (
- `id` bigint(20) unsigned NOT NULL auto_increment PRIMARY KEY,
- `sid` varchar(255) NOT NULL DEFAULT '',
- `data` text NOT NULL,
+ `id` bigint(20) unsigned NOT NULL auto_increment,
+ `sid` varbinary(255) NOT NULL DEFAULT '',
+ `data` text,
`expire` int(10) unsigned NOT NULL DEFAULT 0,
- INDEX `sid` (`sid`),
+ PRIMARY KEY(`id`),
+ INDEX `sid` (`sid`(64)),
INDEX `expire` (`expire`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE sign
--
CREATE TABLE IF NOT EXISTS `sign` (
- `id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `id` int(10) unsigned NOT NULL auto_increment,
`iid` int(10) unsigned NOT NULL DEFAULT 0,
- `retract_iid` int(10) unsigned NOT NULL DEFAULT 0,
- `signed_text` mediumtext NOT NULL,
- `signature` text NOT NULL,
+ `signed_text` mediumtext,
+ `signature` text,
`signer` varchar(255) NOT NULL DEFAULT '',
- INDEX `iid` (`iid`),
- INDEX `retract_iid` (`retract_iid`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `iid` (`iid`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE spam
--
CREATE TABLE IF NOT EXISTS `spam` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`uid` int(11) NOT NULL DEFAULT 0,
`spam` int(11) NOT NULL DEFAULT 0,
`ham` int(11) NOT NULL DEFAULT 0,
`term` varchar(255) NOT NULL DEFAULT '',
`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ PRIMARY KEY(`id`),
INDEX `uid` (`uid`),
INDEX `spam` (`spam`),
INDEX `ham` (`ham`),
INDEX `term` (`term`)
-) DEFAULT CHARSET=utf8;
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE term
--
CREATE TABLE IF NOT EXISTS `term` (
- `tid` int(10) unsigned NOT NULL auto_increment PRIMARY KEY,
+ `tid` int(10) unsigned NOT NULL auto_increment,
`oid` int(10) unsigned NOT NULL DEFAULT 0,
`otype` tinyint(3) unsigned NOT NULL DEFAULT 0,
`type` tinyint(3) unsigned NOT NULL DEFAULT 0,
@@ -891,21 +974,23 @@ CREATE TABLE IF NOT EXISTS `term` (
`global` tinyint(1) NOT NULL DEFAULT 0,
`aid` int(10) unsigned NOT NULL DEFAULT 0,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
+ PRIMARY KEY(`tid`),
INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`),
- INDEX `uid_term_tid` (`uid`,`term`,`tid`),
- INDEX `type_term` (`type`,`term`),
- INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
- INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
- INDEX `guid` (`guid`)
-) DEFAULT CHARSET=utf8;
+ INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`(32),`global`,`created`),
+ INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`(64)),
+ INDEX `guid` (`guid`(64))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE thread
--
CREATE TABLE IF NOT EXISTS `thread` (
- `iid` int(10) unsigned NOT NULL DEFAULT 0 PRIMARY KEY,
+ `iid` int(10) unsigned NOT NULL DEFAULT 0,
`uid` int(10) unsigned NOT NULL DEFAULT 0,
`contact-id` int(11) unsigned NOT NULL DEFAULT 0,
+ `gcontact-id` int(11) unsigned NOT NULL DEFAULT 0,
+ `owner-id` int(11) unsigned NOT NULL DEFAULT 0,
+ `author-id` int(11) unsigned NOT NULL DEFAULT 0,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -926,48 +1011,34 @@ CREATE TABLE IF NOT EXISTS `thread` (
`forum_mode` tinyint(1) NOT NULL DEFAULT 0,
`mention` tinyint(1) NOT NULL DEFAULT 0,
`network` varchar(32) NOT NULL DEFAULT '',
- INDEX `created` (`created`),
- INDEX `commented` (`commented`),
+ PRIMARY KEY(`iid`),
INDEX `uid_network_commented` (`uid`,`network`,`commented`),
INDEX `uid_network_created` (`uid`,`network`,`created`),
INDEX `uid_contactid_commented` (`uid`,`contact-id`,`commented`),
INDEX `uid_contactid_created` (`uid`,`contact-id`,`created`),
- INDEX `wall_private_received` (`wall`,`private`,`received`),
INDEX `uid_created` (`uid`,`created`),
- INDEX `uid_commented` (`uid`,`commented`)
-) DEFAULT CHARSET=utf8;
+ INDEX `uid_commented` (`uid`,`commented`),
+ INDEX `uid_wall_created` (`uid`,`wall`,`created`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE tokens
--
CREATE TABLE IF NOT EXISTS `tokens` (
- `id` varchar(40) NOT NULL PRIMARY KEY,
- `secret` text NOT NULL,
+ `id` varchar(40) NOT NULL,
+ `secret` text,
`client_id` varchar(20) NOT NULL DEFAULT '',
`expires` int(11) NOT NULL DEFAULT 0,
`scope` varchar(200) NOT NULL DEFAULT '',
- `uid` int(11) NOT NULL DEFAULT 0
-) DEFAULT CHARSET=utf8;
-
---
--- TABLE unique_contacts
---
-CREATE TABLE IF NOT EXISTS `unique_contacts` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
- `url` varchar(255) NOT NULL DEFAULT '',
- `nick` varchar(255) NOT NULL DEFAULT '',
- `name` varchar(255) NOT NULL DEFAULT '',
- `avatar` varchar(255) NOT NULL DEFAULT '',
- `location` varchar(255) NOT NULL DEFAULT '',
- `about` text NOT NULL,
- INDEX `url` (`url`)
-) DEFAULT CHARSET=utf8;
+ `uid` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE user
--
CREATE TABLE IF NOT EXISTS `user` (
- `uid` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `uid` int(11) NOT NULL auto_increment,
`guid` varchar(64) NOT NULL DEFAULT '',
`username` varchar(255) NOT NULL DEFAULT '',
`password` varchar(255) NOT NULL DEFAULT '',
@@ -981,10 +1052,10 @@ CREATE TABLE IF NOT EXISTS `user` (
`default-location` varchar(255) NOT NULL DEFAULT '',
`allow_location` tinyint(1) NOT NULL DEFAULT 0,
`theme` varchar(255) NOT NULL DEFAULT '',
- `pubkey` text NOT NULL,
- `prvkey` text NOT NULL,
- `spubkey` text NOT NULL,
- `sprvkey` text NOT NULL,
+ `pubkey` text,
+ `prvkey` text,
+ `spubkey` text,
+ `sprvkey` text,
`verified` tinyint(1) unsigned NOT NULL DEFAULT 0,
`blocked` tinyint(1) unsigned NOT NULL DEFAULT 0,
`blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0,
@@ -994,6 +1065,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`cntunkmail` int(11) NOT NULL DEFAULT 10,
`notify-flags` int(11) unsigned NOT NULL DEFAULT 65535,
`page-flags` int(11) unsigned NOT NULL DEFAULT 0,
+ `account-type` int(11) unsigned NOT NULL DEFAULT 0,
`prvnets` tinyint(1) NOT NULL DEFAULT 0,
`pwdreset` varchar(255) NOT NULL DEFAULT '',
`maxreq` int(11) NOT NULL DEFAULT 10,
@@ -1004,33 +1076,35 @@ CREATE TABLE IF NOT EXISTS `user` (
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`service_class` varchar(32) NOT NULL DEFAULT '',
`def_gid` int(11) NOT NULL DEFAULT 0,
- `allow_cid` mediumtext NOT NULL,
- `allow_gid` mediumtext NOT NULL,
- `deny_cid` mediumtext NOT NULL,
- `deny_gid` mediumtext NOT NULL,
- `openidserver` text NOT NULL,
- INDEX `nickname` (`nickname`)
-) DEFAULT CHARSET=utf8;
+ `allow_cid` mediumtext,
+ `allow_gid` mediumtext,
+ `deny_cid` mediumtext,
+ `deny_gid` mediumtext,
+ `openidserver` text,
+ PRIMARY KEY(`uid`),
+ INDEX `nickname` (`nickname`(32))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE userd
--
CREATE TABLE IF NOT EXISTS `userd` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
+ `id` int(11) NOT NULL auto_increment,
`username` varchar(255) NOT NULL,
- INDEX `username` (`username`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`),
+ INDEX `username` (`username`(32))
+) DEFAULT CHARSET=utf8mb4;
--
-- TABLE workerqueue
--
CREATE TABLE IF NOT EXISTS `workerqueue` (
- `id` int(11) NOT NULL auto_increment PRIMARY KEY,
- `parameter` text NOT NULL,
+ `id` int(11) NOT NULL auto_increment,
+ `parameter` text,
`priority` tinyint(3) unsigned NOT NULL DEFAULT 0,
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`pid` int(11) NOT NULL DEFAULT 0,
`executed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
- INDEX `created` (`created`)
-) DEFAULT CHARSET=utf8;
+ PRIMARY KEY(`id`)
+) DEFAULT CHARSET=utf8mb4;
diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index c49e79c0ab..24b4dd4e7d 100644
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@ -1,6 +1,8 @@
Accesskeys in Friendica
=======================
+* [Home](help)
+
General
-------
* p: profile
@@ -37,10 +39,7 @@ General
* o: Profile
* t: Contacts
* d: Common friends
-* b: Toggle Blocked status
-* i: Toggle Ignored status
-* v: Toggle Archive status
-* r: Repair
+* r: Advanced
/message
--------
diff --git a/doc/BBCode.md b/doc/BBCode.md
index fe7c1481f6..50fb406b05 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -1,154 +1,616 @@
Friendica BBCode tags reference
========================
-* [Home](help)
+* [Creating posts](help/Text_editor)
-Inline
------
+## Inline
+
-
[ul]
+ [li] First list element
+ [li] Second list element
+[/ul]
+[list]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[ol]
+ [*] First list element
+ [*] Second list element
+[/ol]
+[list=1]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[list=]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[list=i]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[list=I]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[list=a]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
+
[list=A]
+ [*] First list element
+ [*] Second list element
+[/list]
+
+
+
First list element
+
Second list element
+
+
+
+
-
-
-
-Block
------
-
-
[code]code[/code]
-
-code
-
-
-
-
[quote]quote[/quote]
-
-
quote
-
-
-
-
[quote=Author]Author? Me? No, no, no...[/quote]
-
-Author wrote:
Author? Me? No, no, no...
-
-
-
-
[center]centered text[/center]
-
-
centered text
-
-
-
-
You should not read any further if you want to be surprised.[spoiler]There is a happy end.[/spoiler]
-
-You should not read any further if you want to be surprised. *click to open/close*
-
-(The text between thhe opening and the closing of the spoiler tag will be visible once the link is clicked. So *"There is a happy end."* wont be visible until the spoiler is uncovered.)
-
-
Full URL to an ogg/ogv/oga/ogm/webm/mp4/mp3 file. An HTML5 player will be used to show it.
+
+
+
[youtube]Youtube URL[/youtube]
+
Youtube video OEmbed display. May not embed an actual player.
+
+
+
[youtube]Youtube video ID[/youtube]
+
Youtube player iframe embed.
+
+
+
[vimeo]Vimeo URL[/vimeo]
+
Vimeo video OEmbed display. May not embed an actual player.
+
+
+
[vimeo]Vimeo video ID[/vimeo]
+
Vimeo player iframe embed.
+
+
+
[embed]URL[/embed]
+
Embed OEmbed rich content.
+
+
+
[iframe]URL[/iframe]
+
General embed, iframe size is limited by the theme size for video players.
+
+
+
[url]*url*[/url]
+
If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
+Page title with a link to *url* will be shown.
+
+
-Where *url* can be an url to youtube, vimeo, soundcloud, or other sites wich supports oembed or opengraph specifications.
-*url* can be also full url to an ogg file. HTML5 tag will be used to show it.
+## Map
-
[url]*url*[/url]
+This require "openstreetmap" or "Google Maps" addon version 1.3 or newer.
+If the addon isn't activated, the raw coordinates are shown instead.
-If *url* supports oembed or opengraph specifications the embedded object will be shown (eg, documents from scribd).
-Page title with a link to *url* will be shown.
+
+
+
BBCode
+
Result
+
+
+
[map]address[/map]
+
Embeds a map centered on this address.
+
+
+
[map=lat,long]
+
Embeds a map centered on those coordinates.
+
+
+
[map]
+
Embeds a map centered on the post's location.
+
+
-Map
----
+## Abstract for longer posts
-
[map]address[/map]
-
[map=lat,long]
+If you want to spread your post to several third party networks you can have the problem that these networks have a length limitation like on Twitter.
-You can embed maps from coordinates or addresses.
-This require "openstreetmap" addon version 1.3 or newer.
+Friendica is using a semi intelligent mechanism to generate a fitting abstract.
+But it can be interesting to define a custom abstract that will only be displayed on the external network.
+This is done with the [abstract]-element.
+
+
+
BBCode
+
Result
+
+
+
[abstract]Totally interesting! A must-see! Please click the link![/abstract]
+I want to tell you a really boring story that you really never wanted to hear.
+
Twitter would display the text
Totally interesting! A must-see! Please click the link!
+On Friendica you would only see the text after
I want to tell you a really ...
+
+
+It is even possible to define abstracts for separate networks:
-Special
--------
+
+
+
BBCode
+
Result
+
+
+
+[abstract]Hi friends Here are my newest pictures![/abstract]
+[abstract=twit]Hi my dear Twitter followers. Do you want to see my new
+pictures?[/abstract]
+[abstract=apdn]Helly my dear followers on ADN. I made sone new pictures
+that I wanted to share with you.[/abstract]
+Today I was in the woods and took some real cool pictures ...
+
For Twitter and App.net the system will use the defined abstracts.
+For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used.
+
+
-If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+If you use (for example) the "buffer" connector to post to Facebook or Google+ you can use this element to define an abstract for a longer blogpost that you don't want to post completely to these networks.
-
[noparse][b]bold[/b][/noparse]
: [b]bold[/b]
+Networks like Facebook or Google+ aren't length limited.
+For this reason the [abstract] element isn't used.
+Instead you have to name the explicit network:
+
+
+
BBCode
+
Result
+
+
+
+[abstract]These days I had a strange encounter...[/abstract]
+[abstract=goog]Helly my dear Google+ followers. You have to read my newest blog post![/abstract]
+[abstract=face]Hello my Facebook friends. These days happened something really cool.[/abstract]
+While taking pictures in the woods I had a really strange encounter...
+
Google and Facebook will show the respective abstracts while the other networks will show the default one.
+ Meanwhile, Friendica won't show any of the abstracts.
+
+
+The [abstract] element isn't working with connectors where we post the HTML like Tumblr, Wordpress or Pump.io.
+For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
+
+## Special
+
+
+
+
BBCode
+
Result
+
+
+
If you need to put literal bbcode in a message, [noparse], [nobb] or [pre] are used to escape bbcode:
+
+
[noparse][b]bold[/b][/noparse]
+
[nobb][b]bold[/b][/nobb]
+
[pre][b]bold[/b][/pre]
+
+
+
[b]bold[/b]
+
+
+
[nosmile] is used to disable smilies on a post by post basis
+
+ [nosmile] ;-) :-O
+
+
;-) :-O
+
+
+
Custom inline styles
+
+[style=text-shadow: 0 0 4px #CC0000;]You can change all the CSS properties of this block.[/style]
+
You can change all the CSS properties of this block.
+
+
+
Custom class block
+
+[class=custom]If the class exists, this block will have the custom class style applied.[/class]
+
<span class="custom">If the class exists, this block will have the custom class style applied.</span>
+
+
diff --git a/doc/Bugs-and-Issues.md b/doc/Bugs-and-Issues.md
index 366b2ed662..d316971d2a 100644
--- a/doc/Bugs-and-Issues.md
+++ b/doc/Bugs-and-Issues.md
@@ -6,8 +6,10 @@ Bugs and Issues
If your server has a support page, you should report any bugs/issues you encounter there first.
Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them.
This helps us get new features faster.
+You can also contact the [friendica support forum](https://helpers.pyxis.uberspace.de/profile/helpers) and report your problem there.
+Maybe someone from another node encountered the problem as well and can help you.
-If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](http://bugs.friendica.com/).
+If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues).
Please perform a search to see if there's already an open bug that matches yours before submitting anything.
Try to provide as much information as you can about the bug, including the **full** text of any error messages or notices, and any steps required to replicate the problem in as much detail as possible.
diff --git a/doc/Connectors.md b/doc/Connectors.md
index cd4b643f14..148352c552 100644
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
@@ -57,13 +57,15 @@ All that the pages need to have is a discoverable feed using either the RSS or A
Twitter
---
-To follow a Twitter member, put the URL of the Twitter member's main page into the Connect box on your [Contacts](contacts) page.
+To follow a Twitter member, the Twitter-Connector (Addon) needs to be configured on your node.
+If this is the case put the URL of the Twitter member's main page into the Connect box on your [Contacts](contacts) page.
To reply, you must have the Twitter connector installed, and reply using your own status editor.
Begin the message with @twitterperson replacing with the Twitter username.
Email
---
+If the php module for IMAP support is available on your server, Friendica can connect to email contacts as well.
Configure the email connector from your [Settings](settings) page.
Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contacts) page.
They must be the sender of a message which is currently in your INBOX for the connection to succeed.
diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 7e5caae2b3..61b300b0cc 100644
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -16,7 +16,7 @@ Contact us
The discussion of Friendica development takes place in the following Friendica forums:
-* The main [forum for Friendica development](https://friendika.openmindspace.org/profile/friendicadevelopers)
+* The main [forum for Friendica development](https://helpers.pyxis.uberspace.de/profile/developers)
* The [forum for Friendica theme development](https://friendica.eu/profile/ftdevs)
Help other users
@@ -29,7 +29,7 @@ Welcome them, answer their questions, point them to documentation or ping other
Translation
---
-The documentation contains help on how to translate Friendica in the [at Transifex](/help/translations) where the UI is translated.
+The documentation contains help on how to translate Friendica [at Transifex](/help/translations) where the UI is translated.
If you don't want to translate the UI, or it is already done to your satisfaction, you might want to work on the translation of the /help files?
Design
@@ -42,16 +42,66 @@ If you have seen Friendica you probably have ideas to improve it, haven't you?
* Make plans for a better Friendica interface design and share them with us.
* Tell us if you are able to realize your ideas or what kind of help you need.
We can't promise we have the right skills in the group but we'll try.
-* Choose a thing to start with, e.g. work on the icon set of your favourite theme
+* Choose a thing to start with, e.g. work on the icon set of your favorite theme
Programming
---
+###Coding standards
+
+For the sake of consistency between contribution and general code readability, Friendica follows the widespread [PSR-2 coding standards](http://www.php-fig.org/psr/psr-2/) to the exception of a few rules.
+Here's a few primers if you are new to Friendica or to the PSR-2 coding standards:
+ * Indentation is tabs, period (not PSR-2).
+ * By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds).
+ * Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'`
+ * Braces are mandatory in conditions
+ * No closing PHP tag
+ * No trailing spaces
+
+Don't worry, you don't have to know by heart the PSR-2 coding standards to start contributing to Friendica.
+There are a few tools you can use to check or fix your files before you commit.
+
+For documentation we use the standard of *one sentence per line* for the `md` files in the `/doc` and `/doc/$lng` subdirectories.
+
+####Check with [PHP Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer)
+
+This tool checks your files against a variety of coding standards, including PSR-2, and ouputs a report of all the standard violations.
+You can simply install it through PEAR: `pear install PHP_CodeSniffer`
+Once it is installed and available in your PATH, here's the command to run before committing your work:
+
+ $> phpcs --standard=PSR2
+
+The output is a list of all the coding standards violations that you should fix before committing your work.
+Additionally, `phpcs` integrates with a few IDEs (Eclipse, Netbeans, PHPStorm...) so that you don't have to fiddle with the command line.
+
+####Fix with PHP Code Beautifier and Fixer (phpbcf) included in PHP Code Sniffer
+
+If you're getting a massive list of standards violations when running `phpcs`, it can be annoying to fix all the violations by hand.
+Thankfully, PHP Code Sniffer is shipped with an automatic code fixer that can take care of the tedious task for you.
+Here's the command to automatically fix the files you created/modified:
+
+ $> phpcbf --standard=PSR2
+
+If the command-line tools `diff` and `patch` are unavailabe for you, `phpcbf` can use slightly slower PHP equivalents by using the `--no-patch` argument.
+
+###Code documentation
+
+If you are interested in having the documentation of the Friendica code outside of the code files, you can use [Doxygen](http://doxygen.org) to generate it.
+The configuration file for Doxygen is located in the `util` directory of the project sources.
+Run
+
+ $> doxygen util/Doxyfile
+
+to generate the files which will be located in the `doc/html` subdirectory in the Friendica directory.
+You can browse these files with any browser.
+
+If you find missing documentation, don't hesitate to contact us and write it down to enhance the code documentation.
+
###Issues
Have a look at our [issue tracker](https://github.com/friendica/friendica) on github!
- * Try to reproduce a bug that needs more inquries and write down what you find out.
+ * Try to reproduce a bug that needs more inquiries and write down what you find out.
* If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed.
* Fix a bug if you can. Please make the pull request against the *develop* branch of the repository.
* There is a *Junior Job* label for issues we think might be a good point to start with.
@@ -66,15 +116,15 @@ If you want to get involved here:
* Look at the first steps that were made (e.g. the clean theme).
Ask us to find out whom to talk to about their experiences.
* Talk to design people if you know any.
-* Let us know about your plans [in the dev forum](https://friendika.openmindspace.org/profile/friendicadevelopers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
+* Let us know about your plans [in the dev forum](https://helpers.pyxis.uberspace.de/profile/developers) and the [theme developer forum](https://friendica.eu/profile/ftdevs).
Do not worry about cross-posting.
###Client software
-There are free software clients that do somehow work with Friendica but most of them need love and maintenance.
-Also, they were mostly made for other platforms using the GNU Social API.
-This means they lack the features that are really specific to Friendica.
-Popular clients you might want to have a look at are:
+As Friendica is using a [Twitter/GNU Social compatible API](help/api) any of the clients for those platforms should work with Friendica as well.
+Furthermore there are several client projects, especially for use with Friendica.
+If you are interested in improving those clients, please contact the developers of the clients directly.
-* [Hotot (Linux)](http://hotot.org/) - abandoned
-* [Friendica for Android](https://github.com/max-weller/friendica-for-android) - abandoned
-* You can find more working client software in [Wikipedia](https://en.wikipedia.org/wiki/Friendica).
+* Android / CynogenMod: **Friendica for Android** [src](https://github.com/max-weller/friendica-for-android), [homepage](http://friendica.android.max-weller.de/) - abandoned
+* iOS: *currently no client*
+* SailfishOS: **Friendiy** [src](https://kirgroup.com/projects/fabrixxm/harbour-friendly) - developed by [Fabio](https://kirgroup.com/profile/fabrixxm/?tab=profile)
+* Windows: **Friendica Mobile** for Windows versions [before 8.1](http://windowsphone.com/s?appid=e3257730-c9cf-4935-9620-5261e3505c67) and [Windows 10](https://www.microsoft.com/store/apps/9nblggh0fhmn) - developed by [Gerhard Seeber](http://mozartweg.dyndns.org/friendica/profile/gerhard/?tab=profile)
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 0343833a25..36fe1a8b47 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -43,29 +43,29 @@ We recommend to talk to the admin(s) of the affected friendica server. (Admins,
###How can I upload images, files, links, videos and sound files to posts?
-You can upload images from your computer by using the [editor](help/Text_editor).
+You can upload images from your computer using the [editor](help/Text_editor).
An overview of all uploaded images is listed at *yourpage.com/photos/profilename*.
-On that page, you can also upload images directly and choose, if your contacts shall receive a message about this upload.
+On that page, you can also upload images directly and choose if your contacts will receive a message about this upload.
-Generally, you could attach every kind of file to a post.
+Generally, you can attach any kind of file to a post.
This is possible by using the "paper-clip"-symbol in the editor.
These files will be linked to your post and can be downloaded by your contacts.
-But it's not possible to get a preview for these ones.
-Because of this, this upload method is recommended for office or zipped files.
-If you want share content from Dropbox, Owncloud or any other [filehoster](http://en.wikipedia.org/wiki/Comparison_of_file_hosting_services), use the "link"-button (chain-symbol).
+But it's not possible to get a preview for these items.
+Because of this, this upload method is only recommended for office or zipped files.
+If you want to share content from Dropbox, Owncloud or any other [filehoster](http://en.wikipedia.org/wiki/Comparison_of_file_hosting_services), use the "link"-button (chain-symbol).
When you're adding URLs of other webpages with the "link"-button, Friendica tries to create a small preview.
If this doesn't work, try to add the link by typing: [url=http://example.com]*self-chosen name*[/url].
You can also add video and audio files to posts.
-But instead of a direct upload you have to use one of the following methods:
+However, instead of a direct upload you have to use one of the following methods:
-1. Add the video or audio link of a hoster (Youtube, Vimeo, Soundcloud and everyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start it. SoundCloud directly inserts a player to your post.
+1. Add the video or audio link of a hoster (Youtube, Vimeo, Soundcloud and anyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start. SoundCloud directly inserts a player to your post.
2. If you have your own server, you can upload multimedia files via FTP and insert the URL.
-Friendica is using HTML5 for embedding content.
-Therefore, the supported files are depending on your browser and operating system.
+Friendica uses HTML5 for embedding content.
+Therefore, the supported files are dependent on your browser and operating system.
Some supported filetypes are WebM, MP4, MP3 and OGG.
See Wikipedia for more of them ([video](http://en.wikipedia.org/wiki/HTML5_video), [audio](http://en.wikipedia.org/wiki/HTML5_audio)).
@@ -188,7 +188,7 @@ Admin
###Can I configure multiple domains with the same code instance?
-No, this function is not supported anymore starting from Friendica 3.3.
+No, this function is no longer supported from Friendica 3.3 onwards.
@@ -202,12 +202,12 @@ Addons are listed at [this page](https://github.com/friendica/friendica-addons).
If you are searching for new themes, you can find them at [Friendica-Themes.com](http://friendica-themes.com/)
-###I've changed the my email address now the admin panel is gone?
+###I've changed my email address now the admin panel is gone?
Have a look into your .htconfig.php and fix your email address there.
-###Can there be more then just one admin for a node?
+###Can there be more then one admin for a node?
Yes. You just have to list more then one email address in the
.htconfig.php file. The listed emails need to be separated by a comma.
diff --git a/doc/Forums.md b/doc/Forums.md
index 2eac81a722..54e8e38791 100644
--- a/doc/Forums.md
+++ b/doc/Forums.md
@@ -53,9 +53,12 @@ Posting to Community forums
If you are a member of a community forum, you may post to the forum by including an @-tag in the post mentioning the forum.
For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients.
-If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members).
+If you mention a forum (you are a member of) in a new posting, the posting will be distributed to all members of the forum, regardless of your privacy settings for the posting.
+Also, if the forum is a public forum, your posting will be public for the all internet users.
+If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members).
+Posting privately to a public forum, will result in your posting being displayed on the forum wall, but not on yours.
-You may also post to a community forum by posting a "wall-to-wall" post using secure cross-site authentication.
+You may also post to a community forum by posting a "wall-to-wall" post using secure cross-site authentication.
Comments which are relayed to community forums will be relayed back to the original post creator.
Mentioning the forum with an @-tag in a comment does not relay the message, as distribution is controlled entirely by the original post creator.
diff --git a/doc/Home.md b/doc/Home.md
index b37c76417c..b4b389921a 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -7,11 +7,11 @@ Friendica Documentation and Resources
* [Account Basics](help/Account-Basics)
* [New User Quick Start](help/Quick-Start-guide)
* [Creating posts](help/Text_editor)
- * [BBCode tag reference](help/BBCode)
+ * [BBCode tag reference](help/BBCode)
* [Comment, sort and delete posts](help/Text_comment)
* [Profiles](help/Profiles)
* [Accesskey reference](help/Accesskeys)
- * [Events](help/events)
+ * [Events](help/events)
* You and other users
* [Connectors](help/Connectors)
* [Making Friends](help/Making-Friends)
@@ -20,7 +20,6 @@ Friendica Documentation and Resources
* [Community Forums](help/Forums)
* [Chats](help/Chats)
* Further information
- * [Improve Performance](help/Improve-Performance)
* [Move your account](help/Move-Account)
* [Delete your account](help/Remove-Account)
* [Frequently asked questions (FAQ)](help/FAQ)
@@ -28,13 +27,12 @@ Friendica Documentation and Resources
**Admin Manual**
* [Install](help/Install)
-* [Settings](help/Settings)
+* [Settings & Admin Panel](help/Settings)
* [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
-* [Message Flow](help/Message-Flow)
* [Using SSL with Friendica](help/SSL)
-* [Twitter/GNU Social API Functions](help/api)
* [Config values that can only be set in .htconfig.php](help/htconfig)
+* [Improve Performance](help/Improve-Performance)
**Developer Manual**
@@ -46,7 +44,12 @@ Friendica Documentation and Resources
* [Plugin Development](help/Plugins)
* [Theme Development](help/themes)
* [Smarty 3 Templates](help/smarty3-templates)
+* [Protocol Documentation](help/Protocol)
+* [Database schema documantation](help/database)
+* [Class Autoloading](help/autoloader)
* [Code - Reference(Doxygen generated - sets cookies)](doc/html/)
+* [Twitter/GNU Social API Functions](help/api)
+
**External Resources**
diff --git a/doc/Install.md b/doc/Install.md
index 5afd5a22c1..9a194254a0 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -10,7 +10,7 @@ Not every PHP/MySQL hosting provider will be able to support Friendica.
Many will.
But **please** review the requirements and confirm these with your hosting provider prior to installation.
-Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://friendika.openmindspace.org/profile/friendicadevelopers) forum or [file an issue](https://github.com/friendica/friendica/issues).
+Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://helpers.pyxis.uberspace.de/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
If you do not have a Friendica account yet, you can register a temporary one at [tryfriendica.de](https://tryfriendica.de) and join the forums mentioned above from there.
@@ -26,12 +26,12 @@ Requirements
---
* Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
-* PHP 5.2+. The later the better. You'll need 5.3 for encryption of key exchange conversations. On a Windows environment, 5.2+ might not work as the function dns_get_record() is only available with version 5.3.
+* PHP 5.4+.
* PHP *command line* access with register_argc_argv set to true in the php.ini file
* curl, gd, mysql, hash and openssl extensions
* some form of email server or email gateway such that PHP mail() works
* mcrypt (optional; used for server-to-server message encryption)
-* Mysql 5.x or an equivalant alternative for MySQL (MariaDB etc.)
+* Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
* the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.)
* Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested.
* If your hosting provider doesn't allow Unix shell access, you might have trouble getting everything to work.
@@ -69,6 +69,15 @@ Create an empty database and note the access details (hostname, username, passwo
Friendica needs the permission to create and delete fields and tables in its own database.
+With newer releases of MySQL (5.7.17 or newer), you might need to set the sql_mode to '' (blank).
+Use this setting when the installer is unable to create all the needed tables due to a timestamp format problem.
+In this case find the [mysqld] section in your my.cnf file and add the line :
+
+ sql_mode = ''
+
+Restart mysql and you should be fine.
+
+
###Run the installer
Point your web browser to the new site and follow the instructions.
diff --git a/doc/Message-Flow.md b/doc/Message-Flow.md
index ce0a4248ab..9a6785d599 100644
--- a/doc/Message-Flow.md
+++ b/doc/Message-Flow.md
@@ -4,7 +4,7 @@ Friendica Message Flow
This page documents some of the details of how messages get from one person to another in the Friendica network.
There are multiple paths, using multiple protocols and message formats.
-Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](http://dfrn.org/dfrn.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
+Those attempting to understand these message flows should become familiar with (at the minimum) the [DFRN protocol document](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf) and the message passing elements of the OStatus stack (salmon and Pubsubhubbub).
Most message passing involves the file include/items.php, which has functions for several feed-related import/export activities.
@@ -21,8 +21,8 @@ Push (pubsubhubbub) feeds arrive via mod/pubsub.php
DFRN-poll feed imports arrive via include/poller.php as a scheduled task, this implements the local side of the DFRN-poll protocol.
-Scenario #1. Bob posts a public status message
----
+### Scenario #1. Bob posts a public status message
+
This is a public message with no conversation members so no private transport is used.
There are two paths it can take - as a bbcode path to DFRN clients, and converted to HTML with the server's PuSH (pubsubhubbub) hubs notified.
When a PuSH hub is operational, dfrn-poll clients prefer to receive their information through the PuSH channel.
@@ -30,31 +30,31 @@ They will fall back on a daily poll in case the hub has delivery issues (this is
If there is no specified hub or hubs, DFRN clients will poll at a configurable (per-contact) rate at up to 5-minute intervals.
Feeds retrieved via dfrn-poll are bbcode and may also contain private conversations which the poller has permissions to see.
-Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
----
+### Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
+
Jack uses dfrn-notify to send a direct reply to Bob.
Bob then creates a feed of the conversation and sends it to everybody involved in the conversation using dfrn-notify.
PuSH hubs are notified that new content is available.
The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
-Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
----
+### Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
+
Mary uses dfrn-notify to send a direct reply to Bob.
Bob then creates a feed of the conversation and sends it to everybody involved in the conversation (excluding himself, the conversation is now sent to both Jack and Mary).
Messages are sent using dfrn-notify.
Push hubs are also notified that new content is available.
The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
-Scenario #4. William replies to Bob's public message. William is on the OStatus network.
----
+### Scenario #4. William replies to Bob's public message. William is on the OStatus network.
+
William uses salmon to notify Bob of the reply.
Content is html embedded in salmon magic envelope.
Bob then creates a feed of the conversation and sends it to all Friendica participants involved in the conversation using dfrn-notify (excluding himself, the conversation is sent to both Jack and Mary).
Push hubs are notified that new content is available.
The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
-Scenario #5. Bob posts a private message to Mary and Jack.
----
+### Scenario #5. Bob posts a private message to Mary and Jack.
+
Message is delivered immediately to Mary and Jack using dfrn_notify.
Public hubs are not notified.
Requeueing is attempted in case of timeout.
diff --git a/doc/Plugins.md b/doc/Plugins.md
index 24d403e1f6..3a25dc7217 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -1,5 +1,7 @@
Friendica Addon/Plugin development
-==========================
+==============
+
+* [Home](help)
Please see the sample addon 'randplace' for a working example of using some of these features.
Addons work by intercepting event hooks - which must be registered.
@@ -16,12 +18,12 @@ Future extensions may provide for "setup" amd "remove".
Plugins should contain a comment block with the four following parameters:
- /*
- * Name: My Great Plugin
- * Description: This is what my plugin does. It's really cool
- * Version: 1.0
- * Author: John Q. Public
- */
+ /*
+ * Name: My Great Plugin
+ * Description: This is what my plugin does. It's really cool.
+ * Version: 1.0
+ * Author: John Q. Public
+ */
Register your plugin hooks during installation.
@@ -38,14 +40,14 @@ Arguments
---
Your hook callback functions will be called with at least one and possibly two arguments
- function myhook_function(&$a, &$b) {
+ function myhook_function(App $a, &$b) {
}
If you wish to make changes to the calling data, you must declare them as reference variables (with '&') during function declaration.
-###$a
+#### $a
$a is the Friendica 'App' class.
It contains a wealth of information about the current state of Friendica:
@@ -56,13 +58,13 @@ It contains a wealth of information about the current state of Friendica:
It is recommeded you call this '$a' to match its usage elsewhere.
-###$b
+#### $b
$b can be called anything you like.
This is information specific to the hook currently being processed, and generally contains information that is being immediately processed or acted on that you can use, display, or alter.
Remember to declare it with '&' if you wish to alter it.
Modules
---------
+---
Plugins/addons may also act as "modules" and intercept all page requests for a given URL path.
In order for a plugin to act as a module it needs to define a function "plugin_name_module()" which takes no arguments and needs not do anything.
@@ -72,15 +74,15 @@ These are parsed into an array $a->argv, with a corresponding $a->argc indicatin
So http://my.web.site/plugin/arg1/arg2 would look for a module named "plugin" and pass its module functions the $a App structure (which is available to many components).
This will include:
- $a->argc = 3
- $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
+ $a->argc = 3
+ $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
-Your module functions will often contain the function plugin_name_content(&$a), which defines and returns the page body content.
-They may also contain plugin_name_post(&$a) which is called before the _content function and typically handles the results of POST forms.
-You may also have plugin_name_init(&$a) which is called very early on and often does module initialisation.
+Your module functions will often contain the function plugin_name_content(App $a), which defines and returns the page body content.
+They may also contain plugin_name_post(App $a) which is called before the _content function and typically handles the results of POST forms.
+You may also have plugin_name_init(App $a) which is called very early on and often does module initialisation.
Templates
-----------
+---
If your plugin needs some template, you can use the Friendica template system.
Friendica uses [smarty3](http://www.smarty.net/) as a template engine.
@@ -104,140 +106,140 @@ See also the wiki page [Quick Template Guide](https://github.com/friendica/frien
Current hooks
-------------
-###'authenticate'
+### 'authenticate'
'authenticate' is called when a user attempts to login.
$b is an array containing:
- 'username' => the supplied username
- 'password' => the supplied password
+ 'username' => the supplied username
+ 'password' => the supplied password
'authenticated' => set this to non-zero to authenticate the user.
'user_record' => successful authentication must also return a valid user record from the database
-###'logged_in'
+### 'logged_in'
'logged_in' is called after a user has successfully logged in.
$b contains the $a->user array.
-###'display_item'
+### 'display_item'
'display_item' is called when formatting a post for display.
$b is an array:
'item' => The item (array) details pulled from the database
'output' => the (string) HTML representation of this item prior to adding it to the page
-###'post_local'
+### 'post_local'
* called when a status post or comment is entered on the local system
* $b is the item array of the information to be stored in the database
* Please note: body contents are bbcode - not HTML
-###'post_local_end'
+### 'post_local_end'
* called when a local status post or comment has been stored on the local system
* $b is the item array of the information which has just been stored in the database
* Please note: body contents are bbcode - not HTML
-###'post_remote'
+### 'post_remote'
* called when receiving a post from another source. This may also be used to post local activity or system generated messages.
* $b is the item array of information to be stored in the database and the item body is bbcode.
-###'settings_form'
+### 'settings_form'
* called when generating the HTML for the user Settings page
* $b is the (string) HTML of the settings page before the final '' tag.
-###'settings_post'
+### 'settings_post'
* called when the Settings pages are submitted
* $b is the $_POST array
-###'plugin_settings'
+### 'plugin_settings'
* called when generating the HTML for the addon settings page
* $b is the (string) HTML of the addon settings page before the final '' tag.
-###'plugin_settings_post'
+### 'plugin_settings_post'
* called when the Addon Settings pages are submitted
* $b is the $_POST array
-###'profile_post'
+### 'profile_post'
* called when posting a profile page
* $b is the $_POST array
-###'profile_edit'
+### 'profile_edit'
'profile_edit' is called prior to output of profile edit page.
$b is an array containing:
'profile' => profile (array) record from the database
'entry' => the (string) HTML of the generated entry
-###'profile_advanced'
+### 'profile_advanced'
* called when the HTML is generated for the 'Advanced profile', corresponding to the 'Profile' tab within a person's profile page
* $b is the (string) HTML representation of the generated profile
* The profile array details are in $a->profile.
-###'directory_item'
+### 'directory_item'
'directory_item' is called from the Directory page when formatting an item for display.
$b is an array:
'contact' => contact (array) record for the person from the database
'entry' => the (string) HTML of the generated entry
-###'profile_sidebar_enter'
+### 'profile_sidebar_enter'
* called prior to generating the sidebar "short" profile for a page
* $b is the person's profile array
-###'profile_sidebar'
+### 'profile_sidebar'
'profile_sidebar is called when generating the sidebar "short" profile for a page.
$b is an array:
'profile' => profile (array) record for the person from the database
'entry' => the (string) HTML of the generated entry
-###'contact_block_end'
+### 'contact_block_end'
is called when formatting the block of contacts/friends on a profile sidebar has completed.
$b is an array:
'contacts' => array of contacts
'output' => the (string) generated HTML of the contact block
-###'bbcode'
+### 'bbcode'
* called during conversion of bbcode to html
* $b is a string converted text
-###'html2bbcode'
+### 'html2bbcode'
* called during conversion of html to bbcode (e.g. remote message posting)
* $b is a string converted text
-###'page_header'
+### 'page_header'
* called after building the page navigation section
* $b is a string HTML of nav region
-###'personal_xrd'
+### 'personal_xrd'
'personal_xrd' is called prior to output of personal XRD file.
$b is an array:
'user' => the user record for the person
'xml' => the complete XML to be output
-###'home_content'
+### 'home_content'
* called prior to output home page content, shown to unlogged users
* $b is (string) HTML of section region
-###'contact_edit'
+### 'contact_edit'
is called when editing contact details on an individual from the Contacts page.
$b is an array:
'contact' => contact record (array) of target contact
'output' => the (string) generated HTML of the contact edit page
-###'contact_edit_post'
+### 'contact_edit_post'
* called when posting the contact edit page.
* $b is the $_POST array
-###'init_1'
+### 'init_1'
* called just after DB has been opened and before session start
* $b is not used or passed
-###'page_end'
+### 'page_end'
* called after HTML content functions have completed
* $b is (string) HTML of content div
-###'avatar_lookup'
+### 'avatar_lookup'
'avatar_lookup' is called when looking up the avatar.
$b is an array:
@@ -245,11 +247,11 @@ $b is an array:
'email' => email to look up the avatar for
'url' => the (string) generated URL of the avatar
-###'emailer_send_prepare'
+### 'emailer_send_prepare'
'emailer_send_prepare' called from Emailer::send() before building the mime message.
$b is an array, params to Emailer::send()
- 'fromName' => name of the sender
+ 'fromName' => name of the sender
'fromEmail' => email fo the sender
'replyTo' => replyTo address to direct responses
'toEmail' => destination email address
@@ -258,20 +260,20 @@ $b is an array, params to Emailer::send()
'textVersion' => text only version of the message
'additionalMailHeader' => additions to the smtp mail header
-###'emailer_send'
+### 'emailer_send'
is called before calling PHP's mail().
$b is an array, params to mail()
- 'to'
- 'subject'
+ 'to'
+ 'subject'
'body'
'headers'
-###'nav_info'
+### 'nav_info'
is called after the navigational menu is build in include/nav.php.
$b is an array containing $nav from nav.php.
-###'template_vars'
+### 'template_vars'
is called before vars are passed to the template engine to render the page.
The registered function can add,change or remove variables passed to template.
$b is an array with:
@@ -279,6 +281,11 @@ $b is an array with:
'template' => filename of template
'vars' => array of vars passed to template
+### ''acl_lookup_end'
+is called after the other queries have passed.
+The registered function can add, change or remove the acl_lookup() variables.
+
+ 'results' => array of the acl_lookup() vars
Complete list of hook callbacks
@@ -336,6 +343,8 @@ include/acl_selectors.php: call_hooks($a->module . '_pre_' . $selname, $arr);
include/acl_selectors.php: call_hooks($a->module . '_post_' . $selname, $o);
+include/acl_selectors.php call_hooks('acl_lookup_end', $results);
+
include/notifier.php: call_hooks('notifier_normal',$target_item);
include/notifier.php: call_hooks('notifier_end',$target_item);
@@ -463,4 +472,3 @@ mod/cb.php: call_hooks('cb_afterpost');
mod/cb.php: call_hooks('cb_content', $o);
mod/directory.php: call_hooks('directory_item', $arr);
-
diff --git a/doc/Protocol.md b/doc/Protocol.md
new file mode 100644
index 0000000000..85fe09a5f1
--- /dev/null
+++ b/doc/Protocol.md
@@ -0,0 +1,42 @@
+Used Protocols
+===============
+
+* [Home](help)
+
+Friendicas DFRN Protocol
+---
+
+* [Document with the DFRN specification](spec/dfrn2.pdf)
+* [Schema of the contact request process](spec/dfrn2_contact_request.png)
+* [Schema of the contact request confirmation](spec/dfrn2_contact_confirmation.png)
+* [Description of the message flow](help/Message-Flow)
+
+ActivityStreams
+---
+
+Friendica is using ActivityStreams in version 1.0 for its activities and object types.
+Additional types are used for non standard activities.
+
+* [Link to the specification](http://activitystrea.ms/head/activity-schema.html)
+* [List of used ActivityStreams verbs and object types.](https://github.com/friendica/friendica/wiki/ActivityStreams)
+
+Salmon
+---
+
+Salmon is used as a message exchange protocol for replies and mentions.
+
+* [Link to the protocol summary](http://www.salmon-protocol.org/salmon-protocol-summary)
+
+Portable Contacts
+---
+
+Portable Contacts is used for friends lists.
+
+* [Link to the specification](https://web.archive.org/web/20160426223008/http://portablecontacts.net/draft-spec.html) (Link to archive.org)
+
+pubsubhubbub
+---
+
+pubsubhubbub is used for OStatus.
+
+* [Link to the specification](https://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html)
diff --git a/doc/Quick-Start-andfinally.md b/doc/Quick-Start-andfinally.md
index 97afd8140c..e76eb7278f 100644
--- a/doc/Quick-Start-andfinally.md
+++ b/doc/Quick-Start-andfinally.md
@@ -5,17 +5,8 @@ Here are some more things to help get you started:
**Groups**
-- New Here - a group for people new to Friendica
-
- Friendica Support - problems? This is the place to ask.
-- Public Stream - a place to talk about anything to anyone.
-
-- Let's Talk a group for finding people and groups who share similar interests.
-
-- Local Friendica a page for local Friendica groups
-
-
**Documentation**
- Connecting to more networks
diff --git a/doc/SSL.md b/doc/SSL.md
index a72eec2a16..95de83305f 100644
--- a/doc/SSL.md
+++ b/doc/SSL.md
@@ -3,15 +3,15 @@ Using SSL with Friendica
* [Home](help)
-Disclaimer
----
-**This document has been updated in November 2015.
+## Disclaimer
+
+**This document has been updated in November 2016.
SSL encryption is relevant for security.
This means that recommended settings change fast.
Keep your setup up to date and do not rely on this document being updated as fast as technologies change!**
-Intro
----
+## Intro
+
If you are running your own Friendica site, you may want to use SSL (https) to encrypt communication between servers and between yourself and your server.
There are basically two sorts of SSL certificates: Self-signed certificates and certificates signed by a certificate authority (CA).
@@ -26,81 +26,73 @@ Normally, you have to pay for them - and they are valid for a limited period of
There are ways to get a trusted certificate for free.
-Chose your domain name
----
+## Choose your domain name
Your SSL certificate will be valid for a domain or even only for a subdomain.
Make your final decision about your domain resp. subdomain *before* ordering the certificate.
Once you have it, changing the domain name means getting a new certificate.
-Shared hosts
----
+### Shared hosts
If your Friendica instance is running on a shared hosting platform, you should first check with your hosting provider.
They have instructions for you on how to do it there.
You can always order a paid certificate with your provider.
They will either install it for you or provide an easy way to upload the certificate and the key via a web interface.
-
-
-It might be worth asking if your provider would install a certificate you provide yourself, to save money.
-If so, read on.
-
-Getting a free StartSSL certificate
----
-StartSSL is a certificate authority that issues certificates for free.
-They are valid for a year and are sufficient for our purposes.
-
-### Step 1: Create a client certificate
-
-When you initially sign up with StartSSL, you receive a certificate that is installed in your browser.
-You need it for the login on startssl.com, also when coming back to the site later.
-It has nothing to do with the SSL certificate for your server.
-
-### Step 2: Validate your email address and your domain
-
-To continue you have to prove that you own the email address you specified and the domain that you want a certificate for.
-Specify your email address, request a validation link via email from the "validations wizard".
-Same procedure for the domain validation.
-
-### Step 3: Request the certificate
-
-Go to the "certificates wizard".
-Choose the target web server.
-When you are first prompted for a domain to certify, you need to enter your main domain, e.g. example.com.
-In the next step, you will be able to specify a subdomain for Friendica, if needed.
-Example: If you have friendica.example.com, you first enter example.com, then specify the subdomain friendica later.
-
-If you know how to generate an openssl key and a certificate signing request (csr) yourself, do so.
-Paste the csr into your browser to get it signed by StartSSL.
-
-If you do not know how to generate a key and a csr, accept StartSSL's offer to generate it for you.
-This means: StartSSL has the key to your encryption but it is better than no certificate at all.
-Download your certificate from the website.
-(Or in the second case: Download your certificate and your key.)
-
-To install your certificate on a server, you need one or two extra files: sub.class1.server.ca.pem and ca.pem, delivered by startssl.com
-Go to the "Tool box" section and download "Class 1 Intermediate Server CA" and "StartCom Root CA (PEM encoded)".
-
-If you want to send your certificate to your hosting provider, they need the certificate, the key and probably at least the intermediate server CA.
-To be sure, send those three and the ca.pem file.
+With some providers, you have to send them your certificate.
+They need the certificate, the key and the CA's intermediate certificate.
+To be sure, send those three files.
**You should send them to your provider via an encrypted channel!**
-If you run your own server, upload the files and check out the Mozilla wiki link below.
+### Own server
-Let's encrypt
----
+If you run your own server, we recommend to check out the ["Let's Encrypt" initiative](https://letsencrypt.org/).
+Not only do they offer free SSL certificates, but also a way to automate their renewal.
+You need to install a client software on your server to use it.
+Instructions for the official client are [here](https://certbot.eff.org/).
+Depending on your needs, you might want to look at the [list of alternative letsencrypt clients](https://letsencrypt.org/docs/client-options/).
-If you run your own server and you control your name server, the "Let's encrypt" initiative might become an interesting alternative.
-Their offer is not ready, yet.
-Check out [their website](https://letsencrypt.org/) for status updates.
-
-Web server settings
----
+## Web server settings
Visit the [Mozilla's wiki](https://wiki.mozilla.org/Security/Server_Side_TLS) for instructions on how to configure a secure webserver.
-They provide recommendations for [different web servers](https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_Server_Configurations).
+They provide recommendations for [different web servers](https://mozilla.github.io/server-side-tls/ssl-config-generator/).
-Test your SSL settings
----
+## Test your SSL settings
When you are done, visit the test site [SSL Labs](https://www.ssllabs.com/ssltest/) to have them check if you succeeded.
+
+## Configure Friendica
+
+If you can successfully access your Friendica instance through https, there are a number of steps you can take to ensure your users will use SSL to access your instance.
+
+### Web server redirection
+
+This is the simplest way to enforce site-wide secure access.
+Every time a user tries to access any Friendica page by any mean (manual address bar entry or link), the web server issues a Permanent Redirect response with the secure protocol prepended to the requested URL.
+
+With Apache, simply add the following lines to the [code].htaccess[/code] file in the root folder of your Friendica instance (thanks to [url=https://github.com/AlfredSK]AlfredSK[/url]):
+
+[code]
+#Force SSL connections
+
+RewriteEngine On
+RewriteCond %{SERVER_PORT} 80
+RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
+[/code]
+
+With nginx, configure your [code]server[/code] directive this way (thanks to [url=https://bjornjohansen.no/redirect-to-https-with-nginx/]Bjørn Johansen[/url]):
+
+[code]
+server {
+ listen 80;
+ listen [::]:80;
+ server_name your.friendica.domain;
+ return 301 https://$server_name$request_uri;
+}
+[/code]
+
+### SSL Settings
+
+In the Admin Settings, there are three SSL-related settings:
+- **SSL link policy**: this affects how Friendica generates internal links. If your SSL installation was successful, we recommend "Force all links to SSL" just in case your web server configuration can't be altered like described above.
+- **Force SSL**: This forces all external links to HTTPS, which may solve Mixed-Content issues, but not all websites support HTTPS yet. Use at your own risk.
+- **Verify SSL**: Enabling this will prevent Friendica to interact with self-signed SSL sites. We recommend you leave it on as a self-signed SSL certificate can be a vectorfor a man-in-the-middle attack.
\ No newline at end of file
diff --git a/doc/Settings.md b/doc/Settings.md
index ae7d916078..9590ad42d6 100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -1,175 +1,108 @@
-Settings
-===
-Here are some of the built-in features which don't have an exposed interface or are otherwise undocumented.
-Configuration settings are stored in the file ".htconfig.php".
-Edit this file with a text editor to make the desired changes.
-Several system settings are already documented in that file and will not be covered here.
+# Settings
-Hot Keys
----
+* [Home](help)
-Friendica traps the following keyboard events:
+If you are the admin of a Friendica node, you have access to the so called **Admin Panel** where you can configure your Friendica node.
-* [Pause] - Pauses "Ajax" update activity. This is the process that provides updates without reloading the page. You may wish to pause it to reduce network usage and/or as a debugging aid for javascript developers. A pause indicator will appear at the lower right hand corner of the page. Hit the [pause] key once again to resume.
-* [F8] - Displays a language selector
+On the front page of the admin panel you will see a summary of information about your node.
+These information include the amount of messages currently being processed in the queues.
+The first number is the number of messages being actively sent.
+This number should decrease quickly.
+The second is the messages which could for various reasons not being delivered.
+They will be resend later.
+You can have a quick glance into that second queus in the "Inspect Queue" section of the admin panel.
+If you have activated the background workers, there is a third number representing the count of jobs queued for the workers.
+These worker tasks are prioritised and are done accordingly.
+Then you get an overview of the accounts on your node, which can be moderated in the "Users" section of the panel.
+As well as an overview of the currently active addons
+The list is linked, so you can have quick access to the plugin settings.
+And finally you are informed about the version of Friendica you have installed.
+If you contact the devs with a bug or problem, please also mention the version of your node.
-Birthday Notifications
----
+The admin panel is seperated into subsections accessible from the side bar of the panel.
-Birthday events are published on your Home page for any friends having a birthday in the coming 6 days.
-In order for your birthday to be discoverable by all of your friends, you must set your birthday (at least the month and day) in your default profile.
-You are not required to provide the year.
+## Site
-System settings
----
+This section of the admin panel contains the main configuration of your Friendica node.
+It is separated into several sub-section beginning with the basic settings at the top, advancing towards the bottom of the page.
-###Language
+Most configuration options have a help text in the admin panel.
+Therefore this document does not yet cover all the options
-Please see util/README for information on creating language translations.
+### Basic Settings
-Config:
-
- $a->config['system']['language'] = 'name';
-
-###System Theme
-
-Choose a theme to be the default system theme. This can be over-ridden by user profiles.
-Default theme is "default".
-
-Config:
-
- $a->config['system']['theme'] = 'theme-name';
-
-###Proxy Configuration Settings
-
-If your site uses a proxy to connect to the internet, you may use these settings to communicate with the outside world.
-The outside world still needs to be able to see your website, or this will not be very useful.
-
-Config:
-
- $a->config['system']['proxy'] = "http://proxyserver.domain:port";
- $a->config['system']['proxyuser'] = "username:password";
-
-###Network Timeout
-
-How long to wait on a network communication before timing out.
-Value is in seconds.
-Default is 60 seconds.
-Set to 0 for unlimited (not recommended).
-
-Config:
-
- $a->config['system']['curl_timeout'] = 60;
-
-###Banner/Logo
+#### Banner/Logo
Set the content for the site banner.
The default logo is the Friendica logo and name.
-You may wish to provide HTML/CSS to style and/or position this content, as it may not be themed by default.
+You may wish to provide HTML/CSS to style and/or position this content, as it may not be themed by default.
-Config:
+#### Language
- $a->config['system']['banner'] = 'My Great Website';
+This option will set the default language for the node.
+It is used as fall back setting should Friendica fail to recognize the visitors preferences and can be overwritten by user settings.
-###Maximum Image Size
+The Friendica community offers some translations.
+Some more compleate then others.
+See [this help page](/help/translations) for more information about the translation process.
-Maximum size in bytes of uploaded images.
-The default is set to 0, which means no limits.
+#### System Theme
-Config:
+Choose a theme to be the default system theme.
+This can be over-ridden by user profiles.
+Default theme is "duepunto zero" at the moment.
- $a->config['system']['maximagesize'] = 1000000;
+You may also want to set a special theme for mobile interfaces.
+Which may or may not be neccessary depending of the mobile friendlyness of the desktop theme you have chosen.
+The `vier` theme for instance is mobile friendly.
-###UTF-8 Regular Expressions
+### Registration
-During registrations, full names are checked using UTF-8 regular expressions.
-This requires PHP to have been compiled with a special setting to allow UTF-8 expressions.
-If you are completely unable to register accounts, set no_utf to true.
-The default is set to false (meaning UTF8 regular expressions are supported and working).
-
-Config:
-
- $a->config['system']['no_utf'] = true;
-
-###Check Full Names
+#### Check Full Names
You may find a lot of spammers trying to register on your site.
During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name.
If you would like to support people with only one name as their full name, you may change this setting to true.
Default is false.
-
-Config:
- $a->config['system']['no_regfullname'] = true;
-
-###OpenID
+#### OpenID
By default, OpenID may be used for both registration and logins.
If you do not wish to make OpenID facilities available on your system (at all), set 'no_openid' to true.
Default is false.
-Config:
-
- $a->config['system']['no_openid'] = true;
-
-###Multiple Registrations
+#### Multiple Registrations
The ability to create "Pages" requires a person to register more than once.
Your site configuration can block registration (or require approval to register).
By default, logged in users can register additional accounts for use as pages.
-These will still require approval if REGISTER_APPROVE is selected.
-You may prohibit logged in users from creating additional accounts by setting 'block_extended_register' to true.
+These will still require approval if the registration policy is set to *require approval*
+You may prohibit logged in users from creating additional accounts by setting *block multible registrations* to true.
Default is false.
-
-Config:
- $a->config['system']['block_extended_register'] = true;
+### File upload
-Security settings
----
+#### Maximum Image Size
-###Verify SSL Certitificates
+Maximum size in bytes of uploaded images.
+The default is set to 0, which means no limits.
-By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates.
-For the widest compatibility with browsers and other networks we do not recommend using self-signed certificates, but we will not prevent you from using them.
-SSL encrypts all the data transmitted between sites (and to your browser). This allows you to have completely encrypted communications, and also protect your login session from hijacking.
-Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate.
-However these aren't looked upon favourably in the security community because they can be subject to so-called "man-in-the-middle" attacks.
-If you wish, you can turn on strict certificate checking.
-This will mean you cannot connect (at all) to self-signed SSL sites.
+### Policies
-Config:
+#### Global Directory
- $a->config['system']['verifyssl'] = true;
+This configures the URL to update the global directory, and is supplied in the default configuration.
+The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
+This allows a private community to be completely isolated from the global network.
-Corporate/Edu enhancements
----
+#### Force Publish
-###Allowed Friend Domains
+By default, each user can choose on their Settings page whether or not to have their profile published in the site directory.
+This setting forces all profiles on this site to be listed in the site directory and there is no option provided to the user to change it.
+Default is false.
-Comma separated list of domains which are allowed to establish friendships with this site.
-Wildcards are accepted.
-(Wildcard support on Windows platforms requires PHP5.3).
-By default, any (valid) domain may establish friendships with this site.
-
-Config:
-
- $a->config['system']['allowed_sites'] = "sitea.com, *siteb.com";
-
-###Allowed Email Domains
-
-Comma separated list of domains which are allowed in email addresses for registrations to this site.
-This can lockout those who are not part of this organisation from registering here.
-Wildcards are accepted.
-(Wildcard support on Windows platforms requires PHP5.3).
-By default, any (valid) email address is allowed in registrations.
-
-Config:
-
- $a->config['system']['allowed_email'] = "sitea.com, *siteb.com";
-
-###Block Public
+#### Block Public
Set to true to block public access to all otherwise public personal pages on this site unless you are currently logged in.
This blocks the viewing of profiles, friends, photos, the site directory and search pages to unauthorised persons.
@@ -179,50 +112,164 @@ Note: this is specifically for sites that desire to be "standalone" and do not w
Unauthorised persons will also not be able to request friendship with site members.
Default is false.
Available in version 2.2 or greater.
-
-Config:
- $a->config['system']['block_public'] = true;
+#### Allowed Friend Domains
-###Force Publish
+Comma separated list of domains which are allowed to establish friendships with this site.
+Wildcards are accepted.
+(Wildcard support on Windows platforms requires PHP5.3).
+By default, any (valid) domain may establish friendships with this site.
-By default, each user can choose on their Settings page whether or not to have their profile published in the site directory.
-This setting forces all profiles on this site to be listed in the site directory and there is no option provided to the user to change it.
-Default is false.
-
-Config:
+This is useful if you want to setup a closed network for educational groups, cooperations and similar communities that don't want to commuicate with the rest of the network.
- $a->config['system']['publish_all'] = true;
+#### Allowed Email Domains
-###Global Directory
+Comma separated list of domains which are allowed in email addresses for registrations to this site.
+This can lockout those who are not part of this organisation from registering here.
+Wildcards are accepted.
+(Wildcard support on Windows platforms requires PHP5.3).
+By default, any (valid) email address is allowed in registrations.
-This configures the URL to update the global directory, and is supplied in the default configuration.
-The undocumented part is that if this is not set, the global directory is completely unavailable to the application.
-This allows a private community to be completely isolated from the global network.
+#### Allow Users to set remote_self
- $a->config['system']['directory'] = 'http://dir.friendi.ca';
+If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in die advanced contact settings.
+Which means that postings by the remote self are automatically reposted by Friendica in their names.
-Developer Settings
----
+As admin of the node you can also set this flag directly in the database.
+Before doing so, you should be sure you know what you do and have a backup of the database.
-### Debugging
-Most useful when debugging protocol exchanges and tracking down other communications issues.
+### Advanced
-Config:
+#### Proxy Configuration Settings
- $a->config['system']['debugging'] = true;
- $a->config['system']['logfile'] = 'logfile.out';
- $a->config['system']['loglevel'] = LOGGER_DEBUG;
+If your site uses a proxy to connect to the internet, you may use these settings to communicate with the outside world.
+The outside world still needs to be able to see your website, or this will not be very useful.
-Turns on detailed debugging logs which will be stored in 'logfile.out' (which must be writeable by the webserver).
-LOGGER_DEBUG will show a good deal of information about system activity but will not include detailed data.
-You may also select LOGGER_ALL but due to the volume of information we recommend only enabling this when you are tracking down a specific problem.
-Other log levels are possible but are not being used at the present time.
+#### Network Timeout
+How long to wait on a network communication before timing out.
+Value is in seconds.
+Default is 60 seconds.
+Set to 0 for unlimited (not recommended).
-###PHP error logging
+#### UTF-8 Regular Expressions
-Use the following settings to redirect PHP errors to a file.
+During registrations, full names are checked using UTF-8 regular expressions.
+This requires PHP to have been compiled with a special setting to allow UTF-8 expressions.
+If you are completely unable to register accounts, set no_utf to true.
+The default is set to false (meaning UTF8 regular expressions are supported and working).
+
+#### Verify SSL Certitificates
+
+By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates.
+For the widest compatibility with browsers and other networks we do not recommend using self-signed certificates, but we will not prevent you from using them.
+SSL encrypts all the data transmitted between sites (and to your browser).
+This allows you to have completely encrypted communications, and also protect your login session from hijacking.
+Self-signed certificates can be generated for free, without paying top-dollar for a website SSL certificate.
+However these aren't looked upon favourably in the security community because they can be subject to so-called "man-in-the-middle" attacks.
+If you wish, you can turn on strict certificate checking.
+This will mean you cannot connect (at all) to self-signed SSL sites.
+
+### Auto Discovered Contact Directory
+
+### Performance
+
+### Worker
+
+### Relocate
+
+## Users
+
+This section of the panel let the admin control the users registered on the node.
+
+If you have selected "Requires approval" for the *Register policy* in the general nodes configuration, new registrations will be listed at the top of the page.
+There the admin can then approve or disapprove the request.
+
+Below the new registration block the current accounts on the Friendica node are listed.
+You can sort the user list by name, email, registration date, date of last login, date of last posting and the account type.
+Here the admin can also block/unblock users from accessing the node or delete the accounts entirely.
+
+In the last section of the page admins can create new accounts on the node.
+The password for the new account will be send by email to the choosen email address.
+
+## Plugins
+
+This page is for selecting and configuration of extensions for Friendica which have to be placed into the `/addon` subdirectory of your Friendica installation.
+You are presented with a long list of available addons.
+The name of each addon is linked to a separate page for that addon which offers more informations and configuration possibilities.
+Also shown is the version of the addon and an indicator if the addon is currently active or not.
+
+When you update your node and the addons they may have to be reloaded.
+To simplify this process there is a button at the top of the page to reload all active plugins.
+
+## Themes
+
+The Themes section of the admin panel works similar to the Plugins section but let you control the themes on your Friendica node.
+Each theme has a dedicated suppage showing the current status, some information about the theme and a screen-shot of the Friendica interface using the theme.
+Should the theme offer special settings, admins can set a global default value here.
+
+You can activate and deactivate themes on their dedicated sub-pages thus making them available for the users of the node.
+To select a default theme for the Friendica node, see the *Site* section of the admin panel.
+
+## Additional Features
+
+There are several optional features in Friendica like the *dislike* button.
+In this section of the admin panel you can select a default setting for your node and eventually fix it, so users cannot change the setting anymore.
+
+## DB Updates
+
+Should the database structure of Friendica change, it will apply the changes automatically.
+In case you are suspecious that the update might not have worked, you can use this section of the admin panel to check the situation.
+
+## Inspect Queue
+
+In the admin panel summary there are two numbers for the message queues.
+The second number represents messages which could not be delivered and are queued for later retry.
+If this number goes sky-rocking you might ask yourself which receopiant is not receiving.
+
+Behind the inspect queue section of the admin panel you will find a list of the messages that could not be delivered.
+The listing is sorted by the receipiant name so identifying potential broken communication lines should be simple.
+These lines might be broken for various reasons.
+The receiving end might be off-line, there might be a high system load and so on.
+
+Don't panic!
+Friendica will not queue messages for all time but will sort out *dead* nodes automatically after a while and remove messages from the queue then.
+
+## Federation Statistics
+
+The federation statistics page gives you a short summery of the nodes/servers/pods of the decentralized social network federation your node knows.
+These numbers are not compleate and only contain nodes from networks Friendica federates directly with.
+
+## Plugin Features
+
+Some of the addons you can install for your Friendica node have settings which have to be set by the admin.
+All those addons will be listed in this area of the admin panels side bar with their names.
+
+## Logs
+
+The log section of the admin panel is seperated into two pages.
+On the first, following the "log" link, you can configure how much Friendica shall log.
+And on the second you can read the log.
+
+You should not place your logs into any directory that is accessible from the web.
+If you have to, and you are using the default configuration from Apache, you should choose a name for the logfile ending in ``.log`` or ``.out``.
+Should you use another web server, please make sure that you have the correct accessrules in place so that your log files are not accessible.
+
+There are five different log levels: Normal, Trace, Debug, Data and All.
+Specifying different verbosities of information and data written out to the log file.
+Normally you should not need to log at all.
+The *DEBUG* level will show a good deal of information about system activity but will not include detailed data.
+In the *ALL* level Friendica will log everything to the file.
+But due to the volume of information we recommend only enabling this when you are tracking down a specific problem.
+
+**The amount of data can grow the filesize of the logfile quickly**.
+You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_rotation) to keep the log file from growing too big.
+
+**Known Issues**: The filename ``friendica.log`` can cause problems depending on your server configuration (see [issue 2209](https://github.com/friendica/friendica/issues/2209)).
+
+By default PHP warnings and error messages are supressed.
+If you want to enable those, you have to activate them in the ``.htconfig.php`` file.
+Use the following settings to redirect PHP errors to a file.
Config:
@@ -232,9 +279,61 @@ Config:
ini_set('display_errors', '0');
This will put all PHP errors in the file php.out (which must be writeable by the webserver).
-Undeclared variables are occasionally referenced in the program and therefore we do not recommend using E_NOTICE or E_ALL.
+Undeclared variables are occasionally referenced in the program and therefore we do not recommend using `E_NOTICE` or `E_ALL`.
The vast majority of issues reported at these levels are completely harmless.
Please report to the developers any errors you encounter in the logs using the recommended settings above.
-They generally indicate issues which need to be resolved.
+They generally indicate issues which need to be resolved.
+
+If you encounter a blank (white) page when using the application, view the PHP logs - as this almost always indicates an error has occurred.
+
+## Diagnostics
+
+In this section of the admin panel you find two tools to investigate what Friendica sees for certain ressources.
+These tools can help to clarify communication problems.
+
+For the *probe address* Friendica will display information for the address provided.
+
+With the second tool *check webfinger* you can request information about the thing identified by a webfinger (`someone@example.com`).
+
+# Exceptions to the rule
+
+There are four exceptions to the rule, that all the config will be read from the data base.
+These are the data base settings, the admin account settings, the path of PHP and information about an eventual installation of the node in a sub-directory of the (sub)domain.
+
+## DB Settings
+
+With the following settings, you specify the data base server, the username and passwort for Friendica and the database to use.
+
+ $db_host = 'your.db.host';
+ $db_user = 'db_username';
+ $db_pass = 'db_password';
+ $db_data = 'database_name';
+
+## Admin users
+
+You can set one, or more, accounts to be *Admin*.
+By default this will be the one account you create during the installation process.
+But you can expand the list of email addresses by any used email address you want.
+Registration of new accounts with a listed email address is not possible.
+
+ $a->config['admin_email'] = 'you@example.com, buddy@example.com';
+
+## PHP Path
+
+Some of Friendicas processes are running in the background.
+For this you need to specify the path to the PHP binary to be used.
+
+ $a->config['php_path'] = '{{$phpath}}';
+
+## Subdirectory configuration
+
+It is possible to install Friendica into a subdirectory of your webserver.
+We strongly discurage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Socia, Hubzilla)
+Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
+
+ $a->path = 'tests/friendica';
+
+## Other exceptions
+
+Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in .htconfig.php](help/htconfig) section of the documentation.
-If you encounter a blank (white) page when using the application, view the PHP logs - as this almost always indicates an error has occurred.
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index 5501d0d580..eac2c97f84 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -21,11 +21,22 @@ You can tag a person on a different network or one that is **not in your social
* @mike@macgirvin.com - This is called a "remote mention" and can only be an email-style locator, not a web URL.
-Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendica blocks incoming "mentions" from people with no relationship to you. This is a spam prevention measure.
+Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
+Friendica blocks incoming “mentions” from people with no relationship to you.
+The exception is an ongiong conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
+This is a spam prevention measure.
-Remote mentions are delivered using the OStatus protocol. This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora.
+Remote mentions are delivered using the OStatus protocol.
+This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora.
+As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
+These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
-Friendica makes no distinction between people and groups for the purpose of tagging. (Some other networks use !group to indicate a group.)
+Friendica makes no distinction between people and forums for the purpose of tagging.
+(Some other networks use !forum to indicate a forum.)
+
+If you sort your contacts into groups, you cannot @-mention these groups.
+But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting.
+See [Groups and Privacy](help/Groups-and-Privacy) for more details about grouping your contacts.
**Topical Tags**
diff --git a/doc/Text_editor.md b/doc/Text_editor.md
index 2d38217674..3e38ca5f1e 100644
--- a/doc/Text_editor.md
+++ b/doc/Text_editor.md
@@ -1,7 +1,7 @@
-
Creating posts
@@ -9,7 +9,7 @@ Creating posts
* [Home](help)
-Here you can find an overview of the different ways to create and edit your post.
+Here you can find an overview of the different ways to create and edit your post.
One click on "Share" text box on top of your Home or Network page, and the post editor shows up:
@@ -42,7 +42,7 @@ The icons under the text area are there to help you to write posts quickly:
Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
- Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
+ Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
@@ -88,26 +88,11 @@ Click on "show" under contact name to hide the post to everyone but selected.
Click on "Visible to everybody" to make the post public again.
-If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post.
+If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post.
If you want to hide the post to one contact of a group selected for "show", click "don't show" under contact name.
Click again on "show" or "don't show" to switch it off.
You can search for contacts or groups with the search box.
-See also [Group and Privacy](help/Groups-and-Privacy)
-
-
-
-WYSIAWYG (What You See Is About What You Get)
---------------------------------------------------
-
-Friendica can use TinyMCE as rich text editor. This way you can write beatifull post without the need to know [BBCode](help/BBCode).
-
-By default, rich editor is disabled. You can enable it from Settings -> [Aditional features](settings/features) page, turn on Richtext Editor and click "Submit".
-
-
-
-Rich editor, with default Friendica theme (duepuntozero)
-
-
+See also [Group and Privacy](help/Groups-and-Privacy)
\ No newline at end of file
diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index 4bc9e6c54d..ec706e5c38 100644
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -8,7 +8,11 @@ Getting started
[Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers.
No need to setup up a webserver, database etc. before actually starting.
-Vagrant creates a virtual machine (an Ubuntu 14.04) for you that you can just run inside VirtualBox and start to work directly on Friendica.
+Vagrant creates a virtual machine for you that you can just run inside VirtualBox and start to work directly on Friendica.
+You can choose between two different Ubuntu Linux versions:
+
+1. Ubuntu Trusty (14.04) with PHP 5.5.9 and MySQL 5.5.53
+2. Ubuntu Xenial (16.04) with PHP 7.0 and MySQL 5.7.16
What you need to do:
@@ -16,21 +20,27 @@ What you need to do:
Please use an up-to-date vagrant version from https://www.vagrantup.com/downloads.html.
2. Git clone your Friendica repository.
Inside, you'll find a "Vagrantfile" and some scripts in the utils folder.
-3. Run "vagrant up" from inside the friendica clone.
+3. Choose the Ubuntu version you'll need und run "vagrant up " from inside the friendica clone:
+ $> vagrant up trusty
+ $> vagrant up xenial
Be patient: When it runs for the first time, it downloads an Ubuntu Server image.
-4. Run "vagrant ssh" to log into the virtual machine to log in to the VM.
-5. Open 192.168.22.10 in a browser.
+4. Run "vagrant ssh " to log into the virtual machine to log in to the VM:
+ $> vagrant ssh trusty
+ $> vagrant ssh xenial
+5. Open you test installation in a browser.
+If you selected an Ubuntu Trusty go to 192.168.22.10.
+If you started a Xenial machine go to 192.168.22.11.
The mysql database is called "friendica", the mysql user and password both are "root".
6. Work on Friendica's code in your git clone on your machine (not in the VM).
Your local working directory is set up as a shared directory with the VM (/vagrant).
7. Check the changes in your browser in the VM.
-Debug via the "vagrant ssh" login.
+Debug via the "vagrant ssh " login.
Find the Friendica log file /vagrant/logfile.out.
8. Commit and push your changes directly back to Github.
If you want to stop vagrant after finishing your work, run the following command
- $> vagrant halt
+ $> vagrant halt
in the development directory.
@@ -44,10 +54,3 @@ You will then have the following accounts to login:
* friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected.
For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
-
-**Important notice:**
-If you already had an Ubuntu 12.04 Vagrant VM, please run
-
- $> vagrant destroy
-
-before starting the new 14.04 machine.
diff --git a/doc/api.md b/doc/api.md
index 147c8b7513..b759b4697c 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -1,12 +1,30 @@
-Implemented API calls
+Friendica API
===
-The Friendica API aims to be compatible to the [GNU Social API](http://skilledtests.com/wiki/Twitter-compatible_API) and the [Twitter API](https://dev.twitter.com/rest/public).
+
+* [Home](help)
+
+The Friendica API aims to be compatible to the [GNU Social API](http://wiki.gnusocial.de/gnusocial:api) and the [Twitter API](https://dev.twitter.com/rest/public).
Please refer to the linked documentation for further information.
## Implemented API calls
### General
+#### HTTP Method
+
+API endpoints can restrict the method used to request them.
+Using an invalid method results in HTTP error 405 "Method Not Allowed".
+
+In this document, the required method is listed after the endpoint name. "*" means every method can be used.
+
+#### Auth
+
+Friendica supports basic http auth and OAuth 1 to authenticate the user to the api.
+
+OAuth settings can be added by the user in web UI under /settings/oauth/
+
+In this document, endpoints which requires auth are marked with "AUTH" after endpoint name
+
#### Unsupported parameters
* cursor: Not implemented in GNU Social
* trim_user: Not implemented in GNU Social
@@ -24,17 +42,50 @@ Please refer to the linked documentation for further information.
* cid: Contact id of the user (important for "contact_allow" and "contact_deny")
* network: network of the user
-### account/rate_limit_status
+#### Errors
+When an error occour in API call, an HTTP error code is returned, with an error message
+Usually:
+- 400 Bad Request: if parameter are missing or items can't be found
+- 403 Forbidden: if authenticated user is missing
+- 405 Method Not Allowed: if API was called with invalid method, eg. GET when API require POST
+- 501 Not Implemented: if requested API doesn't exists
+- 500 Internal Server Error: on other error contitions
-### account/verify_credentials
+Error body is
+
+json:
+```
+ {
+ "error": "Specific error message",
+ "request": "API path requested",
+ "code": "HTTP error code"
+ }
+```
+
+xml:
+```
+
+ Specific error message
+ API path requested
+ HTTP error code
+
+```
+
+---
+### account/rate_limit_status (*; AUTH)
+
+---
+### account/verify_credentials (*; AUTH)
#### Parameters
+
* skip_status: Don't show the "status" field. (Default: false)
* include_entities: "true" shows entities for pictures and links (Default: false)
-### conversation/show
+---
+### conversation/show (*; AUTH)
Unofficial Twitter command. It shows all direct answers (excluding the original post) to a given id.
-#### Parameters
+#### Parameter
* id: id of the post
* count: Items per page (default: 20)
* page: page number
@@ -43,11 +94,12 @@ Unofficial Twitter command. It shows all direct answers (excluding the original
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
+* include_rts
+* trim_user
+* contributor_details
-### direct_messages
+---
+### direct_messages (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -55,19 +107,23 @@ Unofficial Twitter command. It shows all direct answers (excluding the original
* max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain"
* include_entities: "true" shows entities for pictures and links (Default: false)
+* friendica_verbose: "true" enables different error returns (default: "false")
#### Unsupported parameters
-* skip_status
+* skip_status
-### direct_messages/all
+---
+### direct_messages/all (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
* since_id: minimal id
* max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain"
+* friendica_verbose: "true" enables different error returns (default: "false")
-### direct_messages/conversation
+---
+### direct_messages/conversation (*; AUTH)
Shows all direct messages of a conversation
#### Parameters
* count: Items per page (default: 20)
@@ -76,16 +132,10 @@ Shows all direct messages of a conversation
* max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain"
* uri: URI of the conversation
+* friendica_verbose: "true" enables different error returns (default: "false")
-### direct_messages/new
-#### Parameters
-* user_id: id of the user
-* screen_name: screen name (for technical reasons, this value is not unique!)
-* text: The message
-* replyto: ID of the replied direct message
-* title: Title of the direct message
-
-### direct_messages/sent
+---
+### direct_messages/sent (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -93,8 +143,37 @@ Shows all direct messages of a conversation
* max_id: maximum id
* getText: Defines the format of the status field. Can be "html" or "plain"
* include_entities: "true" shows entities for pictures and links (Default: false)
+* friendica_verbose: "true" enables different error returns (default: "false")
-### favorites
+---
+### direct_messages/new (POST,PUT; AUTH)
+#### Parameters
+* user_id: id of the user
+* screen_name: screen name (for technical reasons, this value is not unique!)
+* text: The message
+* replyto: ID of the replied direct message
+* title: Title of the direct message
+
+---
+### direct_messages/destroy (POST,DELETE; AUTH)
+#### Parameters
+* id: id of the message to be deleted
+* include_entities: optional, currently not yet implemented
+* friendica_parenturi: optional, can be used for increased safety to delete only intended messages
+* friendica_verbose: "true" enables different error returns (default: "false")
+
+#### Return values
+
+On success:
+* JSON return as defined for Twitter API not yet implemented
+* on friendica_verbose=true: JSON return {"result":"ok","message":"message deleted"}
+
+On error:
+HTTP 400 BadRequest
+* on friendica_verbose=true: different JSON returns {"result":"error","message":"xyz"}
+
+---
+### favorites (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -106,87 +185,96 @@ Shows all direct messages of a conversation
* user_id
* screen_name
-Favorites aren't displayed to other users, so "user_id" and "screen_name". So setting this value will result in an empty array.
+Favorites aren't displayed to other users, so "user_id" and "screen_name" are unsupported.
+Set this values will result in an empty array.
-### favorites/create
+---
+### favorites/create (POST,PUT; AUTH)
#### Parameters
* id
* include_entities: "true" shows entities for pictures and links (Default: false)
-### favorites/destroy
+---
+### favorites/destroy (POST,DELETE; AUTH)
#### Parameters
* id
* include_entities: "true" shows entities for pictures and links (Default: false)
-### followers/ids
+---
+### followers/ids (*; AUTH)
#### Parameters
* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
#### Unsupported parameters
* user_id
* screen_name
-* cursor
+* cursor
Friendica doesn't allow showing followers of other users.
-### friendica/photo
-#### Parameters
-* photo_id: Resource id of a photo.
-
-Returns data of a picture with the given resource.
-
-### friendica/photos/list
-
-Returns a list of all photo resources of the logged in user.
-
-### friends/ids
+---
+### friends/ids (*; AUTH)
#### Parameters
* stringify_ids: Should the id numbers be sent as text (true) or number (false)? (default: false)
#### Unsupported parameters
* user_id
* screen_name
-* cursor
+* cursor
Friendica doesn't allow showing friends of other users.
-### help/test
+---
+### help/test (*)
-### media/upload
+---
+### media/upload (POST,PUT; AUTH)
#### Parameters
* media: image data
-### oauth/request_token
+---
+### oauth/request_token (*)
#### Parameters
-* oauth_callback
+* oauth_callback
#### Unsupported parameters
-* x_auth_access_type
+* x_auth_access_type
-### oauth/access_token
+---
+### oauth/access_token (*)
#### Parameters
-* oauth_verifier
+* oauth_verifier
#### Unsupported parameters
-* x_auth_password
-* x_auth_username
-* x_auth_mode
+* x_auth_password
+* x_auth_username
+* x_auth_mode
-### statuses/destroy
+---
+### statuses/destroy (POST,DELETE; AUTH)
#### Parameters
* id: message number
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* trim_user
+* trim_user
+
+---
+### statuses/followers (*; AUTH)
+
+#### Parameters
-### statuses/followers
* include_entities: "true" shows entities for pictures and links (Default: false)
-### statuses/friends
+---
+### statuses/friends (*; AUTH)
+
+#### Parameters
+
* include_entities: "true" shows entities for pictures and links (Default: false)
-### statuses/friends_timeline
+---
+### statuses/friends_timeline (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -197,11 +285,12 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
+* include_rts
+* trim_user
+* contributor_details
-### statuses/home_timeline
+---
+### statuses/home_timeline (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -212,11 +301,12 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
+* include_rts
+* trim_user
+* contributor_details
-### statuses/mentions
+---
+### statuses/mentions (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -225,11 +315,12 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
+* include_rts
+* trim_user
+* contributor_details
-### statuses/public_timeline
+---
+### statuses/public_timeline (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -240,9 +331,10 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* trim_user
+* trim_user
-### statuses/replies
+---
+### statuses/replies (*; AUTH)
#### Parameters
* count: Items per page (default: 20)
* page: page number
@@ -251,28 +343,31 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
+* include_rts
+* trim_user
+* contributor_details
-### statuses/retweet
+---
+### statuses/retweet (POST,PUT; AUTH)
#### Parameters
* id: message number
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* trim_user
+* trim_user
-### statuses/show
+---
+### statuses/show (*; AUTH)
#### Parameters
* id: message number
* conversation: if set to "1" show all messages of the conversation with the given id
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_my_retweet
-* trim_user
+* include_my_retweet
+* trim_user
+---
### statuses/update, statuses/update_with_media
#### Parameters
* title: Title of the status
@@ -289,16 +384,17 @@ Friendica doesn't allow showing friends of other users.
* contact_deny
* network
* include_entities: "true" shows entities for pictures and links (Default: false)
-* media_ids: (By now only a single value, no array)
+* media_ids: (By now only a single value, no array)
#### Unsupported parameters
* trim_user
* place_id
* display_coordinates
-### statuses/user_timeline
+---
+### statuses/user_timeline (*; AUTH)
#### Parameters
-* user_id: id of the user
+* user_id: id of the user
* screen_name: screen name (for technical reasons, this value is not unique!)
* count: Items per page (default: 20)
* page: page number
@@ -309,43 +405,381 @@ Friendica doesn't allow showing friends of other users.
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
-* include_rts
-* trim_user
-* contributor_details
-### statusnet/config
+* include_rts
+* trim_user
+* contributor_details
-### statusnet/version
+---
+### statusnet/config (*)
+
+---
+### statusnet/conversation (*; AUTH)
+It shows all direct answers (excluding the original post) to a given id.
+
+#### Parameter
+* id: id of the post
+* count: Items per page (default: 20)
+* page: page number
+* since_id: minimal id
+* max_id: maximum id
+* include_entities: "true" shows entities for pictures and links (Default: false)
+
+---
+### statusnet/version (*)
#### Unsupported parameters
* user_id
* screen_name
-* cursor
+* cursor
Friendica doesn't allow showing followers of other users.
-### users/search
+---
+### users/search (*)
#### Parameters
-* q: name of the user
+* q: name of the user
#### Unsupported parameters
* page
* count
* include_entities
-### users/show
+---
+### users/show (*)
#### Parameters
-* user_id: id of the user
+* user_id: id of the user
* screen_name: screen name (for technical reasons, this value is not unique!)
* include_entities: "true" shows entities for pictures and links (Default: false)
#### Unsupported parameters
* user_id
* screen_name
-* cursor
+* cursor
Friendica doesn't allow showing friends of other users.
+
+## Implemented API calls (not compatible with other APIs)
+
+
+---
+### friendica/activity/
+#### parameters
+* id: item id
+
+Add or remove an activity from an item.
+'verb' can be one of:
+
+- like
+- dislike
+- attendyes
+- attendno
+- attendmaybe
+
+To remove an activity, prepend the verb with "un", eg. "unlike" or "undislike"
+Attend verbs disable eachother: that means that if "attendyes" was added to an item, adding "attendno" remove previous "attendyes".
+Attend verbs should be used only with event-related items (there is no check at the moment)
+
+#### Return values
+
+On success:
+json
+```"ok"```
+
+xml
+```true```
+
+On error:
+HTTP 400 BadRequest
+
+---
+### friendica/group_show (*; AUTH)
+Return all or a specified group of the user with the containing contacts as array.
+
+#### Parameters
+* gid: optional, if not given, API returns all groups of the user
+
+#### Return values
+Array of:
+
+* name: name of the group
+* gid: id of the group
+* user: array of group members (return from api_get_user() function for each member)
+
+
+---
+### friendica/group_delete (POST,DELETE; AUTH)
+delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted.
+
+#### Parameters
+* gid: id of the group to be deleted
+* name: name of the group to be deleted
+
+#### Return values
+Array of:
+
+* success: true if successfully deleted
+* gid: gid of the deleted group
+* name: name of the deleted group
+* status: „deleted“ if successfully deleted
+* wrong users: empty array
+
+
+---
+### friendica/group_create (POST,PUT; AUTH)
+Create the group with the posted array of contacts as members.
+
+#### Parameters
+* name: name of the group to be created
+
+#### POST data
+JSON data as Array like the result of "users/group_show":
+
+* gid
+* name
+* array of users
+
+#### Return values
+Array of:
+
+* success: true if successfully created or reactivated
+* gid: gid of the created group
+* name: name of the created group
+* status: „missing user“ | „reactivated“ | „ok“
+* wrong users: array of users, which were not available in the contact table
+
+
+---
+### friendica/group_update (POST)
+Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted).
+
+#### Parameters
+* gid: id of the group to be changed
+* name: name of the group to be changed
+
+#### POST data
+JSON data as array like the result of „users/group_show“:
+
+* gid
+* name
+* array of users
+
+#### Return values
+Array of:
+
+* success: true if successfully updated
+* gid: gid of the changed group
+* name: name of the changed group
+* status: „missing user“ | „ok“
+* wrong users: array of users, which were not available in the contact table
+
+
+
+---
+### friendica/notifications (GET)
+Return last 50 notification for current user, ordered by date with unseen item on top
+
+#### Parameters
+none
+
+#### Return values
+Array of:
+
+* id: id of the note
+* type: type of notification as int (see NOTIFY_* constants in boot.php)
+* name: full name of the contact subject of the note
+* url: contact's profile url
+* photo: contact's profile photo
+* date: datetime string of the note
+* timestamp: timestamp of the node
+* date_rel: relative date of the note (eg. "1 hour ago")
+* msg: note message in bbcode
+* msg_html: note message in html
+* msg_plain: note message in plain text
+* link: link to note
+* seen: seen state: 0 or 1
+
+
+---
+### friendica/notifications/seen (POST)
+Set note as seen, returns item object if possible
+
+#### Parameters
+id: id of the note to set seen
+
+#### Return values
+If the note is linked to an item, the item is returned, just like one of the "statuses/*_timeline" api.
+
+If the note is not linked to an item, a success status is returned:
+
+* "success" (json) | "<status>success</status>" (xml)
+
+
+---
+### friendica/photo (*; AUTH)
+#### Parameters
+* photo_id: Resource id of a photo.
+* scale: (optional) scale value of the photo
+
+Returns data of a picture with the given resource.
+If 'scale' isn't provided, returned data include full url to each scale of the photo.
+If 'scale' is set, returned data include image data base64 encoded.
+
+possibile scale value are:
+
+* 0: original or max size by server settings
+* 1: image with or height at <= 640
+* 2: image with or height at <= 320
+* 3: thumbnail 160x160
+* 4: Profile image at 175x175
+* 5: Profile image at 80x80
+* 6: Profile image at 48x48
+
+An image used as profile image has only scale 4-6, other images only 0-3
+
+#### Return values
+
+json
+```
+ {
+ "id": "photo id"
+ "created": "date(YYYY-MM-GG HH:MM:SS)",
+ "edited": "date(YYYY-MM-GG HH:MM:SS)",
+ "title": "photo title",
+ "desc": "photo description",
+ "album": "album name",
+ "filename": "original file name",
+ "type": "mime type",
+ "height": "number",
+ "width": "number",
+ "profile": "1 if is profile photo",
+ "link": {
+ "": "url to image"
+ ...
+ },
+ // if 'scale' is set
+ "datasize": "size in byte",
+ "data": "base64 encoded image data"
+ }
+```
+
+xml
+```
+
+ photo id
+ date(YYYY-MM-GG HH:MM:SS)
+ date(YYYY-MM-GG HH:MM:SS)
+ photo title
+ photo description
+ album name
+ original file name
+ mime type
+ number
+ number
+ 1 if is profile photo
+
+
+ ...
+
+
+```
+
+---
+### friendica/photos/list (*; AUTH)
+
+Returns a list of all photo resources of the logged in user.
+
+#### Return values
+
+json
+```
+ [
+ {
+ id: "resource_id",
+ album: "album name",
+ filename: "original file name",
+ type: "image mime type",
+ thumb: "url to thumb sized image"
+ },
+ ...
+ ]
+```
+
+xml
+```
+
+
+ "url to thumb sized image"
+
+ ...
+
+```
+
+---
+### friendica/direct_messages_setseen (GET; AUTH)
+#### Parameters
+* id: id of the message to be updated as seen
+
+#### Return values
+
+On success:
+* JSON return {"result":"ok","message":"message set to seen"}
+
+On error:
+* different JSON returns {"result":"error","message":"xyz"}
+
+---
+### friendica/direct_messages_search (GET; AUTH)
+#### Parameters
+* searchstring: string for which the API call should search as '%searchstring%' in field 'body' of all messages of the authenticated user (caption ignored)
+
+#### Return values
+Returns only tested with JSON, XML might work as well.
+
+On success:
+* JSON return {"success":"true","search_results": array of found messages}
+* JSOn return {"success":"false","search_results":"nothing found"}
+
+On error:
+* different JSON returns {"result":"error","message":"searchstring not specified"}
+
+---
+### friendica/profile/show (GET; AUTH)
+show data of all profiles or a single profile of the authenticated user
+
+#### Parameters
+* profile_id: id of the profile to be returned (optional, if omitted all profiles are returned by default)
+
+#### Return values
+On success: Array of:
+
+* multi_profiles: true if user has activated multi_profiles
+* global_dir: URL of the global directory set in server settings
+* friendica_owner: user data of the authenticated user
+* profiles: array of the profile data
+
+On error:
+HTTP 403 Forbidden: when no authentication provided
+HTTP 400 Bad Request: if given profile_id is not in db or not assigned to authenticated user
+
+General description of profile data in API returns:
+* profile_id
+* profile_name
+* is_default: true if this is the public profile
+* hide_friends: true if friends are hidden
+* profile_photo
+* profile_thumb
+* publish: true if published on the server's local directory
+* net_publish: true if published to global_dir
+* description ... homepage: different data fields from 'profile' table in database
+* users: array with the users allowed to view this profile (empty if is_default=true)
+
+
+---
## Not Implemented API calls
The following API calls are implemented in GNU Social but not in Friendica: (incomplete)
@@ -368,7 +802,6 @@ The following API calls from the Twitter API aren't implemented neither in Frien
* statuses/lookup
* direct_messages/show
* search/tweets
-* direct_messages/destroy
* friendships/no_retweets/ids
* friendships/incoming
* friendships/outgoing
@@ -432,17 +865,21 @@ The following API calls from the Twitter API aren't implemented neither in Frien
* trends/closest
* users/report_spam
+---
+
+---
+
## Usage Examples
### BASH / cURL
Betamax has documentated some example API usage from a [bash script](https://en.wikipedia.org/wiki/Bash_(Unix_shell) employing [curl](https://en.wikipedia.org/wiki/CURL) (see [his posting](https://betamax65.de/display/betamax65/43539)).
- /usr/bin/curl -u USER:PASS https://YOUR.FRIENDICA.TLD/api/statuses/update.xml -d source="some source id" -d status="the status you want to post"
+/usr/bin/curl -u USER:PASS https://YOUR.FRIENDICA.TLD/api/statuses/update.xml -d source="some source id" -d status="the status you want to post"
### Python
The [RSStoFriedika](https://github.com/pafcu/RSStoFriendika) code can be used as an example of how to use the API with python. The lines for posting are located at [line 21](https://github.com/pafcu/RSStoFriendika/blob/master/RSStoFriendika.py#L21) and following.
- def tweet(server, message, group_allow=None):
- url = server + '/api/statuses/update'
- urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True))
+def tweet(server, message, group_allow=None):
+url = server + '/api/statuses/update'
+urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True))
There is also a [module for python 3](https://bitbucket.org/tobiasd/python-friendica) for using the API.
diff --git a/doc/autoloader.md b/doc/autoloader.md
new file mode 100644
index 0000000000..69c62451cd
--- /dev/null
+++ b/doc/autoloader.md
@@ -0,0 +1,209 @@
+Autoloader
+==========
+
+* [Home](help)
+
+There is some initial support to class autoloading in Friendica core.
+
+The autoloader code is in `include/autoloader.php`.
+It's derived from composer autoloader code.
+
+Namespaces and Classes are mapped to folders and files in `library/`,
+and the map must be updated by hand, because we don't use composer yet.
+The mapping is defined by files in `include/autoloader/` folder.
+
+Currently, only HTMLPurifier library is loaded using autoloader.
+
+
+## A quick introdution to class autoloading
+
+The autoloader it's a way for php to automagically include the file that define a class when the class is first used, without the need to use "require_once" every time.
+
+Once is setup you don't have to use it in any way. You need a class? you use the class.
+
+At his basic is a function passed to the "spl_autoload_register()" function, which receive as argument the class name the script want and is it job to include the correct php file where that class is defined.
+The best source for documentation is [php site](http://php.net/manual/en/language.oop5.autoload.php).
+
+One example, based on fictional friendica code.
+
+Let's say you have a php file in "include/" that define a very useful class:
+
+```
+ file: include/ItemsManager.php
+ array($baseDir."/include");
+ );
+```
+
+
+That tells the autoloader code to look for files that defines classes in "Friendica" namespace under "include/" folder. (And btw, that's why the file has the same name as the class it defines.)
+
+*note*: The structure of files in "include/autoloader/" has been copied from the code generated by composer, to ease the work of enable autoloader for external libraries under "library/"
+
+Let's say now that you need to load some items in a view, maybe in a fictional "mod/network.php".
+Somewere at the start of the scripts, the autoloader was initialized. In Friendica is done at the top of "boot.php", with "require_once('include/autoloader.php');".
+
+The code will be something like:
+
+```
+ file: mod/network.php
+ getAll();
+
+ // pass $items to template
+ // return result
+ }
+```
+
+That's a quite simple example, but look: no "require()"!
+You need to use a class, you use the class and you don't need to do anything more.
+
+Going further: now we have a bunch of "*Manager" classes that cause some code duplication, let's define a BaseManager class, where to move all code in common between all managers:
+
+```
+ file: include/BaseManager.php
+ <78> | mediumtext | NO | | NULL | |
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO | | NULL | |
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO | | NULL | |
+| deny_gid | Access Control - list of denied groups | mediumtext | NO | | NULL | |
+
+Notes: Permissions are surrounded by angle chars. e.g. <4>
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
new file mode 100644
index 0000000000..1fec38500d
--- /dev/null
+++ b/doc/database/db_auth_codes.md
@@ -0,0 +1,14 @@
+Table auth_codes
+================
+
+OAuth2 authorisation register - currently implemented but unused
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
+| id | | varchar(40) | NO | PRI | NULL | |
+| client_id | | varchar(20) | NO | | | |
+| redirect_uri | | varchar(200) | NO | | | |
+| expires | | int(11) | NO | | 0 | |
+| scope | | varchar(250) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
new file mode 100644
index 0000000000..333adaa2c1
--- /dev/null
+++ b/doc/database/db_cache.md
@@ -0,0 +1,11 @@
+Table cache
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| k | horizontal width + url or resource | varchar(255) | NO | PRI | NULL | |
+| v | OEmbed response from site | text | NO | | NULL | |
+| updated | datetime of cache insertion | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| expire_mode | | int(11) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
new file mode 100644
index 0000000000..aa7b263fdf
--- /dev/null
+++ b/doc/database/db_challenge.md
@@ -0,0 +1,13 @@
+Table challenge
+===============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-------------|------------------|------------------|------|-----|---------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| challenge | | varchar(255) | NO | | | |
+| dfrn-id | | varchar(255) | NO | | | |
+| expire | | int(11) | NO | | 0 | |
+| type | | varchar(255) | NO | | | |
+| last_update | | varchar(255) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
new file mode 100644
index 0000000000..228b45cc21
--- /dev/null
+++ b/doc/database/db_clients.md
@@ -0,0 +1,13 @@
+Table clients
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
+| client_id | | varchar(20) | NO | PRI | NULL | |
+| pw | | varchar(20) | NO | | | |
+| redirect_uri | | varchar(200) | NO | | | |
+| name | | text | YES | | NULL | |
+| icon | | text | YES | | NULL | |
+| uid | | int(11) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
new file mode 100644
index 0000000000..6bcb4bcf89
--- /dev/null
+++ b/doc/database/db_config.md
@@ -0,0 +1,11 @@
+Table config
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| cat | | char(255) | NO | MUL | | |
+| k | | char(255) | NO | | | |
+| v | | text | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
new file mode 100644
index 0000000000..2e3ebc3130
--- /dev/null
+++ b/doc/database/db_contact.md
@@ -0,0 +1,72 @@
+Table contact
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------------------------|-----------------------------------------------------------|--------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | user.id of the owner of this data | int(11) | NO | MUL | 0 | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+| self | 1 if the contact is the user him/her self | tinyint(1) | NO | | 0 | |
+| remote_self | | tinyint(1) | NO | | 0 | |
+| rel | The kind of the relation between the user and the contact | tinyint(1) | NO | | 0 | |
+| duplex | | tinyint(1) | NO | | 0 | |
+| network | Network protocol of the contact | varchar(255) | NO | | | |
+| name | Name that this contact is known by | varchar(255) | NO | | | |
+| nick | Nick- and user name of the contact | varchar(255) | NO | | | |
+| location | | varchar(255) | NO | | | |
+| about | | text | NO | | NULL | |
+| keywords | public keywords (interests) of the contact | text | NO | | NULL | |
+| gender | | varchar(32) | NO | | | |
+| attag | | varchar(255) | NO | | | |
+| photo | Link to the profile photo of the contact | text | NO | | NULL | |
+| thumb | Link to the profile photo (thumb size) | text | NO | | NULL | |
+| micro | Link to the profile photo (micro size) | text | NO | | NULL | |
+| site-pubkey | | text | NO | | NULL | |
+| issued-id | | varchar(255) | NO | | | |
+| dfrn-id | | varchar(255) | NO | | | |
+| url | | varchar(255) | NO | | | |
+| nurl | | varchar(255) | NO | | | |
+| addr | | varchar(255) | NO | | | |
+| alias | | varchar(255) | NO | | | |
+| pubkey | RSA public key 4096 bit | text | NO | | NULL | |
+| prvkey | RSA private key 4096 bit | text | NO | | NULL | |
+| batch | | varchar(255) | NO | | | |
+| request | | text | NO | | NULL | |
+| notify | | text | NO | | NULL | |
+| poll | | text | NO | | NULL | |
+| confirm | | text | NO | | NULL | |
+| poco | | text | NO | | NULL | |
+| aes_allow | | tinyint(1) | NO | | 0 | |
+| ret-aes | | tinyint(1) | NO | | 0 | |
+| usehub | | tinyint(1) | NO | | 0 | |
+| subhub | | tinyint(1) | NO | | 0 | |
+| hub-verify | | varchar(255) | NO | | | |
+| last-update | Date of the last try to update the contact info | datetime | NO | | 0000-00-00 00:00:00 | |
+| success_update | Date of the last successful contact update | datetime | NO | | 0000-00-00 00:00:00 | |
+| failure_update | Date of the last failed update | datetime | NO | | 0000-00-00 00:00:00 | |
+| name-date | | datetime | NO | | 0000-00-00 00:00:00 | |
+| uri-date | | datetime | NO | | 0000-00-00 00:00:00 | |
+| avatar-date | | datetime | NO | | 0000-00-00 00:00:00 | |
+| term-date | | datetime | NO | | 0000-00-00 00:00:00 | |
+| last-item | date of the last post | datetime | NO | | 0000-00-00 00:00:00 | |
+| priority | | tinyint(3) | NO | | 0 | |
+| blocked | | tinyint(1) | NO | | 1 | |
+| readonly | posts of the contact are readonly | tinyint(1) | NO | | 0 | |
+| writable | | tinyint(1) | NO | | 0 | |
+| forum | contact is a forum | tinyint(1) | NO | | 0 | |
+| prv | contact is a private group | tinyint(1) | NO | | 0 | |
+| hidden | | tinyint(1) | NO | | 0 | |
+| archive | | tinyint(1) | NO | | 0 | |
+| pending | | tinyint(1) | NO | | 1 | |
+| rating | | tinyint(1) | NO | | 0 | |
+| reason | | text | NO | | NULL | |
+| closeness | | tinyint(2) | NO | | 99 | |
+| info | | mediumtext | NO | | NULL | |
+| profile-id | | int(11) | NO | | 0 | |
+| bdyear | | varchar(4) | NO | | | |
+| bd | | date | NO | | 0000-00-00 | |
+| notify_new_posts | | tinyint(1) | NO | | 0 | |
+| fetch_further_information | | tinyint(1) | NO | | 0 | |
+| ffi_keyword_blacklist | | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
new file mode 100644
index 0000000000..f20074d61d
--- /dev/null
+++ b/doc/database/db_conv.md
@@ -0,0 +1,15 @@
+Table conv
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------- | ----------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| guid | A unique identifier for this conversation | varchar(64) | NO | | | |
+| recips | sender_handle;recipient_handle | mediumtext | NO | | NULL | |
+| uid | user_id of the owner of this data | int(11) | NO | MUL | 0 | |
+| creator | handle of creator | varchar(255) | NO | | | |
+| created | creation timestamp | datetime | NO | | 0000-00-00 00:00:00 | |
+| updated | edited timestamp | datetime | NO | | 0000-00-00 00:00:00 | |
+| subject | subject of initial message | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_deliverq.md b/doc/database/db_deliverq.md
new file mode 100644
index 0000000000..5335899571
--- /dev/null
+++ b/doc/database/db_deliverq.md
@@ -0,0 +1,12 @@
+Table deliverq
+==============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|------------------|------|-----|---------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| cmd | | varchar(32) | NO | | | |
+| item | | int(11) | NO | | 0 | |
+| contact | | int(11) | NO | | 0 | |
+
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
new file mode 100644
index 0000000000..d45ddd2063
--- /dev/null
+++ b/doc/database/db_event.md
@@ -0,0 +1,26 @@
+Table event
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ---------- | ----------------------------------------------- -------| ------------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | user_id of the owner of this data | int(11) | NO | MUL | 0 | |
+| cid | contact_id (ID of the contact in contact table) | int(11) | NO | | 0 | |
+| uri | | varchar(255) | NO | | | |
+| created | creation time | datetime | NO | | 0000-00-00 00:00:00 | |
+| edited | last edit time | datetime | NO | | 0000-00-00 00:00:00 | |
+| start | event start time | datetime | NO | | 0000-00-00 00:00:00 | |
+| finish | event end time | datetime | NO | | 0000-00-00 00:00:00 | |
+| summary | short description or title of the event | text | NO | | NULL | |
+| desc | event description | text | NO | | NULL | |
+| location | event location | text | NO | | NULL | |
+| type | event or birthday | varchar(255) | NO | | | |
+| nofinish | if event does have no end this is 1 | tinyint(1) | NO | | 0 | |
+| adjust | adjust to timezone of the recipient (0 or 1) | tinyint(1) | NO | | 1 | |
+| ignore | 0 or 1 | tinyint(1) unsigned | NO | | 0 | |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | NO | | NULL | |
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO | | NULL | |
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO | | NULL | |
+| deny_gid | Access Control - list of denied groups | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
new file mode 100644
index 0000000000..2801605229
--- /dev/null
+++ b/doc/database/db_fcontact.md
@@ -0,0 +1,24 @@
+Table fcontact
+==============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| guid | unique id | varchar(64) | NO | | | |
+| url | | varchar(255) | NO | | | |
+| name | | varchar(255) | NO | | | |
+| photo | | varchar(255) | NO | | | |
+| request | | varchar(255) | NO | | | |
+| nick | | varchar(255) | NO | | | |
+| addr | | varchar(255) | NO | MUL | | |
+| batch | | varchar(255) | NO | | | |
+| notify | | varchar(255) | NO | | | |
+| poll | | varchar(255) | NO | | | |
+| confirm | | varchar(255) | NO | | | |
+| priority | | tinyint(1) | NO | | 0 | |
+| network | | varchar(32) | NO | | | |
+| alias | | varchar(255) | NO | | | |
+| pubkey | | text | NO | | NULL | |
+| updated | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_ffinder.md b/doc/database/db_ffinder.md
new file mode 100644
index 0000000000..29fea20d52
--- /dev/null
+++ b/doc/database/db_ffinder.md
@@ -0,0 +1,11 @@
+Table ffinder
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | | int(10) unsigned | NO | | 0 | |
+| cid | | int(10) unsigned | NO | | 0 | |
+| fid | | int(10) unsigned | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_fserver.md b/doc/database/db_fserver.md
new file mode 100644
index 0000000000..5350676274
--- /dev/null
+++ b/doc/database/db_fserver.md
@@ -0,0 +1,11 @@
+Table fserver
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------- | ----------- | ------------ | ---- | --- | ------- | --------------- |
+| id | | int(11) | NO | PRI | NULL | auto_increment |
+| server | | varchar(255) | NO | MUL | | |
+| posturl | | varchar(255) | NO | | | |
+| key | | text | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
new file mode 100644
index 0000000000..b8751a478c
--- /dev/null
+++ b/doc/database/db_fsuggest.md
@@ -0,0 +1,16 @@
+Table fsuggest
+==============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------- | ----------- | ------------ | ---- | --- | ------------------- | --------------- |
+| id | | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | | 0 | |
+| cid | | int(11) | NO | | 0 | |
+| name | | varchar(255) | NO | | | |
+| url | | varchar(255) | NO | | | |
+| request | | varchar(255) | NO | | | |
+| photo | | varchar(255) | NO | | | |
+| note | | text | NO | | NULL | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_gcign.md b/doc/database/db_gcign.md
new file mode 100644
index 0000000000..9f5bbce76c
--- /dev/null
+++ b/doc/database/db_gcign.md
@@ -0,0 +1,10 @@
+Table gcign
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ------------------------------ | ------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | local user.id | int(11) | NO | MUL | 0 | |
+| gcid | gcontact.id of ignored contact | int(11) | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_gcontact.md b/doc/database/db_gcontact.md
new file mode 100644
index 0000000000..c47e726228
--- /dev/null
+++ b/doc/database/db_gcontact.md
@@ -0,0 +1,32 @@
+Table gcontact
+==============
+
+| Field |Description | Type | Null | Key | Default | Extra |
+|--------------|------------------------------------|------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| name | Name that this contact is known by | varchar(255) | NO | | | |
+| nick | Nick- and user name of the contact | varchar(255) | NO | | | |
+| url | Link to the contacts profile page | varchar(255) | NO | | | |
+| nurl | | varchar(255) | NO | MUL | | |
+| photo | Link to the profile photo | varchar(255) | NO | | | |
+| connect | | varchar(255) | NO | | | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+| updated | | datetime | YES | MUL | 0000-00-00 00:00:00 | |
+| last_contact | | datetime | YES | | 0000-00-00 00:00:00 | |
+| last_failure | | datetime | YES | | 0000-00-00 00:00:00 | |
+| location | | varchar(255) | NO | | | |
+| about | | text | NO | | NULL | |
+| keywords | puplic keywords (interests) | text | NO | | NULL | |
+| gender | | varchar(32) | NO | | | |
+| birthday | | varchar(32) | NO | | 0000-00-00 | |
+| community | 1 if contact is forum account | tinyint(1) | NO | | 0 | |
+| hide | 1 = should be hidden from search | tinyint(1) | NO | | 0 | |
+| nsfw | 1 = contact posts nsfw content | tinyint(1) | NO | | 0 | |
+| network | social network protocol | varchar(255) | NO | | | |
+| addr | | varchar(255) | NO | | | |
+| notify | | text | NO | | | |
+| alias | | varchar(255) | NO | | | |
+| generation | | tinyint(3) | NO | | 0 | |
+| server_url | baseurl of the contacts server | varchar(255) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_glink.md b/doc/database/db_glink.md
new file mode 100644
index 0000000000..eb2f10bc67
--- /dev/null
+++ b/doc/database/db_glink.md
@@ -0,0 +1,13 @@
+Table glink
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| cid | | int(11) | NO | MUL | 0 | |
+| uid | | int(11) | NO | | 0 | |
+| gcid | | int(11) | NO | MUL | 0 | |
+| zcid | | int(11) | NO | MUL | 0 | |
+| updated | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
new file mode 100644
index 0000000000..f27b9a75f7
--- /dev/null
+++ b/doc/database/db_group.md
@@ -0,0 +1,12 @@
+Table group
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------- | ------------------------------------------ | ---------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | user.id owning this data | int(10) unsigned | NO | MUL | 0 | |
+| visible | 1 indicates the member list is not private | tinyint(1) | NO | | 0 | |
+| deleted | 1 indicates the group has been deleted | tinyint(1) | NO | | 0 | |
+| name | human readable name of group | varchar(255) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
new file mode 100644
index 0000000000..f8a402ef6e
--- /dev/null
+++ b/doc/database/db_group_member.md
@@ -0,0 +1,11 @@
+Table group_member
+==================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ---------- | ----------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | user.id of the owner of this data | int(10) unsigned | NO | MUL | 0 | |
+| gid | groups.id of the associated group | int(10) unsigned | NO | | 0 | |
+| contact-id | contact.id of the member assigned to the associated group | int(10) unsigned | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
new file mode 100644
index 0000000000..b62b802726
--- /dev/null
+++ b/doc/database/db_gserver.md
@@ -0,0 +1,23 @@
+Table gserver
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-----------------|------------------|------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| url | | varchar(255) | NO | | | |
+| nurl | | varchar(255) | NO | MUL | | |
+| version | | varchar(255) | NO | | | |
+| site_name | | varchar(255) | NO | | | |
+| info | | text | NO | | NULL | |
+| register_policy | | tinyint(1) | NO | | 0 | |
+| poco | | varchar(255) | NO | | | |
+| noscrape | | varchar(255) | NO | | | |
+| network | | varchar(32) | NO | | | |
+| platform | | varchar(255) | NO | | | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+| last_poco_query | | datetime | YES | | 0000-00-00 00:00:00 | |
+| last_contact | | datetime | YES | | 0000-00-00 00:00:00 | |
+| last_failure | | datetime | YES | | 0000-00-00 00:00:00 | |
+
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
new file mode 100644
index 0000000000..06eb84a182
--- /dev/null
+++ b/doc/database/db_hook.md
@@ -0,0 +1,12 @@
+Table hook
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| -------- | ---------------------------------------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| hook | name of hook | varchar(255) | NO | MUL | | |
+| file | relative filename of hook handler | varchar(255) | NO | | | |
+| function | function name of hook handler | varchar(255) | NO | | | |
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | int(11) unsigned | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
new file mode 100644
index 0000000000..9eb68532c4
--- /dev/null
+++ b/doc/database/db_intro.md
@@ -0,0 +1,18 @@
+Table intro
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|------------|------------------|------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | | int(10) unsigned | NO | | 0 | |
+| fid | | int(11) | NO | | 0 | |
+| contact-id | | int(11) | NO | | 0 | |
+| knowyou | | tinyint(1) | NO | | 0 | |
+| duplex | | tinyint(1) | NO | | 0 | |
+| note | | text | NO | | NULL | |
+| hash | | varchar(255) | NO | | | |
+| datetime | | datetime | NO | | 0000-00-00 00:00:00 | |
+| blocked | | tinyint(1) | NO | | 1 | |
+| ignore | | tinyint(1) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_item.md b/doc/database/db_item.md
new file mode 100644
index 0000000000..7981d29956
--- /dev/null
+++ b/doc/database/db_item.md
@@ -0,0 +1,72 @@
+Table item
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| guid | A unique identifier for this item | varchar(255) | NO | MUL | | |
+| uri | | varchar(255) | NO | MUL | | |
+| uid | user.id which owns this copy of the item | int(10) unsigned | NO | MUL | 0 | |
+| contact-id | contact.id | int(11) | NO | MUL | 0 | |
+| gcontact-id | ID of the global contact | int(11) | NO | MUL | 0 | |
+| type | | varchar(255) | NO | | | |
+| wall | This item was posted to the wall of uid | tinyint(1) | NO | MUL | 0 | |
+| gravity | | tinyint(1) | NO | | 0 | |
+| parent | item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item | int(10) unsigned | NO | MUL | 0 | |
+| parent-uri | uri of the parent to this item | varchar(255) | NO | MUL | | |
+| extid | | varchar(255 | NO | MUL | | |
+| thr-parent | If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri | varchar(255) | NO | | | |
+| created | Creation timestamp. | datetime | NO | | 0000-00-00 00:00:00 | |
+| edited | Date of last edit (default is created) | datetime | NO | | 0000-00-00 00:00:00 | |
+| commented | Date of last comment/reply to this item | datetime | NO | | 0000-00-00 00:00:00 | |
+| received | datetime | datetime | NO | | 0000-00-00 00:00:00 | |
+| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO | | 0000-00-00 00:00:00 | |
+| owner-name | Name of the owner of this item | varchar(255) | NO | | | |
+| owner-link | Link to the profile page of the owner of this item | varchar(255) | NO | | | |
+| owner-avatar | Link to the avatar picture of the owner of this item | varchar(255) | NO | | | |
+| owner-id | Link to the contact table with uid=0 of the owner of this item | int(11) | NO | MUL | 0 | |
+| author-name | Name of the author of this item | varchar(255) | NO | | | |
+| author-link | Link to the profile page of the author of this item | varchar(255) | NO | | | |
+| author-avatar | Link to the avatar picture of the author of this item | varchar(255) | NO | | | |
+| author-id | Link to the contact table with uid=0 of the author of this item | int(11) | NO | MUL | 0 | |
+| title | item title | varchar(255) | NO | | | |
+| body | item body content | mediumtext | NO | | NULL | |
+| app | application which generated this item | varchar(255) | NO | | | |
+| verb | ActivityStreams verb | varchar(255) | NO | | | |
+| object-type | ActivityStreams object type | varchar(255) | NO | | | |
+| object | JSON encoded object structure unless it is an implied object (normal post) | text | NO | | NULL | |
+| target-type | ActivityStreams target type if applicable (URI) | varchar(255) | NO | | | |
+| target | JSON encoded target structure if used | text | NO | | NULL | |
+| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | NO | | NULL | |
+| plink | permalink or URL toa displayable copy of the message at its source | varchar(255) | NO | | | |
+| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(255) | NO | MUL | | |
+| event-id | Used to link to the event.id | int(11) | NO | | 0 | |
+| tag | | mediumtext | NO | | NULL | |
+| attach | JSON structure representing attachments to this item | mediumtext | NO | | NULL | |
+| inform | | mediumtext | NO | | NULL | |
+| file | | mediumtext | NO | | NULL | |
+| location | text location where this item originated | varchar(255) | NO | | | |
+| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | NO | | NULL | |
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO | | NULL | |
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO | | NULL | |
+| deny_gid | Access Control - list of denied groups | mediumtext | NO | | NULL | |
+| private | distribution is restricted | tinyint(1) | NO | | 0 | |
+| pubmail | | tinyint(1) | NO | | 0 | |
+| moderated | | tinyint(1) | NO | | 0 | |
+| visible | | tinyint(1) | NO | | 0 | |
+| spam | | tinyint(1) | NO | | 0 | |
+| starred | item has been favourited | tinyint(1) | NO | | 0 | |
+| bookmark | item has been bookmarked | tinyint(1) | NO | | 0 | |
+| unseen | item has not been seen | tinyint(1) | NO | | 1 | |
+| deleted | item has been deleted | tinyint(1) | NO | MUL | 0 | |
+| origin | item originated at this site | tinyint(1) | NO | | 0 | |
+| forum_mode | | tinyint(1) | NO | | 0 | |
+| last-child | | tinyint(1) unsigned | NO | | 1 | |
+| mention | The owner of this item was mentioned in it | tinyint(1) | NO | | 0 | |
+| network | Network from where the item comes from | varchar(32) | NO | | | |
+| rendered-hash | | varchar(32) | NO | | | |
+| rendered-html | item.body converted to html | mediumtext | NO | | NULL | |
+| global | | tinyint(1) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_item_id.md b/doc/database/db_item_id.md
new file mode 100644
index 0000000000..c578617000
--- /dev/null
+++ b/doc/database/db_item_id.md
@@ -0,0 +1,12 @@
+Table item_id
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| iid | item.id of the referenced item | int(11) | NO | MUL | 0 | |
+| uid | user.id of the owner of this data | int(11) | NO | MUL | 0 | |
+| sid | an additional identifier to attach or link to the referenced item (often used to store a message_id from another system in order to suppress duplicates) | varchar(255) | NO | MUL | | |
+| service | the name or description of the service which generated this identifier | varchar(255) | NO | MUL | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
new file mode 100644
index 0000000000..f9b93ff666
--- /dev/null
+++ b/doc/database/db_locks.md
@@ -0,0 +1,11 @@
+Table locks
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|--------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| name | | varchar(128) | NO | | | |
+| locked | | tinyint(1) | NO | | 0 | |
+| created | | datetime | YES | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
new file mode 100644
index 0000000000..7047da96a5
--- /dev/null
+++ b/doc/database/db_mail.md
@@ -0,0 +1,24 @@
+Table mail
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ---------- | -------------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | user.id of the owner of this data | int(10) unsigned | NO | MUL | 0 | |
+| guid | A unique identifier for this private message | int(10) unsigned | NO | MUL | | |
+| from-name | name of the sender | varchar(255) | NO | | | |
+| from-photo | contact photo link of the sender | varchar(255) | NO | | | |
+| from-url | profile linke of the sender | varchar(255) | NO | | | |
+| contact-id | contact.id | varchar(255) | NO | | | |
+| convid | conv.id | int(11) unsigned | NO | MUL | 0 | |
+| title | | varchar(255) | NO | | | |
+| body | | mediumtext | NO | | NULL | |
+| seen | if message visited it is 1 | varchar(255) | NO | | 0 | |
+| reply | | varchar(255) | NO | MUL | 0 | |
+| replied | | varchar(255) | NO | | 0 | |
+| unknown | if sender not in the contact table this is 1 | varchar(255) | NO | | 0 | |
+| uri | | varchar(255) | NO | MUL | | |
+| parent-uri | | varchar(255) | NO | MUL | | |
+| created | creation time of the private message | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
new file mode 100644
index 0000000000..1c2deb8153
--- /dev/null
+++ b/doc/database/db_mailacct.md
@@ -0,0 +1,20 @@
+Table mailacct
+==============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|--------------|------------------|--------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | | 0 | |
+| server | | varchar(255) | NO | | | |
+| port | | int(11) | NO | | 0 | |
+| ssltype | | varchar(16) | NO | | | |
+| mailbox | | varchar(255) | NO | | | |
+| user | | varchar(255) | NO | | | |
+| pass | | text | NO | | NULL | |
+| reply_to | | varchar(255) | NO | | | |
+| action | | int(11) | NO | | 0 | |
+| movetofolder | | varchar(255) | NO | | | |
+| pubmail | | tinyint(1) | NO | | 0 | |
+| last_check | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
new file mode 100644
index 0000000000..4cfc1d0a11
--- /dev/null
+++ b/doc/database/db_manage.md
@@ -0,0 +1,10 @@
+Table manage
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ------------- | ------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | user.id | int(11) | NO | MUL | 0 | |
+| mid | | int(11) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
new file mode 100644
index 0000000000..5c196628d4
--- /dev/null
+++ b/doc/database/db_notify-threads.md
@@ -0,0 +1,12 @@
+Table notify-threads
+====================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|--------------------|------------------|------------------|------|-----|---------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| notify-id | | int(11) | NO | | 0 | |
+| master-parent-item | | int(10) unsigned | NO | MUL | 0 | |
+| parent-item | | int(10) unsigned | NO | | 0 | |
+| receiver-uid | | int(11) | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
new file mode 100644
index 0000000000..b2bae64717
--- /dev/null
+++ b/doc/database/db_notify.md
@@ -0,0 +1,24 @@
+Table notify
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ---------- | --------------------------------- | ------------ | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| hash | | varchar(64) | NO | | | |
+| type | | int(11) | NO | | 0 | |
+| name | | varchar(255) | NO | | | |
+| url | | varchar(255) | NO | | | |
+| photo | | varchar(255) | NO | | | |
+| date | | datetime | NO | | 0000-00-00 00:00:00 | |
+| msg | | mediumtext | YES | | NULL | |
+| uid | user.id of the owner of this data | int(11) | NO | MUL | 0 | |
+| link | | varchar(255) | NO | | | |
+| iid | item.id | int(11) | NO | | 0 | |
+| parent | | int(11) | NO | | 0 | |
+| seen | | tinyint(1) | NO | | 0 | |
+| verb | | varchar(255) | NO | | | |
+| otype | | varchar(16) | NO | | | |
+| name_cache | Cached bbcode parsing of name | tinytext | YES | | NULL | |
+| msg_cache | Cached bbcode parsing of msg | mediumtext | YES | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
new file mode 100644
index 0000000000..5e994eca39
--- /dev/null
+++ b/doc/database/db_oembed.md
@@ -0,0 +1,10 @@
+Table oembed
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| url | page url | varchar(255) | NO | PRI | NULL | |
+| content | OEmbed data of the page | text | NO | | NULL | |
+| created | datetime of creation | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
new file mode 100644
index 0000000000..ada42c2ea6
--- /dev/null
+++ b/doc/database/db_parsed_url.md
@@ -0,0 +1,12 @@
+Table parsed_url
+================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| url | page url | varchar(255) | NO | PRI | NULL | |
+| guessing | is the "guessing" mode active? | tinyint(1) | NO | PRI | 0 | |
+| oembed | is the data the result of oembed? | tinyint(1) | NO | PRI | 0 | |
+| content | page data | text | NO | | NULL | |
+| created | datetime of creation | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
new file mode 100644
index 0000000000..a4ed10a359
--- /dev/null
+++ b/doc/database/db_pconfig.md
@@ -0,0 +1,12 @@
+Table pconfic
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-------|-------------|------------|------|-----|---------|----------------|
+| id | | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | MUL | 0 | |
+| cat | | char(255) | NO | | | |
+| k | | char(255) | NO | | | |
+| v | | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
new file mode 100644
index 0000000000..2d5bf0938e
--- /dev/null
+++ b/doc/database/db_photo.md
@@ -0,0 +1,29 @@
+Table photo
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----------- | ------------------------------------------------------ | ---------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | user.id of the owner of this data | int(10) unsigned | NO | MUL | 0 | |
+| contact-id | contact.id | int(10) unsigned | NO | | 0 | |
+| guid | A unique identifier for this photo | varchar(64) | NO | MUL | | |
+| resource-id | | varchar(255) | NO | MUL | | |
+| created | creation date | datetime | NO | | 0000-00-00 00:00:00 | |
+| edited | last edited date | datetime | NO | | 0000-00-00 00:00:00 | |
+| title | | varchar(255) | NO | | | |
+| desc | | text | NO | | NULL | |
+| album | The name of the album to which the photo belongs | varchar(255) | NO | | | |
+| filename | | varchar(255) | NO | | | |
+| type | image type | varchar(128) | NO | | image/jpeg | |
+| height | | smallint(6) | NO | | 0 | |
+| width | | smallint(6) | NO | | 0 | |
+| size | | int(10) unsigned | NO | | 0 | |
+| data | | mediumblob | NO | | NULL | |
+| scale | | tinyint(3) | NO | | 0 | |
+| profile | | tinyint(1) | NO | | 0 | |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext | NO | | NULL | |
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO | | NULL | |
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO | | NULL | |
+| deny_gid | Access Control - list of denied groups | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_poll.md b/doc/database/db_poll.md
new file mode 100644
index 0000000000..fd89b345c1
--- /dev/null
+++ b/doc/database/db_poll.md
@@ -0,0 +1,19 @@
+Table poll
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-------|-------------|------------|------|-----|---------|----------------|
+| id | | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | MUL | 0 | |
+| q0 | | mediumtext | NO | | NULL | |
+| q1 | | mediumtext | NO | | NULL | |
+| q2 | | mediumtext | NO | | NULL | |
+| q3 | | mediumtext | NO | | NULL | |
+| q4 | | mediumtext | NO | | NULL | |
+| q5 | | mediumtext | NO | | NULL | |
+| q6 | | mediumtext | NO | | NULL | |
+| q7 | | mediumtext | NO | | NULL | |
+| q8 | | mediumtext | NO | | NULL | |
+| q9 | | mediumtext | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_poll_result.md b/doc/database/db_poll_result.md
new file mode 100644
index 0000000000..5a732d0adf
--- /dev/null
+++ b/doc/database/db_poll_result.md
@@ -0,0 +1,10 @@
+Table poll_result
+=================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|---------|------|-----|---------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| poll_id | | int(11) | NO | MUL | 0 | |
+| choice | | int(11) | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
new file mode 100644
index 0000000000..fba351a2d9
--- /dev/null
+++ b/doc/database/db_profile.md
@@ -0,0 +1,48 @@
+Table profile
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|--------------|-----------------------------------------------|--------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | user.id of the owner of this data | int(11) | NO | | 0 | |
+| profile-name | Name of the profile | varchar(255) | NO | | | |
+| is-default | Mark this profile as default profile | tinyint(1) | NO | | 0 | |
+| hide-friends | Hide friend list from viewers of this profile | tinyint(1) | NO | | 0 | |
+| name | | varchar(255) | NO | | | |
+| pdesc | Title or description | varchar(255) | NO | | | |
+| dob | Day of birth | varchar(32) | NO | | 0000-00-00 | |
+| address | | varchar(255) | NO | | | |
+| locality | | varchar(255) | NO | | | |
+| region | | varchar(255) | NO | | | |
+| postal-code | | varchar(32) | NO | | | |
+| country-name | | varchar(255) | NO | | | |
+| hometown | | varchar(255) | NO | MUL | | |
+| gender | | varchar(32) | NO | | | |
+| marital | | varchar(255) | NO | | | |
+| with | | text | NO | | NULL | |
+| howlong | | datetime | NO | | 0000-00-00 00:00:00 | |
+| sexual | | varchar(255) | NO | | | |
+| politic | | varchar(255) | NO | | | |
+| religion | | varchar(255) | NO | | | |
+| pub_keywords | | text | NO | | NULL | |
+| prv_keywords | | text | NO | | NULL | |
+| likes | | text | NO | | NULL | |
+| dislikes | | text | NO | | NULL | |
+| about | | text | NO | | NULL | |
+| summary | | varchar(255) | NO | | | |
+| music | | text | NO | | NULL | |
+| book | | text | NO | | NULL | |
+| tv | | text | NO | | NULL | |
+| film | | text | NO | | NULL | |
+| interest | | text | NO | | NULL | |
+| romance | | text | NO | | NULL | |
+| work | | text | NO | | NULL | |
+| education | | text | NO | | NULL | |
+| contact | | text | NO | | NULL | |
+| homepage | | varchar(255) | NO | | | |
+| photo | | varchar(255) | NO | | | |
+| thumb | | varchar(255) | NO | | | |
+| publish | publish default profile in local directory | tinyint(1) | NO | | 0 | |
+| net-publish | publish profile in global directory | tinyint(1) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
new file mode 100644
index 0000000000..411da06d30
--- /dev/null
+++ b/doc/database/db_profile_check.md
@@ -0,0 +1,13 @@
+Table profile_check
+===================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| -------- | ------------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| uid | user.id | int(10) unsigned | NO | | 0 | |
+| cid | contact.id | int(10) unsigned | NO | | 0 | |
+| dfrn_id | | varchar(255) | NO | | | |
+| sec | | varchar(255) | NO | | 0 | |
+| expire | | int(11) | NO | | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
new file mode 100644
index 0000000000..b766ccb46c
--- /dev/null
+++ b/doc/database/db_push_subscriber.md
@@ -0,0 +1,10 @@
+Table push_subscriber
+=====================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|---------|------|-----|---------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| poll_id | | int(11) | NO | MUL | 0 | |
+| choice | | int(11) | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_queue.md b/doc/database/db_queue.md
new file mode 100644
index 0000000000..44bb69c2ec
--- /dev/null
+++ b/doc/database/db_queue.md
@@ -0,0 +1,14 @@
+Table queue
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|---------|------------------|-------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| cid | | int(11) | NO | MUL | 0 | |
+| network | | varchar(32) | NO | MUL | | |
+| created | | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| last | | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| content | | mediumtext | NO | | NULL | |
+| batch | | tinyint(1) | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
new file mode 100644
index 0000000000..ac2769b900
--- /dev/null
+++ b/doc/database/db_register.md
@@ -0,0 +1,13 @@
+Table register
+==============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
+| id | sequential ID | int(11) unsigned | NO | PRI | NULL | auto_increment |
+| hash | | varchar(255) | NO | | | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+| uid | user.id | int(11) unsigned | NO | | | |
+| password | | varchar(255) | NO | | | |
+| language | | varchar(16) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
new file mode 100644
index 0000000000..63d0a46b40
--- /dev/null
+++ b/doc/database/db_search.md
@@ -0,0 +1,10 @@
+Table search
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-------|------------------|--------------|------|-----|---------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | MUL | 0 | |
+| term | | varchar(255) | NO | MUL | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
new file mode 100644
index 0000000000..1e87c24d03
--- /dev/null
+++ b/doc/database/db_session.md
@@ -0,0 +1,11 @@
+Table session
+=============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------ | ------------- | ------------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | bigint(20) unsigned | NO | PRI | NULL | auto_increment |
+| sid | | varchar(255) | NO | MUL | | |
+| data | | text | NO | | NULL | |
+| expire | | int(10) unsigned | NO | MUL | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_sign.md b/doc/database/db_sign.md
new file mode 100644
index 0000000000..6986613e59
--- /dev/null
+++ b/doc/database/db_sign.md
@@ -0,0 +1,12 @@
+Table sign
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ------------ | ------------- | ---------------- | ---- | --- | ------- | --------------- |
+| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| iid | item.id | int(10) unsigned | NO | MUL | 0 | |
+| signed_text | | mediumtext | NO | | NULL | |
+| signature | | text | NO | | NULL | |
+| signer | | varchar(255) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_spam.md b/doc/database/db_spam.md
new file mode 100644
index 0000000000..f1428a6821
--- /dev/null
+++ b/doc/database/db_spam.md
@@ -0,0 +1,13 @@
+Table spam
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ------------ | ---- | --- | ------------------- | --------------- |
+| id | | int(11) | NO | PRI | NULL | auto_increment |
+| uid | | int(11) | NO | MUL | 0 | |
+| spam | | int(11) | NO | MUL | 0 | |
+| ham | | int(11) | NO | MUL | 0 | |
+| term | | varchar(255) | NO | MUL | | |
+| date | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_term.md b/doc/database/db_term.md
new file mode 100644
index 0000000000..0240685a0c
--- /dev/null
+++ b/doc/database/db_term.md
@@ -0,0 +1,19 @@
+Table term
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|----------| ------------- |---------------------|------|-----|---------------------|----------------|
+| tid | | int(10) unsigned | NO | PRI | NULL | auto_increment |
+| oid | | int(10) unsigned | NO | MUL | 0 | |
+| otype | | tinyint(3) unsigned | NO | MUL | 0 | |
+| type | | tinyint(3) unsigned | NO | MUL | 0 | |
+| term | | varchar(255) | NO | | | |
+| url | | varchar(255) | NO | | | |
+| aid | | int(10) unsigned | NO | | 0 | |
+| uid | | int(10) unsigned | NO | MUL | 0 | |
+| guid | | varchar(255) | NO | MUL | | |
+| created | | datetime | NO | | 0000-00-00 00:00:00 | |
+| received | | datetime | NO | | 0000-00-00 00:00:00 | |
+| global | | tinyint(1) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_thread.md b/doc/database/db_thread.md
new file mode 100644
index 0000000000..d6484b7609
--- /dev/null
+++ b/doc/database/db_thread.md
@@ -0,0 +1,33 @@
+Table thread
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-------------|------------------|------------------|------|-----|---------------------|-------|
+| iid | sequential ID | int(10) unsigned | NO | PRI | 0 | |
+| uid | | int(10) unsigned | NO | MUL | 0 | |
+| contact-id | | int(11) unsigned | NO | | 0 | |
+| gcontact-id | Global Contact | int(11) unsigned | NO | | 0 | |
+| owner-id | Item owner | int(11) unsigned | NO | MUL | 0 | |
+| author-id | Item author | int(11) unsigned | NO | MUL | 0 | |
+| created | | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| edited | | datetime | NO | | 0000-00-00 00:00:00 | |
+| commented | | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| received | | datetime | NO | | 0000-00-00 00:00:00 | |
+| changed | | datetime | NO | | 0000-00-00 00:00:00 | |
+| wall | | tinyint(1) | NO | MUL | 0 | |
+| private | | tinyint(1) | NO | | 0 | |
+| pubmail | | tinyint(1) | NO | | 0 | |
+| moderated | | tinyint(1) | NO | | 0 | |
+| visible | | tinyint(1) | NO | | 0 | |
+| spam | | tinyint(1) | NO | | 0 | |
+| starred | | tinyint(1) | NO | | 0 | |
+| ignored | | tinyint(1) | NO | | 0 | |
+| bookmark | | tinyint(1) | NO | | 0 | |
+| unseen | | tinyint(1) | NO | | 1 | |
+| deleted | | tinyint(1) | NO | | 0 | |
+| origin | | tinyint(1) | NO | | 0 | |
+| forum_mode | | tinyint(1) | NO | | 0 | |
+| mention | | tinyint(1) | NO | | 0 | |
+| network | | varchar(32) | NO | | | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
new file mode 100644
index 0000000000..3b3778d68c
--- /dev/null
+++ b/doc/database/db_tokens.md
@@ -0,0 +1,13 @@
+Table tokens
+============
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ---------- | ----------- | ------------ | ---- | --- | ------- | ----- |
+| id | | varchar(40) | NO | PRI | NULL | |
+| secret | | text | NO | | NULL | |
+| client_id | | varchar(20) | NO | | | |
+| expires | | int(11) | NO | | 0 | |
+| scope | | varchar(200) | NO | | | |
+| uid | | int(11) | NO | | 0 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
new file mode 100644
index 0000000000..21ca211d73
--- /dev/null
+++ b/doc/database/db_user.md
@@ -0,0 +1,78 @@
+Table user
+==========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|--------------------------|-----------------------------------------------------------------------------------------|---------------------|------|-----|---------------------|----------------|
+| uid | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| guid | A unique identifier for this user | varchar(64) | NO | | | |
+| username | Name that this user is known by | varchar(255) | NO | | | |
+| password | encrypted password | varchar(255) | NO | | | |
+| nickname | nick- and user name | varchar(255) | NO | MUL | | |
+| email | the users email address | varchar(255) | NO | | | |
+| openid | | varchar(255) | NO | | | |
+| timezone | PHP-legal timezone | varchar(128) | NO | | | |
+| language | default language | varchar(32) | NO | | en | |
+| register_date | timestamp of registration | datetime | NO | | 0000-00-00 00:00:00 | |
+| login_date | timestamp of last login | datetime | NO | | 0000-00-00 00:00:00 | |
+| default-location | Default for item.location | varchar(255) | NO | | | |
+| allow_location | 1 allows to display the location | tinyint(1) | NO | | 0 | |
+| theme | user theme preference | varchar(255) | NO | | | |
+| pubkey | RSA public key 4096 bit | text | NO | | NULL | |
+| prvkey | RSA private key 4096 bit | text | NO | | NULL | |
+| spubkey | | text | NO | | NULL | |
+| sprvkey | | text | NO | | NULL | |
+| verified | user is verified through email | tinyint(1) unsigned | NO | | 0 | |
+| blocked | 1 for user is blocked | tinyint(1) unsigned | NO | | 0 | |
+| blockwall | Prohibit contacts to post to the profile page of the user | tinyint(1) unsigned | NO | | 0 | |
+| hidewall | Hide profile details from unkown viewers | tinyint(1) unsigned | NO | | 0 | |
+| blocktags | Prohibit contacts to tag the post of this user | tinyint(1) unsigned | NO | | 0 | |
+| unkmail | Permit unknown people to send private mails to this user | tinyint(1) | NO | | 0 | |
+| cntunkmail | | int(11) | NO | | 10 | |
+| notify-flags | email notification options | int(11) unsigned | NO | | 65535 | |
+| page-flags | page/profile type | int(11) unsigned | NO | | 0 | |
+| prvnets | | tinyint(1) | NO | | 0 | |
+| pwdreset | | varchar(255) | NO | | | |
+| maxreq | | int(11) | NO | | 10 | |
+| expire | | int(11) unsigned | NO | | 0 | |
+| account_removed | if 1 the account is removed | tinyint(1) | NO | | 0 | |
+| account_expired | | tinyint(1) | NO | | 0 | |
+| account_expires_on | timestamp when account expires and will be deleted | datetime | NO | | 0000-00-00 00:00:00 | |
+| expire_notification_sent | timestamp of last warning of account expiration | datetime | NO | | 0000-00-00 00:00:00 | |
+| service_class | service class for this account, determines what if any limits/restrictions are in place | varchar(32) | NO | | | |
+| def_gid | | int(11) | NO | | 0 | |
+| allow_cid | default permission for this user | mediumtext | NO | | NULL | |
+| allow_gid | default permission for this user | mediumtext | NO | | NULL | |
+| deny_cid | default permission for this user | mediumtext | NO | | NULL | |
+| deny_gid | default permission for this user | mediumtext | NO | | NULL | |
+| openidserver | | text | NO | | NULL | |
+
+```
+/**
+* page-flags
+*/
+define ( 'PAGE_NORMAL', 0 );
+define ( 'PAGE_SOAPBOX', 1 );
+define ( 'PAGE_COMMUNITY', 2 );
+define ( 'PAGE_FREELOVE', 3 );
+define ( 'PAGE_BLOG', 4 );
+define ( 'PAGE_PRVGROUP', 5 );
+
+/**
+* notify-flags
+*/
+define ( 'NOTIFY_INTRO', 0x0001 );
+define ( 'NOTIFY_CONFIRM', 0x0002 );
+define ( 'NOTIFY_WALL', 0x0004 );
+define ( 'NOTIFY_COMMENT', 0x0008 );
+define ( 'NOTIFY_MAIL', 0x0010 );
+define ( 'NOTIFY_SUGGEST', 0x0020 );
+define ( 'NOTIFY_PROFILE', 0x0040 );
+define ( 'NOTIFY_TAGSELF', 0x0080 );
+define ( 'NOTIFY_TAGSHARE', 0x0100 );
+define ( 'NOTIFY_POKE', 0x0200 );
+define ( 'NOTIFY_SHARE', 0x0400 );
+
+define ( 'NOTIFY_SYSTEM', 0x8000 );
+```
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
new file mode 100644
index 0000000000..80e3084757
--- /dev/null
+++ b/doc/database/db_userd.md
@@ -0,0 +1,9 @@
+Table userd
+===========
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|----------|------------------|--------------|------|-----|---------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| username | | varchar(255) | NO | MUL | NULL | |
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
new file mode 100644
index 0000000000..b1f5245aea
--- /dev/null
+++ b/doc/database/db_workerqueue.md
@@ -0,0 +1,13 @@
+Table workerqueue
+=================
+
+| Field | Description | Type | Null | Key | Default | Extra |
+|-----------|------------------|---------------------|------|-----|---------------------|----------------|
+| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment |
+| parameter | | text | NO | | NULL | |
+| priority | | tinyint(3) unsigned | NO | | 0 | |
+| created | | datetime | NO | MUL | 0000-00-00 00:00:00 | |
+| pid | | int(11) | NO | | 0 | |
+| executed | | datetime | NO | | 0000-00-00 00:00:00 | |
+
+Return to [database documentation](help/database)
diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md
index d3e205f0fa..5dc8f3bb06 100644
--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@@ -3,153 +3,616 @@ Referenz der Friendica BBCode Tags
* [Zur Startseite der Hilfe](help)
-Inline Tags
------
-
-
-
Wer überrascht werden möchte sollte nicht weiter lesen.[spoiler]Es gibt ein Happy End.[/spoiler]
-
-Wer überrascht werden möchte sollte nicht weiter lesen. *klicken zum öffnen/schließen*
-
-(Der Text zweischen dem öffnenden und dem schließenden Teil des spoiler Tags wird nicht angezeigt, bis der Link angeklickt wurde. In dem Fall wird *"Es gibt ein Happy End."* also erst angezeigt, wenn der Spoiler verraten wird.)
-
-
-
-Für weitere Optionen von sortierten Listen kann man den Stil der Numerierung der Liste definieren:
-
[list=1]
: dezimal
-
-
[list=i]
: römisch, Kleinbuchstaben
-
-
[list=I]
: römisch, Großbuchstaben
-
-
[list=a]
: alphabetisch, Kleinbuchstaben
-
-
[list=A]
: alphabethisch, Großbuchstaben
-
-
-
-
-Einbettung von Inhalten
-------
-
-Man kann viele Dinge, z.B. Video und Audio Dateine, in Nachrichten einbetten.
-
-
[video]url[/video]
-
[audio]url[/audio]
-
-Wobei die *url* von youtube, vimeo, soundcloud oder einer anderen Seite stammen kann die die oembed oder opengraph Spezifikationen unterstützt.
-Außerdem kann *url* die genaue url zu einer ogg Datei sein, die dann per HTML5 eingebunden wird.
-
-
[url]*url*[/url]
-
-Wenn *url* entweder oembed oder opengraph unterstützt wird das eingebettete
-Objekt (z.B. ein Dokument von scribd) eingebunden.
-Der Titel der Seite mit einem Link zur *url* wird ebenfalls angezeigt.
-
-Um eine Karte in einen Beitrag einzubinden, muss das *openstreetmap* Addon aktiviert werden. Ist dies der Fall, kann mit
-
-
[map]Broadway 26, New York[/map]
-
-eine Karte von [OpenStreetmap](http://openstreetmap.org) eingebettet werden. Zur Identifikation des Ortes können entweder seine Koordinaten in der Form
-
-
[map=lat,long]
-
-oder eine Adresse in obiger Form verwendet werden.
-
-Spezielle Tags
--------
-
-Wenn Du über BBCode Tags in einer Nachricht schreiben möchtest, kannst Du [noparse], [nobb] oder [pre] verwenden um den BBCode Tags vor der Evaluierung zu schützen:
-
-
+
+## Einbetten
+
+Du kannst Videos, Musikdateien und weitere Dinge in Beiträgen einbinden.
+
+
+
+
BBCode
+
Ergebnis
+
+
+
[video]url[/video]
+
Wobei die *url* eine URL von youtube, vimeo, soundcloud oder einer anderen Plattform sein kann, die die opengraph Spezifikationen unterstützt.
+
+
+
[video]URL der Videodatei[/video]
+[audio]URL der Musikdatei[/audio]
+
Die komplette URL einer ogg/ogv/oga/ogm/webm/mp4/mp3 Datei angeben, diese wird dann mit einem HTML5-Player angezeigt.
+
+
+
[youtube]Youtube URL[/youtube]
+
Youtube Video mittels OEmbed anzeigen. Kann u.U, den Player nicht einbetten.
+
+
+
[youtube]Youtube video ID[/youtube]
+
Youtube-Player im iframe einbinden.
+
+
+
[vimeo]Vimeo URL[/vimeo]
+
Vimeo Video mittels OEmbed anzeigen. Kann u.U, den Player nicht einbetten.
+
+
+
[vimeo]Vimeo video ID[/vimeo]
+
Vimeo-Player im iframe einbinden.
+
+
+
[embed]URL[/embed]
+
OEmbed rich content einbetten.
+
+
+
[iframe]URL[/iframe]
+
General embed, iframe size is limited by the theme size for video players.
+
+
+
[url]*url*[/url]
+
Wenn *url* die OEmbed- oder Opengraph-Spezifikationen unterstützt, wird das Objekt eingebettet (z.B. Dokumente von scribd).
+ Ansonsten wird der Titel der Seite mit der URL verlinkt.
+
+
+
+## Karten
+
+Das Einbetten von Karten benötigt das "openstreetmap" oder das "Google Maps" Addon.
+Wenn keines der Addons aktiv ist, werden stattdeßen die Kordinaten angezeigt-
+
+
+
+
BBCode
+
Ergebnis
+
+
+
[map]Adresse[/map]
+
Bindet eine Karte ein, auf der die angegebene Adresse zentriert ist.
+
+
+
[map=lat,long]
+
Bindet eine Karte ein, die auf die angegebenen Koordinaten zentriert ist.
+
+
+
[map]
+
Bindet eine Karte ein, die auf die Position des Beitrags zentriert ist.
+
+
+
+## Zusammenfassungen für lange Beiträge
+
+Wenn du deine Beiträge auf anderen Netzwerken von Drittanbietern verbreiten möchtest, z.B. Twitter, könntest du Probleme mit deren Zeichenbegrenzung haben.
+
+Friendica verwendet einen semi-inelligenten Mechanismus um passende Zusammenfassungen zu erstellen.
+Du kannst allerdings auch selbst die Zusammenfassungen erstellen, die auf den unterschiedlichen Netzwerken angezeigt werden.
+Um dies zu tun, verwendest du den [abstract]-Tag.
+
+
+
+
BBCode
+
Ergebnis
+
+
+
[abstract]Unglaublich interessant! Muss man gesehen haben! Unbedingt dem Link folgen![/abstract]
+Ich möchte euch eine unglaublich langweilige Geschichte erzählen, die ihr sicherlich niemals hören wolltet.
+
Auf Twitter würde folgender Text verlffentlicht werden
Unglaublich interessant! Muss man gesehen haben! Unbedingt dem Link folgen!
+Wohingegen auf Friendica folgendes stehen würde
Ich möchte euch eine unglaublich langweilige Geschichte erzählen, die ihr sicherlich niemals hören wolltet.
+
+
+
+Wenn du magst, kannst du auch unterschiedliche Zusammenfassungen für die unterschiedlichen Netzwerke verwenden.
+
+
+
+
BBCode
+
Ergebnis
+
+
+
+[abstract]Hey Leute, hier sind meines neuesten Bilder![/abstract]
+[abstract=twit]Hallo liebe Twitter Follower. Wollt ihr meine neuesten Bilder sehen?[/abstract]
+[abstract=apdn]Moin liebe Follower auf ADN. Ich habe einige neue Bilder gemacht, die ich euch gerne zeigen will.[/abstract]
+Heute war ich im Wald unterwegs und habe einige wirklich schöne Bilder gemacht...
+
Für Twitter und App.net wird Friendica in diesem Fall die speziell definierten Zusammenfassungen Verwenden. Für andere Netzwerke (wie z.B. bei der Verwendung des GNU Social Konnektors zum Veröffentlichen auf deinen GNU Social Account) würde die allgemeine Zusammenfassung verwenden.
+
+
+
+Wenn du beispielsweise den "buffer"-Konnektor verwendest um Beiträge nach Facebook und Google+ zu senden, dort aber nicht den gesamten Blogbeitrag posten willst sondern nur einen Anreißer, kannst du dies mit dem [abstract]-Tag realisieren.
+
+Bei Netzwerken wie Facebook oder Google+, die selbst kein Zeichenlimit haben wird das [abstract]-Element allerdings nicht grundsätzlich verwendet.
+Daher müssen diese Netzwerke explizit genannt werden.
+
+
+
+
BBCode
+
Ergebnis
+
+
+
+[abstract]Dieser Tage hatte ich eine ungewöhnliche Begegnung...[/abstract]
+[abstract=goog]Hey liebe Google+ Follower. Habt ich schon meinen neuesten Blog-Beitrag gelesen?[/abstract]
+[abstract=face]Hallo liebe Facebook Freunde. Letztens ist mir etwas wirklich schönes paßiert.[/abstract]
+Als ich die Bilder im Wald aufgenommen habe, hatte ich eine wirklich ungewöhnliche Begegnung...
+
Auf Google und Facebook würde nun die entsprechende Zusammenfassung verbreitet. Für andere Netzwerke würde die allgemeine Zusammenfassung verwendet werden.
+ Auf Friendica wird weiterhin keine Zusammenfassung angezeigt.
+
+
+
+Für Verbindungen zu Netzwerken, zu denen Friendica den HTML Code postet, wie Tumblr, Wordpress oder Pump.io wird das [abstract] Element nicht verwendet.
+Bei nativen Verbindungen; das heißt zu z.B. Friendica, Hubzilla, Diaspora oder GNU Social Kontakten; wird der ungekürzte Beitrag übertragen.
+Die Instanz des Kontakts kümmert sich um die Darstellung.
+
+## Special
+
+
+
+
BBCode
+
Ergebnis
+
+
+
Wenn du verhindern möchtest, daß der BBCode in einer Nachricht interpretiert wird, kannst du die [noparse], [nobb] oder [pre] Tag verwenden:
+
+
[noparse][b]fett[/b][/noparse]
+
[nobb][b]fett[/b][/nobb]
+
[pre][b]fett[/b][/pre]
+
+
+
[b]fett[/b]
+
+
+
[nosmile] kann verwendet werden um für einen Beitrag das umsetzen von Smilies zu verhindern.
+
+ [nosmile] ;-) :-O
+
+
;-) :-O
+
+
+
Benutzerdefinierte Inline-Styles
+
+[style=text-shadow: 0 0 4px #CC0000;]Du kannst alle CSS-Eigenschaften eines Blocks ändern-[/style]
+
Du kannst alle CSS-Eigenschaften eines Blocks ändern-
+
+
+
Benutzerdefinierte CSS Klassen
+
+[class=custom]Wenn die vergebene Klasse in den CSS Anweisungen existiert, wird sie angewandt.[/class]
+
<span class="custom">Wenn die
+vergebene Klasse in den CSS Anweisungen
+existiert,wird sie angewandt.</span>
+
+
diff --git a/doc/de/Bugs-and-Issues.md b/doc/de/Bugs-and-Issues.md
index 1323b4b9d3..4db1bd6aa3 100644
--- a/doc/de/Bugs-and-Issues.md
+++ b/doc/de/Bugs-and-Issues.md
@@ -6,7 +6,7 @@ Bugs und Probleme
Du solltest jeden Bug und jedes Problem, den/das Du findest, zunächst dem Administrator (oder gegebenenfalls der Support-Seite) Deines Servers melden, statt auf der allgemeinen Bug-Seite.
Das erleichtert den Entwicklern ihre Arbeit (z. B. neue Features zu entwickeln), da sie sich nicht mit Fehlern beschäftigen müssen, mit denen sie nichts zu tun haben.
-Wenn Du technisch versiert bist oder Dein Knoten keine Support-Seite hat, dann kannst Du den Bug Tracker nutzen.
+Wenn Du technisch versiert bist oder Dein Knoten keine Support-Seite hat, dann kannst Du den Bug Tracker nutzen.
Bitte durchsuche zunächst die Seite, ob es bereits einen offenen Bug gibt, der Deiner Anfrage entspricht.
Liefere so viele Informationen wie möglich zu dem Bug.
diff --git a/doc/de/Home.md b/doc/de/Home.md
index 44ebfc0285..e3017c0c60 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -20,37 +20,37 @@ Friendica - Dokumentation und Ressourcen
* [Community-Foren](help/Forums)
* [Chats](help/Chats)
* Weiterführende Informationen
- * [Performance verbessern](help/Improve-Performance)
* [Account umziehen](help/Move-Account)
* [Account löschen](help/Remove-Account)
* [Bugs und Probleme](help/Bugs-and-Issues)
* [Häufig gestellte Fragen (FAQ)](help/FAQ)
-**Technische Dokumentation**
+**Dokumentation für Administratoren**
* [Installation](help/Install)
-* [Konfigurationen](help/Settings)
+* [Konfigurationen & Admin-Panel](help/Settings)
* [Plugins](help/Plugins)
* [Konnektoren (Connectors) installieren (Twitter/GNU Social)](help/Installing-Connectors)
* [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
-* [Nachrichtenfluss](help/Message-Flow)
* [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
-* [Entwickler](help/Developers)
-* [Twitter/GNU Social API Functions](help/api) (EN)
-* [Translation of Friendica](help/translations) (EN)
* [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN)
+* [Performance verbessern](help/Improve-Performance)
-**Entwickler Dokumentation**
+**Dokumentation für Entwickler**
-* [Where to get started?](help/Developers-Intro)
+* [Entwickler](help/Developers)
+* [Where to get started?](help/Developers-Intro) (EN)
* [Help on Github](help/Github)
* [Help on Vagrant](help/Vagrant)
-* [How to translate Friendica](help/translations)
+* [How to translate Friendica](help/translations) (EN)
* [Bugs and Issues](help/Bugs-and-Issues)
* [Plugin Development](help/Plugins)
* [Theme Development](help/themes)
* [Smarty 3 Templates](help/smarty3-templates)
+* [Protokoll Dokumentation](help/Protocol) (EN)
+* [Datenbank-Schema](help/database)
* [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
+* [Twitter/GNU Social API Functions](help/api) (EN)
**Externe Ressourcen**
diff --git a/doc/de/Message-Flow.md b/doc/de/Message-Flow.md
index 0694db1344..3d4c912ccf 100644
--- a/doc/de/Message-Flow.md
+++ b/doc/de/Message-Flow.md
@@ -6,7 +6,7 @@ Friendica Nachrichtenfluss
Diese Seite soll einige Infos darüber dokumentieren, wie Nachrichten innerhalb von Friendica von einer Person zur anderen übertragen werden.
Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate nutzen.
-Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll (http://dfrn.org/dfrn.pdf) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
+Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
Der Großteil der Nachrichtenverarbeitung nutzt die Datei include/items.php, welche Funktionen für verschiedene Feed-bezogene Import-/Exportaktivitäten liefert.
@@ -24,7 +24,7 @@ PuSh-Feeds (pubsubhubbub) kommen via mod/pubsub.php an.
DFRN-poll Feed-Imports kommen via include/poller.php als geplanter Task an, das implementiert die lokale Bearbeitung (local side) des DFRN-Protokolls.
-Szenario #1. Bob schreibt eine öffentliche Statusnachricht
+### Szenario #1. Bob schreibt eine öffentliche Statusnachricht
Dies ist eine öffentliche Nachricht ohne begrenzte Nutzerfreigabe, so dass keine private Übertragung notwendig ist.
Es gibt zwei Wege, die genutzt werden können - als bbcode an DFRN-Clients oder als durch den Server konvertierten HTML-Code (mit PuSH; pubsubhubbub).
@@ -33,13 +33,13 @@ Sie fallen zurück auf eine tägliche Abfrage, wenn der Hub Übertragungsschwier
Wenn kein spezifizierter Hub oder Hubs ausgewählt sind, werden DFRN-Clients in einer pro Kontakt konfigurierbaren Rate mit bis zu 5-Minuten-Intervallen abfragen.
Feeds, die via DFRN-Poll abgerufen werden, sind bbcode und können auch private Unterhaltungen enthalten, die vom Poller auf ihre Zugriffsrechte hin geprüft werden.
-Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
+### Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
Jack nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken.
Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist und dfrn-notify nutzt.
Die PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen diese an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
-Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
+### Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
Mary nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken.
Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist (mit Ausnahme von Bob selbst; die Unterhaltung wird nun an Jack und Mary geschickt).
@@ -47,14 +47,14 @@ Die Nachrichten werden mit dfrn-notify übertragen.
PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist.
Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
-Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
+### Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
William nutzt salmon, um Bob über seine Antwort zu benachrichtigen.
Der Inhalt ist HTML-Code, der in das Salmon Magic Envelope eingebettet ist.
Bob erstellt dann einen Feed der Unterhaltung und sendet es an alle Friendica-Nutzer, die an der Unterhaltung beteiligt sind und dfrn-notify nutzen (mit Ausnahme von William selbst; die Unterhaltung wird an Jack und Mary weitergeleitet).
PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
-Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
+### Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
Die Nachricht wird sofort an Mary und Jack mit Hilfe von dfrn_notify geschickt.
Öffentliche Hubs werden nicht benachrichtigt.
diff --git a/doc/de/Plugins.md b/doc/de/Plugins.md
index dcff41a4b6..8b1c71177d 100644
--- a/doc/de/Plugins.md
+++ b/doc/de/Plugins.md
@@ -1,27 +1,28 @@
-**Friendica Addon/Plugin-Entwicklung**
+Friendica Addon/Plugin-Entwicklung
==============
* [Zur Startseite der Hilfe](help)
-Bitte schau dir das Beispiel-Addon "randplace" für ein funktionierendes Beispiel für manche der hier aufgeführten Funktionen an.
-Das Facebook-Addon bietet ein Beispiel dafür, die "addon"- und "module"-Funktion gemeinsam zu integrieren.
-Addons arbeiten, indem sie Event Hooks abfangen. Module arbeiten, indem bestimmte Seitenanfragen (durch den URL-Pfad) abgefangen werden
+Bitte schau dir das Beispiel-Addon "randplace" für ein funktionierendes Beispiel für manche der hier aufgeführten Funktionen an.
+Das Facebook-Addon bietet ein Beispiel dafür, die "addon"- und "module"-Funktion gemeinsam zu integrieren.
+Addons arbeiten, indem sie Event Hooks abfangen.
+Module arbeiten, indem bestimmte Seitenanfragen (durch den URL-Pfad) abgefangen werden.
-Plugin-Namen können keine Leerstellen oder andere Interpunktionen enthalten und werden als Datei- und Funktionsnamen genutzt.
-Du kannst einen lesbaren Namen im Kommentarblock eintragen.
-Jedes Addon muss beides beinhalten - eine Installations- und eine Deinstallationsfunktion, die auf dem Addon-/Plugin-Namen basieren; z.B. "plugin1name_install()".
-Diese beiden Funktionen haben keine Argumente und sind dafür verantwortlich, Event Hooks zu registrieren und abzumelden (unregistering), die dein Plugin benötigt.
-Die Installations- und Deinstallationsfunktionfunktionen werden auch ausgeführt (z.B. neu installiert), wenn sich das Plugin nach der Installation ändert - somit sollte deine Deinstallationsfunktion keine Daten zerstört und deine Installationsfunktion sollte bestehende Daten berücksichtigen.
+Plugin-Namen können keine Leerstellen oder andere Interpunktionen enthalten und werden als Datei- und Funktionsnamen genutzt.
+Du kannst einen lesbaren Namen im Kommentarblock eintragen.
+Jedes Addon muss beides beinhalten - eine Installations- und eine Deinstallationsfunktion, die auf dem Addon-/Plugin-Namen basieren; z.B. "plugin1name_install()".
+Diese beiden Funktionen haben keine Argumente und sind dafür verantwortlich, Event Hooks zu registrieren und abzumelden (unregistering), die dein Plugin benötigt.
+Die Installations- und Deinstallationsfunktionfunktionen werden auch ausgeführt (z.B. neu installiert), wenn sich das Plugin nach der Installation ändert - somit sollte deine Deinstallationsfunktion keine Daten zerstört und deine Installationsfunktion sollte bestehende Daten berücksichtigen.
Zukünftige Extensions werden möglicherweise "Setup" und "Entfernen" anbieten.
Plugins sollten einen Kommentarblock mit den folgenden vier Parametern enthalten:
- /*
- * Name: My Great Plugin
- * Description: This is what my plugin does. It's really cool
- * Version: 1.0
- * Author: John Q. Public
- */
+ /*
+ * Name: My Great Plugin
+ * Description: This is what my plugin does. It's really cool.
+ * Version: 1.0
+ * Author: John Q. Public
+ */
Registriere deine Plugin-Hooks während der Installation.
@@ -29,45 +30,50 @@ Registriere deine Plugin-Hooks während der Installation.
$hookname ist ein String und entspricht einem bekannten Friendica-Hook.
-$file steht für den Pfadnamen, der relativ zum Top-Level-Friendicaverzeichnis liegt.
+$file steht für den Pfadnamen, der relativ zum Top-Level-Friendicaverzeichnis liegt.
Das *sollte* "addon/plugin_name/plugin_name.php' sein.
$function ist ein String und der Name der Funktion, die ausgeführt wird, wenn der Hook aufgerufen wird.
+Argumente
+---
+
Deine Hook-Callback-Funktion wird mit mindestens einem und bis zu zwei Argumenten aufgerufen
- function myhook_function(&$a, &$b) {
+ function myhook_function(App $a, &$b) {
}
-Wenn du Änderungen an den aufgerufenen Daten vornehmen willst, musst du diese als Referenzvariable (mit "&") während der Funktionsdeklaration deklarieren.
+Wenn du Änderungen an den aufgerufenen Daten vornehmen willst, musst du diese als Referenzvariable (mit "&") während der Funktionsdeklaration deklarieren.
-$a ist die Friendica "App"-Klasse, die eine Menge an Informationen über den aktuellen Friendica-Status beinhaltet, u.a. welche Module genutzt werden, Konfigurationsinformationen, Inhalte der Seite zum Zeitpunkt des Hook-Aufrufs.
-Es ist empfohlen, diese Funktion "$a" zu nennen, um seine Nutzung an den Gebrauch an anderer Stelle anzugleichen.
+$a ist die Friendica "App"-Klasse, die eine Menge an Informationen über den aktuellen Friendica-Status beinhaltet, u.a. welche Module genutzt werden, Konfigurationsinformationen, Inhalte der Seite zum Zeitpunkt des Hook-Aufrufs.
+Es ist empfohlen, diese Funktion "$a" zu nennen, um seine Nutzung an den Gebrauch an anderer Stelle anzugleichen.
-$b kann frei benannt werden.
-Diese Information ist speziell auf den Hook bezogen, der aktuell bearbeitet wird, und beinhaltet normalerweise Daten, die du sofort nutzen, anzeigen oder bearbeiten kannst.
-Achte darauf, diese mit "&" zu deklarieren, wenn du sie bearbeiten willst.
+$b kann frei benannt werden.
+Diese Information ist speziell auf den Hook bezogen, der aktuell bearbeitet wird, und beinhaltet normalerweise Daten, die du sofort nutzen, anzeigen oder bearbeiten kannst.
+Achte darauf, diese mit "&" zu deklarieren, wenn du sie bearbeiten willst.
-**Module**
+Module
+---
-Plugins/Addons können auch als "Module" agieren und alle Seitenanfragen für eine bestimte URL abfangen.
-Um ein Plugin als Modul zu nutzen, ist es nötig, die Funktion "plugin_name_module()" zu definieren, die keine Argumente benötigt und nichts weiter machen muss.
+Plugins/Addons können auch als "Module" agieren und alle Seitenanfragen für eine bestimte URL abfangen.
+Um ein Plugin als Modul zu nutzen, ist es nötig, die Funktion "plugin_name_module()" zu definieren, die keine Argumente benötigt und nichts weiter machen muss.
-Wenn diese Funktion existiert, wirst du nun alle Seitenanfragen für "http://my.web.site/plugin_name" erhalten - mit allen URL-Komponenten als zusätzliche Argumente.
-Diese werden in ein Array $a->argv geparst und stimmen mit $a->argc überein, wobei sie die Anzahl der URL-Komponenten abbilden.
-So würde http://my.web.site/plugin/arg1/arg2 nach einem Modul "plugin" suchen und seiner Modulfunktion die $a-App-Strukur übergeben (dies ist für viele Komponenten verfügbar). Das umfasst:
+Wenn diese Funktion existiert, wirst du nun alle Seitenanfragen für "http://example.com/plugin_name" erhalten - mit allen URL-Komponenten als zusätzliche Argumente.
+Diese werden in ein Array $a->argv geparst und stimmen mit $a->argc überein, wobei sie die Anzahl der URL-Komponenten abbilden.
+So würde http://example.com/plugin/arg1/arg2 nach einem Modul "plugin" suchen und seiner Modulfunktion die $a-App-Strukur übergeben (dies ist für viele Komponenten verfügbar). Das umfasst:
- $a->argc = 3
- $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
+ $a->argc = 3
+ $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
-Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(&$a), welche den Seiteninhalt definiert und zurückgibt.
-Sie können auch plugin_name_post(&$a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
-Du kannst ebenso plugin_name_init(&$a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
+Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(App $a), welche den Seiteninhalt definiert und zurückgibt.
+Sie können auch plugin_name_post(App $a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
+Du kannst ebenso plugin_name_init(App $a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
-**Derzeitige Hooks:**
+Derzeitige Hooks
+---
**'authenticate'** - wird aufgerufen, wenn sich der User einloggt.
$b ist ein Array
@@ -180,6 +186,9 @@ Du kannst ebenso plugin_name_init(&$a) nutzen, was oft frühzeitig aufgerufen wi
- wird aufgerufen nachdem in include/nav,php der Inhalt des Navigations Menüs erzeugt wurde.
- $b ist ein Array, das $nav wiederspiegelt.
+Komplette Liste der Hook-Callbacks
+---
+
Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 14-Feb-2012 generiert): Bitte schau in die Quellcodes für Details zu Hooks, die oben nicht dokumentiert sind.
boot.php: call_hooks('login_hook',$o);
@@ -204,7 +213,7 @@ include/text.php: call_hooks('contact_block_end', $arr);
include/text.php: call_hooks('smilie', $s);
-include/text.php: call_hooks('prepare_body_init', $item);
+include/text.php: call_hooks('prepare_body_init', $item);
include/text.php: call_hooks('prepare_body', $prep_arr);
@@ -302,7 +311,7 @@ mod/photos.php: call_hooks('photo_post_end',intval($item_id));
mod/photos.php: call_hooks('photo_upload_form',$ret);
-mod/friendica.php: call_hooks('about_hook', $o);
+mod/friendica.php: call_hooks('about_hook', $o);
mod/editpost.php: call_hooks('jot_tool', $jotplugins);
@@ -359,4 +368,3 @@ mod/cb.php: call_hooks('cb_afterpost');
mod/cb.php: call_hooks('cb_content', $o);
mod/directory.php: call_hooks('directory_item', $arr);
-
diff --git a/doc/de/SSL.md b/doc/de/SSL.md
index e9deb21b7b..d1929120a4 100644
--- a/doc/de/SSL.md
+++ b/doc/de/SSL.md
@@ -5,7 +5,7 @@ Friendica mit SSL nutzen
Disclaimer
---
-**Dieses Dokument wurde im November 2015 aktualisiert.
+**Dieses Dokument wurde im November 2016 aktualisiert.
SSL-Verschlüsselung ist sicherheitskritisch.
Das bedeutet, dass sich die empfohlenen Einstellungen schnell verändern.
Halte deine Installation auf dem aktuellen Stand und verlasse dich nicht darauf, dass dieses Dokument genau so schnell aktualisiert wird, wie sich Technologien verändern!**
@@ -45,55 +45,15 @@ Sie installieren es für dich oder haben in der Weboberfläche eine einfache Upl
Um Geld zu sparen, kann es sich lohnen, dort auch nachzufragen, ob sie ein anderes Zertifikat, das du selbst beschaffst, für dich installieren würden.
Wenn ja, dann lies weiter.
-Ein kostenloses StartSSL-Zertifikat besorgen
----
-
-StartSSL ist eine Zertifizierungsstelle, die kostenlose Zertifikate ausstellt.
-Sie sind für ein Jahr gültig und genügen für unsere Zwecke.
-
-### Schritt 1: Client-Zertifikat erstellen
-
-Wenn du dich erstmalig bei StartSSL anmeldest, erhältst du ein Zertifikat, das in deinem Browser installiert wird.
-Du brauchst es, um dich bei StartSSL einzuloggen, auch wenn du später wiederkommst.
-Dieses Client-Zertifikat hat nichts mit dem SSL-Zertifikat für deinen Server zu tun.
-
-### Schritt 2: Email-Adresse und Domain validieren
-
-Um fortzufahren musst du beweisen, dass du die Email-Adresse, die du angegeben hast, und die Domain, für die du das Zertifikat möchtest, besitzt.
-Gehe in den "Validation wizard" und fordere einen Bestätigungslink per Mail an.
-Dasselbe machst du auch für die Validierung der Domain.
-
-### Schritt 3: Das Zertifikat bestellen
-
-Gehe in den "Certificate wizard".
-Wähle das Target Webserver.
-Bei der ersten Abfrage der Domain gibst du deine Hauptdomain an.
-Im nächsten Schritt kannst du eine Subdomain hinzufügen.
-Ein Beispiel: Wenn die Adresse der Friendica-Instanz friendica.beispiel.net lautet, gibst du zuerst beispiel.net an und danach friendica.
-
-Wenn du weißt, wie man einen openssl-Schlüssel und einen Certificate Signing Request (CSR) erstellt, tu das.
-Kopiere den CSR in den Browser, um ihn von StartSSL signiert zu bekommen.
-
-Wenn du nicht weißt, wie man Schlüssel und CSR erzeugt, nimm das Angebot von StartSSL an, beides für dich zu generieren.
-Das bedeutet: StartSSL hat den Schlüssel zu deiner SSL-Verschlüsselung, aber das ist immer noch besser als gar kein Zertifikat.
-Lade dein Zertifikat von der Website herunter.
-(Oder im zweiten Fall: Lade Zertifikat und Schlüssel herunter.)
-
-Um dein Zertifikat auf einem Webserver zu installieren, brauchst du noch ein oder zwei andere Dateien: sub.class1.server.ca.pem und ca.pem, auch von StartSSL.
-Gehe in die Rubrik "Tool box" und lade "Class 1 Intermediate Server CA" und "StartCom Root CA (PEM encoded)" herunter.
-
-Wenn du dein Zertifikat zu deinem Hosting-Provider schicken möchtest, brauchen Sie mindestens Zertifikat und Schlüssel.
-Schick zur Sicherheit alle vier Dateien hin.
-**Du solltest sie auf einem verschlüsselten Weg hinschicken!**
-
-Wenn du deinen eigenen Server betreibst, lade die Dateien hoch und besuche das Mozilla-Wiki (Link unten).
Let's encrypt
---
Wenn du einen eigenen Server betreibst und den Nameserver kontrollierst, könnte auch die Initiative "Let's encrypt" interessant für dich werden.
-Momentan ist deren Angebot noch nicht fertig.
-Auf der [Website](https://letsencrypt.org/) kannst du dich über den Stand informieren.
+Sie bietet nicht nur freie SSL Zertifikate sondern auch einen automatisierten Prozess zum Erneuern der Zertifikate.
+Um letsencrypt Zertifikate verwenden zu können, musst du dir einen Client auf deinem Server installieren.
+Eine Anleitung zum offiziellen Client findet du [hier](https://certbot.eff.org/).
+Falls du dir andere Clients anschauen willst, kannst du einen Blick in diese [Liste von alternativen letsencrypt Clients](https://letsencrypt.org/docs/client-options/).
Webserver-Einstellungen
---
diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 988b3657c0..2b7e89a52c 100644
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@@ -1,234 +1,76 @@
-Konfigurationen
-==============
+# Settings
* [Zur Startseite der Hilfe](help)
-Hier findest du einige eingebaute Features, welche kein graphisches Interface haben oder nicht dokumentiert sind.
-Konfigurationseinstellungen sind in der Datei ".htconfig.php" gespeichert.
-Bearbeite diese Datei, indem du sie z.B. mit einem Texteditor öffnest.
-Verschiedene Systemeinstellungen sind bereits in dieser Datei dokumentiert und werden hier nicht weiter erklärt.
+Wenn du der Administrator einer Friendica Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica Instanz konfigurieren kannst,
-**Tastaturbefehle**
+Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst.
+Diese Informationen beinhalten die Anzahl der Nachrichten, die sich aktuell in den Warteschlangen befinden.
+Hierbei ist die erste Zahl die Zahl der Nachrichten die gerade aktiv verteilt werden.
+Diese Zahl sollte sich relativ schnell sinken.
+Die zweite Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
+Die Zustellung wird zu einem späteren Zeitpunkt noch einmal versucht.
+Unter dem Punkt "Warteschlange Inspizieren" kannst du einen schnellen Blick auf die zweite Warteschlange werfen.
+Solltest du für die Hintergrundprozesse die Worker aktiviert haben, wird eine dritte Zahl angezeigt.
+Diese repräsentiert die Anzahl der Aufgaben, die die Worker noch vor sich haben.
+Die Aufgaben der Worker sind priorisiert und werden anhand dieser Prioritäten abgearbeitet.
-Friendica erfasst die folgenden Tastaturbefehle:
+Des weiteren findest du eine Übersicht über die Accounts auf dem Friendica Knoten, die unter dem Punkt "Nutzer" moderiert werden können.
+Sowie eine Liste der derzeit aktivierten Addons.
+Diese Liste ist verlinkt, so dass du schnellen Zugriff auf die Informationsseiten der einzelnen Addons hast.
+Abschließend findest du auf der Startseite des Admin Panels die installierte Version von Friendica.
+Wenn du in Kontakt mit den Entwicklern trittst und Probleme oder Fehler zu schildern, gib diese Version bitte immer mit an.
-* [Pause] - Pausiert die Update-Aktivität via "Ajax". Das ist ein Prozess, der Updates durchführt, ohne die Seite neu zu laden. Du kannst diesen Prozess pausieren, um deine Netzwerkauslastung zu reduzieren und/oder um es in der Javascript-Programmierung zum Debuggen zu nutzen. Ein Pausenzeichen erscheint unten links im Fenster. Klicke die [Pause]-Taste ein weiteres Mal, um die Pause zu beenden.
+Die Unterabschnitte des Admin Panels kannst du in der Seitenleiste auswählen.
-* [F8] - Zeigt eine Sprachauswahl an
+## Seite
+In diesem Bereich des Admin Panels findest du die Hauptkonfiguration deiner Friendica Instanz.
+Er ist in mehrere Unterabschnitte aufgeteilt, wobei die Grundeinstellungen oben auf der Seite zu finden sind.
-**Geburtstagsbenachrichtigung**
+Da die meisten Konfigurationsoptionen einen Hilfstext im Admin Panel haben, kann und will dieser Artikel nicht alle Einstellungen abdecken.
-Geburtstage erscheinen auf deiner Startseite für alle Freunde, die in den nächsten 6 Tagen Geburtstag haben.
-Um deinen Geburtstag für alle sichtbar zu machen, musst du deinen Geburtstag (zumindest Tag und Monat) in dein Standardprofil eintragen.
-Es ist nicht notwendig, das Jahr einzutragen.
+### Grundeinstellungen
-**Konfigurationseinstellungen**
-
-
-**Sprache**
-
-Systemeinstellung
-
-Bitte schau dir die Datei util/README an, um Informationen zur Erstellung einer Übersetzung zu erhalten.
-
-Konfiguriere:
-```
-$a->config['system']['language'] = 'name';
-```
-
-
-**System-Thema (Design)**
-
-Systemeinstellung
-
-Wähle ein Thema als Standardsystemdesign (welches vom Nutzer überschrieben werden kann). Das Standarddesign ist "default".
-
-Konfiguriere:
-```
-$a->config['system']['theme'] = 'theme-name';
-```
-
-
-**Verifiziere SSL-Zertifikate**
-
-Sicherheitseinstellungen
-
-Standardmäßig erlaubt Friendica SSL-Kommunikation von Seiten, die "selbstunterzeichnete" SSL-Zertifikate nutzen.
-Um eine weitreichende Kompatibilität mit anderen Netzwerken und Browsern zu gewährleisten, empfehlen wir, selbstunterzeichnete Zertifikate **nicht** zu nutzen.
-Aber wir halten dich nicht davon ab, solche zu nutzen. SSL verschlüsselt alle Daten zwischen den Webseiten (und für deinen Browser), was dir eine komplett verschlüsselte Kommunikation erlaubt.
-Auch schützt es deine Login-Daten vor Datendiebstahl. Selbstunterzeichnete Zertifikate können kostenlos erstellt werden.
-Diese Zertifikate können allerdings Opfer eines sogenannten ["man-in-the-middle"-Angriffs](http://de.wikipedia.org/wiki/Man-in-the-middle-Angriff) werden, und sind daher weniger bevorzugt.
-Wenn du es wünscht, kannst du eine strikte Zertifikatabfrage einstellen.
-Das führt dazu, dass du keinerlei Verbindung zu einer selbstunterzeichneten SSL-Seite erstellen kannst
-
-Konfiguriere:
-```
-$a->config['system']['verifyssl'] = true;
-```
-
-
-**Erlaubte Freunde-Domains**
-
-Kooperationen/Gemeinschaften/Bildung Erweiterung
-
-Kommagetrennte Liste von Domains, welche eine Freundschaft mit dieser Seite eingehen dürfen.
-Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Domains erlaubt.
-
-Konfiguriere:
-```
-$a->config['system']['allowed_sites'] = "sitea.com, *siteb.com";
-```
-
-
-**Erlaubte Email-Domains**
-
-Kooperationen/Gemeinschaften/Bildung Erweiterung
-
-Kommagetrennte Liste von Domains, welche bei der Registrierung als Part der Email-Adresse erlaubt sind.
-Das grenzt Leute aus, die nicht Teil der Gruppe oder Organisation sind.
-Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Email-Adressen erlaubt.
-
-Konfiguriere:
-```
-$a->config['system']['allowed_email'] = "sitea.com, *siteb.com";
-```
-
-**Öffentlichkeit blockieren**
-
-Kooperationen/Gemeinschaften/Bildung Erweiterung
-
-Setze diese Einstellung auf "true" und sperre den öffentlichen Zugriff auf alle Seiten, solange man nicht eingeloggt ist.
-Das blockiert die Ansicht von Profilen, Freunden, Fotos, vom Verzeichnis und den Suchseiten.
-Ein Nebeneffekt ist, dass Einträge dieser Seite nicht im globalen Verzeichnis erscheinen.
-Wir empfehlen, speziell diese Einstellung auszuschalten (die Einstellung ist an anderer Stelle auf dieser Seite erklärt).
-Beachte: das ist speziell für Seiten, die beabsichtigen, von anderen Friendica-Netzwerken abgeschottet zu sein.
-Unautorisierte Personen haben ebenfalls nicht die Möglichkeit, Freundschaftsanfragen von Seitennutzern zu beantworten.
-Die Standardeinstellung steht auf "false".
-Verfügbar in Version 2.2 und höher.
-
-Konfiguriere:
-```
-$a->config['system']['block_public'] = true;
-```
-
-
-**Veröffentlichung erzwingen**
-
-Kooperationen/Gemeinschaften/Bildung Erweiterung
-
-Standardmäßig können Nutzer selbst auswählen, ob ihr Profil im Seitenverzeichnis erscheint.
-Diese Einstellung zwingt alle Nutzer dazu, im Verzeichnis zu erscheinen.
-Diese Einstellung kann vom Nutzer nicht deaktiviert werden. Die Standardeinstellung steht auf "false".
-
-Konfiguriere:
-```
-$a->config['system']['publish_all'] = true;
-```
-
-
-**Globales Verzeichnis**
-
-Kooperationen/Gemeinschaften/Bildung Erweiterung
-
-Mit diesem Befehl wird die URL eingestellt, die zum Update des globalen Verzeichnisses genutzt wird.
-Dieser Befehl ist in der Standardkonfiguration enthalten.
-Der nichtdokumentierte Teil dieser Einstellung ist, dass das globale Verzeichnis gar nicht verfügbar ist, wenn diese Einstellung nicht gesetzt wird.
-Dies erlaubt eine private Kommunikation, die komplett vom globalen Verzeichnis isoliert ist.
-
-Konfiguriere:
-```
-$a->config['system']['directory'] = 'http://dir.friendi.ca';
-```
-
-
-**Proxy Konfigurationseinstellung**
-
-Wenn deine Seite eine Proxy-Einstellung nutzt, musst du diese Einstellungen vornehmen, um mit anderen Seiten im Internet zu kommunizieren.
-
-Konfiguriere:
-```
-$a->config['system']['proxy'] = "http://proxyserver.domain:port";
-$a->config['system']['proxyuser'] = "username:password";
-```
-
-
-**Netzwerk-Timeout**
-
-Legt fest, wie lange das Netzwerk warten soll, bevor ein Timeout eintritt.
-Der Wert wird in Sekunden angegeben. Standardmäßig ist 60 eingestellt; 0 steht für "unbegrenzt" (nicht empfohlen).
-
-Konfiguriere:
-
-```
-$a->config['system']['curl_timeout'] = 60;
-```
-
-
-**Banner/Logo**
+#### Banner/Logo
Hiermit legst du das Banner der Seite fest. Standardmäßig ist das Friendica-Logo und der Name festgelegt.
Du kannst hierfür HTML/CSS nutzen, um den Inhalt zu gestalten und/oder die Position zu ändern, wenn es nicht bereits voreingestellt ist.
-Konfiguriere:
+#### Systensprache
-```
-$a->config['system']['banner'] = 'Meine tolle Webseite';
-```
+Diese Einstellung legt die Standardsprache der Instanz fest.
+Sie wird verwendet, wenn es Friendica nicht gelingt die Spracheinstellungen des Besuchers zu erkennen oder diese nicht unterstützt wird.
+Nutzer können diese Auswahl in den Einstellungen des Benutzerkontos überschreiben.
+Die Friendica Gemeinschaft bietet einige Übersetzungen an, von denen einige mehr andere weniger komplett sind.
+Mehr Informationen zum Übersetzungsprozess von Friendica findest du [auf dieser Seite](/help/translations) der Dokumentation.
-**Maximale Bildgröße**
+#### Systemweites Theme
-Maximale Bild-Dateigröße in Byte. Standardmäßig ist 0 gesetzt, was bedeutet, dass kein Limit gesetzt ist.
+Hier kann das Theme bestimmt werden, welches standardmäßig zum Anzeigen der Seite verwendet werden soll.
+Nutzer können in ihren Einstellungen andere Themes wählen.
+Derzeit ist das "duepunto zero" Theme das vorausgewählte Theme.
-Konfiguriere:
+Für mobile Geräte kannst du ein spezielles Theme wählen, wenn das Standardtheme ungeeignet für mobile Geräte sein sollte.
+Das `vier` Theme z.B. unterstützt kleine Anzeigen und benötigt kein zusätzliches mobiles Theme.
-```
-$a->config['system']['maximagesize'] = 1000000;
-```
+### Registrierung
-
-**UTF-8 Reguläre Ausdrücke**
-
-Während der Registrierung werden die Namen daraufhin geprüft, ob sie reguläre UTF-8-Ausdrücke nutzen.
-Hierfür wird PHP benötigt, um mit einer speziellen Einstellung kompiliert zu werden, die UTF-8-Ausdrücke benutzt.
-Wenn du absolut keine Möglichkeit hast, Accounts zu registrieren, setze den Wert von "no_utf" auf "true".
-Standardmäßig ist "false" eingestellt (das bedeutet, dass UTF-8-Ausdrücke unterstützt werden und funktionieren).
-
-Konfiguriere:
-
-```
-$a->config['system']['no_utf'] = true;
-```
-
-
-**Prüfe vollständigen Namen**
+#### Namen auf Vollständigkeit überprüfen
Es kann vorkommen, dass viele Spammer versuchen, sich auf deiner Seite zu registrieren.
In Testphasen haben wir festgestellt, dass diese automatischen Registrierungen das Feld "Vollständiger Name" oft nur mit Namen ausfüllen, die kein Leerzeichen beinhalten.
Wenn du Leuten erlauben willst, sich nur mit einem Namen anzumelden, dann setze die Einstellung auf "true".
Die Standardeinstellung ist auf "false" gesetzt.
-
-Konfiguriere:
-
-```
-$a->config['system']['no_regfullname'] = true;
-```
-
-
-**OpenID**
+
+#### OpenID Unterstützung
Standardmäßig wird OpenID für die Registrierung und für Logins genutzt.
Wenn du nicht willst, dass OpenID-Strukturen für dein System übernommen werden, dann setze "no_openid" auf "true".
Standardmäßig ist hier "false" gesetzt.
-Konfiguriere:
-```
-$a->config['system']['no_openid'] = true;
-```
-
-
-**Multiple Registrierungen**
+#### Unterbinde Mehrfachregistrierung
Um mehrfache Seiten zu erstellen, muss sich eine Person mehrfach registrieren können.
Deine Seiteneinstellung kann Registrierungen komplett blockieren oder an Bedingungen knüpfen.
@@ -237,42 +79,246 @@ Hier ist weiterhin eine Bestätigung notwendig, wenn "REGISTER_APPROVE" ausgewä
Wenn du die Erstellung weiterer Accounts blockieren willst, dann setze die Einstellung "block_extended_register" auf "true".
Standardmäßig ist hier "false" gesetzt.
-Konfiguriere:
-```
-$a->config['system']['block_extended_register'] = true;
-```
+### Datei hochladen
+#### Maximale Bildgröße
-**Entwicklereinstellungen**
+Maximale Bild-Dateigröße in Byte. Standardmäßig ist 0 gesetzt, was bedeutet, dass kein Limit gesetzt ist.
-Diese sind am nützlichsten, um Protokollprozesse zu debuggen oder andere Kommunikationsfehler einzugrenzen.
+### Regeln
-Konfiguriere:
-```
-$a->config['system']['debugging'] = true;
-$a->config['system']['logfile'] = 'logfile.out';
-$a->config['system']['loglevel'] = LOGGER_DEBUG;
-```
-Erstellt detaillierte Debugging-Logfiles, die in der Datei "logfile.out" gespeichert werden (Datei muss auf dem Server mit Schreibrechten versehen sein). "LOGGER_DEBUG" zeigt eine Menge an Systeminformationen, enthält aber keine detaillierten Daten.
-Du kannst ebenfalls "LOGGER_ALL" auswählen, allerdings empfehlen wir dieses nur, wenn ein spezifisches Problem eingegrenzt werden soll.
-Andere Log-Level sind möglich, werden aber derzeit noch nicht genutzt.
+#### URL des weltweiten Verzeichnisses
+Mit diesem Befehl wird die URL eingestellt, die zum Update des globalen Verzeichnisses genutzt wird.
+Dieser Befehl ist in der Standardkonfiguration enthalten.
+Der nicht dokumentierte Teil dieser Einstellung ist, dass das globale Verzeichnis gar nicht verfügbar ist, wenn diese Einstellung nicht gesetzt wird.
+Dies erlaubt eine private Kommunikation, die komplett vom globalen Verzeichnis isoliert ist.
-**PHP-Fehler-Logging**
+#### Erzwinge Veröffentlichung
-Nutze die folgenden Einstellungen, um PHP-Fehler direkt in einer Datei zu erfassen.
+Standardmäßig können Nutzer selbst auswählen, ob ihr Profil im Seitenverzeichnis erscheint.
+Diese Einstellung zwingt alle Nutzer dazu, im Verzeichnis zu erscheinen.
+Diese Einstellung kann vom Nutzer nicht deaktiviert werden. Die Standardeinstellung steht auf "false".
-Konfiguriere:
-```
-error_reporting(E_ERROR | E_WARNING | E_PARSE );
-ini_set('error_log','php.out');
-ini_set('log_errors','1');
-ini_set('display_errors', '0');
-```
+#### Öffentlichen Zugriff blockieren
-Diese Befehle erfassen alle PHP-Fehler in der Datei "php.out" (Datei muss auf dem Server mit Schreibrechten versehen sein).
-Nicht deklarierte Variablen werden manchmal mit einem Verweis versehen, weshalb wir empfehlen, "E_NOTICE" und "E_ALL" nicht zu nutzen.
-Die Menge an Fehlern, die auf diesem Level gemeldet werden, ist komplett harmlos.
-Bitte informiere die Entwickler über alle Fehler, die du in deinen Log-Dateien mit den oben genannten Einstellungen erhältst.
-Sie weisen generell auf Fehler in, die bearbeitet werden müssen.
-Wenn du eine leere (weiße) Seite erhältst, schau in die PHP-Log-Datei - dies deutet fast immer darauf hin, dass ein Fehler aufgetreten ist.
+Aktiviere diese Einstellung um den öffentlichen Zugriff auf alle Seiten zu sperren, solange man nicht eingeloggt ist.
+Das blockiert die Ansicht von Profilen, Freunden, Fotos, vom Verzeichnis und den Suchseiten.
+Ein Nebeneffekt ist, dass Einträge dieser Seite nicht im globalen Verzeichnis erscheinen.
+Wir empfehlen, speziell diese Einstellung auszuschalten (die Einstellung ist an anderer Stelle auf dieser Seite erklärt).
+Beachte: das ist speziell für Seiten, die beabsichtigen, von anderen Friendica-Netzwerken abgeschottet zu sein.
+Unautorisierte Personen haben ebenfalls nicht die Möglichkeit, Freundschaftsanfragen von Seitennutzern zu beantworten.
+Die Standardeinstellung ist deaktiviert.
+Verfügbar in Version 2.2 und höher.
+
+#### Erlaubte Domains für Kontakte
+
+Kommagetrennte Liste von Domains, welche eine Freundschaft mit dieser Seite eingehen dürfen.
+Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Domains erlaubt.
+
+Mit dieser Option kann man einfach geschlossene Netzwerke, z.B. im schulischen Bereich aufbauen, aus denen nicht mit dem Rest des Netzwerks kommuniziert werden soll.
+
+#### Erlaubte Domains für E-Mails
+
+Kommagetrennte Liste von Domains, welche bei der Registrierung als Part der Email-Adresse erlaubt sind.
+Das grenzt Leute aus, die nicht Teil der Gruppe oder Organisation sind.
+Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Email-Adressen erlaubt.
+
+#### Nutzern erlauben das remote_self Flag zu setzen
+
+Webb du die Option `Nutzern erlauben das remote_self Flag zu setzen` aktivierst, können alle Nutzer Atom Feeds in den erweiterten Einstellungen des Kontakts als "Entferntes Konto" markieren.
+Dadurch werden automatisch alle Beiträge dieser Feeds für diesen Nutzer gespiegelt und an die Kontakte bei Friendica verteilt.
+
+Als Administrator der Friendica Instanz kannst du diese Einstellungen ansonsten nur direkt in der Datenbank vornehmen.
+Bevor du das tust solltest du sicherstellen, dass du ein Backup der Datenbank hast und genau weißt was die Änderungen an der Datenbank bewirken, die du vornehmen willst.
+
+### Erweitert
+
+#### Proxy Einstellungen
+
+Wenn deine Seite eine Proxy-Einstellung nutzt, musst du diese Einstellungen vornehmen, um mit anderen Seiten im Internet zu kommunizieren.
+
+#### Netzwerk Wartezeit
+
+Legt fest, wie lange das Netzwerk warten soll, bevor ein Timeout eintritt.
+Der Wert wird in Sekunden angegeben. Standardmäßig ist 60 eingestellt; 0 steht für "unbegrenzt" (nicht empfohlen).
+
+#### UTF-8 Reguläre Ausdrücke
+
+Während der Registrierung werden die Namen daraufhin geprüft, ob sie reguläre UTF-8-Ausdrücke nutzen.
+Hierfür wird PHP benötigt, um mit einer speziellen Einstellung kompiliert zu werden, die UTF-8-Ausdrücke benutzt.
+Wenn du absolut keine Möglichkeit hast, Accounts zu registrieren, setze diesen Wert auf ja.
+
+#### SSL Überprüfen
+
+Standardmäßig erlaubt Friendica SSL-Kommunikation von Seiten, die "selbst unterzeichnete" SSL-Zertifikate nutzen.
+Um eine weitreichende Kompatibilität mit anderen Netzwerken und Browsern zu gewährleisten, empfehlen wir, selbst unterzeichnete Zertifikate **nicht** zu nutzen.
+Aber wir halten dich nicht davon ab, solche zu nutzen. SSL verschlüsselt alle Daten zwischen den Webseiten (und für deinen Browser), was dir eine komplett verschlüsselte Kommunikation erlaubt.
+Auch schützt es deine Login-Daten vor Datendiebstahl. Selbst unterzeichnete Zertifikate können kostenlos erstellt werden.
+Diese Zertifikate können allerdings Opfer eines sogenannten ["man-in-the-middle"-Angriffs](http://de.wikipedia.org/wiki/Man-in-the-middle-Angriff) werden, und sind daher weniger bevorzugt.
+Wenn du es wünscht, kannst du eine strikte Zertifikatabfrage einstellen.
+Das führt dazu, dass du keinerlei Verbindung zu einer selbst unterzeichneten SSL-Seite erstellen kannst
+
+### Automatisch ein Kontaktverzeichnis erstellen
+
+### Performance
+
+### Worker
+
+### Umsiedeln
+
+## Nutzer
+
+In diesem Abschnitt des Admin Panels kannst du die Nutzer deiner Friendica Instanz moderieren.
+
+Solltest du für **Registrierungsmethode** die Einstellung "Bedarf Zustimmung" gewählt haben, werden hier zu Beginn der Seite neue Registrationen aufgelistet.
+Als Administrator kannst du hier die Registration akzeptieren oder ablehnen.
+
+Unter dem Abschnitt mit den Registrationen werden die aktuell auf der Instanz registrierten Nutzer aufgelistet.
+Die Liste kann nach Namen, E-Mail Adresse, Datum der Registration, der letzten Anmeldung oder dem letzten Beitrag und dem Account Typ sortiert werden.
+An dieser Stelle kannst du existierende Accounts vom Zugriff auf die Instanz blockieren, sie wieder frei geben oder Accounts endgültig löschen.
+
+Im letzten Bereich auf der Seite kannst du als Administrator neue Accounts anlegen.
+Das Passwort für so eingerichtete Accounts werden per E-Mail an die Nutzer geschickt.
+
+## Plugins
+
+Dieser Bereich des Admin Panels dient der Auswahl und Konfiguration der Erweiterungen von Friendica.
+Sie müssen in das `/addon` Verzeichnis kopiert werden.
+Auf der Seite wird eine Liste der verfügbaren Erweiterungen angezeigt.
+Neben den Namen der Erweiterungen wird ein Indikator angezeigt, der anzeigt ob das Addon gerade aktiviert ist oder nicht.
+
+Wenn du die Erweiterungen aktualisiert die du auf deiner Friendica Instanz nutzt könnte es sein, dass sie neu geladen werden müssen, damit die Änderungen aktiviert werden.
+Um diesen Prozess zu vereinfachen gibt es am Anfang der Seite einen Button um alle aktiven Plugins neu zu laden.
+
+## Themen
+
+Der Bereich zur Kontrolle der auf der Friendica Instanz verfügbaren Themen funktioniert analog zum Plugins Bereich.
+Jedes Theme hat eine extra Seite auf der der aktuelle Status, ein Bildschirmfoto des Themes, zusätzliche Informationen und eventuelle Einstellungen des Themes zu finden sind.
+Genau wie Erweiterungen können Themes in der Übersichtsliste oder der Theme-Seite aktiviert bzw. deaktiviert werden.
+Um ein Standardtheme für die Instanz zu wählen, benutze bitte die *Seiten* Bereich des Admin Panels.
+
+## Zusätzliche Features
+
+Es gibt einige optionale Features in Friendica, die Nutzer benutzen können oder halt nicht.
+Zum Beispiel den *dislike* Button oder den *Webeditor* beim Erstellen von neuen Beiträgen.
+In diesem Bereich des Admin Panels kannst du die Grundeinstellungen für diese Features festlegen und gegebenenfalls die Entscheidung treffen, dass Nutzer deiner Instanz diese auch nicht mehr ändern können.
+
+## DB Updates
+
+Wenn sich die Datenbankstruktur Friendicas ändert werden die Änderungen automatisch angewandt.
+Solltest du den Verdacht haben, das eine Aktualisierung fehlgeschlagen ist, kannst du in diesem Bereich des Admin Panels den Status der Aktualisierungen überprüfen.
+
+## Warteschlange Inspizieren
+
+Auf der Eingangsseite des Admin Panels werden zwei Zahlen fpr die Warteschlangen angegeben.
+Die zweite Zahl steht für die Beiträge, die initial nicht zugestellt werden konnten und später nochmal zugestellt werden sollen.
+Sollte diese Zahl durch die Decke brechen, solltest du nachsehen an welchen Kontakt die Zustellung der Beiträge nicht funktioniert.
+
+Unter dem Menüpunkt "Warteschlange Inspizieren" findest du eine Liste dieser nicht zustellbaren Beiträge.
+Diese Liste ist nach dem Empfänger sortiert.
+Die Kommunikation zu dem Empfänger kann aus unterschiedlichen Gründen gestört sein.
+Der andere Server könnte offline sein, oder gerade einfach nur eine hohe Systemlast aufweisen.
+
+Aber keine Panik!
+Friendica wird die Beiträge nicht für alle Zeiten in der Warteschlange behalten.
+Nach einiger Zeit werden Knoten als inaktiv identifiziert und Nachrichten an Nutzer dieser Knoten aus der Warteschlange gelöscht.
+
+## Federation Statistik
+
+Deine Instanz ist ein Teil eines Netzwerks von Servern dezentraler sozialer Netzwerke, der sogenannten **Federation**.
+In diesem Bereich des Admin Panels findest du ein paar Zahlen zu dem Teil der Federation, die deine Instanz kennt.
+
+## Plugin Features
+
+Einige der Erweiterungen von Friendica benötigen global gültige Einstellungen, die der Administrator vornehmen muss.
+Diese Erweiterungen sind hier aufgelistet, damit du die Einstellungen schneller findest.
+
+## Protokolle
+
+Dieser Bereich des Admin Panels ist auf zwei Seiten verteilt.
+Die eine Seite dient der Konfiguration, die andere dem Anzeigen der Logs.
+
+Du solltest die Logdatei nicht in einem Verzeichnis anlegen, auf das man vom Internet aus zugreifen kann.
+Wenn du das dennoch tun musste und die Standardeinstellungen des Apache Servers verwendest, dann solltest du darauf achten, dass die Logdateien mit der Endung `.log` oder `.out` enden.
+Solltest du einen anderen Webserver verwenden, solltest du sicherstellen, dass der Zugrif zu Dateien mit diesen Endungen nicht möglich ist.
+
+Es gibt fünf Level der Ausführlichkeit mit denen Friendica arbeitet: Normal, Trace, Debug, Data und All.
+Normalerweise solltest du für den Betrieb deiner Friendica Instanz keine Logs benötigen.
+Wenn du versuchst einem Problem auf den Grund zu gehen, solltest du das "DEBUG" Level wählen.
+Mit dem "All" Level schreibt Friendica alles in die Logdatei.
+Die Datenmenge der geloggten Daten kann relativ schnell anwachsen, deshalb empfehlen wir das Anlegen von Protokollen nur zu aktivieren wenn es unbedingt nötig ist.
+
+**Die Größe der Logdateien kann schnell anwachsen**.
+Du solltest deshalb einen Dienst zur [log rotation](https://en.wikipedia.org/wiki/Log_rotation) einrichten.
+
+**Bekannte Probleme**: Der Dateiname `friendica.log` kann bei speziellen Server Konfigurationen zu Problemen führen (siehe [issue 2209](https://github.com/friendica/friendica/issues/2209)).
+
+Normalerweise werden Fehler- und Warnmeldungen von PHP unterdrückt.
+Wenn du sie aktivieren willst, musst du folgendes in der `.htconfig.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
+
+ error_reporting(E_ERROR | E_WARNING | E_PARSE );
+ ini_set('error_log','php.out');
+ ini_set('log_errors','1');
+ ini_set('display_errors', '0');
+
+Die Datei `php.out` muss vom Webserver schreibbar sein und sollte ebenfalls außerhalb der Webverzeichnisse liegen.
+Es kommt gelegentlich vor, dass nicht deklarierte Variablen referenziert werden, dehalb raten wir davon ab `E_NOTICE` oder `E_ALL` zu verwenden.
+Die überwiegende Mehrzahl der auf diesen Stufen dokumentierten Fehler sind absolut harmlos.
+Solltest du mit den oben empfohlenen Einstellungen Fehler finden, teile sie bitte den Entwicklern mit.
+Im Allgemeinen sind dies Fehler, die behoben werden sollten.
+
+Solltest du eine leere (weiße) Seite vorfinden, während du Friendica nutzt, werfe bitte einen Blick in die PHP Logs.
+Solche *White Screens* sind so gut wie immer ein Zeichen dafür, dass ein Fehler aufgetreten ist.
+
+## Diagnose
+
+In diesem Bereich des Admin Panels findest du zwei Werkzeuge mit der du untersuchen kannst, wie Friendica bestimmte Ressourcen einschätzt.
+Diese Werkzeuge sind insbesondere bei der Analyse von Kommunikationsproblemen hilfreich.
+
+"Adresse untersuchen" zeigt Informationen zu einer URL an, wie Friendica sie wahrnimmt.
+
+Mit dem zweiten Werkzeug "Webfinger überprüfen" kannst du Informationen zu einem Ding anfordern, das über einen Webfinger ( jemand@example.com ) identifiziert wird.
+
+# Die Ausnahmen der Regel
+
+Für die oben genannte Regel gibt es vier Ausnahmen, deren Konfiguration nicht über das Admin Panel vorgenommen werden kann.
+Dies sind die Datenbank Einstellungen, die Administrator Accounts, der PHP Pfad und die Konfiguration einer eventuellen Installation in ein Unterverzeichnis unterhalb der Hauptdomain.
+
+## Datenbank Einstellungen
+
+Mit den folgenden Einstellungen kannst du die Zugriffsdaten für den Datenbank Server festlegen.
+
+ $db_host = 'your.db.host';
+ $db_user = 'db_username';
+ $db_pass = 'db_password';
+ $db_data = 'database_name';
+
+## Administratoren
+
+Du kannst einen, oder mehrere Accounts, zu Administratoren machen.
+Normalerweise trifft dies auf den ersten Account zu, der nach der Installation angelegt wird.
+Die Liste der E-Mail Adressen kann aber einfach erweitert werden.
+Mit keiner der angegebenen E-Mail Adressen können weitere Accounts registriert werden.
+
+ $a->config['admin_email'] = 'you@example.com, buddy@example.com';
+
+## PHP Pfad
+
+Einige Prozesse von Friendica laufen im Hintergrund.
+Für diese Prozesse muss der Pfad zu der PHP Version gesetzt sein, die verwendet werden soll.
+
+ $a->config['php_path'] = '/pfad/zur/php-version';
+
+## Unterverzeichnis Konfiguration
+
+Man kann Friendica in ein Unterverzeichnis des Webservers installieren.
+Wir raten allerdings dringen davon ab, da es die Interoperabilität mit anderen Netzwerken (z.B. Diaspora, GNU Social, Hubzilla) verhindert.
+Mal angenommen, du hast ein Unterverzeichnis tests und willst Friendica in ein weiteres Unterverzeichnis installieren, dann lautet die Konfiguration hierfür:
+
+ $a->path = 'tests/friendica';
+
+## Weitere Ausnahmen
+
+Es gibt noch einige experimentelle Einstellungen, die nur in der ``.htconfig.php`` Datei konfiguriert werden können.
+Im [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können (EN)](help/htconfig) Artikel kannst du mehr darüber erfahren.
diff --git a/doc/de/Text_editor.md b/doc/de/Text_editor.md
index 0d9fbb5c74..33fc104dff 100644
--- a/doc/de/Text_editor.md
+++ b/doc/de/Text_editor.md
@@ -52,6 +52,8 @@ Cleanzero (inkl. smoothly, testbubble)
+Frio
+
Frost
Vier (inkl. dispy)
diff --git a/doc/htconfig.md b/doc/htconfig.md
index 4764c287c8..a7dd59d1f5 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -1,100 +1,115 @@
Config values that can only be set in .htconfig.php
===================================================
-There are some config values that haven't found their way into the administration page. This has several reasons. Maybe they are part of a
-current development that isn't considered stable and will be added later in the administration page when it is considered safe. Or it triggers
-something that isn't expected to be of public interest. Or it is for testing purposes only.
+* [Home](help)
-**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger. Especially don't do that with
-undocumented values.
+There are some config values that haven't found their way into the administration page.
+This has several reasons.
+Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe.
+Or it triggers something that isn't expected to be of public interest. Or it is for testing purposes only.
-The header of the section describes the category, the value is the parameter. Example: To set the directory value please add this
-line to your .htconfig.php:
+**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger.
+Especially don't do that with undocumented values.
+
+The header of the section describes the category, the value is the parameter.
+Example: To set the directory value please add this line to your .htconfig.php:
$a->config['system']['directory'] = 'http://dir.friendi.ca';
+## jabber ##
+* **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
+* **logfile** - Logfile for the jabber account synchronisation.
+## system ##
-## Jabber ##
-* debug (Boolean) - Enable debug level for the jabber account synchronisation.
-* logfile - Logfile for the jabber account synchronisation.
-
-## System ##
-
-* birthday_input_format - Default value is "ymd".
-* block_local_dir (Boolean) - Blocks the access to the directory of the local users.
-* default_service_class -
-* delivery_batch_count - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
-* diaspora_test (Boolean) - For development only. Disables the message transfer.
-* directory - The path to global directory. If not set then "http://dir.friendi.ca" is used.
-* disable_email_validation (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
-* disable_url_validation (Boolean) - Disables the DNS lookup of an URL.
-* event_input_format - Default value is "ymd".
-* ignore_cache (Boolean) - For development only. Disables the item cache.
-* like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked.
-* local_block (Boolean) - Used in conjunction with "block_public".
-* local_search (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
-* max_contact_queue - Default value is 500.
-* max_batch_queue - Default value is 1000.
-* no_oembed (Boolean) - Don't use OEmbed to fetch more information about a link.
-* no_oembed_rich_content (Boolean) - Don't show the rich content (e.g. embedded PDF).
-* no_smilies (Boolean) - Don't show smilies.
-* no_view_full_size (Boolean) - Don't add the link "View full size" under a resized image.
-* optimize_items (Boolean) - Triggers an SQL command to optimize the item table before expiring items.
-* ostatus_poll_timeframe - Defines how old an item can be to try to complete the conversation with it.
-* paranoia (Boolean) - Log out users if their IP address changed.
-* permit_crawling (Boolean) - Restricts the search for not logged in users to one search per minute.
-* free_crawls - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
-* crawl_permit_period - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
-* png_quality - Default value is 8.
-* proc_windows (Boolean) - Should be enabled if Friendica is running under Windows.
-* proxy_cache_time - Time after which the cache is cleared. Default value is one day.
-* pushpoll_frequency -
-* qsearch_limit - Default value is 100.
-* relay_server - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
-* relay_subscribe (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
-* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts witt selected tags should be received.
-* relay_server_tags - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
-* relay_user_tags (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
-* remove_multiplicated_lines (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
-* show_unsupported_addons (Boolean) - Show all addons including the unsupported ones.
-* show_unsupported_themes (Boolean) - Show all themes including the unsupported ones.
-* throttle_limit_day - Maximum number of posts that a user can send per day with the API.
-* throttle_limit_week - Maximum number of posts that a user can send per week with the API.
-* throttle_limit_month - Maximum number of posts that a user can send per month with the API.
-* wall-to-wall_share (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
-* worker (Boolean) - (Experimental) Use the worker system instead of calling several background processes. Reduces the overall load and speeds up item delivery.
-* worker_dont_fork (Boolean) - if enabled, the workers are only called from the poller process. Useful on systems that permit the use of "proc_open".
-* worker_queues - Number of parallel workers. Default value is 10 queues.
-* xrd_timeout - Timeout for fetching the XRD links. Default value is 20 seconds.
+* **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
+* **birthday_input_format** - Default value is "ymd".
+* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
+* **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
+* **db_log** - Name of a logfile to log slow database queries
+* **db_loglimit** - If a database call lasts longer than this value it is logged
+* **db_log_index** - Name of a logfile to log queries with bad indexes
+* **db_log_index_watch** - Watchlist of indexes to watch
+* **db_loglimit_index** - Number of index rows needed to be logged for indexes on the watchlist
+* **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
+* **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
+* **dbclean** (Boolean) - Enable the automatic database cleanup process
+* **default_service_class** -
+* **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
+* **diaspora_test** (Boolean) - For development only. Disables the message transfer.
+* **directory** - The path to global directory. If not set then "http://dir.friendi.ca" is used.
+* **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
+* **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
+* **event_input_format** - Default value is "ymd".
+* **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
+* **ignore_cache** (Boolean) - For development only. Disables the item cache.
+* **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked.
+* **local_block** (Boolean) - Used in conjunction with "block_public".
+* **local_search** (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
+* **max_connections** - The poller process isn't started when the maximum level of the possible database connections are used. When the system can't detect the maximum numbers of connection then this value can be used.
+* **max_connections_level** - The maximum level of connections that are allowed to let the poller start. It is a percentage value. Default value is 75.
+* **max_contact_queue** - Default value is 500.
+* **max_batch_queue** - Default value is 1000.
+* **max_processes_backend** - Maximum number of concurrent database processes for background tasks. Default value is 5.
+* **max_processes_frontend** - Maximum number of concurrent database processes for foreground tasks. Default value is 20.
+* **memcache** (Boolean) - Use memcache. To use memcache the PECL extension "memcache" has to be installed and activated.
+* **memcache_host** - Hostname of the memcache daemon. Default is '127.0.0.1'.
+* **memcache_port** - Portnumber of the memcache daemon. Default is 11211.
+* **no_count** (Boolean) - Don't do count calculations (currently only when showing albums)
+* **no_oembed** (Boolean) - Don't use OEmbed to fetch more information about a link.
+* **no_oembed_rich_content** (Boolean) - Don't show the rich content (e.g. embedded PDF).
+* **no_smilies** (Boolean) - Don't show smilies.
+* **no_view_full_size** (Boolean) - Don't add the link "View full size" under a resized image.
+* **optimize_items** (Boolean) - Triggers an SQL command to optimize the item table before expiring items.
+* **ostatus_poll_timeframe** - Defines how old an item can be to try to complete the conversation with it.
+* **paranoia** (Boolean) - Log out users if their IP address changed.
+* **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute.
+* **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false.
+* **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
+* **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
+* **png_quality** - Default value is 8.
+* **proc_windows** (Boolean) - Should be enabled if Friendica is running under Windows.
+* **proxy_cache_time** - Time after which the cache is cleared. Default value is one day.
+* **pushpoll_frequency** -
+* **qsearch_limit** - Default value is 100.
+* **relay_server** - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
+* **relay_subscribe** (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
+* **relay_scope** - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.
+* **relay_server_tags** - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
+* **relay_user_tags** (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
+* **remove_multiplicated_lines** (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
+* **show_unsupported_addons** (Boolean) - Show all addons including the unsupported ones.
+* **show_unsupported_themes** (Boolean) - Show all themes including the unsupported ones.
+* **throttle_limit_day** - Maximum number of posts that a user can send per day with the API.
+* **throttle_limit_week** - Maximum number of posts that a user can send per week with the API.
+* **throttle_limit_month** - Maximum number of posts that a user can send per month with the API.
+* **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
+* **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds.
+* **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
## service_class ##
-* upgrade_link -
+* **upgrade_link** -
## experimentals ##
-* exp_themes (Boolean) - Show experimental themes as well.
+* **exp_themes** (Boolean) - Show experimental themes as well.
## theme ##
-* hide_eventlist (Boolean) - Don't show the birthdays and events on the profile and network page
+* **hide_eventlist** (Boolean) - Don't show the birthdays and events on the profile and network page
# Administrator Options #
-Enabling the admin panel for an account, and thus making the account holder
-admin of the node, is done by setting the variable
+Enabling the admin panel for an account, and thus making the account holder admin of the node, is done by setting the variable
$a->config['admin_email'] = "someone@example.com";
-where you have to match the email address used for the account with the one you
-enter to the .htconfig file. If more then one account should be able to access
-the admin panel, seperate the email addresses with a comma.
+Where you have to match the email address used for the account with the one you enter to the .htconfig file.
+If more then one account should be able to access the admin panel, seperate the email addresses with a comma.
$a->config['admin_email'] = "someone@example.com,someonelese@example.com";
-If you want to have a more personalized closing line for the notification
-emails you can set a variable for the admin_name.
+If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
$a->config['admin_name'] = "Marvin";
-
diff --git a/doc/img/editor_frio.png b/doc/img/editor_frio.png
new file mode 100644
index 0000000000..8428b34382
Binary files /dev/null and b/doc/img/editor_frio.png differ
diff --git a/doc/readme.md b/doc/readme.md
index 068d0c9c5c..98b637a22e 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -27,7 +27,7 @@ Friendica Documentation and Resources
**Technical Documentation**
* [Install](help/Install)
-* [Settings](help/Settings)
+* [Settings & Admin Panel](help/Settings)
* [Plugins](help/Plugins)
* [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
diff --git a/doc/snarty3-templates.md b/doc/smarty3-templates.md
similarity index 100%
rename from doc/snarty3-templates.md
rename to doc/smarty3-templates.md
diff --git a/doc/themes.md b/doc/themes.md
index add44c776b..b553debfd7 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -122,10 +122,11 @@ the 1st part of the line is the name of the CSS file (without the .css) the 2nd
Calling the t() function with the common name makes the string translateable.
The selected 1st part will be saved in the database by the theme_post function.
- function theme_post(&$a){
+ function theme_post(App $a){
// non local users shall not pass
- if(! local_user())
+ if (! local_user()) {
return;
+ }
// if the one specific submit button was pressed then proceed
if (isset($_POST['duepuntozero-settings-submit'])){
// and save the selection key into the personal config of the user
@@ -167,7 +168,7 @@ The content of this file should be something like
theme_info = array(
'extends' => 'duepuntozero'.
);
@@ -250,7 +251,7 @@ Next crucial part of the theme.php file is a definition of an init function.
The name of the function is _init.
So in the case of quattro it is
- function quattro_init(&$a) {
+ function quattro_init(App $a) {
$a->theme_info = array();
set_template_engine($a, 'smarty3');
}
diff --git a/doc/translations.md b/doc/translations.md
index b874e9ea2e..61d91bee5b 100644
--- a/doc/translations.md
+++ b/doc/translations.md
@@ -1,45 +1,37 @@
Friendica translations
======================
+* [Home](help)
+
Translation Process
-------------------
-The strings used in the UI of Friendica is translated at [Transifex] [1] and then
-included in the git repository at github. If you want to help with translation
-for any language, be it correcting terms or translating friendica to a
-currently not supported language, please register an account at transifex.com
-and contact the friendica translation team there.
+The strings used in the UI of Friendica is translated at [Transifex] [1] and then included in the git repository at github.
+If you want to help with translation for any language, be it correcting terms or translating friendica to a currently not supported language, please register an account at transifex.com and contact the friendica translation team there.
-Translating friendica is simple. Just use the online tool at transifex. If you
-don't want to deal with git & co. that is fine, we check the status of the
-translations regularly and import them into the source tree at github so that
-others can use them.
+Translating friendica is simple.
+Just use the online tool at transifex.
+If you don't want to deal with git & co. that is fine, we check the status of the translations regularly and import them into the source tree at github so that others can use them.
-We do not include every translation from transifex in the source tree to avoid
-a scattered and disturbed overall experience. As an uneducated guess we have a
-lower limit of 50% translated strings before we include the language (for the
-core message.po file, addont translation will be included once all strings of
-an addon are translated. This limit is judging only by the amount of translated
-strings under the assumption that the most prominent strings for the UI will be
-translated first by a translation team. If you feel your translation useable
-before this limit, please contact us and we will probably include your teams
-work in the source tree.
+We do not include every translation from transifex in the source tree to avoid a scattered and disturbed overall experience.
+As an uneducated guess we have a lower limit of 50% translated strings before we include the language (for the core messages.po file, addont translation will be included once all strings of an addon are translated.
+This limit is judging only by the amount of translated strings under the assumption that the most prominent strings for the UI will be translated first by a translation team.
+If you feel your translation useable before this limit, please contact us and we will probably include your teams work in the source tree.
-If you want to get your work into the source tree yourself, feel free to do so
-and contact us with and question that arises. The process is simple and
-friendica ships with all the tools necessary.
+If you want to help translating, please concentrate on the core messages.po file first.
+We will only include translations with a sufficient translated messages.po file.
+Translations of addons will only be included, when the core file is included as well.
+
+If you want to get your work into the source tree yourself, feel free to do so and contact us with and question that arises.
+The process is simple and friendica ships with all the tools necessary.
The location of the translated files in the source tree is
- /view/LNG-CODE/
+ /view/lang/LNG-CODE/
where LNG-CODE is the language code used, e.g. de for German or fr for French.
-For the email templates (the *.tpl files) just place them into the directory
-and you are done. The translated strings come as a "message.po" file from
-transifex which needs to be translated into the PHP file friendica uses. To do
-so, place the file in the directory mentioned above and use the "po2php"
-utility from the util directory of your friendica installation.
+The translated strings come as a "message.po" file from transifex which needs to be translated into the PHP file friendica uses.
+To do so, place the file in the directory mentioned above and use the "po2php" utility from the util directory of your friendica installation.
-Assuming you want to convert the German localization which is placed in
-view/de/message.po you would do the following.
+Assuming you want to convert the German localization which is placed in view/lang/de/message.po you would do the following.
1. Navigate at the command prompt to the base directory of your
friendica installation
@@ -47,20 +39,20 @@ view/de/message.po you would do the following.
2. Execute the po2php script, which will place the translation
in the strings.php file that is used by friendica.
- $> php util/po2php.php view/de/message.po
+ $> php util/po2php.php view/lang/de/messages.po
+
+ The output of the script will be placed at view/lang/de/strings.php where
+ friendica is expecting it, so you can test your translation immediately.
- The output of the script will be placed at view/de/strings.php where
- froemdoca os expecting it, so you can test your translation mmediately.
-
3. Visit your friendica page to check if it still works in the language you
just translated. If not try to find the error, most likely PHP will give
you a hint in the log/warnings.about the error.
-
+
For debugging you can also try to "run" the file with PHP. This should
not give any output if the file is ok but might give a hint for
searching the bug in the file.
- $> php view/de/strings.php
+ $> php view/lang/de/strings.php
4. commit the two files with a meaningful commit message to your git
repository, push it to your fork of the friendica repository at github and
@@ -69,27 +61,40 @@ view/de/message.po you would do the following.
Utilities
---------
-Additional to the po2php script there are some more utilities for translation
-in the "util" directory of the friendica source tree. If you only want to
-translate friendica into another language you wont need any of these tools most
-likely but it gives you an idea how the translation process of friendica
-works.
+Additional to the po2php script there are some more utilities for translation in the "util" directory of the friendica source tree.
+If you only want to translate friendica into another language you wont need any of these tools most likely but it gives you an idea how the translation process of friendica works.
For further information see the utils/README file.
-Known Problems
---------------
+Transifex-Client
+----------------
-Friendica uses the language setting of the visitors browser to determain the
-language for the UI. Most of the time this works, but there are some known
-quirks.
+Transifex has a client program which let you interact with the translation files in a similar way to git.
+Help for the client can be found at the [Transifex Help Center] [2].
+Here we will only cover basic usage.
-One is that some browsers, like Safari, do the setting to "de-de" but friendica
-only has a "de" localisation. A workaround would be to add a symbolic link
-from
- $friendica/view/de-de
-pointing to
- $friendica/view/de
+After installation of the client, you should have a `tx` command available on your system.
+To use it, first create a configuration file with your credentials.
+On Linux this file should be placed into your home directory `~/.transifexrc`.
+The content of the file should be something like the following:
+
+ [https://www.transifex.com]
+ username = user
+ token =
+ password = p@ssw0rd
+ hostname = https://www.transifex.com
+
+Since Friendica version 3.5.1 we ship configuration files for the Transifex client in the core repository and the addon repository.
+To update the translation files after you have translated strings of e.g. Esperanto in the web-UI of transifex you can use `tx` to download the file.
+
+ $> tx pull -l eo
+
+And then use the `po2php` utility described above to convert the `messages.po` file to the `strings.php` file Friendica is loading.
+
+ $> php util/po2php.php view/lang/eo/messages.po
+
+Afterwards, just commit the two changed files to a feature branch of your Friendica repository, push the changes to github and open a pull request for your changes.
[1]: https://www.transifex.com/projects/p/friendica/
+[2]: https://docs.transifex.com/client/introduction
diff --git a/doc/upgrade.md b/doc/upgrade.md
new file mode 100644
index 0000000000..778f9355e6
--- /dev/null
+++ b/doc/upgrade.md
@@ -0,0 +1,34 @@
+# Considerations before upgrading Friendica
+
+* [Home](help)
+
+## MySQL >= 5.7.4
+
+Starting from MySQL version 5.7.4, the IGNORE keyword in ALTER TABLE statements is ignored.
+This prevents automatic table deduplication if a UNIQUE index is added to a Friendica table's structure.
+If a DB update fails for you while creating a UNIQUE index, make sure to manually deduplicate the table before trying the update again.
+
+### Manual deduplication
+
+There are two main ways of doing it, either by manually removing the duplicates or by recreating the table.
+Manually removing the duplicates is usually faster if they're not too numerous.
+To manually remove the duplicates, you need to know the UNIQUE index columns available in `database.sql`.
+
+```SQL
+SELECT GROUP_CONCAT(id), , count(*) as count FROM users
+GROUP BY HAVING count >= 2;
+
+/* delete or merge duplicate from above query */;
+```
+
+If there are too many rows to handle manually, you can create a new table with the same structure as the table with duplicates and insert the existing content with INSERT IGNORE.
+To recreate the table you need to know the table structure available in `database.sql`.
+
+```SQL
+CREATE TABLE _new ;
+INSERT IGNORE INTO _new SELECT * FROM ;
+DROP TABLE ;
+RENAME TABLE _new TO ;
+```
+
+This method is slower overall, but it is better suited for large numbers of duplicates.
\ No newline at end of file
diff --git a/friendica_test_data.sql b/friendica_test_data.sql
index c39a057651..45080e44d0 100644
--- a/friendica_test_data.sql
+++ b/friendica_test_data.sql
@@ -1657,35 +1657,6 @@ LOCK TABLES `tokens` WRITE;
/*!40000 ALTER TABLE `tokens` ENABLE KEYS */;
UNLOCK TABLES;
---
--- Table structure for table `unique_contacts`
---
-
-DROP TABLE IF EXISTS `unique_contacts`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `unique_contacts` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `url` varchar(255) NOT NULL DEFAULT '',
- `nick` varchar(255) NOT NULL DEFAULT '',
- `name` varchar(255) NOT NULL DEFAULT '',
- `avatar` varchar(255) NOT NULL DEFAULT '',
- `location` varchar(255) NOT NULL DEFAULT '',
- `about` text NOT NULL,
- PRIMARY KEY (`id`),
- KEY `url` (`url`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `unique_contacts`
---
-
-LOCK TABLES `unique_contacts` WRITE;
-/*!40000 ALTER TABLE `unique_contacts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `unique_contacts` ENABLE KEYS */;
-UNLOCK TABLES;
-
--
-- Table structure for table `user`
--
diff --git a/htconfig.php b/htconfig.php
index 508de9a323..41317c4608 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -16,11 +16,20 @@ $db_user = 'mysqlusername';
$db_pass = 'mysqlpassword';
$db_data = 'mysqldatabasename';
+// Set the database connection charset to UTF8.
+// Changing this value will likely corrupt the special characters.
+// You have been warned.
+$a->config['system']['db_charset'] = "utf8mb4";
+
// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
// It can be changed later and only applies to timestamps for anonymous viewers.
$default_timezone = 'America/Los_Angeles';
+// Default system language
+
+$a->config['system']['language'] = 'en';
+
// What is your site name?
$a->config['sitename'] = "Friendica Social Network";
@@ -55,13 +64,20 @@ $a->config['php_path'] = 'php';
$a->config['system']['huburl'] = '[internal]';
+// Server-to-server private message encryption (RINO) is allowed by default.
+// Encryption will only be provided if this setting is set to a non zero
+// value and the PHP mcrypt extension is installed on both systems
+// set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt
+
+$a->config['system']['rino_encrypt'] = 2;
+
// allowed themes (change this from admin panel after installation)
-$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
+$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
// default system theme
-$a->config['system']['theme'] = 'duepuntozero';
+$a->config['system']['theme'] = 'vier';
// By default allow pseudonyms
@@ -73,3 +89,6 @@ $a->config['system']['no_regfullname'] = true;
// Location of the global directory
$a->config['system']['directory'] = 'http://dir.friendi.ca';
+
+// Allowed protocols in link URLs; HTTP protocols always are accepted
+$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
diff --git a/include/Contact.php b/include/Contact.php
index 340b3ec6fa..2aab828f8a 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,5 +1,6 @@
get_baseurl());
+ goaway(App::get_baseurl());
}
}
function contact_remove($id) {
- $r = q("select uid from contact where id = %d limit 1",
+ // We want just to make sure that we don't delete our "self" contact
+ $r = q("SELECT `uid` FROM `contact` WHERE `id` = %d AND NOT `self` LIMIT 1",
intval($id)
);
- if((! count($r)) || (! intval($r[0]['uid'])))
+ if (!dbm::is_result($r) || !intval($r[0]['uid'])) {
return;
+ }
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
- if($archive) {
+ if ($archive) {
q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
intval($id)
);
return;
}
- q("DELETE FROM `contact` WHERE `id` = %d",
- intval($id)
- );
- q("DELETE FROM `item` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `photo` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `mail` WHERE `contact-id` = %d ",
- intval($id)
- );
- q("DELETE FROM `event` WHERE `cid` = %d ",
- intval($id)
- );
- q("DELETE FROM `queue` WHERE `cid` = %d ",
- intval($id)
- );
+ q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
+ // Delete the rest in the background
+ proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
}
@@ -100,40 +88,31 @@ function contact_remove($id) {
function terminate_friendship($user,$self,$contact) {
-
+ /// @TODO Get rid of this, include/datetime.php should care about it by itself
$a = get_app();
require_once('include/datetime.php');
- if($contact['network'] === NETWORK_OSTATUS) {
+ if ($contact['network'] === NETWORK_OSTATUS) {
- $slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
- '$name' => $user['username'],
- '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
- '$photo' => $self['photo'],
- '$thumb' => $self['thumb'],
- '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
- '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
- '$title' => '',
- '$type' => 'text',
- '$content' => t('stopped following'),
- '$nick' => $user['nickname'],
- '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
- '$ostat_follow' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\r\n"
- ));
+ require_once('include/ostatus.php');
- if((x($contact,'notify')) && (strlen($contact['notify']))) {
+ // create an unfollow slap
+ $item = array();
+ $item['verb'] = NAMESPACE_OSTATUS."/unfollow";
+ $item['follow'] = $contact["url"];
+ $slap = ostatus::salmon($item, $user);
+
+ if ((x($contact,'notify')) && (strlen($contact['notify']))) {
require_once('include/salmon.php');
slapper($user,$contact['notify'],$slap);
}
- }
- elseif($contact['network'] === NETWORK_DIASPORA) {
+ } elseif ($contact['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');
- diaspora_unshare($user,$contact);
- }
- elseif($contact['network'] === NETWORK_DFRN) {
- require_once('include/items.php');
- dfrn_deliver($user,$contact,'placeholder', 1);
+ Diaspora::send_unshare($user,$contact);
+ } elseif ($contact['network'] === NETWORK_DFRN) {
+ require_once('include/dfrn.php');
+ dfrn::deliver($user,$contact,'placeholder', 1);
}
}
@@ -145,7 +124,6 @@ function terminate_friendship($user,$self,$contact) {
// This provides for the possibility that their database is temporarily messed
// up or some other transient event and that there's a possibility we could recover from it.
-if(! function_exists('mark_for_death')) {
function mark_for_death($contact) {
if($contact['archive'])
@@ -156,12 +134,23 @@ function mark_for_death($contact) {
dbesc(datetime_convert()),
intval($contact['id'])
);
- }
- else {
- // TODO: We really should send a notification to the owner after 2-3 weeks
- // so they won't be surprised when the contact vanishes and can take
- // remedial action if this was a serious mistake or glitch
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `term-date` = '%s'
+ WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'",
+ dbesc(datetime_convert()),
+ dbesc(normalise_link($contact['url']))
+ );
+ }
+ } else {
+
+ /// @todo
+ /// We really should send a notification to the owner after 2-3 weeks
+ /// so they won't be surprised when the contact vanishes and can take
+ /// remedial action if this was a serious mistake or glitch
+
+ /// @todo
+ /// Check for contact vitality via probing
$expiry = $contact['term-date'] . ' + 32 days ';
if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
@@ -170,187 +159,294 @@ function mark_for_death($contact) {
// archive them rather than delete
// though if the owner tries to unarchive them we'll start the whole process over again
- q("update contact set `archive` = 1 where id = %d",
+ q("UPDATE `contact` SET `archive` = 1 WHERE `id` = %d",
intval($contact['id'])
);
- q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
-
- //contact_remove($contact['id']);
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'",
+ dbesc(normalise_link($contact['url']))
+ );
+ }
}
}
-}}
+}
-if(! function_exists('unmark_for_death')) {
function unmark_for_death($contact) {
+
+ $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` > '%s'",
+ intval($contact['id']),
+ dbesc('1000-00-00 00:00:00')
+ );
+
+ // We don't need to update, we never marked this contact as dead
+ if (!dbm::is_result($r)) {
+ return;
+ }
+
// It's a miracle. Our dead contact has inexplicably come back to life.
q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
dbesc('0000-00-00 00:00:00'),
intval($contact['id'])
);
-}}
-function get_contact_details_by_url($url, $uid = -1) {
- if ($uid == -1)
+ if ($contact['url'] != '') {
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
+ dbesc('0000-00-00 00:00:00'),
+ dbesc(normalise_link($contact['url']))
+ );
+ }
+}
+
+/**
+ * @brief Get contact data for a given profile link
+ *
+ * The function looks at several places (contact table and gcontact table) for the contact
+ * It caches its result for the same script execution to prevent duplicate calls
+ *
+ * @param string $url The profile link
+ * @param int $uid User id
+ * @param array $default If not data was found take this data as default value
+ *
+ * @return array Contact data
+ */
+function get_contact_details_by_url($url, $uid = -1, $default = array()) {
+ static $cache = array();
+
+ if ($uid == -1) {
$uid = local_user();
-
- $r = q("SELECT `id` AS `gid`, `url`, `name`, `nick`, `addr`, `photo`, `location`, `about`, `keywords`, `gender`, `community`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($url)));
-
- if ($r) {
- $profile = $r[0];
-
- if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND
- in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
- proc_run('php',"include/update_gcontact.php", $profile["gid"]);
-
- } else {
- $r = q("SELECT `url`, `name`, `nick`, `avatar` AS `photo`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'",
- dbesc(normalise_link($url)));
-
- if (count($r)) {
- $profile = $r[0];
- $profile["keywords"] = "";
- $profile["gender"] = "";
- $profile["community"] = false;
- $profile["network"] = "";
- $profile["addr"] = "";
- }
}
- // Fetching further contact data from the contact table
- $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s'",
- dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"]));
+ if (isset($cache[$url][$uid])) {
+ return $cache[$url][$uid];
+ }
- if (!count($r))
- $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+ // Fetch contact data from the contact table for the given user
+ $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
+ FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
dbesc(normalise_link($url)), intval($uid));
- if (!count($r))
- $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
- dbesc(normalise_link($url)));
+ // Fetch the data from the contact table with "uid=0" (which is filled automatically)
+ if (!dbm::is_result($r))
+ $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
+ FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
+ dbesc(normalise_link($url)));
- if ($r) {
- if (isset($r[0]["url"]) AND $r[0]["url"])
- $profile["url"] = $r[0]["url"];
- if (isset($r[0]["name"]) AND $r[0]["name"])
- $profile["name"] = $r[0]["name"];
- if (isset($r[0]["nick"]) AND $r[0]["nick"] AND ($profile["nick"] == ""))
- $profile["nick"] = $r[0]["nick"];
- if (isset($r[0]["addr"]) AND $r[0]["addr"] AND ($profile["addr"] == ""))
- $profile["addr"] = $r[0]["addr"];
- if (isset($r[0]["photo"]) AND $r[0]["photo"])
- $profile["photo"] = $r[0]["photo"];
- if (isset($r[0]["location"]) AND $r[0]["location"])
- $profile["location"] = $r[0]["location"];
- if (isset($r[0]["about"]) AND $r[0]["about"])
- $profile["about"] = $r[0]["about"];
- if (isset($r[0]["keywords"]) AND $r[0]["keywords"])
- $profile["keywords"] = $r[0]["keywords"];
- if (isset($r[0]["gender"]) AND $r[0]["gender"])
- $profile["gender"] = $r[0]["gender"];
- if (isset($r[0]["forum"]) OR isset($r[0]["prv"]))
- $profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]);
- if (isset($r[0]["network"]) AND $r[0]["network"])
- $profile["network"] = $r[0]["network"];
- if (isset($r[0]["addr"]) AND $r[0]["addr"])
- $profile["addr"] = $r[0]["addr"];
- if (isset($r[0]["bd"]) AND $r[0]["bd"])
- $profile["bd"] = $r[0]["bd"];
- if ($r[0]["uid"] == 0)
- $profile["cid"] = 0;
- else
- $profile["cid"] = $r[0]["id"];
- } else
- $profile["cid"] = 0;
+ // Fetch the data from the gcontact table
+ if (!dbm::is_result($r))
+ $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+ FROM `gcontact` WHERE `nurl` = '%s'",
+ dbesc(normalise_link($url)));
+ if (dbm::is_result($r)) {
+ // If there is more than one entry we filter out the connector networks
+ if (count($r) > 1) {
+ foreach ($r AS $id => $result) {
+ if ($result["network"] == NETWORK_STATUSNET) {
+ unset($r[$id]);
+ }
+ }
+ }
+
+ $profile = array_shift($r);
+
+ // "bd" always contains the upcoming birthday of a contact.
+ // "birthday" might contain the birthday including the year of birth.
+ if ($profile["birthday"] != "0000-00-00") {
+ $bd_timestamp = strtotime($profile["birthday"]);
+ $month = date("m", $bd_timestamp);
+ $day = date("d", $bd_timestamp);
+
+ $current_timestamp = time();
+ $current_year = date("Y", $current_timestamp);
+ $current_month = date("m", $current_timestamp);
+ $current_day = date("d", $current_timestamp);
+
+ $profile["bd"] = $current_year."-".$month."-".$day;
+ $current = $current_year."-".$current_month."-".$current_day;
+
+ if ($profile["bd"] < $current) {
+ $profile["bd"] = (++$current_year)."-".$month."-".$day;
+ }
+ } else {
+ $profile["bd"] = "0000-00-00";
+ }
+ } else {
+ $profile = $default;
+ }
+
+ if (($profile["photo"] == "") AND isset($default["photo"])) {
+ $profile["photo"] = $default["photo"];
+ }
+
+ if (($profile["name"] == "") AND isset($default["name"])) {
+ $profile["name"] = $default["name"];
+ }
+
+ if (($profile["network"] == "") AND isset($default["network"])) {
+ $profile["network"] = $default["network"];
+ }
+
+ if (($profile["thumb"] == "") AND isset($profile["photo"])) {
+ $profile["thumb"] = $profile["photo"];
+ }
+
+ if (($profile["micro"] == "") AND isset($profile["thumb"])) {
+ $profile["micro"] = $profile["thumb"];
+ }
+
+ if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
+ in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+ proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+ }
+
+ // Show contact details of Diaspora contacts only if connected
if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
$profile["location"] = "";
$profile["about"] = "";
+ $profile["gender"] = "";
+ $profile["birthday"] = "0000-00-00";
}
- return($profile);
+ $cache[$url][$uid] = $profile;
+
+ return $profile;
}
-if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact, $uid = 0) {
+/**
+ * @brief Get contact data for a given address
+ *
+ * The function looks at several places (contact table and gcontact table) for the contact
+ *
+ * @param string $addr The profile link
+ * @param int $uid User id
+ *
+ * @return array Contact data
+ */
+function get_contact_details_by_addr($addr, $uid = -1) {
+ static $cache = array();
+ if ($uid == -1) {
+ $uid = local_user();
+ }
+
+ // Fetch contact data from the contact table for the given user
+ $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
+ FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
+ dbesc($addr), intval($uid));
+
+ // Fetch the data from the contact table with "uid=0" (which is filled automatically)
+ if (!dbm::is_result($r))
+ $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
+ FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
+ dbesc($addr));
+
+ // Fetch the data from the gcontact table
+ if (!dbm::is_result($r))
+ $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+ FROM `gcontact` WHERE `addr` = '%s'",
+ dbesc($addr));
+
+ if (!dbm::is_result($r)) {
+ $data = Probe::uri($addr);
+
+ $profile = get_contact_details_by_url($data['url'], $uid);
+ } else {
+ $profile = $r[0];
+ }
+
+ return $profile;
+}
+
+if (! function_exists('contact_photo_menu')) {
+function contact_photo_menu($contact, $uid = 0)
+{
$a = get_app();
- $contact_url="";
- $pm_url="";
- $status_link="";
- $photos_link="";
- $posts_link="";
- $contact_drop_link = "";
- $poke_link="";
+ $contact_url = '';
+ $pm_url = '';
+ $status_link = '';
+ $photos_link = '';
+ $posts_link = '';
+ $contact_drop_link = '';
+ $poke_link = '';
- if ($uid == 0)
+ if ($uid == 0) {
$uid = local_user();
+ }
- if ($contact["uid"] != $uid) {
+ if ($contact['uid'] != $uid) {
if ($uid == 0) {
$profile_link = zrl($contact['url']);
- $menu = Array('profile' => array(t("View Profile"), $profile_link, true));
+ $menu = Array('profile' => array(t('View Profile'), $profile_link, true));
return $menu;
}
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
- dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
- if ($r)
+ dbesc($contact['nurl']), dbesc($contact['network']), intval($uid));
+ if ($r) {
return contact_photo_menu($r[0], $uid);
- else {
+ } else {
$profile_link = zrl($contact['url']);
$connlnk = 'follow/?url='.$contact['url'];
- $menu = Array(
- 'profile' => array(t("View Profile"), $profile_link, true),
- 'follow' => array(t("Connect/Follow"), $connlnk, true)
- );
+ $menu = array(
+ 'profile' => array(t('View Profile'), $profile_link, true),
+ 'follow' => array(t('Connect/Follow'), $connlnk, true)
+ );
return $menu;
}
}
$sparkle = false;
- if($contact['network'] === NETWORK_DFRN) {
+ if ($contact['network'] === NETWORK_DFRN) {
$sparkle = true;
- $profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
- }
- else
+ $profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
+ } else {
$profile_link = $contact['url'];
-
- if($profile_link === 'mailbox')
- $profile_link = '';
-
- if($sparkle) {
- $status_link = $profile_link . "?url=status";
- $photos_link = $profile_link . "?url=photos";
- $profile_link = $profile_link . "?url=profile";
}
- if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
- $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+ if ($profile_link === 'mailbox') {
+ $profile_link = '';
+ }
- if ($contact["network"] == NETWORK_DFRN)
- $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+ if ($sparkle) {
+ $status_link = $profile_link . '?url=status';
+ $photos_link = $profile_link . '?url=photos';
+ $profile_link = $profile_link . '?url=profile';
+ }
- $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
- $posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts';
- $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+ if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
+ $pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
+ }
+ if ($contact['network'] == NETWORK_DFRN) {
+ $poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+ }
+
+ $contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];
+
+ $posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+ $contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
/**
* menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/
- $menu = Array(
+ $menu = array(
'status' => array(t("View Status"), $status_link, true),
'profile' => array(t("View Profile"), $profile_link, true),
- 'photos' => array(t("View Photos"), $photos_link,true),
- 'network' => array(t("Network Posts"), $posts_link,false),
- 'edit' => array(t("Edit Contact"), $contact_url, false),
+ 'photos' => array(t("View Photos"), $photos_link, true),
+ 'network' => array(t("Network Posts"), $posts_link, false),
+ 'edit' => array(t("View Contact"), $contact_url, false),
'drop' => array(t("Drop Contact"), $contact_drop_link, false),
'pm' => array(t("Send PM"), $pm_url, false),
'poke' => array(t("Poke"), $poke_link, false),
@@ -363,9 +459,11 @@ function contact_photo_menu($contact, $uid = 0) {
$menucondensed = array();
- foreach ($menu AS $menuname=>$menuitem)
- if ($menuitem[1] != "")
+ foreach ($menu AS $menuname => $menuitem) {
+ if ($menuitem[1] != '') {
$menucondensed[$menuname] = $menuitem;
+ }
+ }
return $menucondensed;
}}
@@ -378,7 +476,7 @@ function random_profile() {
ORDER BY rand() LIMIT 1",
dbesc(NETWORK_DFRN));
- if(count($r))
+ if (dbm::is_result($r))
return dirname($r[0]['url']);
return '';
}
@@ -407,13 +505,25 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
return $r;
}
-function get_contact($url, $uid = 0) {
+/**
+ * @brief Fetch the contact id for a given url and user
+ *
+ * @param string $url Contact URL
+ * @param integer $uid The user id for the contact
+ * @param boolean $no_update Don't update the contact
+ *
+ * @return integer Contact ID
+ */
+function get_contact($url, $uid = 0, $no_update = false) {
require_once("include/Scrape.php");
+ logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
+
$data = array();
$contactid = 0;
// is it an address in the format user@server.tld?
+ /// @todo use gcontact and/or the addr field for a lookup
if (!strstr($url, "http") OR strstr($url, "@")) {
$data = probe_url($url);
$url = $data["url"];
@@ -421,12 +531,12 @@ function get_contact($url, $uid = 0) {
return 0;
}
- $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+ $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
dbesc(normalise_link($url)),
intval($uid));
if (!$contact)
- $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d",
+ $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d ORDER BY `id` LIMIT 1",
dbesc($url),
dbesc(normalise_link($url)),
intval($uid));
@@ -438,8 +548,9 @@ function get_contact($url, $uid = 0) {
$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days'));
//$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
- if (!$update_photo)
+ if (!$update_photo OR $no_update) {
return($contactid);
+ }
} elseif ($uid != 0)
return 0;
@@ -447,19 +558,27 @@ function get_contact($url, $uid = 0) {
$data = probe_url($url);
// Does this address belongs to a valid network?
- if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
- return 0;
+ if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+ if ($uid != 0)
+ return 0;
- // tempory programming. Can be deleted after 2015-02-07
- if (($data["alias"] == "") AND (normalise_link($data["url"]) != normalise_link($url)))
- $data["alias"] = normalise_link($url);
+ // Get data from the gcontact table
+ $r = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'",
+ dbesc(normalise_link($url)));
+ if (!$r)
+ return 0;
+
+ $data = $r[0];
+ }
+
+ $url = $data["url"];
if ($contactid == 0) {
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
- `batch`, `request`, `confirm`, `poco`,
+ `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
`writable`, `blocked`, `readonly`, `pending`)
- VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
+ VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
intval($uid),
dbesc(datetime_convert()),
dbesc($data["url"]),
@@ -478,37 +597,246 @@ function get_contact($url, $uid = 0) {
dbesc($data["batch"]),
dbesc($data["request"]),
dbesc($data["confirm"]),
- dbesc($data["poco"])
+ dbesc($data["poco"]),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert())
);
- $contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+ $contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
dbesc(normalise_link($data["url"])),
intval($uid));
if (!$contact)
return 0;
$contactid = $contact[0]["id"];
+
+ // Update the newly created contact from data in the gcontact table
+ $r = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'",
+ dbesc(normalise_link($data["url"])));
+ if ($r) {
+ logger("Update contact ".$data["url"]);
+ q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d",
+ dbesc($r["location"]), dbesc($r["about"]), dbesc($r["keywords"]),
+ dbesc($r["gender"]), intval($contactid));
+ }
}
+ if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != ""))
+ q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
+ dbesc(normalise_link($url)),
+ intval($contactid));
+
require_once("Photo.php");
- $photos = import_profile_photo($data["photo"],$uid,$contactid);
+ update_contact_avatar($data["photo"],$uid,$contactid);
- q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s',
- `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
- `name-date` = '%s', `uri-date` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc($data["addr"]),
- dbesc($data["alias"]),
- dbesc($data["name"]),
- dbesc($data["nick"]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contactid)
- );
+ $r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contactid));
+
+ // This condition should always be true
+ if (!dbm::is_result($r))
+ return $contactid;
+
+ // Only update if there had something been changed
+ if (($data["addr"] != $r[0]["addr"]) OR
+ ($data["alias"] != $r[0]["alias"]) OR
+ ($data["name"] != $r[0]["name"]) OR
+ ($data["nick"] != $r[0]["nick"]))
+ q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
+ `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
+ dbesc($data["addr"]),
+ dbesc($data["alias"]),
+ dbesc($data["name"]),
+ dbesc($data["nick"]),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($contactid)
+ );
return $contactid;
}
+
+/**
+ * @brief Returns posts from a given gcontact
+ *
+ * @param App $a argv application class
+ * @param int $gcontact_id Global contact
+ *
+ * @return string posts in HTML
+ */
+function posts_from_gcontact(App $a, $gcontact_id) {
+
+ require_once('include/conversation.php');
+
+ // There are no posts with "uid = 0" with connector networks
+ // This speeds up the query a lot
+ $r = q("SELECT `network` FROM `gcontact` WHERE `id` = %d", dbesc($gcontact_id));
+ if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
+ $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+ else
+ $sql = "`item`.`uid` = %d";
+
+ if(get_config('system', 'old_pager')) {
+ $r = q("SELECT COUNT(*) AS `total` FROM `item`
+ WHERE `gcontact-id` = %d and $sql",
+ intval($gcontact_id),
+ intval(local_user()));
+
+ $a->set_pager_total($r[0]['total']);
+ }
+
+ $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+ `author-name` AS `name`, `owner-avatar` AS `photo`,
+ `owner-link` AS `url`, `owner-avatar` AS `thumb`
+ FROM `item`
+ WHERE `gcontact-id` = %d AND $sql AND
+ NOT `deleted` AND NOT `moderated` AND `visible`
+ ORDER BY `item`.`created` DESC LIMIT %d, %d",
+ intval($gcontact_id),
+ intval(local_user()),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
+
+ $o = conversation($a,$r,'community',false);
+
+ if(!get_config('system', 'old_pager')) {
+ $o .= alt_pager($a,count($r));
+ } else {
+ $o .= paginate($a);
+ }
+
+ return $o;
+}
+/**
+ * @brief Returns posts from a given contact url
+ *
+ * @param App $a argv application class
+ * @param string $contact_url Contact URL
+ *
+ * @return string posts in HTML
+ */
+function posts_from_contact_url(App $a, $contact_url) {
+
+ require_once('include/conversation.php');
+
+ // There are no posts with "uid = 0" with connector networks
+ // This speeds up the query a lot
+ $r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
+ WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
+ dbesc(normalise_link($contact_url)));
+ if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+ $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+ } else {
+ $sql = "`item`.`uid` = %d";
+ }
+
+ if (!dbm::is_result($r)) {
+ return '';
+ }
+
+ $author_id = intval($r[0]["author-id"]);
+
+ if (get_config('system', 'old_pager')) {
+ $r = q("SELECT COUNT(*) AS `total` FROM `item`
+ WHERE `author-id` = %d and $sql",
+ intval($author_id),
+ intval(local_user()));
+
+ $a->set_pager_total($r[0]['total']);
+ }
+
+ $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
+ " ORDER BY `item`.`created` DESC LIMIT %d, %d",
+ intval($author_id),
+ intval(local_user()),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
+
+ $o = conversation($a,$r,'community',false);
+
+ if (!get_config('system', 'old_pager')) {
+ $o .= alt_pager($a,count($r));
+ } else {
+ $o .= paginate($a);
+ }
+
+ return $o;
+}
+
+/**
+ * @brief Returns a formatted location string from the given profile array
+ *
+ * @param array $profile Profile array (Generated from the "profile" table)
+ *
+ * @return string Location string
+ */
+function formatted_location($profile) {
+ $location = '';
+
+ if($profile['locality'])
+ $location .= $profile['locality'];
+
+ if($profile['region'] AND ($profile['locality'] != $profile['region'])) {
+ if($location)
+ $location .= ', ';
+
+ $location .= $profile['region'];
+ }
+
+ if($profile['country-name']) {
+ if($location)
+ $location .= ', ';
+
+ $location .= $profile['country-name'];
+ }
+
+ return $location;
+}
+
+/**
+ * @brief Returns the account type name
+ *
+ * The function can be called with either the user or the contact array
+ *
+ * @param array $contact contact or user array
+ */
+function account_type($contact) {
+
+ // There are several fields that indicate that the contact or user is a forum
+ // "page-flags" is a field in the user table,
+ // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
+ // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
+ if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
+ || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+ || (isset($contact['forum']) && intval($contact['forum']))
+ || (isset($contact['prv']) && intval($contact['prv']))
+ || (isset($contact['community']) && intval($contact['community'])))
+ $type = ACCOUNT_TYPE_COMMUNITY;
+ else
+ $type = ACCOUNT_TYPE_PERSON;
+
+ // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
+ if (isset($contact["contact-type"]))
+ $type = $contact["contact-type"];
+ if (isset($contact["account-type"]))
+ $type = $contact["account-type"];
+
+ switch($type) {
+ case ACCOUNT_TYPE_ORGANISATION:
+ $account_type = t("Organisation");
+ break;
+ case ACCOUNT_TYPE_NEWS:
+ $account_type = t('News');
+ break;
+ case ACCOUNT_TYPE_COMMUNITY:
+ $account_type = t("Forum");
+ break;
+ default:
+ $account_type = "";
+ break;
+ }
+
+ return $account_type;
+}
+?>
diff --git a/include/Core/Config.php b/include/Core/Config.php
new file mode 100644
index 0000000000..4e5c1e3d04
--- /dev/null
+++ b/include/Core/Config.php
@@ -0,0 +1,216 @@
+config
+ *
+ * @param string $family
+ * The category of the configuration value
+ * @return void
+ */
+ public static function load($family = "config") {
+
+ // We don't preload "system" anymore.
+ // This reduces the number of database reads a lot.
+ if ($family === 'system') {
+ return;
+ }
+
+ $a = get_app();
+
+ $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s'", dbesc($family));
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
+ $k = $rr['k'];
+ if ($family === 'config') {
+ $a->config[$k] = $rr['v'];
+ } else {
+ $a->config[$family][$k] = $rr['v'];
+ self::$cache[$family][$k] = $rr['v'];
+ self::$in_db[$family][$k] = true;
+ }
+ }
+ }
+ }
+
+ /**
+ * @brief Get a particular user's config variable given the category name
+ * ($family) and a key.
+ *
+ * Get a particular config value from the given category ($family)
+ * and the $key from a cached storage in $a->config[$uid].
+ * $instore is only used by the set_config function
+ * to determine if the key already exists in the DB
+ * If a key is found in the DB but doesn't exist in
+ * local config cache, pull it into the cache so we don't have
+ * to hit the DB again for this item.
+ *
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to query
+ * @param mixed $default_value optional
+ * The value to return if key is not set (default: null)
+ * @param boolean $refresh optional
+ * If true the config is loaded from the db and not from the cache (default: false)
+ * @return mixed Stored value or null if it does not exist
+ */
+ public static function get($family, $key, $default_value = null, $refresh = false) {
+
+ $a = get_app();
+
+ if (!$refresh) {
+
+ // Do we have the cached value? Then return it
+ if (isset(self::$cache[$family][$key])) {
+ if (self::$cache[$family][$key] === '!!') {
+ return $default_value;
+ } else {
+ return self::$cache[$family][$key];
+ }
+ }
+ }
+
+ $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
+ dbesc($family),
+ dbesc($key)
+ );
+ if (dbm::is_result($ret)) {
+ // manage array value
+ $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v']) ? unserialize($ret[0]['v']) : $ret[0]['v']);
+
+ // Assign the value from the database to the cache
+ self::$cache[$family][$key] = $val;
+ self::$in_db[$family][$key] = true;
+ return $val;
+ } elseif (isset($a->config[$family][$key])) {
+
+ // Assign the value (mostly) from the .htconfig.php to the cache
+ self::$cache[$family][$key] = $a->config[$family][$key];
+ self::$in_db[$family][$key] = false;
+
+ return $a->config[$family][$key];
+ }
+
+ self::$cache[$family][$key] = '!!';
+ self::$in_db[$family][$key] = false;
+
+ return $default_value;
+ }
+
+ /**
+ * @brief Sets a configuration value for system config
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the user_id $uid.
+ *
+ * Note: Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to set
+ * @param string $value
+ * The value to store
+ * @return mixed Stored $value or false if the database update failed
+ */
+ public static function set($family, $key, $value) {
+ $a = get_app();
+
+ // We store our setting values in a string variable.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $dbvalue = (!is_array($value) ? (string)$value : $value);
+
+ $stored = self::get($family, $key, null, true);
+
+ if (($stored === $dbvalue) AND self::$in_db[$family][$key]) {
+ return true;
+ }
+
+ if ($family === 'config') {
+ $a->config[$key] = $dbvalue;
+ } elseif ($family != 'system') {
+ $a->config[$family][$key] = $dbvalue;
+ }
+
+ // Assign the just added value to the cache
+ self::$cache[$family][$key] = $dbvalue;
+
+ // manage array value
+ $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+ if (is_null($stored) OR !self::$in_db[$family][$key]) {
+ $ret = q("INSERT INTO `config` (`cat`, `k`, `v`) VALUES ('%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
+ dbesc($family),
+ dbesc($key),
+ dbesc($dbvalue),
+ dbesc($dbvalue)
+ );
+ } else {
+ $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'",
+ dbesc($dbvalue),
+ dbesc($family),
+ dbesc($key)
+ );
+ }
+ if ($ret) {
+ self::$in_db[$family][$key] = true;
+ return $value;
+ }
+ return $ret;
+ }
+
+ /**
+ * @brief Deletes the given key from the system configuration.
+ *
+ * Removes the configured value from the stored cache in $a->config
+ * and removes it from the database.
+ *
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to delete
+ * @return mixed
+ */
+ public static function delete($family, $key) {
+
+ if (isset(self::$cache[$family][$key])) {
+ unset(self::$cache[$family][$key]);
+ unset(self::$in_db[$family][$key]);
+ }
+ $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s'",
+ dbesc($family),
+ dbesc($key)
+ );
+
+ return $ret;
+ }
+}
diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php
new file mode 100644
index 0000000000..6ced9fc755
--- /dev/null
+++ b/include/Core/PConfig.php
@@ -0,0 +1,204 @@
+config[$uid].
+ *
+ * @param string $uid
+ * The user_id
+ * @param string $family
+ * The category of the configuration value
+ * @return void
+ */
+ public static function load($uid, $family) {
+ $a = get_app();
+ $r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d ORDER BY `cat`, `k`, `id`",
+ dbesc($family),
+ intval($uid)
+ );
+ if (dbm::is_result($r)) {
+ foreach ($r as $rr) {
+ $k = $rr['k'];
+ $a->config[$uid][$family][$k] = $rr['v'];
+ self::$in_db[$uid][$family][$k] = true;
+ }
+ } else if ($family != 'config') {
+ // Negative caching
+ $a->config[$uid][$family] = "!!";
+ }
+ }
+
+ /**
+ * @brief Get a particular user's config variable given the category name
+ * ($family) and a key.
+ *
+ * Get a particular user's config value from the given category ($family)
+ * and the $key from a cached storage in $a->config[$uid].
+ *
+ * @param string $uid
+ * The user_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to query
+ * @param mixed $default_value optional
+ * The value to return if key is not set (default: null)
+ * @param boolean $refresh optional
+ * If true the config is loaded from the db and not from the cache (default: false)
+ * @return mixed Stored value or null if it does not exist
+ */
+ public static function get($uid, $family, $key, $default_value = null, $refresh = false) {
+
+ $a = get_app();
+
+ if (!$refresh) {
+ // Looking if the whole family isn't set
+ if (isset($a->config[$uid][$family])) {
+ if ($a->config[$uid][$family] === '!!') {
+ return $default_value;
+ }
+ }
+
+ if (isset($a->config[$uid][$family][$key])) {
+ if ($a->config[$uid][$family][$key] === '!!') {
+ return $default_value;
+ }
+ return $a->config[$uid][$family][$key];
+ }
+ }
+
+ $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' ORDER BY `id` DESC LIMIT 1",
+ intval($uid),
+ dbesc($family),
+ dbesc($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;
+ self::$in_db[$uid][$family][$key] = true;
+
+ return $val;
+ } else {
+ $a->config[$uid][$family][$key] = '!!';
+ self::$in_db[$uid][$family][$key] = false;
+
+ return $default_value;
+ }
+ }
+
+ /**
+ * @brief Sets a configuration value for a user
+ *
+ * Stores a config value ($value) in the category ($family) under the key ($key)
+ * for the user_id $uid.
+ *
+ * @note Please do not store booleans - convert to 0/1 integer values!
+ *
+ * @param string $uid
+ * The user_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to set
+ * @param string $value
+ * The value to store
+ * @return mixed Stored $value or false
+ */
+ public static function set($uid, $family, $key, $value) {
+
+ $a = get_app();
+
+ // We store our setting values in a string variable.
+ // So we have to do the conversion here so that the compare below works.
+ // The exception are array values.
+ $dbvalue = (!is_array($value) ? (string)$value : $value);
+
+ $stored = self::get($uid, $family, $key, null, true);
+
+ if (($stored === $dbvalue) AND self::$in_db[$uid][$family][$key]) {
+ return true;
+ }
+
+ $a->config[$uid][$family][$key] = $dbvalue;
+
+ // manage array value
+ $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
+
+ if (is_null($stored) OR !self::$in_db[$uid][$family][$key]) {
+ $ret = q("INSERT INTO `pconfig` (`uid`, `cat`, `k`, `v`) VALUES (%d, '%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'",
+ intval($uid),
+ dbesc($family),
+ dbesc($key),
+ dbesc($dbvalue),
+ dbesc($dbvalue)
+ );
+ } else {
+ $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
+ dbesc($dbvalue),
+ intval($uid),
+ dbesc($family),
+ dbesc($key)
+ );
+ }
+
+ if ($ret) {
+ self::$in_db[$uid][$family][$key] = true;
+ return $value;
+ }
+ return $ret;
+ }
+
+ /**
+ * @brief Deletes the given key from the users's configuration.
+ *
+ * Removes the configured value from the stored cache in $a->config[$uid]
+ * and removes it from the database.
+ *
+ * @param string $uid The user_id
+ * @param string $family
+ * The category of the configuration value
+ * @param string $key
+ * The configuration key to delete
+ * @return mixed
+ */
+ public static function delete($uid,$family,$key) {
+
+ $a = get_app();
+
+ if (x($a->config[$uid][$family], $key)) {
+ unset($a->config[$uid][$family][$key]);
+ unset(self::$in_db[$uid][$family][$key]);
+ }
+
+ $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
+ intval($uid),
+ dbesc($family),
+ dbesc($key)
+ );
+
+ return $ret;
+ }
+}
diff --git a/include/DirSearch.php b/include/DirSearch.php
new file mode 100644
index 0000000000..5968608236
--- /dev/null
+++ b/include/DirSearch.php
@@ -0,0 +1,63 @@
+ 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
+ ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
+ (`gcontact`.`addr` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`nick` LIKE '%s') $extra_sql
+ GROUP BY `gcontact`.`nurl`
+ ORDER BY `gcontact`.`nurl` DESC
+ LIMIT 1000",
+ intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+ dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
+ dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+
+ return $results;
+ }
+
+ }
+}
diff --git a/include/Emailer.php b/include/Emailer.php
index d0568f6001..b0cdc3fe63 100644
--- a/include/Emailer.php
+++ b/include/Emailer.php
@@ -30,8 +30,8 @@ class Emailer {
// generate a mime boundary
$mimeBoundary =rand(0,9)."-"
- .rand(10000000000,99999999999)."-"
- .rand(10000000000,99999999999)."=:"
+ .rand(100000000,999999999)."-"
+ .rand(100000000,999999999)."=:"
.rand(10000,99999);
// generate a multipart/alternative message header
diff --git a/include/ForumManager.php b/include/ForumManager.php
new file mode 100644
index 0000000000..c2a20df29f
--- /dev/null
+++ b/include/ForumManager.php
@@ -0,0 +1,192 @@
+ forum url
+ * 'name' => forum name
+ * 'id' => number of the key from the array
+ * 'micro' => contact photo in format micro
+ * 'thumb' => contact photo in format thumb
+ */
+ public static function get_list($uid, $showhidden = true, $lastitem, $showprivate = false) {
+
+ $forumlist = array();
+
+ $order = (($showhidden) ? '' : ' AND NOT `hidden` ');
+ $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
+ $select = '`forum` ';
+ if ($showprivate) {
+ $select = '(`forum` OR `prv`)';
+ }
+
+ $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb` FROM `contact`
+ WHERE `network`= 'dfrn' AND $select AND `uid` = %d
+ AND NOT `blocked` AND NOT `hidden` AND NOT `pending` AND NOT `archive`
+ AND `success_update` > `failure_update`
+ $order ",
+ intval($uid)
+ );
+
+ if (!$contacts)
+ return($forumlist);
+
+ foreach($contacts as $contact) {
+ $forumlist[] = array(
+ 'url' => $contact['url'],
+ 'name' => $contact['name'],
+ 'id' => $contact['id'],
+ 'micro' => $contact['micro'],
+ 'thumb' => $contact['thumb'],
+ );
+ }
+ return($forumlist);
+ }
+
+
+ /**
+ * @brief Forumlist widget
+ *
+ * Sidebar widget to show subcribed friendica forums. If activated
+ * in the settings, it appears at the notwork page sidebar
+ *
+ * @param int $uid The ID of the User
+ * @param int $cid
+ * The contact id which is used to mark a forum as "selected"
+ * @return string
+ */
+ public static function widget($uid,$cid = 0) {
+
+ if(! intval(feature_enabled(local_user(),'forumlist_widget')))
+ return;
+
+ $o = '';
+
+ //sort by last updated item
+ $lastitem = true;
+
+ $contacts = self::get_list($uid,true,$lastitem, true);
+ $total = count($contacts);
+ $visible_forums = 10;
+
+ if (dbm::is_result($contacts)) {
+
+ $id = 0;
+
+ foreach($contacts as $contact) {
+
+ $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
+
+ $entry = array(
+ 'url' => 'network?f=&cid=' . $contact['id'],
+ 'external_url' => 'redir/' . $contact['id'],
+ 'name' => $contact['name'],
+ 'cid' => $contact['id'],
+ 'selected' => $selected,
+ 'micro' => App::remove_baseurl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+ 'id' => ++$id,
+ );
+ $entries[] = $entry;
+ }
+
+ $tpl = get_markup_template('widget_forumlist.tpl');
+
+ $o .= replace_macros($tpl,array(
+ '$title' => t('Forums'),
+ '$forums' => $entries,
+ '$link_desc' => t('External link to forum'),
+ '$total' => $total,
+ '$visible_forums' => $visible_forums,
+ '$showmore' => t('show more'),
+ ));
+ }
+
+ return $o;
+ }
+
+ /**
+ * @brief Format forumlist as contact block
+ *
+ * This function is used to show the forumlist in
+ * the advanced profile.
+ *
+ * @param int $uid The ID of the User
+ * @return string
+ *
+ */
+ public static function profile_advanced($uid) {
+
+ $profile = intval(feature_enabled($uid,'forumlist_profile'));
+ if(! $profile)
+ return;
+
+ $o = '';
+
+ // place holder in case somebody wants configurability
+ $show_total = 9999;
+
+ //don't sort by last updated item
+ $lastitem = false;
+
+ $contacts = self::get_list($uid,false,$lastitem,false);
+
+ $total_shown = 0;
+
+ foreach($contacts as $contact) {
+ $forumlist .= micropro($contact,false,'forumlist-profile-advanced');
+ $total_shown ++;
+ if($total_shown == $show_total)
+ break;
+ }
+
+ if(count($contacts) > 0)
+ $o .= $forumlist;
+ return $o;
+ }
+
+ /**
+ * @brief count unread forum items
+ *
+ * Count unread items of connected forums and private groups
+ *
+ * @return array
+ * 'id' => contact id
+ * 'name' => contact/forum name
+ * 'count' => counted unseen forum items
+ *
+ */
+ public static function count_unseen_items() {
+ $r = q("SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
+ INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
+ WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
+ AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
+ AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
+ AND NOT `contact`.`pending` AND NOT `contact`.`archive`
+ AND `contact`.`success_update` > `failure_update`
+ GROUP BY `contact`.`id` ",
+ intval(local_user())
+ );
+
+ return $r;
+ }
+
+}
diff --git a/include/HTTPExceptions.php b/include/HTTPExceptions.php
new file mode 100644
index 0000000000..8571c99de5
--- /dev/null
+++ b/include/HTTPExceptions.php
@@ -0,0 +1,105 @@
+httpdesc=="") {
+ $this->httpdesc = preg_replace("|([a-z])([A-Z])|",'$1 $2', str_replace("Exception","",get_class($this)));
+ }
+ parent::__construct($message, $code, $previous);
+ }
+}
+
+// 4xx
+class TooManyRequestsException extends HTTPException {
+ var $httpcode = 429;
+}
+
+class UnauthorizedException extends HTTPException {
+ var $httpcode = 401;
+}
+
+class ForbiddenException extends HTTPException {
+ var $httpcode = 403;
+}
+
+class NotFoundException extends HTTPException {
+ var $httpcode = 404;
+}
+
+class GoneException extends HTTPException {
+ var $httpcode = 410;
+}
+
+class MethodNotAllowedException extends HTTPException {
+ var $httpcode = 405;
+}
+
+class NonAcceptableException extends HTTPException {
+ var $httpcode = 406;
+}
+
+class LenghtRequiredException extends HTTPException {
+ var $httpcode = 411;
+}
+
+class PreconditionFailedException extends HTTPException {
+ var $httpcode = 412;
+}
+
+class UnsupportedMediaTypeException extends HTTPException {
+ var $httpcode = 415;
+}
+
+class ExpetationFailesException extends HTTPException {
+ var $httpcode = 417;
+}
+
+class ConflictException extends HTTPException {
+ var $httpcode = 409;
+}
+
+class UnprocessableEntityException extends HTTPException {
+ var $httpcode = 422;
+}
+
+class ImATeapotException extends HTTPException {
+ var $httpcode = 418;
+ var $httpdesc = "I'm A Teapot";
+}
+
+class BadRequestException extends HTTPException {
+ var $httpcode = 400;
+}
+
+// 5xx
+
+class ServiceUnavaiableException extends HTTPException {
+ var $httpcode = 503;
+}
+
+class BadGatewayException extends HTTPException {
+ var $httpcode = 502;
+}
+
+class GatewayTimeoutException extends HTTPException {
+ var $httpcode = 504;
+}
+
+class NotImplementedException extends HTTPException {
+ var $httpcode = 501;
+}
+
+class InternalServerErrorException extends HTTPException {
+ var $httpcode = 500;
+}
+
+
+
diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
new file mode 100644
index 0000000000..611860f9d0
--- /dev/null
+++ b/include/NotificationsManager.php
@@ -0,0 +1,830 @@
+a = get_app();
+ }
+
+ /**
+ * @brief set some extra note properties
+ *
+ * @param array $notes array of note arrays from db
+ * @return array Copy of input array with added properties
+ *
+ * Set some extra properties to note array from db:
+ * - timestamp as int in default TZ
+ * - date_rel : relative date string
+ * - msg_html: message as html string
+ * - msg_plain: message as plain text string
+ */
+ private function _set_extra($notes) {
+ $rets = array();
+ foreach($notes as $n) {
+ $local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+ $n['timestamp'] = strtotime($local_time);
+ $n['date_rel'] = relative_date($n['date']);
+ $n['msg_html'] = bbcode($n['msg'], false, false, false, false);
+ $n['msg_plain'] = explode("\n",trim(html2plain($n['msg_html'], 0)))[0];
+
+ $rets[] = $n;
+ }
+ return $rets;
+ }
+
+
+ /**
+ * @brief Get all notifications for local_user()
+ *
+ * @param array $filter optional Array "column name"=>value: filter query by columns values
+ * @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date"
+ * @param string $limit optional Query limits
+ *
+ * @return array of results or false on errors
+ */
+ public function getAll($filter = array(), $order="-date", $limit="") {
+ $filter_str = array();
+ $filter_sql = "";
+ foreach($filter as $column => $value) {
+ $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
+ }
+ if (count($filter_str)>0) {
+ $filter_sql = "AND ".implode(" AND ", $filter_str);
+ }
+
+ $aOrder = explode(" ", $order);
+ $asOrder = array();
+ foreach($aOrder as $o) {
+ $dir = "asc";
+ if ($o[0]==="-") {
+ $dir = "desc";
+ $o = substr($o,1);
+ }
+ if ($o[0]==="+") {
+ $dir = "asc";
+ $o = substr($o,1);
+ }
+ $asOrder[] = "$o $dir";
+ }
+ $order_sql = implode(", ", $asOrder);
+
+ if($limit!="")
+ $limit = " LIMIT ".$limit;
+
+ $r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
+ intval(local_user())
+ );
+
+ if (dbm::is_result($r))
+ return $this->_set_extra($r);
+
+ return false;
+ }
+
+ /**
+ * @brief Get one note for local_user() by $id value
+ *
+ * @param int $id
+ * @return array note values or null if not found
+ */
+ public function getByID($id) {
+ $r = q("SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($id),
+ intval(local_user())
+ );
+ if (dbm::is_result($r)) {
+ return $this->_set_extra($r)[0];
+ }
+ return null;
+ }
+
+ /**
+ * @brief set seen state of $note of local_user()
+ *
+ * @param array $note
+ * @param bool $seen optional true or false, default true
+ * @return bool true on success, false on errors
+ */
+ public function setSeen($note, $seen = true) {
+ return q("UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d",
+ intval($seen),
+ dbesc($note['link']),
+ intval($note['parent']),
+ dbesc($note['otype']),
+ intval(local_user())
+ );
+ }
+
+ /**
+ * @brief set seen state of all notifications of local_user()
+ *
+ * @param bool $seen optional true or false. default true
+ * @return bool true on success, false on error
+ */
+ public function setAllSeen($seen = true) {
+ return q("UPDATE `notify` SET `seen` = %d WHERE `uid` = %d",
+ intval($seen),
+ intval(local_user())
+ );
+ }
+
+ /**
+ * @brief List of pages for the Notifications TabBar
+ *
+ * @param app $a The
+ * @return array with with notifications TabBar data
+ */
+ public function getTabs() {
+ $tabs = array(
+ array(
+ 'label' => t('System'),
+ 'url'=>'notifications/system',
+ 'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''),
+ 'id' => 'system-tab',
+ 'accesskey' => 'y',
+ ),
+ array(
+ 'label' => t('Network'),
+ 'url'=>'notifications/network',
+ 'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''),
+ 'id' => 'network-tab',
+ 'accesskey' => 'w',
+ ),
+ array(
+ 'label' => t('Personal'),
+ 'url'=>'notifications/personal',
+ 'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''),
+ 'id' => 'personal-tab',
+ 'accesskey' => 'r',
+ ),
+ array(
+ 'label' => t('Home'),
+ 'url' => 'notifications/home',
+ 'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''),
+ 'id' => 'home-tab',
+ 'accesskey' => 'h',
+ ),
+ array(
+ 'label' => t('Introductions'),
+ 'url' => 'notifications/intros',
+ 'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''),
+ 'id' => 'intro-tab',
+ 'accesskey' => 'i',
+ ),
+ );
+
+ return $tabs;
+ }
+
+ /**
+ * @brief Format the notification query in an usable array
+ *
+ * @param array $notifs The array from the db query
+ * @param string $ident The notifications identifier (e.g. network)
+ * @return array
+ * string 'label' => The type of the notification
+ * string 'link' => URL to the source
+ * string 'image' => The avatar image
+ * string 'url' => The profile url of the contact
+ * string 'text' => The notification text
+ * string 'when' => The date of the notification
+ * string 'ago' => T relative date of the notification
+ * bool 'seen' => Is the notification marked as "seen"
+ */
+ private function formatNotifs($notifs, $ident = "") {
+
+ $notif = array();
+ $arr = array();
+
+ if (dbm::is_result($notifs)) {
+
+ foreach ($notifs as $it) {
+ // Because we use different db tables for the notification query
+ // we have sometimes $it['unseen'] and sometimes $it['seen].
+ // So we will have to transform $it['unseen']
+ if (array_key_exists('unseen', $it)) {
+ $it['seen'] = ($it['unseen'] > 0 ? false : true);
+ }
+
+ // Depending on the identifier of the notification we need to use different defaults
+ switch ($ident) {
+ case 'system':
+ $default_item_label = 'notify';
+ $default_item_link = $this->a->get_baseurl(true).'/notify/view/'. $it['id'];
+ $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
+ $default_item_url = $it['url'];
+ $default_item_text = strip_tags(bbcode($it['msg']));
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
+ $default_item_ago = relative_date($it['date']);
+ break;
+
+ case 'home':
+ $default_item_label = 'comment';
+ $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
+ $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+ $default_item_url = $it['author-link'];
+ $default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+ $default_item_ago = relative_date($it['created']);
+ break;
+
+ default:
+ $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
+ $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
+ $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+ $default_item_url = $it['author-link'];
+ $default_item_text = (($it['id'] == $it['parent'])
+ ? sprintf(t("%s created a new post"), $it['author-name'])
+ : sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+ $default_item_ago = relative_date($it['created']);
+
+ }
+
+ // Transform the different types of notification in an usable array
+ switch ($it['verb']){
+ case ACTIVITY_LIKE:
+ $notif = array(
+ 'label' => 'like',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ case ACTIVITY_DISLIKE:
+ $notif = array(
+ 'label' => 'dislike',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ case ACTIVITY_ATTEND:
+ $notif = array(
+ 'label' => 'attend',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ case ACTIVITY_ATTENDNO:
+ $notif = array(
+ 'label' => 'attendno',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ case ACTIVITY_ATTENDMAYBE:
+ $notif = array(
+ 'label' => 'attendmaybe',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ case ACTIVITY_FRIEND:
+ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+ $obj = parse_xml_string($xmlhead.$it['object']);
+ $it['fname'] = $obj->title;
+
+ $notif = array(
+ 'label' => 'friend',
+ 'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+ 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ 'url' => $it['author-link'],
+ 'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ break;
+
+ default:
+ $notif = array(
+ 'label' => $default_item_label,
+ 'link' => $default_item_link,
+ 'image' => $default_item_image,
+ 'url' => $default_item_url,
+ 'text' => $default_item_text,
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
+ 'seen' => $it['seen']
+ );
+ }
+
+ $arr[] = $notif;
+ }
+ }
+
+ return $arr;
+
+ }
+
+ /**
+ * @brief Total number of network notifications
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @return int Number of network notifications
+ */
+ private function networkTotal($seen = 0) {
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+ $r = q("SELECT COUNT(*) AS `total`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
+ $sql_seen",
+ intval(local_user())
+ );
+
+ if (dbm::is_result($r))
+ return $r[0]['total'];
+
+ return 0;
+ }
+
+ /**
+ * @brief Get network notifications
+ *
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @param int $start Start the query at this point
+ * @param int $limit Maximum number of query results
+ *
+ * @return array with
+ * string 'ident' => Notification identifier
+ * int 'total' => Total number of available network notifications
+ * array 'notifications' => Network notifications
+ */
+ public function networkNotifs($seen = 0, $start = 0, $limit = 80) {
+ $ident = 'network';
+ $total = $this->networkTotal($seen);
+ $notifs = array();
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+ `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
+ $sql_seen
+ ORDER BY `item`.`created` DESC LIMIT %d, %d ",
+ intval(local_user()),
+ intval($start),
+ intval($limit)
+ );
+
+ if (dbm::is_result($r))
+ $notifs = $this->formatNotifs($r, $ident);
+
+ $arr = array (
+ 'notifications' => $notifs,
+ 'ident' => $ident,
+ 'total' => $total,
+ );
+
+ return $arr;
+ }
+
+ /**
+ * @brief Total number of system notifications
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @return int Number of system notifications
+ */
+ private function systemTotal($seen = 0) {
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `seen` = 0 ";
+
+ $r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
+ intval(local_user())
+ );
+
+ if (dbm::is_result($r))
+ return $r[0]['total'];
+
+ return 0;
+ }
+
+ /**
+ * @brief Get system notifications
+ *
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @param int $start Start the query at this point
+ * @param int $limit Maximum number of query results
+ *
+ * @return array with
+ * string 'ident' => Notification identifier
+ * int 'total' => Total number of available system notifications
+ * array 'notifications' => System notifications
+ */
+ public function systemNotifs($seen = 0, $start = 0, $limit = 80) {
+ $ident = 'system';
+ $total = $this->systemTotal($seen);
+ $notifs = array();
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `seen` = 0 ";
+
+ $r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
+ WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
+ intval(local_user()),
+ intval($start),
+ intval($limit)
+ );
+
+ if (dbm::is_result($r))
+ $notifs = $this->formatNotifs($r, $ident);
+
+ $arr = array (
+ 'notifications' => $notifs,
+ 'ident' => $ident,
+ 'total' => $total,
+ );
+
+ return $arr;
+ }
+
+ /**
+ * @brief Addional SQL query string for the personal notifications
+ *
+ * @return string The additional sql query
+ */
+ private function _personal_sql_extra() {
+ $myurl = $this->a->get_baseurl(true) . '/profile/'. $this->a->user['nickname'];
+ $myurl = substr($myurl,strpos($myurl,'://')+3);
+ $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
+ $diasp_url = str_replace('/profile/','/u/',$myurl);
+ $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
+ dbesc($myurl . '$'),
+ dbesc($myurl . '\\]'),
+ dbesc($diasp_url . '\\]')
+ );
+
+ return $sql_extra;
+ }
+
+ /**
+ * @brief Total number of personal notifications
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @return int Number of personal notifications
+ */
+ private function personalTotal($seen = 0) {
+ $sql_seen = "";
+ $sql_extra = $this->_personal_sql_extra();
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+ $r = q("SELECT COUNT(*) AS `total`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`visible` = 1
+ $sql_extra
+ $sql_seen
+ AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 " ,
+ intval(local_user())
+ );
+
+ if (dbm::is_result($r))
+ return $r[0]['total'];
+
+ return 0;
+ }
+
+ /**
+ * @brief Get personal notifications
+ *
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @param int $start Start the query at this point
+ * @param int $limit Maximum number of query results
+ *
+ * @return array with
+ * string 'ident' => Notification identifier
+ * int 'total' => Total number of available personal notifications
+ * array 'notifications' => Personal notifications
+ */
+ public function personalNotifs($seen = 0, $start = 0, $limit = 80) {
+ $ident = 'personal';
+ $total = $this->personalTotal($seen);
+ $sql_extra = $this->_personal_sql_extra();
+ $notifs = array();
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+ `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`visible` = 1
+ $sql_extra
+ $sql_seen
+ AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
+ ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
+ intval(local_user()),
+ intval($start),
+ intval($limit)
+ );
+
+ if (dbm::is_result($r))
+ $notifs = $this->formatNotifs($r, $ident);
+
+ $arr = array (
+ 'notifications' => $notifs,
+ 'ident' => $ident,
+ 'total' => $total,
+ );
+
+ return $arr;
+ }
+
+ /**
+ * @brief Total number of home notifications
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @return int Number of home notifications
+ */
+ private function homeTotal($seen = 0) {
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+ $r = q("SELECT COUNT(*) AS `total` FROM `item`
+ WHERE `item`.`visible` = 1 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
+ $sql_seen",
+ intval(local_user())
+ );
+
+ if (dbm::is_result($r))
+ return $r[0]['total'];
+
+ return 0;
+ }
+
+ /**
+ * @brief Get home notifications
+ *
+ * @param int|string $seen
+ * If 0 only include notifications into the query
+ * which aren't marked as "seen"
+ * @param int $start Start the query at this point
+ * @param int $limit Maximum number of query results
+ *
+ * @return array with
+ * string 'ident' => Notification identifier
+ * int 'total' => Total number of available home notifications
+ * array 'notifications' => Home notifications
+ */
+ public function homeNotifs($seen = 0, $start = 0, $limit = 80) {
+ $ident = 'home';
+ $total = $this->homeTotal($seen);
+ $notifs = array();
+ $sql_seen = "";
+
+ if($seen === 0)
+ $sql_seen = " AND `item`.`unseen` = 1 ";
+
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+ `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`visible` = 1 AND
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
+ $sql_seen
+ ORDER BY `item`.`created` DESC LIMIT %d, %d ",
+ intval(local_user()),
+ intval($start),
+ intval($limit)
+ );
+
+ if (dbm::is_result($r))
+ $notifs = $this->formatNotifs($r, $ident);
+
+ $arr = array (
+ 'notifications' => $notifs,
+ 'ident' => $ident,
+ 'total' => $total,
+ );
+
+ return $arr;
+ }
+
+ /**
+ * @brief Total number of introductions
+ * @param bool $all
+ * If false only include introductions into the query
+ * which aren't marked as ignored
+ * @return int Number of introductions
+ */
+ private function introTotal($all = false) {
+ $sql_extra = "";
+
+ if(!$all)
+ $sql_extra = " AND `ignore` = 0 ";
+
+ $r = q("SELECT COUNT(*) AS `total` FROM `intro`
+ WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
+ intval($_SESSION['uid'])
+ );
+
+ if (dbm::is_result($r))
+ return $r[0]['total'];
+
+ return 0;
+ }
+
+ /**
+ * @brief Get introductions
+ *
+ * @param bool $all
+ * If false only include introductions into the query
+ * which aren't marked as ignored
+ * @param int $start Start the query at this point
+ * @param int $limit Maximum number of query results
+ *
+ * @return array with
+ * string 'ident' => Notification identifier
+ * int 'total' => Total number of available introductions
+ * array 'notifications' => Introductions
+ */
+ public function introNotifs($all = false, $start = 0, $limit = 80) {
+ $ident = 'introductions';
+ $total = $this->introTotal($seen);
+ $notifs = array();
+ $sql_extra = "";
+
+ if(!$all)
+ $sql_extra = " AND `ignore` = 0 ";
+
+ /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact
+ $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`,
+ `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
+ `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
+ `gcontact`.`network` AS `gnetwork`
+ FROM `intro`
+ LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
+ LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
+ LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+ WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0
+ LIMIT %d, %d",
+ intval($_SESSION['uid']),
+ intval($start),
+ intval($limit)
+ );
+
+ if (dbm::is_result($r))
+ $notifs = $this->formatIntros($r);
+
+ $arr = array (
+ 'ident' => $ident,
+ 'total' => $total,
+ 'notifications' => $notifs,
+ );
+
+ return $arr;
+ }
+
+ /**
+ * @brief Format the notification query in an usable array
+ *
+ * @param array $intros The array from the db query
+ * @return array with the introductions
+ */
+ private function formatIntros($intros) {
+ $knowyou = '';
+
+ foreach($intros as $it) {
+ // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
+ // We have to distinguish between these two because they use different data.
+
+ // Contact suggestions
+ if($it['fid']) {
+
+ $return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
+
+ $intro = array(
+ 'label' => 'friend_suggestion',
+ 'notify_type' => t('Friend Suggestion'),
+ 'intro_id' => $it['intro_id'],
+ 'madeby' => $it['name'],
+ 'contact_id' => $it['contact-id'],
+ 'photo' => ((x($it,'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+ 'name' => $it['fname'],
+ 'url' => zrl($it['furl']),
+ 'hidden' => $it['hidden'] == 1,
+ 'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0),
+
+ 'knowyou' => $knowyou,
+ 'note' => $it['note'],
+ 'request' => $it['frequest'] . '?addr=' . $return_addr,
+
+ );
+
+ // Normal connection requests
+ } else {
+
+ // Probe the contact url to get missing data
+ $ret = probe_url($it["url"]);
+
+ if ($it['gnetwork'] == "")
+ $it['gnetwork'] = $ret["network"];
+
+ // Don't show these data until you are connected. Diaspora is doing the same.
+ if($it['gnetwork'] === NETWORK_DIASPORA) {
+ $it['glocation'] = "";
+ $it['gabout'] = "";
+ $it['ggender'] = "";
+ }
+ $intro = array(
+ 'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'),
+ 'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
+ 'dfrn_id' => $it['issued-id'],
+ 'uid' => $_SESSION['uid'],
+ 'intro_id' => $it['intro_id'],
+ 'contact_id' => $it['contact-id'],
+ 'photo' => ((x($it,'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+ 'name' => $it['name'],
+ 'location' => bbcode($it['glocation'], false, false),
+ 'about' => bbcode($it['gabout'], false, false),
+ 'keywords' => $it['gkeywords'],
+ 'gender' => $it['ggender'],
+ 'hidden' => $it['hidden'] == 1,
+ 'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0),
+ 'url' => $it['url'],
+ 'zrl' => zrl($it['url']),
+ 'addr' => $ret['addr'],
+ 'network' => $it['gnetwork'],
+ 'knowyou' => $it['knowyou'],
+ 'note' => $it['note'],
+ );
+ }
+
+ $arr[] = $intro;
+ }
+
+ return $arr;
+ }
+}
diff --git a/include/ParseUrl.php b/include/ParseUrl.php
new file mode 100644
index 0000000000..e9ac527a1a
--- /dev/null
+++ b/include/ParseUrl.php
@@ -0,0 +1,532 @@
+ The url of the parsed page
+ * string 'type' => Content type
+ * string 'title' => The title of the content
+ * string 'text' => The description for the content
+ * string 'image' => A preview image of the content (only available
+ * if $no_geuessing = false
+ * array'images' = Array of preview pictures
+ * string 'keywords' => The tags which belong to the content
+ *
+ * @see ParseUrl::getSiteinfo() for more information about scraping
+ * embeddable content
+ */
+ public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true) {
+
+ if ($url == "") {
+ return false;
+ }
+
+ $r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
+ dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
+
+ if ($r) {
+ $data = $r[0]["content"];
+ }
+
+ if (!is_null($data)) {
+ $data = unserialize($data);
+ return $data;
+ }
+
+ $data = self::getSiteinfo($url, $no_guessing, $do_oembed);
+
+ q("INSERT INTO `parsed_url` (`url`, `guessing`, `oembed`, `content`, `created`) VALUES ('%s', %d, %d, '%s', '%s')
+ ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'",
+ dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed),
+ dbesc(serialize($data)), dbesc(datetime_convert()),
+ dbesc(serialize($data)), dbesc(datetime_convert()));
+
+ return $data;
+ }
+ /**
+ * @brief Parse a page for embeddable content information
+ *
+ * This method parses to url for meta data which can be used to embed
+ * the content. If available it prioritizes Open Graph meta tags.
+ * If this is not available it uses the twitter cards meta tags.
+ * As fallback it uses standard html elements with meta informations
+ * like \Awesome Title\ or
+ * \
+ *
+ * @param type $url The url of the page which should be scraped
+ * @param type $no_guessing If true the parse doens't search for
+ * preview pictures
+ * @param type $do_oembed The false option is used by the function fetch_oembed()
+ * to avoid endless loops
+ * @param type $count Internal counter to avoid endless loops
+ *
+ * @return array which contains needed data for embedding
+ * string 'url' => The url of the parsed page
+ * string 'type' => Content type
+ * string 'title' => The title of the content
+ * string 'text' => The description for the content
+ * string 'image' => A preview image of the content (only available
+ * if $no_geuessing = false
+ * array'images' = Array of preview pictures
+ * string 'keywords' => The tags which belong to the content
+ *
+ * @todo https://developers.google.com/+/plugins/snippet/
+ * @verbatim
+ *
+ *
+ *
+ *
+ *
+ *
Shiny Trinket
+ *
+ *
Shiny trinkets are shiny.
+ *
+ * @endverbatim
+ */
+ public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
+
+ $a = get_app();
+
+ $siteinfo = array();
+
+ // Check if the URL does contain a scheme
+ $scheme = parse_url($url, PHP_URL_SCHEME);
+
+ if ($scheme == "") {
+ $url = "http://".trim($url, "/");
+ }
+
+ if ($count > 10) {
+ logger("parseurl_getsiteinfo: Endless loop detected for ".$url, LOGGER_DEBUG);
+ return($siteinfo);
+ }
+
+ $url = trim($url, "'");
+ $url = trim($url, '"');
+
+ $url = strip_tracking_query_params($url);
+
+ $siteinfo["url"] = $url;
+ $siteinfo["type"] = "link";
+
+ $check_cert = Config::get("system", "verifyssl");
+
+ $stamp1 = microtime(true);
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_HEADER, 1);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+ curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+ if ($check_cert) {
+ @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+ }
+
+ $header = curl_exec($ch);
+ $curl_info = @curl_getinfo($ch);
+ curl_close($ch);
+
+ $a->save_timestamp($stamp1, "network");
+
+ if ((($curl_info["http_code"] == "301") || ($curl_info["http_code"] == "302") || ($curl_info["http_code"] == "303") || ($curl_info["http_code"] == "307"))
+ && (($curl_info["redirect_url"] != "") || ($curl_info["location"] != ""))) {
+ if ($curl_info["redirect_url"] != "") {
+ $siteinfo = self::getSiteinfo($curl_info["redirect_url"], $no_guessing, $do_oembed, ++$count);
+ } else {
+ $siteinfo = self::getSiteinfo($curl_info["location"], $no_guessing, $do_oembed, ++$count);
+ }
+ return($siteinfo);
+ }
+
+ // If the file is too large then exit
+ if ($curl_info["download_content_length"] > 1000000) {
+ return($siteinfo);
+ }
+
+ // If it isn't a HTML file then exit
+ if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]), "html")) {
+ return($siteinfo);
+ }
+
+ if ($do_oembed) {
+
+ $oembed_data = oembed_fetch_url($url);
+
+ if (!in_array($oembed_data->type, array("error", "rich"))) {
+ $siteinfo["type"] = $oembed_data->type;
+ }
+
+ if (($oembed_data->type == "link") && ($siteinfo["type"] != "photo")) {
+ if (isset($oembed_data->title)) {
+ $siteinfo["title"] = $oembed_data->title;
+ }
+ if (isset($oembed_data->description)) {
+ $siteinfo["text"] = trim($oembed_data->description);
+ }
+ if (isset($oembed_data->thumbnail_url)) {
+ $siteinfo["image"] = $oembed_data->thumbnail_url;
+ }
+ }
+ }
+
+ // Fetch the first mentioned charset. Can be in body or header
+ $charset = "";
+ if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) {
+ $charset = trim(trim(trim(array_pop($matches)), ';,'));
+ }
+
+ if ($charset == "") {
+ $charset = "utf-8";
+ }
+
+ $pos = strpos($header, "\r\n\r\n");
+
+ if ($pos) {
+ $body = trim(substr($header, $pos));
+ } else {
+ $body = $header;
+ }
+
+ if (($charset != "") && (strtoupper($charset) != "UTF-8")) {
+ logger("parseurl_getsiteinfo: detected charset ".$charset, LOGGER_DEBUG);
+ //$body = mb_convert_encoding($body, "UTF-8", $charset);
+ $body = iconv($charset, "UTF-8//TRANSLIT", $body);
+ }
+
+ $body = mb_convert_encoding($body, 'HTML-ENTITIES', "UTF-8");
+
+ $doc = new \DOMDocument();
+ @$doc->loadHTML($body);
+
+ \xml::deleteNode($doc, "style");
+ \xml::deleteNode($doc, "script");
+ \xml::deleteNode($doc, "option");
+ \xml::deleteNode($doc, "h1");
+ \xml::deleteNode($doc, "h2");
+ \xml::deleteNode($doc, "h3");
+ \xml::deleteNode($doc, "h4");
+ \xml::deleteNode($doc, "h5");
+ \xml::deleteNode($doc, "h6");
+ \xml::deleteNode($doc, "ol");
+ \xml::deleteNode($doc, "ul");
+
+ $xpath = new \DomXPath($doc);
+
+ $list = $xpath->query("//meta[@content]");
+ foreach ($list as $node) {
+ $attr = array();
+ if ($node->attributes->length) {
+ foreach ($node->attributes as $attribute) {
+ $attr[$attribute->name] = $attribute->value;
+ }
+ }
+
+ if (@$attr["http-equiv"] == "refresh") {
+ $path = $attr["content"];
+ $pathinfo = explode(";", $path);
+ $content = "";
+ foreach ($pathinfo as $value) {
+ if (substr(strtolower($value), 0, 4) == "url=") {
+ $content = substr($value, 4);
+ }
+ }
+ if ($content != "") {
+ $siteinfo = self::getSiteinfo($content, $no_guessing, $do_oembed, ++$count);
+ return($siteinfo);
+ }
+ }
+ }
+
+ $list = $xpath->query("//title");
+ if ($list->length > 0) {
+ $siteinfo["title"] = $list->item(0)->nodeValue;
+ }
+
+ //$list = $xpath->query("head/meta[@name]");
+ $list = $xpath->query("//meta[@name]");
+ foreach ($list as $node) {
+ $attr = array();
+ if ($node->attributes->length) {
+ foreach ($node->attributes as $attribute) {
+ $attr[$attribute->name] = $attribute->value;
+ }
+ }
+
+ $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+
+ if ($attr["content"] != "") {
+ switch (strtolower($attr["name"])) {
+ case "fulltitle":
+ $siteinfo["title"] = $attr["content"];
+ break;
+ case "description":
+ $siteinfo["text"] = $attr["content"];
+ break;
+ case "thumbnail":
+ $siteinfo["image"] = $attr["content"];
+ break;
+ case "twitter:image":
+ $siteinfo["image"] = $attr["content"];
+ break;
+ case "twitter:image:src":
+ $siteinfo["image"] = $attr["content"];
+ break;
+ case "twitter:card":
+ if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
+ $siteinfo["type"] = $attr["content"];
+ }
+ break;
+ case "twitter:description":
+ $siteinfo["text"] = $attr["content"];
+ break;
+ case "twitter:title":
+ $siteinfo["title"] = $attr["content"];
+ break;
+ case "dc.title":
+ $siteinfo["title"] = $attr["content"];
+ break;
+ case "dc.description":
+ $siteinfo["text"] = $attr["content"];
+ break;
+ case "keywords":
+ $keywords = explode(",", $attr["content"]);
+ break;
+ case "news_keywords":
+ $keywords = explode(",", $attr["content"]);
+ break;
+ }
+ }
+ if ($siteinfo["type"] == "summary") {
+ $siteinfo["type"] = "link";
+ }
+ }
+
+ if (isset($keywords)) {
+ $siteinfo["keywords"] = array();
+ foreach ($keywords as $keyword) {
+ if (!in_array(trim($keyword), $siteinfo["keywords"])) {
+ $siteinfo["keywords"][] = trim($keyword);
+ }
+ }
+ }
+
+ //$list = $xpath->query("head/meta[@property]");
+ $list = $xpath->query("//meta[@property]");
+ foreach ($list as $node) {
+ $attr = array();
+ if ($node->attributes->length) {
+ foreach ($node->attributes as $attribute) {
+ $attr[$attribute->name] = $attribute->value;
+ }
+ }
+
+ $attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
+
+ if ($attr["content"] != "") {
+ switch (strtolower($attr["property"])) {
+ case "og:image":
+ $siteinfo["image"] = $attr["content"];
+ break;
+ case "og:title":
+ $siteinfo["title"] = $attr["content"];
+ break;
+ case "og:description":
+ $siteinfo["text"] = $attr["content"];
+ break;
+ }
+ }
+ }
+
+ if ((@$siteinfo["image"] == "") && !$no_guessing) {
+ $list = $xpath->query("//img[@src]");
+ foreach ($list as $node) {
+ $attr = array();
+ if ($node->attributes->length) {
+ foreach ($node->attributes as $attribute) {
+ $attr[$attribute->name] = $attribute->value;
+ }
+ }
+
+ $src = self::completeUrl($attr["src"], $url);
+ $photodata = get_photo_info($src);
+
+ if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
+ if ($photodata[0] > 300) {
+ $photodata[1] = round($photodata[1] * (300 / $photodata[0]));
+ $photodata[0] = 300;
+ }
+ if ($photodata[1] > 300) {
+ $photodata[0] = round($photodata[0] * (300 / $photodata[1]));
+ $photodata[1] = 300;
+ }
+ $siteinfo["images"][] = array("src" => $src,
+ "width" => $photodata[0],
+ "height" => $photodata[1]);
+ }
+
+ }
+ } elseif ($siteinfo["image"] != "") {
+ $src = self::completeUrl($siteinfo["image"], $url);
+
+ unset($siteinfo["image"]);
+
+ $photodata = get_photo_info($src);
+
+ if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
+ $siteinfo["images"][] = array("src" => $src,
+ "width" => $photodata[0],
+ "height" => $photodata[1]);
+ }
+ }
+
+ if ((@$siteinfo["text"] == "") && (@$siteinfo["title"] != "") && !$no_guessing) {
+ $text = "";
+
+ $list = $xpath->query("//div[@class='article']");
+ foreach ($list as $node) {
+ if (strlen($node->nodeValue) > 40) {
+ $text .= " ".trim($node->nodeValue);
+ }
+ }
+
+ if ($text == "") {
+ $list = $xpath->query("//div[@class='content']");
+ foreach ($list as $node) {
+ if (strlen($node->nodeValue) > 40) {
+ $text .= " ".trim($node->nodeValue);
+ }
+ }
+ }
+
+ // If none text was found then take the paragraph content
+ if ($text == "") {
+ $list = $xpath->query("//p");
+ foreach ($list as $node) {
+ if (strlen($node->nodeValue) > 40) {
+ $text .= " ".trim($node->nodeValue);
+ }
+ }
+ }
+
+ if ($text != "") {
+ $text = trim(str_replace(array("\n", "\r"), array(" ", " "), $text));
+
+ while (strpos($text, " ")) {
+ $text = trim(str_replace(" ", " ", $text));
+ }
+
+ $siteinfo["text"] = trim(html_entity_decode(substr($text, 0, 350), ENT_QUOTES, "UTF-8").'...');
+ }
+ }
+
+ logger("parseurl_getsiteinfo: Siteinfo for ".$url." ".print_r($siteinfo, true), LOGGER_DEBUG);
+
+ call_hooks("getsiteinfo", $siteinfo);
+
+ return($siteinfo);
+ }
+
+ /**
+ * @brief Convert tags from CSV to an array
+ *
+ * @param string $string Tags
+ * @return array with formatted Hashtags
+ */
+ public static function convertTagsToArray($string) {
+ $arr_tags = str_getcsv($string);
+ if (count($arr_tags)) {
+ // add the # sign to every tag
+ array_walk($arr_tags, array("self", "arrAddHashes"));
+
+ return $arr_tags;
+ }
+ }
+
+ /**
+ * @brief Add a hasht sign to a string
+ *
+ * This method is used as callback function
+ *
+ * @param string $tag The pure tag name
+ * @param int $k Counter for internal use
+ */
+ private static function arrAddHashes(&$tag, $k) {
+ $tag = "#" . $tag;
+ }
+
+ /**
+ * @brief Add a scheme to an url
+ *
+ * The src attribute of some html elements (e.g. images)
+ * can miss the scheme so we need to add the correct
+ * scheme
+ *
+ * @param string $url The url which possibly does have
+ * a missing scheme (a link to an image)
+ * @param string $scheme The url with a correct scheme
+ * (e.g. the url from the webpage which does contain the image)
+ *
+ * @return string The url with a scheme
+ */
+ private static function completeUrl($url, $scheme) {
+ $urlarr = parse_url($url);
+
+ // If the url does allready have an scheme
+ // we can stop the process here
+ if (isset($urlarr["scheme"])) {
+ return($url);
+ }
+
+ $schemearr = parse_url($scheme);
+
+ $complete = $schemearr["scheme"]."://".$schemearr["host"];
+
+ if (@$schemearr["port"] != "") {
+ $complete .= ":".$schemearr["port"];
+ }
+
+ if (strpos($urlarr["path"],"/") !== 0) {
+ $complete .= "/";
+ }
+
+ $complete .= $urlarr["path"];
+
+ if (@$urlarr["query"] != "") {
+ $complete .= "?".$urlarr["query"];
+ }
+
+ if (@$urlarr["fragment"] != "") {
+ $complete .= "#".$urlarr["fragment"];
+ }
+
+ return($complete);
+ }
+}
diff --git a/include/Photo.php b/include/Photo.php
index 9732801c9a..828dce82d7 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -1,133 +1,141 @@
'jpg',
- 'image/png' => 'png',
- 'image/gif' => 'gif'
- );
- } else {
- $t = array();
- $t['image/jpeg'] ='jpg';
- if (imagetypes() & IMG_PNG) $t['image/png'] = 'png';
+ /**
+ * @brief supported mimetypes and corresponding file extensions
+ */
+ static function supportedTypes() {
+ if (class_exists('Imagick')) {
+
+ // Imagick::queryFormats won't help us a lot there...
+ // At least, not yet, other parts of friendica uses this array
+ $t = array(
+ 'image/jpeg' => 'jpg',
+ 'image/png' => 'png',
+ 'image/gif' => 'gif'
+ );
+ } else {
+ $t = array();
+ $t['image/jpeg'] ='jpg';
+ if (imagetypes() & IMG_PNG) {
+ $t['image/png'] = 'png';
+ }
+ }
+
+ return $t;
}
- return $t;
- }
+ public function __construct($data, $type=null) {
+ $this->imagick = class_exists('Imagick');
+ $this->types = $this->supportedTypes();
+ if (!array_key_exists($type, $this->types)){
+ $type='image/jpeg';
+ }
+ $this->type = $type;
- public function __construct($data, $type=null) {
- $this->imagick = class_exists('Imagick');
- $this->types = $this->supportedTypes();
- if (!array_key_exists($type,$this->types)){
- $type='image/jpeg';
- }
- $this->type = $type;
-
- if($this->is_imagick() && $this->load_data($data)) {
+ if ($this->is_imagick() && $this->load_data($data)) {
return true;
} else {
// Failed to load with Imagick, fallback
$this->imagick = false;
}
return $this->load_data($data);
- }
-
- public function __destruct() {
- if($this->image) {
- if($this->is_imagick()) {
- $this->image->clear();
- $this->image->destroy();
- return;
- }
- imagedestroy($this->image);
}
- }
- public function is_imagick() {
- return $this->imagick;
- }
-
- /**
- * Maps Mime types to Imagick formats
- */
- public function get_FormatsMap() {
- $m = array(
- 'image/jpeg' => 'JPG',
- 'image/png' => 'PNG',
- 'image/gif' => 'GIF'
- );
- return $m;
- }
-
- private function load_data($data) {
- if($this->is_imagick()) {
- $this->image = new Imagick();
- try {
- $this->image->readImageBlob($data);
+ public function __destruct() {
+ if ($this->image) {
+ if ($this->is_imagick()) {
+ $this->image->clear();
+ $this->image->destroy();
+ return;
}
- catch (Exception $e) {
+ imagedestroy($this->image);
+ }
+ }
+
+ public function is_imagick() {
+ return $this->imagick;
+ }
+
+ /**
+ * @brief Maps Mime types to Imagick formats
+ * @return arr With with image formats (mime type as key)
+ */
+ public function get_FormatsMap() {
+ $m = array(
+ 'image/jpeg' => 'JPG',
+ 'image/png' => 'PNG',
+ 'image/gif' => 'GIF'
+ );
+ return $m;
+ }
+
+ private function load_data($data) {
+ if ($this->is_imagick()) {
+ $this->image = new Imagick();
+ try {
+ $this->image->readImageBlob($data);
+ } catch (Exception $e) {
// Imagick couldn't use the data
return false;
}
- /**
- * Setup the image to the format it will be saved to
- */
- $map = $this->get_FormatsMap();
- $format = $map[$type];
- $this->image->setFormat($format);
+ /*
+ * Setup the image to the format it will be saved to
+ */
+ $map = $this->get_FormatsMap();
+ $format = $map[$type];
+ $this->image->setFormat($format);
- // Always coalesce, if it is not a multi-frame image it won't hurt anyway
- $this->image = $this->image->coalesceImages();
+ // Always coalesce, if it is not a multi-frame image it won't hurt anyway
+ $this->image = $this->image->coalesceImages();
- /**
- * setup the compression here, so we'll do it only once
- */
- switch($this->getType()){
- case "image/png":
- $quality = get_config('system','png_quality');
- if((! $quality) || ($quality > 9))
- $quality = PNG_QUALITY;
- /**
- * From http://www.imagemagick.org/script/command-line-options.php#quality:
- *
- * 'For the MNG and PNG image formats, the quality value sets
- * the zlib compression level (quality / 10) and filter-type (quality % 10).
- * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
- * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
- */
- $quality = $quality * 10;
- $this->image->setCompressionQuality($quality);
- break;
- case "image/jpeg":
- $quality = get_config('system','jpeg_quality');
- if((! $quality) || ($quality > 100))
- $quality = JPEG_QUALITY;
- $this->image->setCompressionQuality($quality);
- }
+ /*
+ * setup the compression here, so we'll do it only once
+ */
+ switch($this->getType()){
+ case "image/png":
+ $quality = get_config('system', 'png_quality');
+ if ((! $quality) || ($quality > 9)) {
+ $quality = PNG_QUALITY;
+ }
+ /*
+ * From http://www.imagemagick.org/script/command-line-options.php#quality:
+ *
+ * 'For the MNG and PNG image formats, the quality value sets
+ * the zlib compression level (quality / 10) and filter-type (quality % 10).
+ * The default PNG "quality" is 75, which means compression level 7 with adaptive PNG filtering,
+ * unless the image has a color map, in which case it means compression level 7 with no PNG filtering'
+ */
+ $quality = $quality * 10;
+ $this->image->setCompressionQuality($quality);
+ break;
+ case "image/jpeg":
+ $quality = get_config('system', 'jpeg_quality');
+ if ((! $quality) || ($quality > 100)) {
+ $quality = JPEG_QUALITY;
+ }
+ $this->image->setCompressionQuality($quality);
+ }
// The 'width' and 'height' properties are only used by non-Imagick routines.
$this->width = $this->image->getImageWidth();
@@ -139,7 +147,7 @@ class Photo {
$this->valid = false;
$this->image = @imagecreatefromstring($data);
- if($this->image !== FALSE) {
+ if ($this->image !== false) {
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
$this->valid = true;
@@ -148,123 +156,125 @@ class Photo {
return true;
}
-
+
return false;
}
- public function is_valid() {
- if($this->is_imagick())
- return ($this->image !== FALSE);
- return $this->valid;
- }
-
- public function getWidth() {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick())
- return $this->image->getImageWidth();
- return $this->width;
- }
-
- public function getHeight() {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick())
- return $this->image->getImageHeight();
- return $this->height;
- }
-
- public function getImage() {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick()) {
- /* Clean it */
- $this->image = $this->image->deconstructImages();
- return $this->image;
+ public function is_valid() {
+ if ($this->is_imagick()) {
+ return ($this->image !== false);
+ }
+ return $this->valid;
}
- return $this->image;
- }
- public function getType() {
- if(!$this->is_valid())
- return FALSE;
+ public function getWidth() {
+ if (!$this->is_valid()) {
+ return false;
+ }
- return $this->type;
- }
+ if ($this->is_imagick()) {
+ return $this->image->getImageWidth();
+ }
+ return $this->width;
+ }
- public function getExt() {
- if(!$this->is_valid())
- return FALSE;
+ public function getHeight() {
+ if (!$this->is_valid()) {
+ return false;
+ }
- return $this->types[$this->getType()];
- }
+ if ($this->is_imagick()) {
+ return $this->image->getImageHeight();
+ }
+ return $this->height;
+ }
- public function scaleImage($max) {
- if(!$this->is_valid())
- return FALSE;
+ public function getImage() {
+ if (!$this->is_valid()) {
+ return false;
+ }
- $width = $this->getWidth();
- $height = $this->getHeight();
+ if ($this->is_imagick()) {
+ /* Clean it */
+ $this->image = $this->image->deconstructImages();
+ return $this->image;
+ }
+ return $this->image;
+ }
- $dest_width = $dest_height = 0;
+ public function getType() {
+ if (!$this->is_valid()) {
+ return false;
+ }
- if((! $width)|| (! $height))
- return FALSE;
+ return $this->type;
+ }
- if($width > $max && $height > $max) {
+ public function getExt() {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ return $this->types[$this->getType()];
+ }
+
+ public function scaleImage($max) {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ $width = $this->getWidth();
+ $height = $this->getHeight();
+
+ $dest_width = $dest_height = 0;
+
+ if ((! $width)|| (! $height)) {
+ return false;
+ }
+
+ if ($width > $max && $height > $max) {
// very tall image (greater than 16:9)
// constrain the width - let the height float.
- if((($height * 9) / 16) > $width) {
+ if ((($height * 9) / 16) > $width) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
+ } elseif ($width > $height) {
+ // else constrain both dimensions
+ $dest_width = $max;
+ $dest_height = intval(($height * $max) / $width);
+ } else {
+ $dest_width = intval(($width * $max) / $height);
+ $dest_height = $max;
}
-
- // else constrain both dimensions
-
- elseif($width > $height) {
- $dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
- }
- else {
- $dest_width = intval(( $width * $max ) / $height);
- $dest_height = $max;
- }
- }
- else {
- if( $width > $max ) {
- $dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
- }
- else {
- if( $height > $max ) {
+ } else {
+ if ($width > $max) {
+ $dest_width = $max;
+ $dest_height = intval(($height * $max) / $width);
+ } else {
+ if ($height > $max) {
// very tall image (greater than 16:9)
// but width is OK - don't do anything
- if((($height * 9) / 16) > $width) {
+ if ((($height * 9) / 16) > $width) {
$dest_width = $width;
- $dest_height = $height;
- }
- else {
- $dest_width = intval(( $width * $max ) / $height);
- $dest_height = $max;
+ $dest_height = $height;
+ } else {
+ $dest_width = intval(($width * $max) / $height);
+ $dest_height = $max;
}
+ } else {
+ $dest_width = $width;
+ $dest_height = $height;
+ }
+ }
}
- else {
- $dest_width = $width;
- $dest_height = $height;
- }
- }
- }
- if($this->is_imagick()) {
- /**
+ if ($this->is_imagick()) {
+ /*
* If it is not animated, there will be only one iteration here,
* so don't bother checking
*/
@@ -273,7 +283,7 @@ class Photo {
do {
// FIXME - implement horizantal bias for scaling as in followin GD functions
- // to allow very tall images to be constrained only horizontally.
+ // to allow very tall images to be constrained only horizontally.
$this->image->scaleImage($dest_width, $dest_height);
} while ($this->image->nextImage());
@@ -283,234 +293,253 @@ class Photo {
$this->height = $this->image->getImageHeight();
return;
- }
-
-
- $dest = imagecreatetruecolor( $dest_width, $dest_height );
- imagealphablending($dest, false);
- imagesavealpha($dest, true);
- if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
- imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
- if($this->image)
- imagedestroy($this->image);
- $this->image = $dest;
- $this->width = imagesx($this->image);
- $this->height = imagesy($this->image);
- }
-
- public function rotate($degrees) {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick()) {
- $this->image->setFirstIterator();
- do {
- $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
- } while ($this->image->nextImage());
- return;
- }
-
- $this->image = imagerotate($this->image,$degrees,0);
- $this->width = imagesx($this->image);
- $this->height = imagesy($this->image);
- }
-
- public function flip($horiz = true, $vert = false) {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick()) {
- $this->image->setFirstIterator();
- do {
- if($horiz) $this->image->flipImage();
- if($vert) $this->image->flopImage();
- } while ($this->image->nextImage());
- return;
- }
-
- $w = imagesx($this->image);
- $h = imagesy($this->image);
- $flipped = imagecreate($w, $h);
- if($horiz) {
- for ($x = 0; $x < $w; $x++) {
- imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
- }
- }
- if($vert) {
- for ($y = 0; $y < $h; $y++) {
- imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
- }
- }
- $this->image = $flipped;
- }
-
- public function orient($filename) {
- if ($this->is_imagick()) {
- // based off comment on http://php.net/manual/en/imagick.getimageorientation.php
- $orientation = $this->image->getImageOrientation();
- switch ($orientation) {
- case imagick::ORIENTATION_BOTTOMRIGHT:
- $this->image->rotateimage("#000", 180);
- break;
- case imagick::ORIENTATION_RIGHTTOP:
- $this->image->rotateimage("#000", 90);
- break;
- case imagick::ORIENTATION_LEFTBOTTOM:
- $this->image->rotateimage("#000", -90);
- break;
}
- $this->image->setImageOrientation(imagick::ORIENTATION_TOPLEFT);
- return TRUE;
- }
- // based off comment on http://php.net/manual/en/function.imagerotate.php
- if(!$this->is_valid())
- return FALSE;
-
- if( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') )
- return;
-
- $exif = @exif_read_data($filename,null,true);
- if(! $exif)
- return;
-
- $ort = $exif['IFD0']['Orientation'];
-
- switch($ort)
- {
- case 1: // nothing
- break;
-
- case 2: // horizontal flip
- $this->flip();
- break;
-
- case 3: // 180 rotate left
- $this->rotate(180);
- break;
-
- case 4: // vertical flip
- $this->flip(false, true);
- break;
-
- case 5: // vertical flip + 90 rotate right
- $this->flip(false, true);
- $this->rotate(-90);
- break;
-
- case 6: // 90 rotate right
- $this->rotate(-90);
- break;
-
- case 7: // horizontal flip + 90 rotate right
- $this->flip();
- $this->rotate(-90);
- break;
-
- case 8: // 90 rotate left
- $this->rotate(90);
- break;
- }
-
- // logger('exif: ' . print_r($exif,true));
- return $exif;
-
- }
-
-
-
- public function scaleImageUp($min) {
- if(!$this->is_valid())
- return FALSE;
-
-
- $width = $this->getWidth();
- $height = $this->getHeight();
-
- $dest_width = $dest_height = 0;
-
- if((! $width)|| (! $height))
- return FALSE;
-
- if($width < $min && $height < $min) {
- if($width > $height) {
- $dest_width = $min;
- $dest_height = intval(( $height * $min ) / $width);
- }
- else {
- $dest_width = intval(( $width * $min ) / $height);
- $dest_height = $min;
- }
- }
- else {
- if( $width < $min ) {
- $dest_width = $min;
- $dest_height = intval(( $height * $min ) / $width);
- }
- else {
- if( $height < $min ) {
- $dest_width = intval(( $width * $min ) / $height);
- $dest_height = $min;
+ $dest = imagecreatetruecolor($dest_width, $dest_height);
+ imagealphablending($dest, false);
+ imagesavealpha($dest, true);
+ if ($this->type=='image/png') {
+ imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
}
- else {
- $dest_width = $width;
- $dest_height = $height;
+ imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+ if ($this->image) {
+ imagedestroy($this->image);
}
- }
+ $this->image = $dest;
+ $this->width = imagesx($this->image);
+ $this->height = imagesy($this->image);
}
- if($this->is_imagick())
- return $this->scaleImage($dest_width,$dest_height);
+ public function rotate($degrees) {
+ if (!$this->is_valid()) {
+ return false;
+ }
- $dest = imagecreatetruecolor( $dest_width, $dest_height );
- imagealphablending($dest, false);
- imagesavealpha($dest, true);
- if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
- imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
- if($this->image)
- imagedestroy($this->image);
- $this->image = $dest;
- $this->width = imagesx($this->image);
- $this->height = imagesy($this->image);
- }
+ if ($this->is_imagick()) {
+ $this->image->setFirstIterator();
+ do {
+ $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
+ } while ($this->image->nextImage());
+ return;
+ }
-
-
- public function scaleImageSquare($dim) {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick()) {
- $this->image->setFirstIterator();
- do {
- $this->image->scaleImage($dim, $dim);
- } while ($this->image->nextImage());
- return;
+ $this->image = imagerotate($this->image,$degrees,0);
+ $this->width = imagesx($this->image);
+ $this->height = imagesy($this->image);
}
- $dest = imagecreatetruecolor( $dim, $dim );
- imagealphablending($dest, false);
- imagesavealpha($dest, true);
- if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
- imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
- if($this->image)
- imagedestroy($this->image);
- $this->image = $dest;
- $this->width = imagesx($this->image);
- $this->height = imagesy($this->image);
- }
+ public function flip($horiz = true, $vert = false) {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ if ($this->is_imagick()) {
+ $this->image->setFirstIterator();
+ do {
+ if ($horiz) {
+ $this->image->flipImage();
+ }
+ if ($vert) {
+ $this->image->flopImage();
+ }
+ } while ($this->image->nextImage());
+ return;
+ }
+
+ $w = imagesx($this->image);
+ $h = imagesy($this->image);
+ $flipped = imagecreate($w, $h);
+ if ($horiz) {
+ for ($x = 0; $x < $w; $x++) {
+ imagecopy($flipped, $this->image, $x, 0, $w - $x - 1, 0, 1, $h);
+ }
+ }
+ if ($vert) {
+ for ($y = 0; $y < $h; $y++) {
+ imagecopy($flipped, $this->image, 0, $y, 0, $h - $y - 1, $w, 1);
+ }
+ }
+ $this->image = $flipped;
+ }
+
+ public function orient($filename) {
+ if ($this->is_imagick()) {
+ // based off comment on http://php.net/manual/en/imagick.getimageorientation.php
+ $orientation = $this->image->getImageOrientation();
+ switch ($orientation) {
+ case imagick::ORIENTATION_BOTTOMRIGHT:
+ $this->image->rotateimage("#000", 180);
+ break;
+ case imagick::ORIENTATION_RIGHTTOP:
+ $this->image->rotateimage("#000", 90);
+ break;
+ case imagick::ORIENTATION_LEFTBOTTOM:
+ $this->image->rotateimage("#000", -90);
+ break;
+ }
+
+ $this->image->setImageOrientation(imagick::ORIENTATION_TOPLEFT);
+ return true;
+ }
+ // based off comment on http://php.net/manual/en/function.imagerotate.php
+
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ if ((!function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) {
+ return;
+ }
+
+ $exif = @exif_read_data($filename,null,true);
+ if (!$exif) {
+ return;
+ }
+
+ $ort = $exif['IFD0']['Orientation'];
+
+ switch($ort)
+ {
+ case 1: // nothing
+ break;
+
+ case 2: // horizontal flip
+ $this->flip();
+ break;
+
+ case 3: // 180 rotate left
+ $this->rotate(180);
+ break;
+
+ case 4: // vertical flip
+ $this->flip(false, true);
+ break;
+
+ case 5: // vertical flip + 90 rotate right
+ $this->flip(false, true);
+ $this->rotate(-90);
+ break;
+
+ case 6: // 90 rotate right
+ $this->rotate(-90);
+ break;
+
+ case 7: // horizontal flip + 90 rotate right
+ $this->flip();
+ $this->rotate(-90);
+ break;
+
+ case 8: // 90 rotate left
+ $this->rotate(90);
+ break;
+ }
+
+ // logger('exif: ' . print_r($exif,true));
+ return $exif;
+
+ }
- public function cropImage($max,$x,$y,$w,$h) {
- if(!$this->is_valid())
- return FALSE;
- if($this->is_imagick()) {
+ public function scaleImageUp($min) {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+
+ $width = $this->getWidth();
+ $height = $this->getHeight();
+
+ $dest_width = $dest_height = 0;
+
+ if ((!$width)|| (!$height)) {
+ return false;
+ }
+
+ if ($width < $min && $height < $min) {
+ if ($width > $height) {
+ $dest_width = $min;
+ $dest_height = intval(($height * $min) / $width);
+ } else {
+ $dest_width = intval(($width * $min) / $height);
+ $dest_height = $min;
+ }
+ } else {
+ if ($width < $min) {
+ $dest_width = $min;
+ $dest_height = intval(($height * $min) / $width);
+ } else {
+ if ($height < $min) {
+ $dest_width = intval(($width * $min) / $height);
+ $dest_height = $min;
+ } else {
+ $dest_width = $width;
+ $dest_height = $height;
+ }
+ }
+ }
+
+ if ($this->is_imagick()) {
+ return $this->scaleImage($dest_width, $dest_height);
+ }
+
+ $dest = imagecreatetruecolor($dest_width, $dest_height);
+ imagealphablending($dest, false);
+ imagesavealpha($dest, true);
+ if ($this->type=='image/png') {
+ imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+ }
+ imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height);
+ if ($this->image) {
+ imagedestroy($this->image);
+ }
+ $this->image = $dest;
+ $this->width = imagesx($this->image);
+ $this->height = imagesy($this->image);
+ }
+
+
+
+ public function scaleImageSquare($dim) {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ if ($this->is_imagick()) {
+ $this->image->setFirstIterator();
+ do {
+ $this->image->scaleImage($dim, $dim);
+ } while ($this->image->nextImage());
+ return;
+ }
+
+ $dest = imagecreatetruecolor($dim, $dim);
+ imagealphablending($dest, false);
+ imagesavealpha($dest, true);
+ if ($this->type=='image/png') {
+ imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+ }
+ imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height);
+ if ($this->image) {
+ imagedestroy($this->image);
+ }
+ $this->image = $dest;
+ $this->width = imagesx($this->image);
+ $this->height = imagesy($this->image);
+ }
+
+
+ public function cropImage($max, $x, $y, $w, $h) {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ if ($this->is_imagick()) {
$this->image->setFirstIterator();
do {
$this->image->cropImage($w, $h, $x, $y);
- /**
+ /*
* We need to remove the canva,
* or the image is not resized to the crop:
* http://php.net/manual/en/imagick.cropimage.php#97232
@@ -520,159 +549,167 @@ class Photo {
return $this->scaleImage($max);
}
- $dest = imagecreatetruecolor( $max, $max );
- imagealphablending($dest, false);
- imagesavealpha($dest, true);
- if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
- imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
- if($this->image)
- imagedestroy($this->image);
- $this->image = $dest;
- $this->width = imagesx($this->image);
- $this->height = imagesy($this->image);
- }
-
- public function saveImage($path) {
- if(!$this->is_valid())
- return FALSE;
-
- $string = $this->imageString();
-
- $a = get_app();
-
- $stamp1 = microtime(true);
- file_put_contents($path, $string);
- $a->save_timestamp($stamp1, "file");
- }
-
- public function imageString() {
- if(!$this->is_valid())
- return FALSE;
-
- if($this->is_imagick()) {
- /* Clean it */
- $this->image = $this->image->deconstructImages();
- $string = $this->image->getImagesBlob();
- return $string;
+ $dest = imagecreatetruecolor($max, $max);
+ imagealphablending($dest, false);
+ imagesavealpha($dest, true);
+ if ($this->type=='image/png') {
+ imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha
+ }
+ imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h);
+ if ($this->image) {
+ imagedestroy($this->image);
+ }
+ $this->image = $dest;
+ $this->width = imagesx($this->image);
+ $this->height = imagesy($this->image);
}
- $quality = FALSE;
+ public function saveImage($path) {
+ if (!$this->is_valid()) {
+ return false;
+ }
- ob_start();
+ $string = $this->imageString();
- // Enable interlacing
- imageinterlace($this->image, true);
+ $a = get_app();
- switch($this->getType()){
- case "image/png":
- $quality = get_config('system','png_quality');
- if((! $quality) || ($quality > 9))
- $quality = PNG_QUALITY;
- imagepng($this->image,NULL, $quality);
- break;
- case "image/jpeg":
- $quality = get_config('system','jpeg_quality');
- if((! $quality) || ($quality > 100))
- $quality = JPEG_QUALITY;
- imagejpeg($this->image,NULL,$quality);
+ $stamp1 = microtime(true);
+ file_put_contents($path, $string);
+ $a->save_timestamp($stamp1, "file");
}
- $string = ob_get_contents();
- ob_end_clean();
- return $string;
- }
+ public function imageString() {
+ if (!$this->is_valid()) {
+ return false;
+ }
+
+ if ($this->is_imagick()) {
+ /* Clean it */
+ $this->image = $this->image->deconstructImages();
+ $string = $this->image->getImagesBlob();
+ return $string;
+ }
+
+ $quality = false;
+
+ ob_start();
+
+ // Enable interlacing
+ imageinterlace($this->image, true);
+
+ switch($this->getType()){
+ case "image/png":
+ $quality = get_config('system', 'png_quality');
+ if ((!$quality) || ($quality > 9)) {
+ $quality = PNG_QUALITY;
+ }
+ imagepng($this->image, null, $quality);
+ break;
+ case "image/jpeg":
+ $quality = get_config('system', 'jpeg_quality');
+ if ((!$quality) || ($quality > 100)) {
+ $quality = JPEG_QUALITY;
+ }
+ imagejpeg($this->image, null, $quality);
+ }
+ $string = ob_get_contents();
+ ob_end_clean();
+
+ return $string;
+ }
- public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
+ public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
- $r = q("select `guid` from photo where `resource-id` = '%s' and `guid` != '' limit 1",
- dbesc($rid)
- );
- if(count($r))
- $guid = $r[0]['guid'];
- else
- $guid = get_guid();
+ $r = q("SELECT `guid` FROM `photo` WHERE `resource-id` = '%s' AND `guid` != '' LIMIT 1",
+ dbesc($rid)
+ );
+ if (dbm::is_result($r)) {
+ $guid = $r[0]['guid'];
+ } else {
+ $guid = get_guid();
+ }
- $x = q("select id from photo where `resource-id` = '%s' and uid = %d and `contact-id` = %d and `scale` = %d limit 1",
- dbesc($rid),
- intval($uid),
- intval($cid),
- intval($scale)
- );
- if(count($x)) {
- $r = q("UPDATE `photo`
- set `uid` = %d,
- `contact-id` = %d,
- `guid` = '%s',
- `resource-id` = '%s',
- `created` = '%s',
- `edited` = '%s',
- `filename` = '%s',
- `type` = '%s',
- `album` = '%s',
- `height` = %d,
- `width` = %d,
+ $x = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `contact-id` = %d AND `scale` = %d LIMIT 1",
+ dbesc($rid),
+ intval($uid),
+ intval($cid),
+ intval($scale)
+ );
+ if (dbm::is_result($x)) {
+ $r = q("UPDATE `photo`
+ SET `uid` = %d,
+ `contact-id` = %d,
+ `guid` = '%s',
+ `resource-id` = '%s',
+ `created` = '%s',
+ `edited` = '%s',
+ `filename` = '%s',
+ `type` = '%s',
+ `album` = '%s',
+ `height` = %d,
+ `width` = %d,
`datasize` = %d,
- `data` = '%s',
- `scale` = %d,
- `profile` = %d,
- `allow_cid` = '%s',
- `allow_gid` = '%s',
- `deny_cid` = '%s',
- `deny_gid` = '%s'
- where id = %d",
+ `data` = '%s',
+ `scale` = %d,
+ `profile` = %d,
+ `allow_cid` = '%s',
+ `allow_gid` = '%s',
+ `deny_cid` = '%s',
+ `deny_gid` = '%s'
+ WHERE `id` = %d",
- intval($uid),
- intval($cid),
- dbesc($guid),
- dbesc($rid),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(basename($filename)),
- dbesc($this->getType()),
- dbesc($album),
- intval($this->getHeight()),
- intval($this->getWidth()),
+ intval($uid),
+ intval($cid),
+ dbesc($guid),
+ dbesc($rid),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(basename($filename)),
+ dbesc($this->getType()),
+ dbesc($album),
+ intval($this->getHeight()),
+ intval($this->getWidth()),
dbesc(strlen($this->imageString())),
- dbesc($this->imageString()),
- intval($scale),
- intval($profile),
- dbesc($allow_cid),
- dbesc($allow_gid),
- dbesc($deny_cid),
- dbesc($deny_gid),
- intval($x[0]['id'])
- );
- }
- else {
- $r = q("INSERT INTO `photo`
- ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
- intval($uid),
- intval($cid),
- dbesc($guid),
- dbesc($rid),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(basename($filename)),
- dbesc($this->getType()),
- dbesc($album),
- intval($this->getHeight()),
- intval($this->getWidth()),
+ dbesc($this->imageString()),
+ intval($scale),
+ intval($profile),
+ dbesc($allow_cid),
+ dbesc($allow_gid),
+ dbesc($deny_cid),
+ dbesc($deny_gid),
+ intval($x[0]['id'])
+ );
+ } else {
+ $r = q("INSERT INTO `photo`
+ (`uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
+ VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s')",
+ intval($uid),
+ intval($cid),
+ dbesc($guid),
+ dbesc($rid),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(basename($filename)),
+ dbesc($this->getType()),
+ dbesc($album),
+ intval($this->getHeight()),
+ intval($this->getWidth()),
dbesc(strlen($this->imageString())),
- dbesc($this->imageString()),
- intval($scale),
- intval($profile),
- dbesc($allow_cid),
- dbesc($allow_gid),
- dbesc($deny_cid),
- dbesc($deny_gid)
- );
+ dbesc($this->imageString()),
+ intval($scale),
+ intval($profile),
+ dbesc($allow_cid),
+ dbesc($allow_gid),
+ dbesc($deny_cid),
+ dbesc($deny_gid)
+ );
+ }
+
+ return $r;
}
- return $r;
- }
-}}
+}
/**
@@ -682,103 +719,144 @@ class Photo {
* @arg $fromcurl boolean Check Content-Type header from curl request
*/
function guess_image_type($filename, $fromcurl=false) {
- logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
- $type = null;
- if ($fromcurl) {
- $a = get_app();
- $headers=array();
- $h = explode("\n",$a->get_curl_headers());
- foreach ($h as $l) {
- list($k,$v) = array_map("trim", explode(":", trim($l), 2));
- $headers[$k] = $v;
+ logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
+ $type = null;
+ if ($fromcurl) {
+ $a = get_app();
+ $headers=array();
+ $h = explode("\n",$a->get_curl_headers());
+ foreach ($h as $l) {
+ list($k,$v) = array_map("trim", explode(":", trim($l), 2));
+ $headers[$k] = $v;
+ }
+ if (array_key_exists('Content-Type', $headers))
+ $type = $headers['Content-Type'];
}
- if (array_key_exists('Content-Type', $headers))
- $type = $headers['Content-Type'];
- }
- if (is_null($type)){
- // Guessing from extension? Isn't that... dangerous?
- if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
- /**
- * Well, this not much better,
- * but at least it comes from the data inside the image,
- * we won't be tricked by a manipulated extension
- */
- $image = new Imagick($filename);
- $type = $image->getImageMimeType();
- $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
- } else {
- $ext = pathinfo($filename, PATHINFO_EXTENSION);
- $types = Photo::supportedTypes();
- $type = "image/jpeg";
- foreach ($types as $m=>$e){
- if ($ext==$e) $type = $m;
- }
+ if (is_null($type)){
+ // Guessing from extension? Isn't that... dangerous?
+ if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
+ /**
+ * Well, this not much better,
+ * but at least it comes from the data inside the image,
+ * we won't be tricked by a manipulated extension
+ */
+ $image = new Imagick($filename);
+ $type = $image->getImageMimeType();
+ $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
+ } else {
+ $ext = pathinfo($filename, PATHINFO_EXTENSION);
+ $types = Photo::supportedTypes();
+ $type = "image/jpeg";
+ foreach ($types as $m => $e){
+ if ($ext == $e) {
+ $type = $m;
+ }
+ }
+ }
}
- }
- logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
- return $type;
+ logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
+ return $type;
}
-function import_profile_photo($photo,$uid,$cid) {
+/**
+ * @brief Updates the avatar links in a contact only if needed
+ *
+ * @param string $avatar Link to avatar picture
+ * @param int $uid User id of contact owner
+ * @param int $cid Contact id
+ * @param bool $force force picture update
+ *
+ * @return array Returns array of the different avatar sizes
+ */
+function update_contact_avatar($avatar, $uid, $cid, $force = false) {
- $a = get_app();
+ $r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
+ if (!dbm::is_result($r)) {
+ return false;
+ } else {
+ $data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
+ }
- $r = q("select `resource-id` from photo where `uid` = %d and `contact-id` = %d and `scale` = 4 and `album` = 'Contact Photos' limit 1",
- intval($uid),
- intval($cid)
- );
- if(count($r) && strlen($r[0]['resource-id'])) {
- $hash = $r[0]['resource-id'];
- }
- else {
- $hash = photo_new_resource();
- }
+ if (($r[0]["avatar"] != $avatar) OR $force) {
+ $photos = import_profile_photo($avatar, $uid, $cid, true);
- $photo_failure = false;
+ if ($photos) {
+ q("UPDATE `contact` SET `avatar` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
+ dbesc($avatar), dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
+ dbesc(datetime_convert()), intval($cid));
+ return $photos;
+ }
+ }
- $filename = basename($photo);
- $img_str = fetch_url($photo,true);
+ return $data;
+}
- $type = guess_image_type($photo,true);
- $img = new Photo($img_str, $type);
- if($img->is_valid()) {
+function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
- $img->scaleImageSquare(175);
+ $r = q("SELECT `resource-id` FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `scale` = 4 AND `album` = 'Contact Photos' LIMIT 1",
+ intval($uid),
+ intval($cid)
+ );
+ if (dbm::is_result($r) && strlen($r[0]['resource-id'])) {
+ $hash = $r[0]['resource-id'];
+ } else {
+ $hash = photo_new_resource();
+ }
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
+ $photo_failure = false;
- if($r === false)
- $photo_failure = true;
+ $filename = basename($photo);
+ $img_str = fetch_url($photo, true);
- $img->scaleImage(80);
+ if ($quit_on_error AND ($img_str == "")) {
+ return false;
+ }
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
+ $type = guess_image_type($photo, true);
+ $img = new Photo($img_str, $type);
+ if ($img->is_valid()) {
- if($r === false)
- $photo_failure = true;
+ $img->scaleImageSquare(175);
- $img->scaleImage(48);
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4);
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
+ if ($r === false)
+ $photo_failure = true;
- if($r === false)
- $photo_failure = true;
+ $img->scaleImage(80);
- $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
- $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
- $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
- }
- else
- $photo_failure = true;
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5);
- if($photo_failure) {
- $photo = $a->get_baseurl() . '/images/person-175.jpg';
- $thumb = $a->get_baseurl() . '/images/person-80.jpg';
- $micro = $a->get_baseurl() . '/images/person-48.jpg';
- }
+ if ($r === false)
+ $photo_failure = true;
- return(array($photo,$thumb,$micro));
+ $img->scaleImage(48);
+
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6);
+
+ if ($r === false) {
+ $photo_failure = true;
+ }
+
+ $photo = App::get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
+ $thumb = App::get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
+ $micro = App::get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
+ } else {
+ $photo_failure = true;
+ }
+
+ if ($photo_failure AND $quit_on_error) {
+ return false;
+ }
+
+ if ($photo_failure) {
+ $photo = App::get_baseurl() . '/images/person-175.jpg';
+ $thumb = App::get_baseurl() . '/images/person-80.jpg';
+ $micro = App::get_baseurl() . '/images/person-48.jpg';
+ }
+
+ return(array($photo,$thumb,$micro));
}
@@ -787,27 +865,30 @@ function get_photo_info($url) {
$data = Cache::get($url);
- if (is_null($data)) {
+ if (is_null($data) OR !$data OR !is_array($data)) {
$img_str = fetch_url($url, true, $redirects, 4);
-
$filesize = strlen($img_str);
- $tempfile = tempnam(get_temppath(), "cache");
+ if (function_exists("getimagesizefromstring")) {
+ $data = getimagesizefromstring($img_str);
+ } else {
+ $tempfile = tempnam(get_temppath(), "cache");
- $a = get_app();
- $stamp1 = microtime(true);
- file_put_contents($tempfile, $img_str);
- $a->save_timestamp($stamp1, "file");
+ $a = get_app();
+ $stamp1 = microtime(true);
+ file_put_contents($tempfile, $img_str);
+ $a->save_timestamp($stamp1, "file");
- $data = getimagesize($tempfile);
- unlink($tempfile);
+ $data = getimagesize($tempfile);
+ unlink($tempfile);
+ }
- if ($data)
+ if ($data) {
$data["size"] = $filesize;
+ }
- Cache::set($url, serialize($data));
- } else
- $data = unserialize($data);
+ Cache::set($url, $data);
+ }
return $data;
}
@@ -816,40 +897,41 @@ function scale_image($width, $height, $max) {
$dest_width = $dest_height = 0;
- if((!$width) || (!$height))
- return FALSE;
+ if ((!$width) || (!$height)) {
+ return false;
+ }
- if($width > $max && $height > $max) {
+ if ($width > $max && $height > $max) {
// very tall image (greater than 16:9)
// constrain the width - let the height float.
- if((($height * 9) / 16) > $width) {
+ if ((($height * 9) / 16) > $width) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
- } elseif($width > $height) {
+ $dest_height = intval(($height * $max) / $width);
+ } elseif ($width > $height) {
// else constrain both dimensions
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
- } else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_height = intval(($height * $max) / $width);
+ } else {
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
- if( $width > $max ) {
+ if ($width > $max) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
- } else {
- if( $height > $max ) {
+ $dest_height = intval(($height * $max) / $width);
+ } else {
+ if ($height > $max) {
// very tall image (greater than 16:9)
// but width is OK - don't do anything
- if((($height * 9) / 16) > $width) {
+ if ((($height * 9) / 16) > $width) {
$dest_width = $width;
$dest_height = $height;
} else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
@@ -861,21 +943,21 @@ function scale_image($width, $height, $max) {
return array("width" => $dest_width, "height" => $dest_height);
}
-function store_photo($a, $uid, $imagedata = "", $url = "") {
+function store_photo(App $a, $uid, $imagedata = "", $url = "") {
$r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
- WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
+ WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
intval($uid));
- if(!count($r)) {
+ if (!dbm::is_result($r)) {
logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
return(array());
}
$page_owner_nick = $r[0]['nickname'];
-// To-Do:
-// $default_cid = $r[0]['id'];
-// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+ /// @TODO
+ /// $default_cid = $r[0]['id'];
+ /// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
if ((strlen($imagedata) == 0) AND ($url == "")) {
logger("No image data and no url provided", LOGGER_DEBUG);
@@ -888,24 +970,24 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
$a->save_timestamp($stamp1, "file");
}
- $maximagesize = get_config('system','maximagesize');
+ $maximagesize = get_config('system', 'maximagesize');
- if(($maximagesize) && (strlen($imagedata) > $maximagesize)) {
+ if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
return(array());
- }
+ }
/*
- $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
- intval($uid)
- );
+ $r = q("select sum(octet_length(data)) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
+ intval($uid)
+ );
- $limit = service_class_fetch($uid,'photo_upload_limit');
+ $limit = service_class_fetch($uid,'photo_upload_limit');
- if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
+ if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
logger("Image exceeds personal limit of uid ".$uid, LOGGER_DEBUG);
return(array());
- }
+ }
*/
$tempfile = tempnam(get_temppath(), "cache");
@@ -924,7 +1006,7 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
$ph = new Photo($imagedata, $data["mime"]);
- if(!$ph->is_valid()) {
+ if (!$ph->is_valid()) {
unlink($tempfile);
logger("Picture is no valid picture", LOGGER_DEBUG);
return(array());
@@ -933,11 +1015,13 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
$ph->orient($tempfile);
unlink($tempfile);
- $max_length = get_config('system','max_image_length');
- if(! $max_length)
+ $max_length = get_config('system', 'max_image_length');
+ if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
- if($max_length > 0)
+ }
+ if ($max_length > 0) {
$ph->scaleImage($max_length);
+ }
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -949,55 +1033,61 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
// Pictures are always public by now
//$defperm = '<'.$default_cid.'>';
$defperm = "";
- $visitor = 0;
+ $visitor = 0;
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
- if(!$r) {
+ if (!$r) {
logger("Picture couldn't be stored", LOGGER_DEBUG);
return(array());
}
- $image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
- "full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
+ $image = array("page" => App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+ "full" => App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
- if($width > 800 || $height > 800)
- $image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+ if ($width > 800 || $height > 800) {
+ $image["large"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+ }
- if($width > 640 || $height > 640) {
+ if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
- if($r)
- $image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
+ if ($r) {
+ $image["medium"] = App::get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
+ }
}
- if($width > 320 || $height > 320) {
+ if ($width > 320 || $height > 320) {
$ph->scaleImage(320);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
- if($r)
- $image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
+ if ($r) {
+ $image["small"] = App::get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
+ }
}
- if($width > 160 AND $height > 160) {
+ if ($width > 160 AND $height > 160) {
$x = 0;
$y = 0;
$min = $ph->getWidth();
- if ($min > 160)
+ if ($min > 160) {
$x = ($min - 160) / 2;
+ }
if ($ph->getHeight() < $min) {
$min = $ph->getHeight();
- if ($min > 160)
+ if ($min > 160) {
$y = ($min - 160) / 2;
+ }
}
$min = 160;
$ph->cropImage(160, $x, $y, $min, $min);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
- if($r)
- $image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
+ if ($r) {
+ $image["thumb"] = App::get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
+ }
}
// Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
@@ -1011,9 +1101,9 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
//if (isset($image["small"]))
// $image["preview"] = $image["small"];
- if (isset($image["medium"]))
+ if (isset($image["medium"])) {
$image["preview"] = $image["medium"];
+ }
return($image);
}
-
diff --git a/include/Probe.php b/include/Probe.php
new file mode 100644
index 0000000000..0b3c664129
--- /dev/null
+++ b/include/Probe.php
@@ -0,0 +1,1151 @@
+ Link to LRDD endpoint
+ * 'lrdd-xml' => Link to LRDD endpoint in XML format
+ * 'lrdd-json' => Link to LRDD endpoint in JSON format
+ */
+ private function xrd($host) {
+
+ $ssl_url = "https://".$host."/.well-known/host-meta";
+ $url = "http://".$host."/.well-known/host-meta";
+
+ $xrd_timeout = Config::get('system','xrd_timeout', 20);
+ $redirects = 0;
+
+ $xml = fetch_url($ssl_url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+ $xrd = parse_xml_string($xml, false);
+
+ if (!is_object($xrd)) {
+ $xml = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+ $xrd = parse_xml_string($xml, false);
+ }
+ if (!is_object($xrd))
+ return false;
+
+ $links = xml::element_to_array($xrd);
+ if (!isset($links["xrd"]["link"]))
+ return false;
+
+ $xrd_data = array();
+
+ foreach ($links["xrd"]["link"] AS $value => $link) {
+ if (isset($link["@attributes"]))
+ $attributes = $link["@attributes"];
+ elseif ($value == "@attributes")
+ $attributes = $link;
+ else
+ continue;
+
+ if (($attributes["rel"] == "lrdd") AND
+ ($attributes["type"] == "application/xrd+xml"))
+ $xrd_data["lrdd-xml"] = $attributes["template"];
+ elseif (($attributes["rel"] == "lrdd") AND
+ ($attributes["type"] == "application/json"))
+ $xrd_data["lrdd-json"] = $attributes["template"];
+ elseif ($attributes["rel"] == "lrdd")
+ $xrd_data["lrdd"] = $attributes["template"];
+ }
+ return $xrd_data;
+ }
+
+ /**
+ * @brief Perform Webfinger lookup and return DFRN data
+ *
+ * Given an email style address, perform webfinger lookup and
+ * return the resulting DFRN profile URL, or if no DFRN profile URL
+ * is located, returns an OStatus subscription template (prefixed
+ * with the string 'stat:' to identify it as on OStatus template).
+ * If this isn't an email style address just return $webbie.
+ * Return an empty string if email-style addresses but webfinger fails,
+ * or if the resultant personal XRD doesn't contain a supported
+ * subscription/friend-request attribute.
+ *
+ * amended 7/9/2011 to return an hcard which could save potentially loading
+ * a lengthy content page to scrape dfrn attributes
+ *
+ * @param string $webbie Address that should be probed
+ * @param string $hcard Link to the hcard - is returned by reference
+ *
+ * @return string profile link
+ */
+
+ public static function webfinger_dfrn($webbie, &$hcard) {
+
+ $profile_link = '';
+
+ $links = self::lrdd($webbie);
+ logger('webfinger_dfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA);
+ if (count($links)) {
+ foreach ($links as $link) {
+ if ($link['@attributes']['rel'] === NAMESPACE_DFRN)
+ $profile_link = $link['@attributes']['href'];
+ if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == ""))
+ $profile_link = 'stat:'.$link['@attributes']['template'];
+ if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
+ $hcard = $link['@attributes']['href'];
+ }
+ }
+ return $profile_link;
+ }
+
+ /**
+ * @brief Check an URI for LRDD data
+ *
+ * this is a replacement for the "lrdd" function in include/network.php.
+ * It isn't used in this class and has some redundancies in the code.
+ * When time comes we can check the existing calls for "lrdd" if we can rework them.
+ *
+ * @param string $uri Address that should be probed
+ *
+ * @return array uri data
+ */
+ public static function lrdd($uri) {
+
+ $lrdd = self::xrd($uri);
+
+ if (!$lrdd) {
+ $parts = @parse_url($uri);
+ if (!$parts)
+ return array();
+
+ $host = $parts["host"];
+
+ $path_parts = explode("/", trim($parts["path"], "/"));
+
+ do {
+ $lrdd = self::xrd($host);
+ $host .= "/".array_shift($path_parts);
+ } while (!$lrdd AND (sizeof($path_parts) > 0));
+ }
+
+ if (!$lrdd)
+ return array();
+
+ foreach ($lrdd AS $key => $link) {
+ if ($webfinger)
+ continue;
+
+ if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json")))
+ continue;
+
+ $path = str_replace('{uri}', urlencode($uri), $link);
+ $webfinger = self::webfinger($path);
+
+ if (!$webfinger AND (strstr($uri, "@"))) {
+ $path = str_replace('{uri}', urlencode("acct:".$uri), $link);
+ $webfinger = self::webfinger($path);
+ }
+ }
+
+ if (!is_array($webfinger["links"]))
+ return false;
+
+ $data = array();
+
+ foreach ($webfinger["links"] AS $link)
+ $data[] = array("@attributes" => $link);
+
+ if (is_array($webfinger["aliases"]))
+ foreach ($webfinger["aliases"] AS $alias)
+ $data[] = array("@attributes" =>
+ array("rel" => "alias",
+ "href" => $alias));
+
+ return $data;
+ }
+
+ /**
+ * @brief Fetch information (protocol endpoints and user information) about a given uri
+ *
+ * @param string $uri Address that should be probed
+ * @param string $network Test for this specific network
+ * @param integer $uid User ID for the probe (only used for mails)
+ * @param boolean $cache Use cached values?
+ *
+ * @return array uri data
+ */
+ public static function uri($uri, $network = "", $uid = 0, $cache = true) {
+
+ if ($cache) {
+ $result = Cache::get("probe_url:".$network.":".$uri);
+ if (!is_null($result)) {
+ return $result;
+ }
+ }
+
+ if ($uid == 0)
+ $uid = local_user();
+
+ $data = self::detect($uri, $network, $uid);
+
+ if (!isset($data["url"]))
+ $data["url"] = $uri;
+
+ if ($data["photo"] != "")
+ $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+ else
+ $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
+
+ if (!isset($data["name"]) OR ($data["name"] == "")) {
+ if (isset($data["nick"]))
+ $data["name"] = $data["nick"];
+
+ if ($data["name"] == "")
+ $data["name"] = $data["url"];
+ }
+
+ if (!isset($data["nick"]) OR ($data["nick"] == "")) {
+ $data["nick"] = strtolower($data["name"]);
+
+ if (strpos($data['nick'], ' '))
+ $data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
+ }
+
+ if (!isset($data["network"]))
+ $data["network"] = NETWORK_PHANTOM;
+
+ $data = self::rearrange_data($data);
+
+ // Only store into the cache if the value seems to be valid
+ if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
+ Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
+
+ /// @todo temporary fix - we need a real contact update function that updates only changing fields
+ /// The biggest problem is the avatar picture that could have a reduced image size.
+ /// It should only be updated if the existing picture isn't existing anymore.
+ if (($data['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND
+ $data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"])
+ q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
+ `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
+ WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0",
+ dbesc($data["name"]),
+ dbesc($data["nick"]),
+ dbesc($data["url"]),
+ dbesc($data["addr"]),
+ dbesc($data["notify"]),
+ dbesc($data["poll"]),
+ dbesc($data["alias"]),
+ dbesc(datetime_convert()),
+ dbesc(normalise_link($data['url']))
+ );
+ }
+ return $data;
+ }
+
+ /**
+ * @brief Fetch information (protocol endpoints and user information) about a given uri
+ *
+ * This function is only called by the "uri" function that adds caching and rearranging of data.
+ *
+ * @param string $uri Address that should be probed
+ * @param string $network Test for this specific network
+ * @param integer $uid User ID for the probe (only used for mails)
+ *
+ * @return array uri data
+ */
+ private function detect($uri, $network, $uid) {
+ if (strstr($uri, '@')) {
+ // If the URI starts with "mailto:" then jump directly to the mail detection
+ if (strpos($url,'mailto:') !== false) {
+ $uri = str_replace('mailto:', '', $url);
+ return self::mail($uri, $uid);
+ }
+
+ if ($network == NETWORK_MAIL)
+ return self::mail($uri, $uid);
+
+ // Remove "acct:" from the URI
+ $uri = str_replace('acct:', '', $uri);
+
+ $host = substr($uri,strpos($uri, '@') + 1);
+ $nick = substr($uri,0, strpos($uri, '@'));
+
+ if (strpos($uri, '@twitter.com'))
+ return array("network" => NETWORK_TWITTER);
+
+ $lrdd = self::xrd($host);
+
+ if (!$lrdd)
+ return self::mail($uri, $uid);
+
+ $addr = $uri;
+ } else {
+ $parts = parse_url($uri);
+ if (!isset($parts["scheme"]) OR
+ !isset($parts["host"]) OR
+ !isset($parts["path"]))
+ return false;
+
+ /// @todo: Ports?
+ $host = $parts["host"];
+
+ if ($host == 'twitter.com')
+ return array("network" => NETWORK_TWITTER);
+
+ $lrdd = self::xrd($host);
+
+ $path_parts = explode("/", trim($parts["path"], "/"));
+
+ while (!$lrdd AND (sizeof($path_parts) > 1)) {
+ $host .= "/".array_shift($path_parts);
+ $lrdd = self::xrd($host);
+ }
+ if (!$lrdd)
+ return self::feed($uri);
+
+ $nick = array_pop($path_parts);
+ $addr = $nick."@".$host;
+ }
+ $webfinger = false;
+
+ /// @todo Do we need the prefix "acct:" or "acct://"?
+
+ foreach ($lrdd AS $key => $link) {
+ if ($webfinger)
+ continue;
+
+ if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json")))
+ continue;
+
+ // Try webfinger with the address (user@domain.tld)
+ $path = str_replace('{uri}', urlencode($addr), $link);
+ $webfinger = self::webfinger($path);
+
+ // Mastodon needs to have it with "acct:"
+ if (!$webfinger) {
+ $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
+ $webfinger = self::webfinger($path);
+ }
+
+ // If webfinger wasn't successful then try it with the URL - possibly in the format https://...
+ if (!$webfinger AND ($uri != $addr)) {
+ $path = str_replace('{uri}', urlencode($uri), $link);
+ $webfinger = self::webfinger($path);
+
+ // Since the detection with the address wasn't successful, we delete it.
+ if ($webfinger) {
+ $nick = "";
+ $addr = "";
+ }
+ }
+
+ }
+ if (!$webfinger)
+ return self::feed($uri);
+
+ $result = false;
+
+ logger("Probing ".$uri, LOGGER_DEBUG);
+
+ if (in_array($network, array("", NETWORK_DFRN)))
+ $result = self::dfrn($webfinger);
+ if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA))
+ $result = self::diaspora($webfinger);
+ if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS))
+ $result = self::ostatus($webfinger);
+ if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO))
+ $result = self::pumpio($webfinger);
+ if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED))
+ $result = self::feed($uri);
+ else {
+ // We overwrite the detected nick with our try if the previois routines hadn't detected it.
+ // Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
+ if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != ""))
+ $result["nick"] = $nick;
+
+ if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != ""))
+ $result["addr"] = $addr;
+ }
+
+ logger($uri." is ".$result["network"], LOGGER_DEBUG);
+
+ if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
+ $pos = strpos($result["url"], $host);
+ if ($pos)
+ $result["baseurl"] = substr($result["url"], 0, $pos).$host;
+ }
+
+ return $result;
+ }
+
+ /**
+ * @brief Perform a webfinger request.
+ *
+ * For details see RFC 7033:
+ *
+ * @param string $url Address that should be probed
+ *
+ * @return array webfinger data
+ */
+ private function webfinger($url) {
+
+ $xrd_timeout = Config::get('system','xrd_timeout', 20);
+ $redirects = 0;
+
+ $data = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+ $xrd = parse_xml_string($data, false);
+
+ if (!is_object($xrd)) {
+ // If it is not XML, maybe it is JSON
+ $webfinger = json_decode($data, true);
+
+ if (!isset($webfinger["links"]))
+ return false;
+
+ return $webfinger;
+ }
+
+ $xrd_arr = xml::element_to_array($xrd);
+ if (!isset($xrd_arr["xrd"]["link"]))
+ return false;
+
+ $webfinger = array();
+
+ if (isset($xrd_arr["xrd"]["subject"]))
+ $webfinger["subject"] = $xrd_arr["xrd"]["subject"];
+
+ if (isset($xrd_arr["xrd"]["alias"]))
+ $webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
+
+ $webfinger["links"] = array();
+
+ foreach ($xrd_arr["xrd"]["link"] AS $value => $data) {
+ if (isset($data["@attributes"]))
+ $attributes = $data["@attributes"];
+ elseif ($value == "@attributes")
+ $attributes = $data;
+ else
+ continue;
+
+ $webfinger["links"][] = $attributes;
+ }
+ return $webfinger;
+ }
+
+ /**
+ * @brief Poll the Friendica specific noscrape page.
+ *
+ * "noscrape" is a faster alternative to fetch the data from the hcard.
+ * This functionality was originally created for the directory.
+ *
+ * @param string $noscrape Link to the noscrape page
+ * @param array $data The already fetched data
+ *
+ * @return array noscrape data
+ */
+ private function poll_noscrape($noscrape, $data) {
+ $content = fetch_url($noscrape);
+ if (!$content)
+ return false;
+
+ $json = json_decode($content, true);
+ if (!is_array($json))
+ return false;
+
+ if (isset($json["fn"]))
+ $data["name"] = $json["fn"];
+
+ if (isset($json["addr"]))
+ $data["addr"] = $json["addr"];
+
+ if (isset($json["nick"]))
+ $data["nick"] = $json["nick"];
+
+ if (isset($json["comm"]))
+ $data["community"] = $json["comm"];
+
+ if (isset($json["tags"])) {
+ $keywords = implode(" ", $json["tags"]);
+ if ($keywords != "")
+ $data["keywords"] = $keywords;
+ }
+
+ $location = formatted_location($json);
+ if ($location)
+ $data["location"] = $location;
+
+ if (isset($json["about"]))
+ $data["about"] = $json["about"];
+
+ if (isset($json["key"]))
+ $data["pubkey"] = $json["key"];
+
+ if (isset($json["photo"]))
+ $data["photo"] = $json["photo"];
+
+ if (isset($json["dfrn-request"]))
+ $data["request"] = $json["dfrn-request"];
+
+ if (isset($json["dfrn-confirm"]))
+ $data["confirm"] = $json["dfrn-confirm"];
+
+ if (isset($json["dfrn-notify"]))
+ $data["notify"] = $json["dfrn-notify"];
+
+ if (isset($json["dfrn-poll"]))
+ $data["poll"] = $json["dfrn-poll"];
+
+ return $data;
+ }
+
+ /**
+ * @brief Check for valid DFRN data
+ *
+ * @param array $data DFRN data
+ *
+ * @return int Number of errors
+ */
+ public static function valid_dfrn($data) {
+ $errors = 0;
+ if(!isset($data['key']))
+ $errors ++;
+ if(!isset($data['dfrn-request']))
+ $errors ++;
+ if(!isset($data['dfrn-confirm']))
+ $errors ++;
+ if(!isset($data['dfrn-notify']))
+ $errors ++;
+ if(!isset($data['dfrn-poll']))
+ $errors ++;
+ return $errors;
+ }
+
+ /**
+ * @brief Fetch data from a DFRN profile page and via "noscrape"
+ *
+ * @param string $profile Link to the profile page
+ *
+ * @return array profile data
+ */
+ public static function profile($profile) {
+
+ $data = array();
+
+ logger("Check profile ".$profile, LOGGER_DEBUG);
+
+ // Fetch data via noscrape - this is faster
+ $noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile);
+ $data = self::poll_noscrape($noscrape, $data);
+
+ if (!isset($data["notify"]) OR !isset($data["confirm"]) OR
+ !isset($data["request"]) OR !isset($data["poll"]) OR
+ !isset($data["poco"]) OR !isset($data["name"]) OR
+ !isset($data["photo"]))
+ $data = self::poll_hcard($profile, $data, true);
+
+ $prof_data = array();
+ $prof_data["addr"] = $data["addr"];
+ $prof_data["nick"] = $data["nick"];
+ $prof_data["dfrn-request"] = $data["request"];
+ $prof_data["dfrn-confirm"] = $data["confirm"];
+ $prof_data["dfrn-notify"] = $data["notify"];
+ $prof_data["dfrn-poll"] = $data["poll"];
+ $prof_data["dfrn-poco"] = $data["poco"];
+ $prof_data["photo"] = $data["photo"];
+ $prof_data["fn"] = $data["name"];
+ $prof_data["key"] = $data["pubkey"];
+
+ logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG);
+
+ return $prof_data;
+ }
+
+ /**
+ * @brief Check for DFRN contact
+ *
+ * @param array $webfinger Webfinger data
+ *
+ * @return array DFRN data
+ */
+ private function dfrn($webfinger) {
+
+ $hcard = "";
+ $data = array();
+ foreach ($webfinger["links"] AS $link) {
+ if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != ""))
+ $data["network"] = NETWORK_DFRN;
+ elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != ""))
+ $data["poll"] = $link["href"];
+ elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
+ ($link["type"] == "text/html") AND ($link["href"] != ""))
+ $data["url"] = $link["href"];
+ elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != ""))
+ $hcard = $link["href"];
+ elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != ""))
+ $data["poco"] = $link["href"];
+ elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != ""))
+ $data["photo"] = $link["href"];
+
+ elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != ""))
+ $data["baseurl"] = trim($link["href"], '/');
+ elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != ""))
+ $data["guid"] = $link["href"];
+ elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ $data["pubkey"] = base64_decode($link["href"]);
+
+ //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ if (strstr($data["pubkey"], 'RSA '))
+ $data["pubkey"] = rsatopem($data["pubkey"]);
+ }
+ }
+
+ if (!isset($data["network"]) OR ($hcard == ""))
+ return false;
+
+ // Fetch data via noscrape - this is faster
+ $noscrape = str_replace("/hcard/", "/noscrape/", $hcard);
+ $data = self::poll_noscrape($noscrape, $data);
+
+ if (isset($data["notify"]) AND isset($data["confirm"]) AND isset($data["request"]) AND
+ isset($data["poll"]) AND isset($data["name"]) AND isset($data["photo"]))
+ return $data;
+
+ $data = self::poll_hcard($hcard, $data, true);
+
+ return $data;
+ }
+
+ /**
+ * @brief Poll the hcard page (Diaspora and Friendica specific)
+ *
+ * @param string $hcard Link to the hcard page
+ * @param array $data The already fetched data
+ * @param boolean $dfrn Poll DFRN specific data
+ *
+ * @return array hcard data
+ */
+ private function poll_hcard($hcard, $data, $dfrn = false) {
+
+ $content = fetch_url($hcard);
+ if (!$content)
+ return false;
+
+ $doc = new DOMDocument();
+ if (!@$doc->loadHTML($content))
+ return false;
+
+ $xpath = new DomXPath($doc);
+
+ $vcards = $xpath->query("//div[contains(concat(' ', @class, ' '), ' vcard ')]");
+ if (!is_object($vcards))
+ return false;
+
+ if ($vcards->length > 0) {
+ $vcard = $vcards->item(0);
+
+ // We have to discard the guid from the hcard in favour of the guid from lrdd
+ // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
+ if (($search->length > 0) AND ($data["guid"] == ""))
+ $data["guid"] = $search->item(0)->nodeValue;
+
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["nick"] = $search->item(0)->nodeValue;
+
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["name"] = $search->item(0)->nodeValue;
+
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
+ if ($search->length > 0)
+ $data["searchable"] = $search->item(0)->nodeValue;
+
+ $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
+ if ($search->length > 0) {
+ $data["pubkey"] = $search->item(0)->nodeValue;
+ if (strstr($data["pubkey"], 'RSA '))
+ $data["pubkey"] = rsatopem($data["pubkey"]);
+ }
+
+ $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
+ if ($search->length > 0)
+ $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
+ }
+
+ $avatar = array();
+ $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
+ foreach ($photos AS $photo) {
+ $attr = array();
+ foreach ($photo->attributes as $attribute) {
+ $attr[$attribute->name] = trim($attribute->value);
+ }
+
+ if (isset($attr["src"]) AND isset($attr["width"])) {
+ $avatar[$attr["width"]] = $attr["src"];
+ }
+
+ // We don't have a width. So we just take everything that we got.
+ // This is a Hubzilla workaround which doesn't send a width.
+ if ((sizeof($avatar) == 0) AND isset($attr["src"])) {
+ $avatar[] = $attr["src"];
+ }
+ }
+
+ if (sizeof($avatar)) {
+ ksort($avatar);
+ $data["photo"] = array_pop($avatar);
+ }
+
+ if ($dfrn) {
+ // Poll DFRN specific data
+ $search = $xpath->query("//link[contains(concat(' ', @rel), ' dfrn-')]");
+ if ($search->length > 0) {
+ foreach ($search AS $link) {
+ //$data["request"] = $search->item(0)->nodeValue;
+ $attr = array();
+ foreach ($link->attributes as $attribute)
+ $attr[$attribute->name] = trim($attribute->value);
+
+ $data[substr($attr["rel"], 5)] = $attr["href"];
+ }
+ }
+
+ // Older Friendica versions had used the "uid" field differently than newer versions
+ if ($data["nick"] == $data["guid"])
+ unset($data["guid"]);
+ }
+
+
+ return $data;
+ }
+
+ /**
+ * @brief Check for Diaspora contact
+ *
+ * @param array $webfinger Webfinger data
+ *
+ * @return array Diaspora data
+ */
+ private function diaspora($webfinger) {
+
+ $hcard = "";
+ $data = array();
+ foreach ($webfinger["links"] AS $link) {
+ if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != ""))
+ $hcard = $link["href"];
+ elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != ""))
+ $data["baseurl"] = trim($link["href"], '/');
+ elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != ""))
+ $data["guid"] = $link["href"];
+ elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
+ ($link["type"] == "text/html") AND ($link["href"] != ""))
+ $data["url"] = $link["href"];
+ elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != ""))
+ $data["poll"] = $link["href"];
+ elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != ""))
+ $data["poco"] = $link["href"];
+ elseif (($link["rel"] == "salmon") AND ($link["href"] != ""))
+ $data["notify"] = $link["href"];
+ elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+ $data["pubkey"] = base64_decode($link["href"]);
+
+ //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+ if (strstr($data["pubkey"], 'RSA '))
+ $data["pubkey"] = rsatopem($data["pubkey"]);
+ }
+ }
+
+ if (!isset($data["url"]) OR ($hcard == ""))
+ return false;
+
+ if (is_array($webfinger["aliases"]))
+ foreach ($webfinger["aliases"] AS $alias)
+ if (normalise_link($alias) != normalise_link($data["url"]) AND !strstr($alias, "@"))
+ $data["alias"] = $alias;
+
+ // Fetch further information from the hcard
+ $data = self::poll_hcard($hcard, $data);
+
+ if (!$data)
+ return false;
+
+ if (isset($data["url"]) AND isset($data["guid"]) AND isset($data["baseurl"]) AND
+ isset($data["pubkey"]) AND ($hcard != "")) {
+ $data["network"] = NETWORK_DIASPORA;
+
+ // The Diaspora handle must always be lowercase
+ $data["addr"] = strtolower($data["addr"]);
+
+ // We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
+ $data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"];
+ $data["batch"] = $data["baseurl"]."/receive/public";
+ } else
+ return false;
+
+ return $data;
+ }
+
+ /**
+ * @brief Check for OStatus contact
+ *
+ * @param array $webfinger Webfinger data
+ *
+ * @return array OStatus data
+ */
+ private function ostatus($webfinger) {
+
+ $data = array();
+ if (is_array($webfinger["aliases"]))
+ foreach($webfinger["aliases"] AS $alias)
+ if (strstr($alias, "@"))
+ $data["addr"] = str_replace('acct:', '', $alias);
+
+ if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@"))
+ $data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
+
+ $pubkey = "";
+ foreach ($webfinger["links"] AS $link) {
+ if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
+ ($link["type"] == "text/html") AND ($link["href"] != ""))
+ $data["url"] = $link["href"];
+ elseif (($link["rel"] == "salmon") AND ($link["href"] != ""))
+ $data["notify"] = $link["href"];
+ elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != ""))
+ $data["poll"] = $link["href"];
+ elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) {
+ $pubkey = $link["href"];
+
+ if (substr($pubkey, 0, 5) === 'data:') {
+ if (strstr($pubkey, ','))
+ $pubkey = substr($pubkey, strpos($pubkey, ',') + 1);
+ else
+ $pubkey = substr($pubkey, 5);
+ } elseif (normalise_link($pubkey) == 'http://')
+ $pubkey = fetch_url($pubkey);
+
+ $key = explode(".", $pubkey);
+
+ if (sizeof($key) >= 3) {
+ $m = base64url_decode($key[1]);
+ $e = base64url_decode($key[2]);
+ $data["pubkey"] = metopem($m,$e);
+ }
+
+ }
+ }
+
+ if (isset($data["notify"]) AND isset($data["pubkey"]) AND
+ isset($data["poll"]) AND isset($data["url"])) {
+ $data["network"] = NETWORK_OSTATUS;
+ } else
+ return false;
+
+ // Fetch all additional data from the feed
+ $feed = fetch_url($data["poll"]);
+ $feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true);
+ if (!$feed_data)
+ return false;
+
+ if ($feed_data["header"]["author-name"] != "")
+ $data["name"] = $feed_data["header"]["author-name"];
+
+ if ($feed_data["header"]["author-nick"] != "")
+ $data["nick"] = $feed_data["header"]["author-nick"];
+
+ if ($feed_data["header"]["author-avatar"] != "")
+ $data["photo"] = $feed_data["header"]["author-avatar"];
+
+ if ($feed_data["header"]["author-id"] != "")
+ $data["alias"] = $feed_data["header"]["author-id"];
+
+ if ($feed_data["header"]["author-location"] != "")
+ $data["location"] = $feed_data["header"]["author-location"];
+
+ if ($feed_data["header"]["author-about"] != "")
+ $data["about"] = $feed_data["header"]["author-about"];
+
+ // OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl)
+ // So we take the value that we just fetched, although the other one worked as well
+ if ($feed_data["header"]["author-link"] != "")
+ $data["url"] = $feed_data["header"]["author-link"];
+
+ /// @todo Fetch location and "about" from the feed as well
+ return $data;
+ }
+
+ /**
+ * @brief Fetch data from a pump.io profile page
+ *
+ * @param string $profile Link to the profile page
+ *
+ * @return array profile data
+ */
+ private function pumpio_profile_data($profile) {
+
+ $doc = new DOMDocument();
+ if (!@$doc->loadHTMLFile($profile))
+ return false;
+
+ $xpath = new DomXPath($doc);
+
+ $data = array();
+
+ // This is ugly - but pump.io doesn't seem to know a better way for it
+ $data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
+ $pos = strpos($data["name"], chr(10));
+ if ($pos)
+ $data["name"] = trim(substr($data["name"], 0, $pos));
+
+ $avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+ if ($avatar)
+ foreach ($avatar->attributes as $attribute)
+ if ($attribute->name == "src")
+ $data["photo"] = trim($attribute->value);
+
+ $data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue;
+ $data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue;
+
+ return $data;
+ }
+
+ /**
+ * @brief Check for pump.io contact
+ *
+ * @param array $webfinger Webfinger data
+ *
+ * @return array pump.io data
+ */
+ private function pumpio($webfinger) {
+
+ $data = array();
+ foreach ($webfinger["links"] AS $link) {
+ if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
+ ($link["type"] == "text/html") AND ($link["href"] != ""))
+ $data["url"] = $link["href"];
+ elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != ""))
+ $data["notify"] = $link["href"];
+ elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != ""))
+ $data["poll"] = $link["href"];
+ elseif (($link["rel"] == "dialback") AND ($link["href"] != ""))
+ $data["dialback"] = $link["href"];
+ }
+ if (isset($data["poll"]) AND isset($data["notify"]) AND
+ isset($data["dialback"]) AND isset($data["url"])) {
+
+ // by now we use these fields only for the network type detection
+ // So we unset all data that isn't used at the moment
+ unset($data["dialback"]);
+
+ $data["network"] = NETWORK_PUMPIO;
+ } else
+ return false;
+
+ $profile_data = self::pumpio_profile_data($data["url"]);
+
+ if (!$profile_data)
+ return false;
+
+ $data = array_merge($data, $profile_data);
+
+ return $data;
+ }
+
+ /**
+ * @brief Check page for feed link
+ *
+ * @param string $url Page link
+ *
+ * @return string feed link
+ */
+ private function get_feed_link($url) {
+ $doc = new DOMDocument();
+
+ if (!@$doc->loadHTMLFile($url))
+ return false;
+
+ $xpath = new DomXPath($doc);
+
+ //$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']");
+ $feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']");
+ if (!is_object($feeds))
+ return false;
+
+ if ($feeds->length == 0)
+ return false;
+
+ $feed_url = "";
+
+ foreach ($feeds AS $feed) {
+ $attr = array();
+ foreach ($feed->attributes as $attribute)
+ $attr[$attribute->name] = trim($attribute->value);
+
+ if ($feed_url == "")
+ $feed_url = $attr["href"];
+ }
+
+ return $feed_url;
+ }
+
+ /**
+ * @brief Check for feed contact
+ *
+ * @param string $url Profile link
+ * @param boolean $probe Do a probe if the page contains a feed link
+ *
+ * @return array feed data
+ */
+ private function feed($url, $probe = true) {
+ $feed = fetch_url($url);
+ $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+
+ if (!$feed_data) {
+ if (!$probe)
+ return false;
+
+ $feed_url = self::get_feed_link($url);
+
+ if (!$feed_url)
+ return false;
+
+ return self::feed($feed_url, false);
+ }
+
+ if ($feed_data["header"]["author-name"] != "")
+ $data["name"] = $feed_data["header"]["author-name"];
+
+ if ($feed_data["header"]["author-nick"] != "")
+ $data["nick"] = $feed_data["header"]["author-nick"];
+
+ if ($feed_data["header"]["author-avatar"] != "")
+ $data["photo"] = $feed_data["header"]["author-avatar"];
+
+ if ($feed_data["header"]["author-id"] != "")
+ $data["alias"] = $feed_data["header"]["author-id"];
+
+ $data["url"] = $url;
+ $data["poll"] = $url;
+
+ if ($feed_data["header"]["author-link"] != "")
+ $data["baseurl"] = $feed_data["header"]["author-link"];
+ else
+ $data["baseurl"] = $data["url"];
+
+ $data["network"] = NETWORK_FEED;
+
+ return $data;
+ }
+
+ /**
+ * @brief Check for mail contact
+ *
+ * @param string $uri Profile link
+ * @param integer $uid User ID
+ *
+ * @return array mail data
+ */
+ private function mail($uri, $uid) {
+
+ if (!validate_email($uri))
+ return false;
+
+ $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+
+ $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+
+ if (dbm::is_result($x) && dbm::is_result($r)) {
+ $mailbox = construct_mailbox_name($r[0]);
+ $password = '';
+ openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);
+ $mbox = email_connect($mailbox,$r[0]['user'], $password);
+ if(!mbox)
+ return false;
+ }
+
+ $msgs = email_poll($mbox, $uri);
+ logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+
+ if (!count($msgs))
+ return false;
+
+ $data = array();
+
+ $data["addr"] = $uri;
+ $data["network"] = NETWORK_MAIL;
+ $data["name"] = substr($uri, 0, strpos($uri,'@'));
+ $data["nick"] = $data["name"];
+ $data["photo"] = avatar_img($uri);
+
+ $phost = substr($uri, strpos($uri,'@') + 1);
+ $data["url"] = 'http://'.$phost."/".$data["nick"];
+ $data["notify"] = 'smtp '.random_string();
+ $data["poll"] = 'email '.random_string();
+
+ $x = email_msg_meta($mbox, $msgs[0]);
+ if(stristr($x[0]->from, $uri))
+ $adr = imap_rfc822_parse_adrlist($x[0]->from, '');
+ elseif(stristr($x[0]->to, $uri))
+ $adr = imap_rfc822_parse_adrlist($x[0]->to, '');
+ if(isset($adr)) {
+ foreach($adr as $feadr) {
+ if((strcasecmp($feadr->mailbox, $data["name"]) == 0)
+ &&(strcasecmp($feadr->host, $phost) == 0)
+ && (strlen($feadr->personal))) {
+
+ $personal = imap_mime_header_decode($feadr->personal);
+ $data["name"] = "";
+ foreach($personal as $perspart)
+ if ($perspart->charset != "default")
+ $data["name"] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text);
+ else
+ $data["name"] .= $perspart->text;
+
+ $data["name"] = notags($data["name"]);
+ }
+ }
+ }
+ imap_close($mbox);
+
+ return $data;
+ }
+}
+?>
diff --git a/include/Scrape.php b/include/Scrape.php
index 6ee3dabfca..bb9af60d70 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -1,317 +1,5 @@
get_curl_headers();
- logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
-
-
- $lines = explode("\n",$headers);
- if(count($lines)) {
- foreach($lines as $line) {
- // don't try and run feeds through the html5 parser
- if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
- return ret;
- }
- }
-
- try {
- $dom = HTML5_Parser::parse($s);
- } catch (DOMException $e) {
- logger('scrape_dfrn: parse error: ' . $e);
- }
-
- if(! $dom)
- return $ret;
-
- $items = $dom->getElementsByTagName('link');
-
- // get DFRN link elements
-
- foreach($items as $item) {
- $x = $item->getAttribute('rel');
- if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml'))
- $ret['feed_atom'] = $item->getAttribute('href');
- if(substr($x,0,5) == "dfrn-") {
- $ret[$x] = $item->getAttribute('href');
- }
- if($x === 'lrdd') {
- $decoded = urldecode($item->getAttribute('href'));
- if(preg_match('/acct:([^@]*)@/',$decoded,$matches))
- $ret['nick'] = $matches[1];
- }
- }
-
- // Pull out hCard profile elements
-
- $largest_photo = 0;
-
- $items = $dom->getElementsByTagName('*');
- foreach($items as $item) {
- if(attribute_contains($item->getAttribute('class'), 'vcard')) {
- $level2 = $item->getElementsByTagName('*');
- foreach($level2 as $x) {
- if(attribute_contains($x->getAttribute('class'),'fn')) {
- $ret['fn'] = $x->textContent;
- }
- if((attribute_contains($x->getAttribute('class'),'photo'))
- || (attribute_contains($x->getAttribute('class'),'avatar'))) {
- $size = intval($x->getAttribute('width'));
- // dfrn prefers 175, so if we find this, we set largest_size so it can't be topped.
- if(($size > $largest_photo) || ($size == 175) || (! $largest_photo)) {
- $ret['photo'] = $x->getAttribute('src');
- $largest_photo = (($size == 175) ? 9999 : $size);
- }
- }
- if(attribute_contains($x->getAttribute('class'),'key')) {
- $ret['key'] = $x->textContent;
- }
- }
- }
- }
-
- return $ret;
-}}
-
-
-
-
-
-
-if(! function_exists('validate_dfrn')) {
-function validate_dfrn($a) {
- $errors = 0;
- if(! x($a,'key'))
- $errors ++;
- if(! x($a,'dfrn-request'))
- $errors ++;
- if(! x($a,'dfrn-confirm'))
- $errors ++;
- if(! x($a,'dfrn-notify'))
- $errors ++;
- if(! x($a,'dfrn-poll'))
- $errors ++;
- return $errors;
-}}
-
-if(! function_exists('scrape_meta')) {
-function scrape_meta($url) {
-
- $a = get_app();
-
- $ret = array();
-
- logger('scrape_meta: url=' . $url);
-
- $s = fetch_url($url);
-
- if(! $s)
- return $ret;
-
- $headers = $a->get_curl_headers();
- logger('scrape_meta: headers=' . $headers, LOGGER_DEBUG);
-
- $lines = explode("\n",$headers);
- if(count($lines)) {
- foreach($lines as $line) {
- // don't try and run feeds through the html5 parser
- if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
- return ret;
- }
- }
-
- try {
- $dom = HTML5_Parser::parse($s);
- } catch (DOMException $e) {
- logger('scrape_meta: parse error: ' . $e);
- }
-
- if(! $dom)
- return $ret;
-
- $items = $dom->getElementsByTagName('meta');
-
- // get DFRN link elements
-
- foreach($items as $item) {
- $x = $item->getAttribute('name');
- if(substr($x,0,5) == "dfrn-")
- $ret[$x] = $item->getAttribute('content');
- }
-
- return $ret;
-}}
-
-
-if(! function_exists('scrape_vcard')) {
-function scrape_vcard($url) {
-
- $a = get_app();
-
- $ret = array();
-
- logger('scrape_vcard: url=' . $url);
-
- $s = fetch_url($url);
-
- if(! $s)
- return $ret;
-
- $headers = $a->get_curl_headers();
- $lines = explode("\n",$headers);
- if(count($lines)) {
- foreach($lines as $line) {
- // don't try and run feeds through the html5 parser
- if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
- return ret;
- }
- }
-
- try {
- $dom = HTML5_Parser::parse($s);
- } catch (DOMException $e) {
- logger('scrape_vcard: parse error: ' . $e);
- }
-
- if(! $dom)
- return $ret;
-
- // Pull out hCard profile elements
-
- $largest_photo = 0;
-
- $items = $dom->getElementsByTagName('*');
- foreach($items as $item) {
- if(attribute_contains($item->getAttribute('class'), 'vcard')) {
- $level2 = $item->getElementsByTagName('*');
- foreach($level2 as $x) {
- if(attribute_contains($x->getAttribute('class'),'fn'))
- $ret['fn'] = $x->textContent;
- if((attribute_contains($x->getAttribute('class'),'photo'))
- || (attribute_contains($x->getAttribute('class'),'avatar'))) {
- $size = intval($x->getAttribute('width'));
- if(($size > $largest_photo) || (! $largest_photo)) {
- $ret['photo'] = $x->getAttribute('src');
- $largest_photo = $size;
- }
- }
- if((attribute_contains($x->getAttribute('class'),'nickname'))
- || (attribute_contains($x->getAttribute('class'),'uid'))) {
- $ret['nick'] = $x->textContent;
- }
- }
- }
- }
-
- return $ret;
-}}
-
-
-if(! function_exists('scrape_feed')) {
-function scrape_feed($url) {
-
- $a = get_app();
-
- $ret = array();
- $s = fetch_url($url);
-
- $headers = $a->get_curl_headers();
- $code = $a->get_curl_code();
-
- logger('scrape_feed: returns: ' . $code . ' headers=' . $headers, LOGGER_DEBUG);
-
- if(! $s) {
- logger('scrape_feed: no data returned for ' . $url);
- return $ret;
- }
-
-
- $lines = explode("\n",$headers);
- if(count($lines)) {
- foreach($lines as $line) {
- if(stristr($line,'content-type:')) {
- if(stristr($line,'application/atom+xml') || stristr($s,'')) {
- $ret['feed_rss'] = $url;
- return $ret;
- }
- }
-
- $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/';
-
- $doc = new DOMDocument();
- @$doc->loadHTML($s);
- $xpath = new DomXPath($doc);
-
- $base = $xpath->query("//base");
- foreach ($base as $node) {
- $attr = array();
-
- if ($node->attributes->length)
- foreach ($node->attributes as $attribute)
- $attr[$attribute->name] = $attribute->value;
-
- if ($attr["href"] != "")
- $basename = $attr["href"] ;
- }
-
- $list = $xpath->query("//link");
- foreach ($list as $node) {
- $attr = array();
-
- if ($node->attributes->length)
- foreach ($node->attributes as $attribute)
- $attr[$attribute->name] = $attribute->value;
-
- if (($attr["rel"] == "alternate") AND ($attr["type"] == "application/atom+xml"))
- $ret["feed_atom"] = $attr["href"];
-
- if (($attr["rel"] == "alternate") AND ($attr["type"] == "application/rss+xml"))
- $ret["feed_rss"] = $attr["href"];
- }
-
- // Drupal and perhaps others only provide relative URLs. Turn them into absolute.
-
- if(x($ret,'feed_atom') && (! strstr($ret['feed_atom'],'://')))
- $ret['feed_atom'] = $basename . $ret['feed_atom'];
- if(x($ret,'feed_rss') && (! strstr($ret['feed_rss'],'://')))
- $ret['feed_rss'] = $basename . $ret['feed_rss'];
-
- return $ret;
-}}
-
+require_once('include/Probe.php');
/**
*
@@ -331,564 +19,17 @@ function scrape_feed($url) {
*
*/
-
-define ( 'PROBE_NORMAL', 0);
-define ( 'PROBE_DIASPORA', 1);
+define('PROBE_NORMAL', 0);
+define('PROBE_DIASPORA', 1);
function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
- require_once('include/email.php');
- $result = array();
+ if ($mode == PROBE_DIASPORA)
+ $network = NETWORK_DIASPORA;
+ else
+ $network = "";
- if(! $url)
- return $result;
+ $data = Probe::uri($url, $network);
- $result = Cache::get("probe_url:".$mode.":".$url);
- if (!is_null($result)) {
- $result = unserialize($result);
- return $result;
- }
-
- $network = null;
- $diaspora = false;
- $diaspora_base = '';
- $diaspora_guid = '';
- $diaspora_key = '';
- $has_lrdd = false;
- $email_conversant = false;
- $connectornetworks = false;
- $appnet = false;
-
- if (strpos($url,'twitter.com')) {
- $connectornetworks = true;
- $network = NETWORK_TWITTER;
- }
-
- // Twitter is deactivated since twitter closed its old API
- //$twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
- $lastfm = ((strpos($url,'last.fm/user') !== false) ? true : false);
-
- $at_addr = ((strpos($url,'@') !== false) ? true : false);
-
- if((!$appnet) && (!$lastfm) && !$connectornetworks) {
-
- if(strpos($url,'mailto:') !== false && $at_addr) {
- $url = str_replace('mailto:','',$url);
- $links = array();
- }
- else
- $links = lrdd($url);
-
- if(count($links)) {
- $has_lrdd = true;
-
- logger('probe_url: found lrdd links: ' . print_r($links,true), LOGGER_DATA);
- foreach($links as $link) {
- if($link['@attributes']['rel'] === NAMESPACE_ZOT)
- $zot = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === NAMESPACE_DFRN)
- $dfrn = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === 'salmon')
- $notify = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === NAMESPACE_FEED)
- $poll = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
- $hcard = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
- $profile = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === 'http://portablecontacts.net/spec/1.0')
- $poco = unamp($link['@attributes']['href']);
- if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location') {
- $diaspora_base = unamp($link['@attributes']['href']);
- $diaspora = true;
- }
- if($link['@attributes']['rel'] === 'http://joindiaspora.com/guid') {
- $diaspora_guid = unamp($link['@attributes']['href']);
- $diaspora = true;
- }
- if($link['@attributes']['rel'] === 'diaspora-public-key') {
- $diaspora_key = base64_decode(unamp($link['@attributes']['href']));
- if(strstr($diaspora_key,'RSA '))
- $pubkey = rsatopem($diaspora_key);
- else
- $pubkey = $diaspora_key;
- $diaspora = true;
- }
- if(($link['@attributes']['rel'] === 'http://ostatus.org/schema/1.0/subscribe') AND ($mode == PROBE_NORMAL)) {
- $diaspora = false;
- }
- }
-
- // Status.Net can have more than one profile URL. We need to match the profile URL
- // to a contact on incoming messages to prevent spam, and we won't know which one
- // to match. So in case of two, one of them is stored as an alias. Only store URL's
- // and not webfinger user@host aliases. If they've got more than two non-email style
- // aliases, let's hope we're lucky and get one that matches the feed author-uri because
- // otherwise we're screwed.
-
- foreach($links as $link) {
- if($link['@attributes']['rel'] === 'alias') {
- if(strpos($link['@attributes']['href'],'@') === false) {
- if(isset($profile)) {
- if($link['@attributes']['href'] !== $profile)
- $alias = unamp($link['@attributes']['href']);
- }
- else
- $profile = unamp($link['@attributes']['href']);
- }
- }
- }
-
- // If the profile is different from the url then the url is abviously an alias
- if (($alias == "") AND ($profile != "") AND !$at_addr AND (normalise_link($profile) != normalise_link($url)))
- $alias = $url;
- }
- elseif($mode == PROBE_NORMAL) {
-
- // Check email
-
- $orig_url = $url;
- if((strpos($orig_url,'@')) && validate_email($orig_url)) {
- $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
- intval(local_user())
- );
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
- intval(local_user())
- );
- if(count($x) && count($r)) {
- $mailbox = construct_mailbox_name($r[0]);
- $password = '';
- openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
- $mbox = email_connect($mailbox,$r[0]['user'],$password);
- if(! $mbox)
- logger('probe_url: email_connect failed.');
- unset($password);
- }
- if($mbox) {
- $msgs = email_poll($mbox,$orig_url);
- logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG);
- if(count($msgs)) {
- $addr = $orig_url;
- $network = NETWORK_MAIL;
- $name = substr($url,0,strpos($url,'@'));
- $phost = substr($url,strpos($url,'@')+1);
- $profile = 'http://' . $phost;
- // fix nick character range
- $vcard = array('fn' => $name, 'nick' => $name, 'photo' => avatar_img($url));
- $notify = 'smtp ' . random_string();
- $poll = 'email ' . random_string();
- $priority = 0;
- $x = email_msg_meta($mbox,$msgs[0]);
- if(stristr($x[0]->from,$orig_url))
- $adr = imap_rfc822_parse_adrlist($x[0]->from,'');
- elseif(stristr($x[0]->to,$orig_url))
- $adr = imap_rfc822_parse_adrlist($x[0]->to,'');
- if(isset($adr)) {
- foreach($adr as $feadr) {
- if((strcasecmp($feadr->mailbox,$name) == 0)
- &&(strcasecmp($feadr->host,$phost) == 0)
- && (strlen($feadr->personal))) {
-
- $personal = imap_mime_header_decode($feadr->personal);
- $vcard['fn'] = "";
- foreach($personal as $perspart)
- if ($perspart->charset != "default")
- $vcard['fn'] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text);
- else
- $vcard['fn'] .= $perspart->text;
-
- $vcard['fn'] = notags($vcard['fn']);
- }
- }
- }
- }
- imap_close($mbox);
- }
- }
- }
- }
-
- if($mode == PROBE_NORMAL) {
-
- if(strlen($zot)) {
- $s = fetch_url($zot);
- if($s) {
- $j = json_decode($s);
- if($j) {
- $network = NETWORK_ZOT;
- $vcard = array(
- 'fn' => $j->fullname,
- 'nick' => $j->nickname,
- 'photo' => $j->photo
- );
- $profile = $j->url;
- $notify = $j->post;
- $pubkey = $j->pubkey;
- $poll = 'N/A';
- }
- }
- }
-
-
- if(strlen($dfrn)) {
- $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
- if(is_array($ret) && x($ret,'dfrn-request')) {
- $network = NETWORK_DFRN;
- $request = $ret['dfrn-request'];
- $confirm = $ret['dfrn-confirm'];
- $notify = $ret['dfrn-notify'];
- $poll = $ret['dfrn-poll'];
-
- $vcard = array();
- $vcard['fn'] = $ret['fn'];
- $vcard['nick'] = $ret['nick'];
- $vcard['photo'] = $ret['photo'];
- }
- }
- }
-
- if($diaspora && $diaspora_base && $diaspora_guid) {
- if($mode == PROBE_DIASPORA || ! $notify) {
- $notify = $diaspora_base . 'receive/users/' . $diaspora_guid;
- $batch = $diaspora_base . 'receive/public' ;
- }
- if(strpos($url,'@'))
- $addr = str_replace('acct:', '', $url);
- }
-
- if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
- if($diaspora)
- $network = NETWORK_DIASPORA;
- elseif($has_lrdd AND ($notify))
- $network = NETWORK_OSTATUS;
-
- if(strpos($url,'@'))
- $addr = str_replace('acct:', '', $url);
-
- $priority = 0;
-
- if($hcard && ! $vcard) {
- $vcard = scrape_vcard($hcard);
-
- // Google doesn't use absolute url in profile photos
-
- if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
- $h = @parse_url($hcard);
- if($h)
- $vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
- }
-
- logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
- }
-
- if($diaspora && $addr) {
- // Diaspora returns the name as the nick. As the nick will never be updated,
- // let's use the Diaspora nickname (the first part of the handle) as the nick instead
- $addr_parts = explode('@', $addr);
- $vcard['nick'] = $addr_parts[0];
- }
-
- /* if($twitter) {
- logger('twitter: setup');
- $tid = basename($url);
- $tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
- if(intval($tid))
- $poll = $tapi . '?user_id=' . $tid;
- else
- $poll = $tapi . '?screen_name=' . $tid;
- $profile = 'http://twitter.com/#!/' . $tid;
- //$vcard['photo'] = 'https://api.twitter.com/1/users/profile_image/' . $tid;
- $vcard['photo'] = 'https://api.twitter.com/1/users/profile_image?screen_name=' . $tid . '&size=bigger';
- $vcard['nick'] = $tid;
- $vcard['fn'] = $tid;
- } */
-
- if($lastfm) {
- $profile = $url;
- $poll = str_replace(array('www.','last.fm/'),array('','ws.audioscrobbler.com/1.0/'),$url) . '/recenttracks.rss';
- $vcard['nick'] = basename($url);
- $vcard['fn'] = $vcard['nick'] . t(' on Last.fm');
- $network = NETWORK_FEED;
- }
-
- if(! x($vcard,'fn'))
- if(x($vcard,'nick'))
- $vcard['fn'] = $vcard['nick'];
-
- $check_feed = false;
-
- if(stristr($url,'tumblr.com') && (! stristr($url,'/rss'))) {
- $poll = $url . '/rss';
- $check_feed = true;
- // Will leave it to others to figure out how to grab the avatar, which is on the $url page in the open graph meta links
- }
-
- if($appnet || ! $poll)
- $check_feed = true;
- if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))
- $check_feed = true;
- if(($at_addr) && (! count($links)))
- $check_feed = false;
-
- if ($connectornetworks)
- $check_feed = false;
-
- if($check_feed) {
-
- $feedret = scrape_feed(($poll) ? $poll : $url);
-
- logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA);
- if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
- $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
- if(! x($vcard))
- $vcard = array();
- }
-
- if(x($feedret,'photo') && (! x($vcard,'photo')))
- $vcard['photo'] = $feedret['photo'];
- require_once('library/simplepie/simplepie.inc');
- $feed = new SimplePie();
- $xml = fetch_url($poll);
-
- logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
- $a = get_app();
-
- logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
-
- // Don't try and parse an empty string
- $feed->set_raw_data(($xml) ? $xml : '');
-
- $feed->init();
- if($feed->error()) {
- logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error());
- $network = NETWORK_PHANTOM;
- }
-
- if(! x($vcard,'photo'))
- $vcard['photo'] = $feed->get_image_url();
- $author = $feed->get_author();
-
- if($author) {
- $vcard['fn'] = unxmlify(trim($author->get_name()));
- if(! $vcard['fn'])
- $vcard['fn'] = trim(unxmlify($author->get_email()));
- if(strpos($vcard['fn'],'@') !== false)
- $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-
- $email = unxmlify($author->get_email());
- if(! $profile && $author->get_link())
- $profile = trim(unxmlify($author->get_link()));
- if(! $vcard['photo']) {
- $rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
- if($rawtags) {
- $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
- if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo'))
- $vcard['photo'] = $elems['link'][0]['attribs']['']['href'];
- }
- }
- // Fetch fullname via poco:displayName
- $pocotags = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
- if ($pocotags) {
- $elems = $pocotags[0]['child']['http://portablecontacts.net/spec/1.0'];
- if (isset($elems["displayName"]))
- $vcard['fn'] = $elems["displayName"][0]["data"];
- if (isset($elems["preferredUsername"]))
- $vcard['nick'] = $elems["preferredUsername"][0]["data"];
- }
- }
- else {
- $item = $feed->get_item(0);
- if($item) {
- $author = $item->get_author();
- if($author) {
- $vcard['fn'] = trim(unxmlify($author->get_name()));
- if(! $vcard['fn'])
- $vcard['fn'] = trim(unxmlify($author->get_email()));
- if(strpos($vcard['fn'],'@') !== false)
- $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
- $email = unxmlify($author->get_email());
- if(! $profile && $author->get_link())
- $profile = trim(unxmlify($author->get_link()));
- }
- if(! $vcard['photo']) {
- $rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
- if($rawmedia && $rawmedia[0]['attribs']['']['url'])
- $vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
- }
- if(! $vcard['photo']) {
- $rawtags = $item->get_item_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
- if($rawtags) {
- $elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
- if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo'))
- $vcard['photo'] = $elems['link'][0]['attribs']['']['href'];
- }
- }
- }
- }
-
- // Workaround for misconfigured Friendica servers
- if (($network == "") AND (strstr($url, "/profile/"))) {
- $noscrape = str_replace("/profile/", "/noscrape/", $url);
- $noscrapejson = fetch_url($noscrape);
- if ($noscrapejson) {
-
- $network = NETWORK_DFRN;
-
- $poco = str_replace("/profile/", "/poco/", $url);
-
- $noscrapedata = json_decode($noscrapejson, true);
-
- if (isset($noscrapedata["addr"]))
- $addr = $noscrapedata["addr"];
-
- if (isset($noscrapedata["fn"]))
- $vcard["fn"] = $noscrapedata["fn"];
-
- if (isset($noscrapedata["key"]))
- $pubkey = $noscrapedata["key"];
-
- if (isset($noscrapedata["photo"]))
- $vcard["photo"] = $noscrapedata["photo"];
-
- if (isset($noscrapedata["dfrn-request"]))
- $request = $noscrapedata["dfrn-request"];
-
- if (isset($noscrapedata["dfrn-confirm"]))
- $confirm = $noscrapedata["dfrn-confirm"];
-
- if (isset($noscrapedata["dfrn-notify"]))
- $notify = $noscrapedata["dfrn-notify"];
-
- if (isset($noscrapedata["dfrn-poll"]))
- $poll = $noscrapedata["dfrn-poll"];
-
- }
- }
-
- if((! $vcard['photo']) && strlen($email))
- $vcard['photo'] = avatar_img($email);
- if($poll === $profile)
- $lnk = $feed->get_permalink();
- if(isset($lnk) && strlen($lnk))
- $profile = $lnk;
-
- if(! $network) {
- $network = NETWORK_FEED;
- // If it is a feed, don't take the author name as feed name
- unset($vcard['fn']);
- }
- if(! (x($vcard,'fn')))
- $vcard['fn'] = notags($feed->get_title());
- if(! (x($vcard,'fn')))
- $vcard['fn'] = notags($feed->get_description());
-
- if(strpos($vcard['fn'],'Twitter / ') !== false) {
- $vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1);
- $vcard['fn'] = trim($vcard['fn']);
- }
- if(! x($vcard,'nick')) {
- $vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
- if(strpos($vcard['nick'],' '))
- $vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
- }
- if(! $priority)
- $priority = 2;
- }
- }
-
- if(! x($vcard,'photo')) {
- $a = get_app();
- $vcard['photo'] = $a->get_baseurl() . '/images/person-175.jpg' ;
- }
-
- if(! $profile)
- $profile = $url;
-
- // No human could be associated with this link, use the URL as the contact name
-
- if(($network === NETWORK_FEED) && ($poll) && (! x($vcard,'fn')))
- $vcard['fn'] = $url;
-
- if (($notify != "") AND ($poll != "")) {
- $baseurl = matching(normalise_link($notify), normalise_link($poll));
-
- $baseurl2 = matching($baseurl, normalise_link($profile));
- if ($baseurl2 != "")
- $baseurl = $baseurl2;
- }
-
- if (($baseurl == "") AND ($notify != ""))
- $baseurl = matching(normalise_link($profile), normalise_link($notify));
-
- if (($baseurl == "") AND ($poll != ""))
- $baseurl = matching(normalise_link($profile), normalise_link($poll));
-
- $baseurl = rtrim($baseurl, "/");
-
- if(strpos($url,'@') AND ($addr == "") AND ($network == NETWORK_DFRN))
- $addr = str_replace('acct:', '', $url);
-
- $vcard['fn'] = notags($vcard['fn']);
- $vcard['nick'] = str_replace(' ','',notags($vcard['nick']));
-
- $result['name'] = $vcard['fn'];
- $result['nick'] = $vcard['nick'];
- $result['url'] = $profile;
- $result['addr'] = $addr;
- $result['batch'] = $batch;
- $result['notify'] = $notify;
- $result['poll'] = $poll;
- $result['request'] = $request;
- $result['confirm'] = $confirm;
- $result['poco'] = $poco;
- $result['photo'] = $vcard['photo'];
- $result['priority'] = $priority;
- $result['network'] = $network;
- $result['alias'] = $alias;
- $result['pubkey'] = $pubkey;
- $result['baseurl'] = $baseurl;
-
- logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
-
- if ($level == 1) {
- // Trying if it maybe a diaspora account
- if (($result['network'] == NETWORK_FEED) OR ($result['addr'] == "")) {
- require_once('include/bbcode.php');
- $address = GetProfileUsername($url, "", true);
- $result2 = probe_url($address, $mode, ++$level);
- if ($result2['network'] != "")
- $result = $result2;
- }
-
- // Maybe it's some non standard GNU Social installation (Single user, subfolder or no uri rewrite)
- if (($result['network'] == NETWORK_FEED) AND ($result['baseurl'] != "") AND ($result['nick'] != "")) {
- $addr = $result['nick'].'@'.str_replace("http://", "", $result['baseurl']);
- $result2 = probe_url($addr, $mode, ++$level);
- if (($result2['network'] != "") AND ($result2['network'] != NETWORK_FEED))
- $result = $result2;
- }
- }
-
- // Only store into the cache if the value seems to be valid
- if ($result['network'] != NETWORK_PHANTOM)
- Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
-
- return $result;
-}
-
-function matching($part1, $part2) {
- $len = min(strlen($part1), strlen($part2));
-
- $match = "";
- $matching = true;
- $i = 0;
- while (($i <= $len) AND $matching) {
- if (substr($part1, $i, 1) == substr($part2, $i, 1))
- $match .= substr($part1, $i, 1);
- else
- $matching = false;
-
- $i++;
- }
- return($match);
+ return $data;
}
diff --git a/include/Smilies.php b/include/Smilies.php
new file mode 100644
index 0000000000..d67b92d8b0
--- /dev/null
+++ b/include/Smilies.php
@@ -0,0 +1,182 @@
+ smilie shortcut
+ * 'icons' => icon in html
+ *
+ * @hook smilie ('texts' => smilies texts array, 'icons' => smilies html array)
+ */
+ public static function get_list() {
+
+ $texts = array(
+ '<3',
+ '</3',
+ '<\\3',
+ ':-)',
+ ';-)',
+ ':-(',
+ ':-P',
+ ':-p',
+ ':-"',
+ ':-"',
+ ':-x',
+ ':-X',
+ ':-D',
+ '8-|',
+ '8-O',
+ ':-O',
+ '\\o/',
+ 'o.O',
+ 'O.o',
+ 'o_O',
+ 'O_o',
+ ":'(",
+ ":-!",
+ ":-/",
+ ":-[",
+ "8-)",
+ ':beer',
+ ':homebrew',
+ ':coffee',
+ ':facepalm',
+ ':like',
+ ':dislike',
+ '~friendica',
+ 'red#',
+ 'red#matrix'
+
+ );
+
+ $icons = array(
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '~friendica ',
+ 'redmatrix',
+ 'redmatrix'
+ );
+
+ $params = array('texts' => $texts, 'icons' => $icons);
+ call_hooks('smilie', $params);
+
+ return $params;
+
+ }
+
+ /**
+ * @brief Replaces text emoticons with graphical images
+ *
+ * It is expected that this function will be called using HTML text.
+ * We will escape text between HTML pre and code blocks from being
+ * processed.
+ *
+ * At a higher level, the bbcode [nosmile] tag can be used to prevent this
+ * function from being executed by the prepare_text() routine when preparing
+ * bbcode source for HTML display
+ *
+ * @param string $s
+ * @param boolean $sample
+ *
+ * @return string HML Output of the Smilie
+ */
+ public static function replace($s, $sample = false) {
+ if(intval(get_config('system','no_smilies'))
+ || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
+ return $s;
+
+ $s = preg_replace_callback('/
Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
-
Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
+
-
(inkl. smoothly, testbubble)
+Frio 
+
Frost 
Vier 
(inkl. dispy)
diff --git a/doc/htconfig.md b/doc/htconfig.md
index 4764c287c8..a7dd59d1f5 100644
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -1,100 +1,115 @@
Config values that can only be set in .htconfig.php
===================================================
-There are some config values that haven't found their way into the administration page. This has several reasons. Maybe they are part of a
-current development that isn't considered stable and will be added later in the administration page when it is considered safe. Or it triggers
-something that isn't expected to be of public interest. Or it is for testing purposes only.
+* [Home](help)
-**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger. Especially don't do that with
-undocumented values.
+There are some config values that haven't found their way into the administration page.
+This has several reasons.
+Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe.
+Or it triggers something that isn't expected to be of public interest. Or it is for testing purposes only.
-The header of the section describes the category, the value is the parameter. Example: To set the directory value please add this
-line to your .htconfig.php:
+**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger.
+Especially don't do that with undocumented values.
+
+The header of the section describes the category, the value is the parameter.
+Example: To set the directory value please add this line to your .htconfig.php:
$a->config['system']['directory'] = 'http://dir.friendi.ca';
+## jabber ##
+* **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
+* **logfile** - Logfile for the jabber account synchronisation.
+## system ##
-## Jabber ##
-* debug (Boolean) - Enable debug level for the jabber account synchronisation.
-* logfile - Logfile for the jabber account synchronisation.
-
-## System ##
-
-* birthday_input_format - Default value is "ymd".
-* block_local_dir (Boolean) - Blocks the access to the directory of the local users.
-* default_service_class -
-* delivery_batch_count - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
-* diaspora_test (Boolean) - For development only. Disables the message transfer.
-* directory - The path to global directory. If not set then "http://dir.friendi.ca" is used.
-* disable_email_validation (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
-* disable_url_validation (Boolean) - Disables the DNS lookup of an URL.
-* event_input_format - Default value is "ymd".
-* ignore_cache (Boolean) - For development only. Disables the item cache.
-* like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked.
-* local_block (Boolean) - Used in conjunction with "block_public".
-* local_search (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
-* max_contact_queue - Default value is 500.
-* max_batch_queue - Default value is 1000.
-* no_oembed (Boolean) - Don't use OEmbed to fetch more information about a link.
-* no_oembed_rich_content (Boolean) - Don't show the rich content (e.g. embedded PDF).
-* no_smilies (Boolean) - Don't show smilies.
-* no_view_full_size (Boolean) - Don't add the link "View full size" under a resized image.
-* optimize_items (Boolean) - Triggers an SQL command to optimize the item table before expiring items.
-* ostatus_poll_timeframe - Defines how old an item can be to try to complete the conversation with it.
-* paranoia (Boolean) - Log out users if their IP address changed.
-* permit_crawling (Boolean) - Restricts the search for not logged in users to one search per minute.
-* free_crawls - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
-* crawl_permit_period - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
-* png_quality - Default value is 8.
-* proc_windows (Boolean) - Should be enabled if Friendica is running under Windows.
-* proxy_cache_time - Time after which the cache is cleared. Default value is one day.
-* pushpoll_frequency -
-* qsearch_limit - Default value is 100.
-* relay_server - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
-* relay_subscribe (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
-* relay_scope - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts witt selected tags should be received.
-* relay_server_tags - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
-* relay_user_tags (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
-* remove_multiplicated_lines (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
-* show_unsupported_addons (Boolean) - Show all addons including the unsupported ones.
-* show_unsupported_themes (Boolean) - Show all themes including the unsupported ones.
-* throttle_limit_day - Maximum number of posts that a user can send per day with the API.
-* throttle_limit_week - Maximum number of posts that a user can send per week with the API.
-* throttle_limit_month - Maximum number of posts that a user can send per month with the API.
-* wall-to-wall_share (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
-* worker (Boolean) - (Experimental) Use the worker system instead of calling several background processes. Reduces the overall load and speeds up item delivery.
-* worker_dont_fork (Boolean) - if enabled, the workers are only called from the poller process. Useful on systems that permit the use of "proc_open".
-* worker_queues - Number of parallel workers. Default value is 10 queues.
-* xrd_timeout - Timeout for fetching the XRD links. Default value is 20 seconds.
+* **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
+* **birthday_input_format** - Default value is "ymd".
+* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
+* **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
+* **db_log** - Name of a logfile to log slow database queries
+* **db_loglimit** - If a database call lasts longer than this value it is logged
+* **db_log_index** - Name of a logfile to log queries with bad indexes
+* **db_log_index_watch** - Watchlist of indexes to watch
+* **db_loglimit_index** - Number of index rows needed to be logged for indexes on the watchlist
+* **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
+* **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
+* **dbclean** (Boolean) - Enable the automatic database cleanup process
+* **default_service_class** -
+* **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
+* **diaspora_test** (Boolean) - For development only. Disables the message transfer.
+* **directory** - The path to global directory. If not set then "http://dir.friendi.ca" is used.
+* **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
+* **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
+* **event_input_format** - Default value is "ymd".
+* **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
+* **ignore_cache** (Boolean) - For development only. Disables the item cache.
+* **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked.
+* **local_block** (Boolean) - Used in conjunction with "block_public".
+* **local_search** (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
+* **max_connections** - The poller process isn't started when the maximum level of the possible database connections are used. When the system can't detect the maximum numbers of connection then this value can be used.
+* **max_connections_level** - The maximum level of connections that are allowed to let the poller start. It is a percentage value. Default value is 75.
+* **max_contact_queue** - Default value is 500.
+* **max_batch_queue** - Default value is 1000.
+* **max_processes_backend** - Maximum number of concurrent database processes for background tasks. Default value is 5.
+* **max_processes_frontend** - Maximum number of concurrent database processes for foreground tasks. Default value is 20.
+* **memcache** (Boolean) - Use memcache. To use memcache the PECL extension "memcache" has to be installed and activated.
+* **memcache_host** - Hostname of the memcache daemon. Default is '127.0.0.1'.
+* **memcache_port** - Portnumber of the memcache daemon. Default is 11211.
+* **no_count** (Boolean) - Don't do count calculations (currently only when showing albums)
+* **no_oembed** (Boolean) - Don't use OEmbed to fetch more information about a link.
+* **no_oembed_rich_content** (Boolean) - Don't show the rich content (e.g. embedded PDF).
+* **no_smilies** (Boolean) - Don't show smilies.
+* **no_view_full_size** (Boolean) - Don't add the link "View full size" under a resized image.
+* **optimize_items** (Boolean) - Triggers an SQL command to optimize the item table before expiring items.
+* **ostatus_poll_timeframe** - Defines how old an item can be to try to complete the conversation with it.
+* **paranoia** (Boolean) - Log out users if their IP address changed.
+* **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute.
+* **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false.
+* **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
+* **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
+* **png_quality** - Default value is 8.
+* **proc_windows** (Boolean) - Should be enabled if Friendica is running under Windows.
+* **proxy_cache_time** - Time after which the cache is cleared. Default value is one day.
+* **pushpoll_frequency** -
+* **qsearch_limit** - Default value is 100.
+* **relay_server** - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
+* **relay_subscribe** (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
+* **relay_scope** - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.
+* **relay_server_tags** - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
+* **relay_user_tags** (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
+* **remove_multiplicated_lines** (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
+* **show_unsupported_addons** (Boolean) - Show all addons including the unsupported ones.
+* **show_unsupported_themes** (Boolean) - Show all themes including the unsupported ones.
+* **throttle_limit_day** - Maximum number of posts that a user can send per day with the API.
+* **throttle_limit_week** - Maximum number of posts that a user can send per week with the API.
+* **throttle_limit_month** - Maximum number of posts that a user can send per month with the API.
+* **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
+* **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds.
+* **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
## service_class ##
-* upgrade_link -
+* **upgrade_link** -
## experimentals ##
-* exp_themes (Boolean) - Show experimental themes as well.
+* **exp_themes** (Boolean) - Show experimental themes as well.
## theme ##
-* hide_eventlist (Boolean) - Don't show the birthdays and events on the profile and network page
+* **hide_eventlist** (Boolean) - Don't show the birthdays and events on the profile and network page
# Administrator Options #
-Enabling the admin panel for an account, and thus making the account holder
-admin of the node, is done by setting the variable
+Enabling the admin panel for an account, and thus making the account holder admin of the node, is done by setting the variable
$a->config['admin_email'] = "someone@example.com";
-where you have to match the email address used for the account with the one you
-enter to the .htconfig file. If more then one account should be able to access
-the admin panel, seperate the email addresses with a comma.
+Where you have to match the email address used for the account with the one you enter to the .htconfig file.
+If more then one account should be able to access the admin panel, seperate the email addresses with a comma.
$a->config['admin_email'] = "someone@example.com,someonelese@example.com";
-If you want to have a more personalized closing line for the notification
-emails you can set a variable for the admin_name.
+If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
$a->config['admin_name'] = "Marvin";
-
diff --git a/doc/img/editor_frio.png b/doc/img/editor_frio.png
new file mode 100644
index 0000000000..8428b34382
Binary files /dev/null and b/doc/img/editor_frio.png differ
diff --git a/doc/readme.md b/doc/readme.md
index 068d0c9c5c..98b637a22e 100644
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -27,7 +27,7 @@ Friendica Documentation and Resources
**Technical Documentation**
* [Install](help/Install)
-* [Settings](help/Settings)
+* [Settings & Admin Panel](help/Settings)
* [Plugins](help/Plugins)
* [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
diff --git a/doc/snarty3-templates.md b/doc/smarty3-templates.md
similarity index 100%
rename from doc/snarty3-templates.md
rename to doc/smarty3-templates.md
diff --git a/doc/themes.md b/doc/themes.md
index add44c776b..b553debfd7 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -122,10 +122,11 @@ the 1st part of the line is the name of the CSS file (without the .css) the 2nd
Calling the t() function with the common name makes the string translateable.
The selected 1st part will be saved in the database by the theme_post function.
- function theme_post(&$a){
+ function theme_post(App $a){
// non local users shall not pass
- if(! local_user())
+ if (! local_user()) {
return;
+ }
// if the one specific submit button was pressed then proceed
if (isset($_POST['duepuntozero-settings-submit'])){
// and save the selection key into the personal config of the user
@@ -167,7 +168,7 @@ The content of this file should be something like
theme_info = array(
'extends' => 'duepuntozero'.
);
@@ -250,7 +251,7 @@ Next crucial part of the theme.php file is a definition of an init function.
The name of the function is  . '/images/smiley-heart.gif "<3")
',
+ ' . '/images/smiley-brokenheart.gif "</3")
',
+ ' . '/images/smiley-smile.gif ":-)")
',
+ ' . '/images/smiley-wink.gif ";-)")
',
+ ' . '/images/smiley-frown.gif ":-(")
',
+ ' . '/images/smiley-tongue-out.gif ":-P")
',
+ ' . '/images/smiley-kiss.gif ":-\")
',
+ ' . '/images/smiley-laughing.gif ":-D")
',
+ ' . '/images/smiley-surprised.gif "8-|")
',
+ ' . '/images/smiley-thumbsup.gif "\\o/")
',
+ ' . '/images/smiley-Oo.gif "o.O")
',
+ ' . '/images/smiley-cry.gif ":\'(")
',
+ ' . '/images/smiley-foot-in-mouth.gif ":-!")
',
+ ' . '/images/smiley-undecided.gif ":-/")
',
+ ' . '/images/smiley-embarassed.gif ":-[")
',
+ ' . '/images/smiley-cool.gif "8-)")
',
+ ' . '/images/beer_mug.gif ":beer")
',
+ ' . '/images/coffee.gif ":coffee")
',
+ ' . '/images/smiley-facepalm.gif ":facepalm")
',
+ ' . '/images/like.gif ":like")
',
+ ' . '/images/dislike.gif ":dislike")
',
+ '~friendica  . '/images/friendica-16.png "~friendica")
',
+ 'red . '/images/rm-16.png "red#")
matrix',
+ 'red