X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromapp%2Ffromapp.php;h=0d5a5b16b1f19ce91e9171b0fe45db3c45750867;hb=3f2cc739369597b2199a5801397443ba03dbfcdc;hp=b5ad9c39aae0645dc48c91329ce4e76ec025dba5;hpb=8eca74cfabee22683eee42e9a6e4bdc6ca4f0d3f;p=friendica-addons.git

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index b5ad9c39..0d5a5b16 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\DI;
 
 function fromapp_install()
@@ -22,24 +21,24 @@ function fromapp_install()
 	Logger::notice("installed fromapp");
 }
 
-function fromapp_settings_post(App $a, $post)
+function fromapp_settings_post($post)
 {
-	if (!Session::getLocalUser() || empty($_POST['fromapp-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['fromapp-submit'])) {
 		return;
 	}
 
-	DI::pConfig()->set(Session::getLocalUser(), 'fromapp', 'app', $_POST['fromapp-input']);
-	DI::pConfig()->set(Session::getLocalUser(), 'fromapp', 'force', intval($_POST['fromapp-force']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'app', $_POST['fromapp-input']);
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'force', intval($_POST['fromapp-force']));
 }
 
-function fromapp_settings(App &$a, array &$data)
+function fromapp_settings(array &$data)
 {
-	if (!Session::getLocalUser()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	$fromapp = DI::pConfig()->get(Session::getLocalUser(), 'fromapp', 'app', '');
-	$force   = intval(DI::pConfig()->get(Session::getLocalUser(), 'fromapp', 'force'));
+	$fromapp = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app', '');
+	$force   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/fromapp/');
 	$html = Renderer::replaceMacros($t, [
@@ -54,18 +53,18 @@ function fromapp_settings(App &$a, array &$data)
 	];
 }
 
-function fromapp_post_hook(App $a, &$item)
+function fromapp_post_hook(&$item)
 {
-	if (!Session::getLocalUser()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	if (Session::getLocalUser() != $item['uid']) {
+	if (DI::userSession()->getLocalUserId() != $item['uid']) {
 		return;
 	}
 
-	$app = DI::pConfig()->get(Session::getLocalUser(), 'fromapp', 'app');
-	$force = intval(DI::pConfig()->get(Session::getLocalUser(), 'fromapp', 'force'));
+	$app = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app');
+	$force = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
 
 	if (is_null($app) || (! strlen($app))) {
 		return;