From 0c35dff73d1cd3be6400d59b445bf5996cc9474c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 19 Nov 2017 22:47:12 +0000
Subject: [PATCH 1/2] One script needed to be moved, one script was obsolete

---
 {include => scripts}/auth_ejabberd.php |  0
 util/db_update.php                     | 37 --------------------------
 2 files changed, 37 deletions(-)
 rename {include => scripts}/auth_ejabberd.php (100%)
 delete mode 100644 util/db_update.php

diff --git a/include/auth_ejabberd.php b/scripts/auth_ejabberd.php
similarity index 100%
rename from include/auth_ejabberd.php
rename to scripts/auth_ejabberd.php
diff --git a/util/db_update.php b/util/db_update.php
deleted file mode 100644
index a611a65c27..0000000000
--- a/util/db_update.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * @package util
- */
-
-use Friendica\App;
-use Friendica\Core\Config;
-
-/*
- * require boot.php
- */
-require_once("boot.php");
-
-if (empty($a)) {
-	$a = new App(dirname(__DIR__));
-}
-@include(".htconfig.php");
-
-$lang = get_browser_language();
-load_translation_table($lang);
-
-require_once("include/dba.php");
-dba::connect($db_host, $db_user, $db_pass, $db_data, false);
-unset($db_host, $db_user, $db_pass, $db_data);
-
-$build = Config::get('system', 'build');
-
-echo "Old DB VERSION: " . $build . "\n";
-echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
-
-
-if ($build != DB_UPDATE_VERSION) {
-	echo "Updating database...";
-	update_db($a);
-	echo "Done\n";
-}

From 7341c3bad5d41d01b5026f648b12f742c3153115 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 19 Nov 2017 22:52:35 +0000
Subject: [PATCH 2/2] Some small changes

---
 scripts/auth_ejabberd.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/auth_ejabberd.php b/scripts/auth_ejabberd.php
index fff2bab327..9ad79004d5 100755
--- a/scripts/auth_ejabberd.php
+++ b/scripts/auth_ejabberd.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/include/auth_ejabberd.php
+ *	  $ chown ejabberd:ejabberd /path/to/friendica/scripts/auth_ejabberd.php
  *
  * 	- Change the access mode so it is readable only to the user ejabberd and has exec
- *	  $ chmod 700 /path/to/friendica/include/auth_ejabberd.php
+ *	  $ chmod 700 /path/to/friendica/scripts/auth_ejabberd.php
  *
  *	- Edit your ejabberd.cfg file, comment out your auth_method and add:
  *	  {auth_method, external}.
- *	  {extauth_program, "/path/to/friendica/include/auth_ejabberd.php"}.
+ *	  {extauth_program, "/path/to/friendica/script/auth_ejabberd.php"}.
  *
  *	- Restart your ejabberd service, you should be able to login with your friendica auth info
  *
@@ -47,16 +47,13 @@ if (substr($directory, 0, 1) != "/")
 $directory = realpath($directory."/..");
 
 chdir($directory);
-require_once("boot.php");
 
-global $a;
+require_once "boot.php";
+require_once "include/dba.php";
 
-if (empty($a)) {
-	$a = new App(dirname(__DIR__));
-}
+$a = new App(dirname(__DIR__));
 
 @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);