X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fauth_ejabberd.php;h=14f5dcfe0c797271ab5d09720223c2a8675d82a8;hb=83bbbd1fe3d75a62f27462250ebe7632ecea0a75;hp=8ee3af8e2be23148342d2eb84bcffb6707ba8da4;hpb=8ec5b06e0440302cef9f6bc2f35730fca5a9030e;p=friendica.git

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 8ee3af8e2b..14f5dcfe0c 100755
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -32,6 +32,8 @@
  *
  */
 
+use Friendica\App;
+
 if (sizeof($_SERVER["argv"]) == 0)
 	die();
 
@@ -45,17 +47,16 @@ $directory = realpath($directory."/..");
 chdir($directory);
 require_once("boot.php");
 
-global $a, $db;
+global $a;
 
-if (is_null($a))
-	$a = new App;
+if (empty($a)) {
+	$a = new App(dirname(__DIR__));
+}
 
-if (is_null($db)) {
-	@include(".htconfig.php");
-	require_once("include/dba.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
-	unset($db_host, $db_user, $db_pass, $db_data);
-};
+@include(".htconfig.php");
+require_once("include/dba.php");
+dba::connect($db_host, $db_user, $db_pass, $db_data);
+unset($db_host, $db_user, $db_pass, $db_data);
 
 // the logfile to which to write, should be writeable by the user which is running the server
 $sLogFile = get_config('jabber','logfile');
@@ -78,22 +79,20 @@ class exAuth {
 	 * @param boolean $bDebug Debug mode
 	 */
 	public function __construct($sLogFile, $bDebug) {
-		global $db;
-
 		// setter
 		$this->sLogFile 	= $sLogFile;
 		$this->bDebug		= $bDebug;
 
 		// Open the logfile if the logfile name is defined
 		if ($this->sLogFile != '')
-			$this->rLogFile = fopen($this->sLogFile, "a") or die("Error opening log file: ". $this->sLogFile);
+			$this->rLogFile = fopen($this->sLogFile, "a") || die("Error opening log file: ". $this->sLogFile);
 
 		$this->writeLog("[exAuth] start");
 
 		// We are connected to the SQL server and are having a log file.
 		do {
 			// Quit if the database connection went down
-			if (!$db->connected()) {
+			if (!dba::connected()) {
 				$this->writeDebugLog("[debug] the database connection went down");
 				return;
 			}
@@ -332,4 +331,3 @@ class exAuth {
 			fclose($this->rLogFile);
 	}
 }
-?>