Merge pull request #778 from MrPetovan/task/move-config-to-php-array

Move config to PHP array

geonames/README.md

@@ -7,9 +7,10 @@ Use Geonames service to resolve nearest populated location for given latitude, l
 
 ## Installation
 
-Pre-requisite: Register a username at geonames.org and set in config/addon.ini.php
+Pre-requisite: Register a username at geonames.org and set in `config/addon.config.php`
 
-    [geonames]
+    'geonames' => [
-    username = your_username
+        'username' => 'your_username'
+    ],
 
 Also visit http://geonames.org/manageaccount and enable access to the free web services.

geonames/config/geonames.config.php

@@ -0,0 +1,12 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'geonames' => [
+		//username (String)
+		//The geonames.org API username
+		'username' => '',
+	],
+];

geonames/config/geonames.ini.php

@@ -1,12 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[geonames]
-; username (String)
-; The geonames.org API username
-username =
-
-INI;
-//Keep this line

geonames/geonames.php

@@ -7,7 +7,7 @@
  *
  *
  * Pre-requisite: Register a username at geonames.org
- * and set in config/addon.ini.php
+ * and set in config/addon.config.php
  *
  * [geonames]
  * username = your_username
@@ -78,7 +78,7 @@ function geonames_uninstall() {
 
 function geonames_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/geonames.ini.php');
+	$a->loadConfigFile(__DIR__. '/config/geonames.config.php');
 }
 
 function geonames_post_hook($a, &$item) {

gravatar/README.md

@@ -30,15 +30,19 @@ Gravatar lets users self-rate their images to be used at appropriate audiences.
 See more information at [Gravatar][1].
 
 ## Alternative Configuration
-Open the config/local.ini.php file and add "gravatar" to the list of activated addons:
+Open the `config/local.config.php` file and add "gravatar" to the list of activated addons:
 
-        [system]
+	'system' => [
-		addon = ...,gravatar
+		...
+		'addon' => '...,gravatar'
+		...
+	]
 
-You can add two configuration variables for the addon to the config/addon.ini.php file:
+You can add two configuration variables for the addon to the `config/addon.config.php` file:
 
-        [gravatar]
+    'gravatar' => [
-		default_avatar = identicon
+        'default_avatar' => 'identicon',
-        rating = g
+        'rating' => 'g',
+    ],
 
 [1]: http://www.gravatar.com/site/implement/images/ "See documentation at Gravatar for more information"

gravatar/config/gravatar.config.php

@@ -0,0 +1,28 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'gravatar' => [
+		// default_avatar (String)
+		// If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
+		// You can choose between these presets:
+		// - gravatar : default static Gravatar logo
+		// - mm       : (mystery-man) a static image
+		// - identicon: a generated geometric pattern based on email hash
+		// - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
+		// - wavatar  : faces with different features and backgrounds based on email hash
+		// - retro    : 8-bit arcade-styled pixelated faces based on email hash
+		'default_avatar' => 'gravatar',
+
+		// rating (String)
+		// Gravatar lets users self-rate their images to be used at appropriate audiences.
+		// Choose which are appropriate for your friendica site:
+		// - g : suitable for display on all wesites with any audience type
+		// - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence
+		// - r : may contain such things as harsh profanity, intense violence, nudity, or hard drug use
+		// - x : may contain hardcore sexual imagery or extremely disurbing violence
+		'rating' => 'g',
+	],
+];

gravatar/config/gravatar.ini.php

@@ -1,28 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[gravatar]
-; default_avatar (String)
-; If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
-; You can choose between these presets:
-; - gravatar : default static Gravatar logo
-; - mm       : (mystery-man) a static image
-; - identicon: a generated geometric pattern based on email hash
-; - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
-; - wavatar  : faces with different features and backgrounds based on email hash
-; - retro    : 8-bit arcade-styled pixelated faces based on email hash
-default_avatar = gravatar
-
-; rating (String)
-; Gravatar lets users self-rate their images to be used at appropriate audiences.
-; Choose which are appropriate for your friendica site:
-; - g : suitable for display on all wesites with any audience type
-; - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence
-; - r : may contain such things as harsh profanity, intense violence, nudity, or hard drug use
-; - x : may contain hardcore sexual imagery or extremely disurbing violence
-rating = g
-
-INI;
-//Keep this line

