From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 21 Jan 2019 09:04:26 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;p=friendica-addons.git

Merge branch 'master' into develop
---

08206fdcc0750ec9dd12a68addb341cd05f8bcfb
diff --cc curweather/curweather.php
index 4c24007c,d1ef63b8..6d7edc06
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@@ -9,12 -9,10 +9,10 @@@
   *
   */
  
- require_once 'include/text.php';
- 
  use Friendica\App;
 -use Friendica\Core\Addon;
  use Friendica\Core\Cache;
  use Friendica\Core\Config;
 +use Friendica\Core\Hook;
  use Friendica\Core\L10n;
  use Friendica\Core\PConfig;
  use Friendica\Core\Renderer;
diff --cc forumdirectory/forumdirectory.php
index c07f072c,526a35fe..a66e85dd
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@@ -20,13 -20,9 +20,9 @@@ use Friendica\Model\Profile
  use Friendica\Util\Strings;
  use Friendica\Util\Temporal;
  
- require_once 'boot.php';
- require_once 'include/dba.php';
- require_once 'include/text.php';
- 
  function forumdirectory_install()
  {
 -	Addon::registerHook('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 +	Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
  }
  
  function forumdirectory_uninstall()
diff --cc fromgplus/fromgplus.php
index 28cb7602,b8217fc0..245766dd
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@@ -23,12 -23,10 +23,10 @@@ use Friendica\Model\Item
  
  require_once 'mod/share.php';
  require_once 'mod/parse_url.php';
- require_once 'include/text.php';
- 
  function fromgplus_install() {
 -	Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 -	Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
 -	Addon::registerHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
 +	Hook::register('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
 +	Hook::register('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
 +	Hook::register('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
  }
  
  function fromgplus_uninstall() {
diff --cc ifttt/ifttt.php
index a1891499,d7eb5109..3bb55f35
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@@ -7,11 -7,8 +7,8 @@@
   * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
   */
  require_once 'mod/item.php';
- require_once 'include/items.php';
- require_once 'include/text.php';
- 
  use Friendica\App;
 -use Friendica\Core\Addon;
 +use Friendica\Core\Hook;
  use Friendica\Core\L10n;
  use Friendica\Core\Logger;
  use Friendica\Core\PConfig;
diff --cc jappixmini/jappixmini.php
index 13e0cf42,28e238db..f11e9b11
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@@ -200,23 -200,23 +200,23 @@@ function jappixmini_init(
  	if ($role == "pub") {
  		$r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
  		if (!count($r)) {
 -			killme();
 +			exit();
  		}
  
- 		$encrypt_func = openssl_public_encrypt;
- 		$decrypt_func = openssl_public_decrypt;
+ 		$encrypt_func = 'openssl_public_encrypt';
+ 		$decrypt_func = 'openssl_public_decrypt';
  		$key = $r[0]["pubkey"];
  	} else if ($role == "prv") {
  		$r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
  		if (!count($r)) {
 -			killme();
 +			exit();
  		}
  
- 		$encrypt_func = openssl_private_encrypt;
- 		$decrypt_func = openssl_private_decrypt;
+ 		$encrypt_func = 'openssl_private_encrypt';
+ 		$decrypt_func = 'openssl_private_decrypt';
  		$key = $r[0]["prvkey"];
  	} else {
 -		killme();
 +		exit();
  	}
  
  	$uid = $r[0]["uid"];