mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #3922 from annando/scripts2

Browse source 
One script needed to be moved, one script was obsolete
This commit is contained in:
Hypolite Petovan 2017-11-19 18:11:40 -05:00 committed by GitHub
parent 81647cefed 7341c3bad5
commit 158cc9dc45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/auth_ejabberd.php → scripts/auth_ejabberd.php
View file

@ -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);

37
util/db_update.php
View file

@ -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";
}