gravatar/gravatar.php

@@ -39,7 +39,7 @@ function gravatar_uninstall() {
 
 function gravatar_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/gravatar.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/gravatar.config.php');
 }
 
 /**

impressum/README.md

@@ -16,13 +16,14 @@ Simply fill in the fields in the impressium settings page in the addons area of
 
 Manual Configuration
 --------------------
-If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/addon.ini.php file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/addon.config.php` file
 
-	[impressum]
+	'impressum' => [
-	owner =           this is the Name of the Operator
+        'owner' => '',           This is the Name of the Operator
-	ownerprofile =    this is an optional Friendica account where the above owner name will link to
+        'ownerprofile' => '',    This is an optional Friendica account where the above owner name will link to
-	email =           a contact email address (optional)
+        'email' => '',           A contact email address (optional)
-					  will be displayed slightly obfuscated as name(at)example(dot)com
+                                 Will be displayed slightly obfuscated as name(at)example(dot)com
-	postal =          should contain a postal address where you can be reached at (optional)
+        'postal' => '',          Should contain a postal address where you can be reached at (optional)
-	notes =           additional informations that should be displayed in the Impressum block
+        'notes' => '',           Additional informations that should be displayed in the Impressum block
-	footer_text =     Text that will be displayed at the bottom of the pages.
+        'footer_text' => '',     Text that will be displayed at the bottom of the pages.
+    ],

impressum/config/impressum.config.php

@@ -0,0 +1,33 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'impressum' => [
+		// owner (String)
+		// This is the Name of the Operator
+		'owner' => '',
+
+		// ownerprofile (String)
+		// This is an optional Friendica account where the above owner name will link to
+		'ownerprofile' => '',
+
+		// email (String)
+		// A contact email address (optional)
+		// Will be displayed slightly obfuscated as name(at)example(dot)com
+		'email' => '',
+
+		// postal (String)
+		// Should contain a postal address where you can be reached at (optional)
+		'postal' => '',
+
+		// notes (String)
+		// Additional informations that should be displayed in the Impressum block
+		'notes' => '',
+
+		// footer_text (String)
+		// Text that will be displayed at the bottom of the pages.
+		'footer_text' => '',
+	],
+];

impressum/config/impressum.ini.php

@@ -1,33 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[impressum]
-; owner (String)
-; This is the Name of the Operator
-owner =
-
-; ownerprofile (String)
-; This is an optional Friendica account where the above owner name will link to
-ownerprofile =
-
-; email (String)
-; A contact email address (optional)
-; Will be displayed slightly obfuscated as name(at)example(dot)com
-email =
-
-; postal (String)
-; Should contain a postal address where you can be reached at (optional)
-postal =
-
-; notes (String)
-; Additional informations that should be displayed in the Impressum block
-notes =
-
-; footer_text (String)
-; Text that will be displayed at the bottom of the pages.
-footer_text =
-
-INI;
-//Keep this line

impressum/impressum.php

@@ -54,7 +54,7 @@ function impressum_footer($a, &$b) {
 
 function impressum_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/impressum.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/impressum.config.php');
 }
 
 function impressum_show($a,&$b) {

ldapauth/README

@@ -1,38 +0,0 @@
-Authenticate a user against an LDAP directory
-Useful for Windows Active Directory and other LDAP-based organisations
-to maintain a single password across the organisation.
-Optionally authenticates only if a member of a given group in the directory.
-
-By default, the person must have registered with Friendica using the normal registration
-procedures in order to have a Friendica user record, contact, and profile.
-However, it's possible with an option to automate the creation of a Friendica basic account.
-
-Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
-ldap.conf file to the signing cert for your LDAP server.
-
-The configuration options for this module may be set in the config/addon.ini.php file
-e.g.:
-
-	[ldapauth]
-	// ldap hostname server - required
-	ldap_server = host.example.com
-	// dn to search users - required
-	ldap_searchdn = ou=users,dc=example,dc=com
-	// attribute to find username - required
-	ldap_userattr = uid
-
-	// admin dn - optional - only if ldap server dont have anonymous access
-	ldap_binddn = cn=admin,dc=example,dc=com
-	// admin password - optional - only if ldap server dont have anonymous access
-	ldap_bindpw = password
-
-	// for create Friendica account if user exist in ldap
-	//     required an email and a simple (beautiful) nickname on user ldap object
-	//   active account creation - optional - default none
-	ldap_autocreateaccount = true
-	//   attribute to get email - optional - default : 'mail'
-	ldap_autocreateaccount_emailattribute = mail
-	//   attribute to get nickname - optional - default : 'givenName'
-	ldap_autocreateaccount_nameattribute = givenName
-
-...etc.

ldapauth/README.md

@@ -0,0 +1,49 @@
+Authenticate a user against an LDAP directory
+===
+
+Useful for Windows Active Directory and other LDAP-based organisations
+to maintain a single password across the organisation.
+Optionally authenticates only if a member of a given group in the directory.
+
+By default, the person must have registered with Friendica using the normal registration
+procedures in order to have a Friendica user record, contact, and profile.
+However, it's possible with an option to automate the creation of a Friendica basic account.
+
+Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
+ldap.conf file to the signing cert for your LDAP server.
+
+The configuration options for this module may be set in the `config/addon.config.php` file
+e.g.:
+
+	'ldapauth' => [
+        // ldap hostname server - required
+        'ldap_server' => '',
+
+        // admin dn - optional - only if ldap server dont have anonymous access
+        'ldap_binddn' => '',
+
+        // admin password - optional - only if ldap server dont have anonymous access
+        'ldap_bindpw' => '',
+
+        // dn to search users - required
+        'ldap_searchdn' => '',
+
+        // attribute to find username - required
+        'ldap_userattr' => '',
+
+        // DN of the group whose member can auth on Friendica - optional
+        'ldap_group' => '',
+
+        // To create Friendica account if user exists in ldap
+        // Requires an email and a simple (beautiful) nickname on user ldap object
+        // active account creation - optional - default true
+        'ldap_autocreateaccount' => true,
+
+        // attribute to get email - optional - default : 'mail'
+        'ldap_autocreateaccount_emailattribute' => 'mail',
+
+        // attribute to get nickname - optional - default : 'givenName'
+        'ldap_autocreateaccount_nameattribute' => 'givenName',
+    ],
+
+...etc.

ldapauth/config/ldapauth.config.php

@@ -0,0 +1,50 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'ldapauth' => [
+		// ldap_server (String)
+		// ldap hostname server - required
+		// Example: ldap_server = host.example.com
+		'ldap_server' => '',
+
+		// ldap_binddn (String)
+		// admin dn - optional - only if ldap server dont have anonymous access
+		// Example: ldap_binddn = cn=admin,dc=example,dc=com
+		'ldap_binddn' => '',
+
+		// ldap_bindpw (String)
+		// admin password - optional - only if ldap server dont have anonymous access
+		'ldap_bindpw' => '',
+
+		// ldap_searchdn (String)
+		// dn to search users - required
+		// Example: ldap_searchdn = ou=users,dc=example,dc=com
+		'ldap_searchdn' => '',
+
+		// ldap_userattr (String)
+		// attribute to find username - required
+		// Example: ldap_userattr = uid
+		'ldap_userattr' => '',
+
+		// ldap_group (String)
+		// DN of the group whose member can auth on Friendica - optional
+		'ldap_group' => '',
+
+		// ldap_autocreateaccount (Boolean)
+		// To create Friendica account if user exists in ldap
+		// Requires an email and a simple (beautiful) nickname on user ldap object
+		// active account creation - optional - default true
+		'ldap_autocreateaccount' => true,
+
+		// ldap_autocreateaccount_emailattribute (String)
+		// attribute to get email - optional - default : 'mail'
+		'ldap_autocreateaccount_emailattribute' => 'mail',
+
+		// ldap_autocreateaccount_nameattribute (String)
+		// attribute to get nickname - optional - default : 'givenName'
+		'ldap_autocreateaccount_nameattribute' => 'givenName',
+	],
+];

ldapauth/config/ldapauth.ini.php

@@ -1,50 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[ldapauth]
-; ldap_server (String)
-; ldap hostname server - required
-; Example: ldap_server = host.example.com
-ldap_server =
-
-; ldap_binddn (String)
-; admin dn - optional - only if ldap server dont have anonymous access
-; Example: ldap_binddn = cn=admin,dc=example,dc=com
-ldap_binddn =
-
-; ldap_bindpw (String)
-; admin password - optional - only if ldap server dont have anonymous access
-ldap_bindpw =
-
-; ldap_searchdn (String)
-; dn to search users - required
-; Example: ldap_searchdn = ou=users,dc=example,dc=com
-ldap_searchdn =
-
-; ldap_userattr (String)
-; attribute to find username - required
-; Example: ldap_userattr = uid
-ldap_userattr =
-
-; ldap_group (String)
-; DN of the group whose member can auth on Friendica - optional
-ldap_group =
-
-; ldap_autocreateaccount (Boolean)
-; for create Friendica account if user exist in ldap
-;	required an email and a simple (beautiful) nickname on user ldap object
-; active account creation - optional - default none
-ldap_autocreateaccount = true
-
-; ldap_autocreateaccount_emailattribute (String)
-; attribute to get email - optional - default : 'mail'
-ldap_autocreateaccount_emailattribute = mail
-
-; ldap_autocreateaccount_nameattribute (String)
-; attribute to get nickname - optional - default : 'givenName'
-ldap_autocreateaccount_nameattribute = givenName
-
-INI;
-//Keep this line

ldapauth/ldapauth.php

@@ -26,7 +26,7 @@
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server.
  *
- * The configuration options for this module may be set in the config/addon.ini.php file
+ * The configuration options for this module may be set in the config/addon.config.php file
  * e.g.:
  *
  * [ldapauth]
@@ -72,7 +72,7 @@ function ldapauth_uninstall()
 
 function ldapauth_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/ldapauth.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/ldapauth.config.php');
 }
 
 function ldapauth_hook_authenticate($a, &$b)

libravatar/README.md

@@ -23,14 +23,18 @@ If no avatar was found for an email Libravatar can create some pseudo-random gen
 See examples at [Libravatar][1].
 
 ## Alternative Configuration
-Open the config/local.ini.php file and add "libravatar" to the list of activated addons:
+Open the `config/local.config.php` file and add "libravatar" to the list of activated addons:
 
-        [system]
+    'system' => [
-		addon = ...,libravatar
+        ...
+        'addon' => '...,libravatar'
+        ...
+    ]
 
-You can add one configuration variables for the addon to the config/addon.ini.php file:
+You can add one configuration variables for the addon to the `config/addon.config.php` file:
 
-        [libravatar]
+    'libravatar' => [
-		default_avatar = identicon
+        'default_avatar' => 'identicon',
+    ],
 
 [1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information"

libravatar/config/libravatar.config.php

@@ -0,0 +1,18 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'libravatar' => [
+		// default_avatar (String)
+		// If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
+		// You can choose between these presets:
+		// - mm       : (mystery-man) a static image
+		// - identicon: a generated geometric pattern based on email hash
+		// - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
+		// - wavatar  : faces with different features and backgrounds based on email hash
+		// - retro    : 8-bit arcade-styled pixelated faces based on email hash
+		'default_avatar' => 'identicon',
+	],
+];

libravatar/config/libravatar.ini.php

@@ -1,18 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[libravatar]
-; default_avatar (String)
-; If no avatar was found for an email Gravatar can create some pseudo-random generated avatars based on an email hash.
-; You can choose between these presets:
-; - mm       : (mystery-man) a static image
-; - identicon: a generated geometric pattern based on email hash
-; - monsterid: a generated 'monster' with different colors, faces, etc. based on email hash
-; - wavatar  : faces with different features and backgrounds based on email hash
-; - retro    : 8-bit arcade-styled pixelated faces based on email hash
-default_avatar = identicon
-
-INI;
-//Keep this line

libravatar/libravatar.php

@@ -39,7 +39,7 @@ function libravatar_uninstall()
 
 function libravatar_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/libravatar.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/libravatar.config.php');
 }
 
 /**

mathjax/README.md

@@ -21,15 +21,19 @@ In case you want to use the CDN you can try the following URL as a quick start
 	http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML
 
 In case you don't want or can use the admin panel of Friendica you can activate
-the addon by adding _mathjax_ to the list in your config/local.ini.php file
+the addon by adding _mathjax_ to the list in your `config/local.config.php` file
 
-	[system]
+    'system' => [
-	addon = ...,mathjax
+        ...
+        'addon' => '...,mathjax'
+        ...
+    ]
 
-and then providing the base URL after that in the config/addon.ini.php file
+and then providing the base URL after that in the `config/addon.config.php` file
 
-	[mathjax]
+	'mathjax' => [
-	baseurl = [the URL to your MathJax installation];
+		'baseurl' => '[the URL to your MathJax installation]',
+	],
 
 Usage
 =====

openstreetmap/README.md

@@ -1,10 +1,12 @@
- ____ OpenStreetMap Addon ____
+OpenStreetMap Addon
-by Mike Macgirvin
+===
-   Klaus Weidenbach
+
+	by Mike Macgirvin
+	   Klaus Weidenbach
 
 This addon allows you to use OpenStreetMap for displaying locations.
 
-___ Requirements ___
+## Requirements
 
 To use this addon you need a tile Server that provides the maps.
 OpenStreetMap data is free for everyone to use. Their tile servers are not.
@@ -14,7 +16,7 @@ You can run your own tile server or choose one from their list of public
 tile servers: http://wiki.openstreetmap.org/wiki/TMS
 Support the OpenStreetMap community and share the load.
 
-___ Configuration ___
+## Configuration
 
 If you for any reason prefer to use a configuration file instead
 of the admin panels, please refer to the Alternative Configuration below.
@@ -30,21 +32,28 @@ level on the map in the Default Zoom box.  1 will show the whole world and 18 is
 zoom level available.
 
 
-___ Alternative Configuration ___
+## Alternative Configuration
 
-Open the config/local.ini.php file and add "openstreetmap" to the list of activated
+Open the `config/local.config.php` file and add "openstreetmap" to the list of activated addons.
-addons.
 
-    [system]
+     'system' => [
-	addon = ...,openstreetmap
+         ...
+         'addon' => '...,openstreetmap'
+         ...
+     ]
 
-You can change two configuration variables for the addon in the config/addon.ini.php file:
+You can set configuration variables for the addon in the `config/addon.config.php` file:
 
-	[openstreetmap]
+	'openstreetmap' => [
-	tmsserver = https://www.openstreetmap.org
+		'tmsserver' => 'https://www.openstreetmap.org',
-    zoom = 18
+		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
+		'zoom' => 16,
+		'marker' => 0,
+	],
 
 The *tmsserver* points to the tile server you want to use. Use the full URL,
 with protocol (http/s) and trailing slash. You can configure the default zoom
 level on the map with *zoom*. 1 will show the whole world and 18 is the highest
-zoom level available.
+zoom level available.
+
+Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys.

openstreetmap/config/openstreetmap.config.php

@@ -0,0 +1,23 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'openstreetmap' => [
+		// tmsserver (String)
+		// This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
+		'tmsserver' => 'https://www.openstreetmap.org',
+
+		// nomserver (String)
+		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
+
+		// zoom (Integer)
+		// The default zoom level on the map.
+		// 1 will show the whole world and 18 is the highest zoom level available.
+		'zoom' => 16,
+
+		// marker (Integer)
+		'marker' => 0,
+	],
+];

openstreetmap/config/openstreetmap.ini.php

@@ -1,23 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[openstreetmap]
-; tmsserver (String)
-; This points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash.
-tmsserver = https://www.openstreetmap.org
-
-; nomserver (String)
-nomserver = https://nominatim.openstreetmap.org/search.php
-
-; zoom (Integer)
-; The default zoom level on the map.
-; 1 will show the whole world and 18 is the highest zoom level available.
-zoom = 16
-
-; marker (Integer)
-marker = 0
-
-INI;
-//Keep this line

openstreetmap/openstreetmap.php

@@ -49,7 +49,7 @@ function openstreetmap_uninstall()
 
 function openstreetmap_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/openstreetmap.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/openstreetmap.config.php');
 }
 
 function openstreetmap_alterheader($a, &$navHtml)

piwik/README.md

@@ -20,20 +20,24 @@ Configuration
 
 The easiest way to configure this addon is by activating the admin panels of your ~friendica server and then enter the needed details on the config page for the addon.
 
-If you don't want to use the admin panel, you can configure the addon through the config/local.ini.php file.
+If you don't want to use the admin panel, you can configure the addon through the `config/local.config.php` file.
 
-Open the config/local.ini.php file and add "piwik" to the list of activated addons.
+Open the `config/local.config.php` file and add "piwik" to the list of activated addons.
 
-    [system]
+    'system' => [
-    addon = ...,piwik
+        ...
+        'addon' => '...,piwik'
+        ...
+    ]
 
-You can change 4 more configuration variables for the addon in the config/addon.ini.php file:
+You can change 4 more configuration variables for the addon in the `config/addon.config.php` file:
 
-    [piwik]
+	'piwik' => [
-    baseurl = example.com/piwik/
+        'baseurl' => 'example.com/piwik/',
-    sideid = 1
+        'sideid' => 1,
-    optout = true
+        'optout' => true,
-    async = false
+        'async' => false,
+    ],
 
 Configuration fields
 ---------------------

piwik/config/piwik.config.php

@@ -0,0 +1,29 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'piwik' => [
+		// baseurl (String)
+		// This URL points to your Piwik installation.
+		// Use the absolute path, remember trailing slashes but ignore the protocol (http/s) part of the URL.
+		// Example: baseurl = example.com/piwik/
+		'baseurl' => '',
+
+		// siteid (Integer)
+		// Change the *sideid* parameter to whatever ID you want to use for tracking your Friendica installation.
+		'sideid' => '',
+
+		// optout (Boolean)
+		// This defines whether or not a short notice about the utilization of Piwik will be displayed on every
+		// page of your Friendica site (at the bottom of the page with some spacing to the other content).
+		// Part of the note is a link that allows the visitor to set an opt-out cookie which will prevent visits
+		// from that user be tracked by Piwik.
+		'optout' => true,
+
+		// async (Boolean)
+		// This defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
+		'async' => false,
+	],
+];

piwik/config/piwik.ini.php

@@ -1,29 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[piwik]
-; baseurl (String)
-; This URL points to your Piwik installation.
-; Use the absolute path, remember trailing slashes but ignore the protocol (http/s) part of the URL.
-; Example: baseurl = example.com/piwik/
-baseurl =
-
-; siteid (Integer)
-; Change the *sideid* parameter to whatever ID you want to use for tracking your Friendica installation.
-sideid =
-
-; optout (Boolean)
-; This defines whether or not a short notice about the utilization of Piwik will be displayed on every
-; page of your Friendica site (at the bottom of the page with some spacing to the other content).
-; Part of the note is a link that allows the visitor to set an opt-out cookie which will prevent visits
-; from that user be tracked by Piwik.
-optout = true
-
-; async (Boolean)
-; This defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
-async = false
-
-INI;
-//Keep this line

piwik/piwik.php

@@ -16,7 +16,7 @@
  *
  *   Configuration:
  *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this add the following lines to your config/addon.ini.php
+ *     in case you don't use this add the following lines to your config/addon.config.php
  *     file:
  *
  *     [piwik]
@@ -53,7 +53,7 @@ function piwik_uninstall() {
 
 function piwik_load_config(\Friendica\App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/piwik.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/piwik.config.php');
 }
 
 function piwik_analytics($a,&$b) {
@@ -66,7 +66,7 @@ function piwik_analytics($a,&$b) {
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
 
 	/*
-	 *   Get the configuration variables from the config/addon.ini.php file.
+	 *   Get the configuration variables from the config/addon.config.php file.
 	 */
 	$baseurl = Config::get('piwik', 'baseurl');
 	$siteid  = Config::get('piwik', 'siteid');

