X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fauth_ejabberd.php;h=f00615f02be452a4b0e3ae458d903e4c6e13fe71;hb=a74c547af470947c3420157cba237c4951da58f4;hp=ba3a9b8dd15b73b556edc34ef29470411896caa8;hpb=55999730e0b4ad847bb891af0aa7dbfa531f998e;p=friendica.git

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index ba3a9b8dd1..f00615f02b 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -1,6 +1,23 @@
 #!/usr/bin/env php
 <?php
-/*
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * 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 the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  * ejabberd extauth script for the integration with friendica
  *
  * Originally written for joomla by Dalibor Karlovic <dado@krizevci.info>
@@ -18,9 +35,11 @@
  * 	- Change the access mode so it is readable only to the user ejabberd and has exec
  * 	  $ chmod 700 /path/to/friendica/bin/auth_ejabberd.php
  *
- * 	- Edit your ejabberd.cfg file, comment out your auth_method and add:
- * 	  {auth_method, external}.
- * 	  {extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
+ * 	- Edit your ejabberd.yml file and add after "shaper:":
+ *
+ * 	  auth_method: [external]
+ * 	  extauth_program: "/path/to/friendica/bin/auth_ejabberd.php"
+ *    auth_use_cache: false
  *
  * 	- Restart your ejabberd service, you should be able to login with your friendica auth info
  *
@@ -32,8 +51,10 @@
  *
  */
 
-use Friendica\Factory;
+use Dice\Dice;
+use Friendica\App\Mode;
 use Friendica\Util\ExAuth;
+use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {
 	die();
@@ -51,12 +72,14 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
-$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
+
+\Friendica\DI::init($dice);
 
-$a = Factory\DependencyFactory::setUp('auth_ejabbered', $dice);
+$appMode = $dice->create(Mode::class);
 
-if ($a->getMode()->isNormal()) {
+if ($appMode->isNormal()) {
 	$oAuth = new ExAuth();
 	$oAuth->readStdin();
 }