X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=92f3f56f85eac0abd4574d92dbb337a404e18638;hb=5456ef01855f7f6bda4f137980df5a1793712bb1;hp=a6851c3852441358d184cc3ca785434c17773fab;hpb=f04d40a37eb36e903433478d671a9dcd5bb6aacb;p=friendica.git

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index a6851c3852..92f3f56f85 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -13,14 +13,14 @@
  * Installation:
  *
  * 	- Change it's owner to whichever user is running the server, ie. ejabberd
- * 	  $ chown ejabberd:ejabberd /path/to/friendica/scripts/auth_ejabberd.php
+ * 	  $ chown ejabberd:ejabberd /path/to/friendica/bin/auth_ejabberd.php
  *
  * 	- Change the access mode so it is readable only to the user ejabberd and has exec
- * 	  $ chmod 700 /path/to/friendica/scripts/auth_ejabberd.php
+ * 	  $ 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/script/auth_ejabberd.php"}.
+ * 	  {extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
  *
  * 	- Restart your ejabberd service, you should be able to login with your friendica auth info
  *
@@ -36,10 +36,8 @@ namespace Friendica\Util;
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Util\Network;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -72,7 +70,7 @@ class ExAuth
 	{
 		while (!feof(STDIN)) {
 			// Quit if the database connection went down
-			if (!dba::connected()) {
+			if (!DBA::connected()) {
 				$this->writeLog(LOG_ERR, 'the database connection went down');
 				return;
 			}
@@ -145,7 +143,7 @@ class ExAuth
 		// Does the hostname match? So we try directly
 		if ($a->get_hostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
-			$found = dba::exists('user', ['nickname' => $sUser]);
+			$found = DBA::exists('user', ['nickname' => $sUser]);
 		} else {
 			$found = false;
 		}
@@ -226,8 +224,8 @@ class ExAuth
 		if ($a->get_hostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
 
-			$aUser = dba::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
-			if (DBM::is_result($aUser)) {
+			$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
+			if (DBA::isResult($aUser)) {
 				$uid = $aUser['uid'];
 				$success = User::authenticate($aUser, $aCommand[3]);
 				$Error = $success === false;