public_server/README.md

@@ -6,20 +6,21 @@ Public Server is a Friendica addon which implements automatic account & post exp
 
 This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON.
 
-    [public_server]
+    'public_server' => [
-	; When an account is created on the site, it is given a hard expiration date of
+        // When an account is created on the site, it is given a hard expiration date of. 0 to disable.
-    expiredays = 30
+        'expiredays' => 0,
-    ; Set the default days for posts to expire here
+        // Set the default days for posts to expire here. 0 to disable.
-    expireposts = 30
+        'expireposts' => 0,
-    ; Remove users who have never logged in after nologin days
+        // Remove users who have never logged in after nologin days. 0 to disable.
-    nologin = 30
+        'nologin' => 0,
-    ; Remove users who last logged in over flagusers days ago
+        // Remove users who last logged in over flagusers days ago. 0 to disable.
-    flagusers = 146
+        'flagusers' => 0,
-    ; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
+        // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
-    flagposts = 90
+        'flagposts' => 0,
-    flagpostsexpire = 146
+        'flagpostsexpire' => 0,
+    ],
 
-Set these in your config/addon.ini.php file. By default nothing is defined in case the addon is activated accidentally.
+Set these in your `config/addon.config.php` file. By default nothing is defined in case the addon is activated accidentally.
 They can be ommitted or set to 0 to disable each option.
 The default values are those used by friendica.eu, change these as desired.
 

