Merge github.com:tobiasd/friendika
This commit is contained in:
		| @@ -4,7 +4,7 @@ | ||||
|  * Description: Plugin to add contact information to the about page (/friendika) | ||||
|  * Version: 1.0 | ||||
|  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> | ||||
|  * License: 3-clause BSD license (same as Friendika) | ||||
|  * License: 3-clause BSD license | ||||
|  */ | ||||
|  | ||||
| function impressum_install() { | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|  *   Author: Tobias Diekershoff | ||||
|  *           tobias.diekershoff@gmx.net | ||||
|  * | ||||
|  *   License: 3-clause BSD license (same as Friendika) | ||||
| *   License: 3-clause BSD license | ||||
|  * | ||||
|  *   Configuration: | ||||
|  *     Add the following two lines to your .htconfig.php file: | ||||
|   | ||||
| @@ -10,7 +10,7 @@ | ||||
|  *   Author: Tobias Diekershoff | ||||
|  *           tobias.diekershoff@gmx.net | ||||
|  * | ||||
|  *   License:3-clause BSD license (same as Friendika) | ||||
|  *   License:3-clause BSD license | ||||
|  * | ||||
|  *   Configuration: | ||||
|  *     To activate the plugin itself add it to the $a->config['system']['addon'] | ||||
| @@ -155,8 +155,8 @@ function statusnet_settings_post ($a,$post) { | ||||
|                 goaway($a->get_baseurl().'/settings/addon'); | ||||
|             } else { | ||||
|     	        if (isset($_POST['statusnet-pin'])) { | ||||
| 					//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen | ||||
| 					logger('got a StatusNet security code'); | ||||
|                 	//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen | ||||
| 			logger('got a StatusNet security code'); | ||||
|                     $api     = get_pconfig(local_user(), 'statusnet', 'baseapi'); | ||||
| 					$ckey    = get_pconfig(local_user(), 'statusnet', 'consumerkey'  ); | ||||
| 					$csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); | ||||
|   | ||||
| @@ -11,7 +11,7 @@ | ||||
|  *   Author: Tobias Diekershoff | ||||
|  *           tobias.diekershoff@gmx.net | ||||
|  * | ||||
|  *   License:3-clause BSD license (same as Friendika) | ||||
|  *   License:3-clause BSD license | ||||
|  * | ||||
|  *   Configuration: | ||||
|  *     To use this plugin you need a OAuth Consumer key pair (key & secret) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user