From 049c1d839a3ccd8da922e6b0b9240f0c2ed11d29 Mon Sep 17 00:00:00 2001
From: pezcurrel <pezcurrel@tiscali.it>
Date: Wed, 21 Oct 2020 15:26:31 +0200
Subject: [PATCH] ...

---
 web/clitools/addlang.php       |  2 +-
 web/clitools/addsuperadmin.php |  2 +-
 web/clitools/crawler.php       | 12 ++++++------
 web/clitools/peerscrawl.php    |  8 ++++----
 web/clitools/populangs.php     |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/clitools/addlang.php b/web/clitools/addlang.php
index c9079ce..137d850 100755
--- a/web/clitools/addlang.php
+++ b/web/clitools/addlang.php
@@ -20,7 +20,7 @@ $newlang='CA';
 $newlangcode=strtolower($newlang);
 $email='pezcurrel@tiscali.it';
 
-require(__DIR__.'/../include/mb_ucfirst.php');
+require(__DIR__.'/../site/mustard/include/mb_ucfirst.php');
 
 define('N',"\n");
 
diff --git a/web/clitools/addsuperadmin.php b/web/clitools/addsuperadmin.php
index 5dd366b..d56242c 100755
--- a/web/clitools/addsuperadmin.php
+++ b/web/clitools/addsuperadmin.php
@@ -13,7 +13,7 @@ function mexit($msg,$code) {
 if ($argc!=4)
 	mexit('addsuperadmin.php <username> <email> <password>'.N,1);
 
-$iniarr=@parse_ini_file(__DIR__.'/../../conf/mustard.ini')
+$iniarr=@parse_ini_file(__DIR__.'/../conf/mustard.ini')
 	or mexit('Impossibile aprire il file di configurazione.'.N,1);
 $link=mysqli_connect($iniarr['db_host'],$iniarr['db_admin_name'],$iniarr['db_admin_password'],$iniarr['db_name'],$iniarr['db_port'],$iniarr['db_socket'])
 	or mexit('Impossibile connettersi al database: '.mysqli_connect_error().' ['.mysqli_connect_errno().']'.N,1);
diff --git a/web/clitools/crawler.php b/web/clitools/crawler.php
index 632ee74..95d9379 100755
--- a/web/clitools/crawler.php
+++ b/web/clitools/crawler.php
@@ -18,9 +18,9 @@
 
 define('N',"\n");
 
-require(__DIR__.'/../include/getfc.php');
+require(__DIR__.'/../site/mustard/include/getfc.php');
 
-require(__DIR__.'/../../vendor/autoload.php');
+require(__DIR__.'/../site/vendor/autoload.php');
 use LanguageDetection\Language;
 
 if (strtoupper(substr(PHP_OS,0,3))==='WIN')
@@ -211,7 +211,7 @@ $link=@mysqli_connect($iniarr['db_host'],$iniarr['db_admin_name'],$iniarr['db_ad
 mysqli_set_charset($link,'utf8mb4')
 	or mexit(__LINE__.': '.mysqli_error($link).N,1);
 
-require(__DIR__.'/../include/tables.php');
+require(__DIR__.'/../site/mustard/include/tables.php');
 $tables=tables($link);
 //print_r($tables);
 
@@ -599,7 +599,7 @@ function get_instance_langs($host) {
     return $languages;
 }
 
-require(__DIR__.'/../include/mb_ucfirst.php');
+require(__DIR__.'/../site/mustard/include/mb_ucfirst.php');
 
 function langs($instid, $uri, $auto) {
 	global $info, $instrow, $link, $opts;
@@ -668,9 +668,9 @@ function mdasortbykey(&$arr,$key,$rev=false) {
 		$arr[$subarr[0]]=$subarr[1];
 }
 
-require('../include/ghs.php');
+require(__DIR__.'/../site/mustard/include/ghs.php');
 
-require('../include/ght.php');
+require(__DIR__.'/../site/mustard/include/ght.php');
 
 /*
  * Nodeinfo ('https://'.$dom.'/nodeinfo/2.0.json') è stato aggiunto nella 3.0.0
diff --git a/web/clitools/peerscrawl.php b/web/clitools/peerscrawl.php
index 49bac6c..0f0d816 100755
--- a/web/clitools/peerscrawl.php
+++ b/web/clitools/peerscrawl.php
@@ -18,12 +18,12 @@
 
 define('N',"\n");
 
-require(__DIR__.'/../include/getfc.php');
+require(__DIR__.'/../site/mustard/include/getfc.php');
 
 setlocale(LC_ALL,getenv('LANG'));
 
 $opts=array(
-	'inifp'=>__DIR__.'/../conf/mustard.ini,
+	'inifp'=>__DIR__.'/../conf/mustard.ini',
 	'startinst'=>'mastodon.social',
 	'peersfp'=>__DIR__.'/peers',
 	'allpeersfp'=>__DIR__.'/peers.all',
@@ -311,8 +311,8 @@ function ckexarr($inst) {
 	return(false);
 }
 
-require('../include/ghs.php');
-require('../include/ght.php');
+require(__DIR__.'/../site/mustard/include/ghs.php');
+require(__DIR__.'/../site/mustard/include/ght.php');
 
 function validhostname($url) {
 	$hostname=preg_replace('#/.*#','',$url);
diff --git a/web/clitools/populangs.php b/web/clitools/populangs.php
index 7b21aea..ffaf846 100755
--- a/web/clitools/populangs.php
+++ b/web/clitools/populangs.php
@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-require(__DIR__.'/../include/mb_ucfirst.php');
+require(__DIR__.'/../site/mustard/include/mb_ucfirst.php');
 
 define('N',"\n");