public_server/config/public_server.config.php

@@ -0,0 +1,30 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'public_server' => [
+		// expiredays (Integer)
+		// When an account is created on the site, it is given a hard expiration date of. 0 to disable.
+		'expiredays' => 0,
+
+		// expireposts (Integer)
+		// Set the default days for posts to expire here. 0 to disable.
+		'expireposts' => 0,
+
+		// nologin (Integer)
+		// Remove users who have never logged in after nologin days. 0 to disable.
+		'nologin' => 0,
+
+		// flagusers (Integer)
+		// Remove users who last logged in over flagusers days ago. 0 to disable.
+		'flagusers' => 0,
+
+		// flagposts (Integer)
+		// flagpostsexpire (Integer)
+		// For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
+		'flagposts' => 0,
+		'flagpostsexpire' => 0,
+	],
+];

public_server/config/public_server.ini.php

@@ -1,30 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[public_server]
-; expiredays (Integer)
-; When an account is created on the site, it is given a hard expiration date of
-expiredays =
-
-; expireposts (Integer)
-; Set the default days for posts to expire here
-expireposts =
-
-; nologin (Integer)
-; Remove users who have never logged in after nologin days
-nologin =
-
-; flagusers (Integer)
-; Remove users who last logged in over flagusers days ago
-flagusers =
-
-; flagposts (Integer)
-; flagpostsexpire (Integer)
-; For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire
-flagposts =
-flagpostsexpire =
-
-INI;
-//Keep this line

public_server/public_server.php

@@ -37,7 +37,7 @@ function public_server_uninstall()
 
 function public_server_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
 }
 
 function public_server_register_account($a, $b)

pumpio/README.md

@@ -1,6 +1,11 @@
-To let the connector work properly you should define an application name in config/addon.ini.php:
+To let the connector work properly you should define an application name in `config/addon.config.php`:
 
-[pumpio]
+	'pumpio' => [
-application_name = Name of you site
+		'application_name' => '',
+		// Displays forwarded posts like "wall-to-wall" posts.
+		'wall-to-wall_share' => false,
+		// Given in minutes
+		'poll_interval' => 5,
+	],
 
 This name appears at pump.io and is important for not mirroring back posts that came from Friendica.

pumpio/config/pumpio.config.php

@@ -0,0 +1,21 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'pumpio' => [
+		// application_name (String)
+		// To let the connector work properly you should define an application name.
+		// This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
+		'application_name' => '',
+
+		// wall-to-wall_share (Boolean)
+		// Displays forwarded posts like "wall-to-wall" posts.
+		'wall-to-wall_share' => false,
+
+		// poll_interval (Integer)
+		// Given in minutes
+		'poll_interval' => 5,
+	],
+];

pumpio/config/pumpio.ini.php

@@ -1,21 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[pumpio]
-; application_name (String)
-; To let the connector work properly you should define an application name.
-; This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
-application_name =
-
-; wall-to-wall_share (Boolean)
-; Displays forwarded posts like "wall-to-wall" posts.
-wall-to-wall_share = false
-
-; poll_interval (Integer)
-; Given in minutes
-poll_interval = 5
-
-INI;
-//Keep this line

pumpio/pumpio.php

@@ -380,7 +380,7 @@ function pumpio_settings_post(App $a, array &$b)
 
 function pumpio_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/pumpio.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/pumpio.config.php');
 }
 
 function pumpio_hook_fork(App $a, array &$b)

testdrive/README.md

@@ -6,10 +6,11 @@ Testdrive is a Friendica addon which implements automatic account expiration so
 
 When an account is created on the site, it is given a hard expiration date of
 
-	[testdrive]
+	'testdrive' => [
-	expiredays = 30
+		'expiredays' => 30,
+	],
 
-Set this in your config/addon.ini.php file to allow a 30 day test drive period.
+Set this in your `config/addon.config.php` file to allow a 30 day test drive period.
 By default no expiration period is defined in case the addon is activated accidentally.
 
 There is no opportunity to extend an expired account using this addon.

testdrive/config/testdrive.config.php

@@ -0,0 +1,12 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'testdrive' => [
+		// expiredays (Integer)
+		// When an account is created on the site, it is given a hard expiration date of this many days. 0 to disable.
+		'expiredays' => 0,
+	],
+];

testdrive/config/testdrive.ini.php

@@ -1,12 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[testdrive]
-; expiredays (Integer)
-; When an account is created on the site, it is given a hard expiration date of this many days.
-expiredays =
-
-INI;
-//Keep this line

testdrive/testdrive.php

@@ -37,7 +37,7 @@ function testdrive_uninstall() {
 
 function testdrive_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/testdrive.config.php');
 }
 
 function testdrive_globaldir_update($a,&$b) {

twitter/README.md

@@ -16,13 +16,21 @@ After the registration please enter the values for "Consumer Key" and "Consumer
 
 ## Alternative configuration
 
-Add your key pair to your global config/addon.ini.php.
+Open the `config/local.config.php` file and add "twitter" to the list of activated addons:
 
-    [twitter]
+    'system' => [
-    consumerkey = your consumer_key here
+        ...
-    consumersecret = your consumer_secret here
+        'addon' => '...,twitter'
+        ...
+    ]
+
+Add your key pair to your global `config/addon.config.php`.
+
+	'twitter' => [
+		'consumerkey' => 'your consumer_key here',
+		'consumersecret' => 'your consumer_secret here',
+	],
 
-To activate the addon itself add it to the [system] addon setting.
 After this, users can configure their Twitter account settings from "Settings -> Addon Settings".
 
 ## License

twitter/config/twitter.config.php

@@ -0,0 +1,16 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'twitter' => [
+		// consumerkey (String)
+		// OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
+		'consumerkey' => '',
+
+		// consumersecret (String)
+		// OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
+		'consumersecret' => '',
+	],
+];

twitter/config/twitter.ini.php

@@ -1,16 +0,0 @@
-<?php return <<<INI
-
-; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
-
-[twitter]
-; consumerkey (String)
-; OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
-consumerkey =
-
-; consumersecret (String)
-; OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
-consumersecret =
-
-INI;
-//Keep this line

twitter/twitter.php

@@ -48,13 +48,14 @@
  *     we do not need "Twitter as login". When you've registered the app you get the
  *     OAuth Consumer key and secret pair for your application/site.
  *
- *     Add this key pair to your global config/addon.ini.php or use the admin panel.
+ *     Add this key pair to your global config/addon.config.php or use the admin panel.
  *
- *     [twitter]
+ *     	'twitter' => [
- *     consumerkey = your consumer_key here
+ * 		    'consumerkey' => '',
- *     consumersecret = your consumer_secret here
+ *  		'consumersecret' => '',
+ *      ],
  *
- *     To activate the addon itself add it to the [system] addon
+ *     To activate the addon itself add it to the system.addon
  *     setting. After this, your user can configure their Twitter account settings
  *     from "Settings -> Addon Settings".
  *
@@ -141,7 +142,7 @@ function twitter_uninstall()
 
 function twitter_load_config(App $a)
 {
-	$a->loadConfigFile(__DIR__ . '/config/twitter.ini.php');
+	$a->loadConfigFile(__DIR__ . '/config/twitter.config.php');
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)