From 3b568cf6eca53870dece2909fcd4aa2c0e6325bd Mon Sep 17 00:00:00 2001
From: pezcurrel <pezcurrel@tiscali.it>
Date: Tue, 13 Oct 2020 14:41:55 +0200
Subject: [PATCH] ...

---
 .../clitools/estemporanei/setusers.php        | 35 ------------------
 .../clitools/{popudb.php => populangs.php}    | 36 +------------------
 .../{estemporanei => unatantum}/.htaccess     |  0
 .../{estemporanei => unatantum}/UPDATE.php    |  0
 .../setinstactpos.php                         |  0
 .../setlangnames.php                          |  0
 web/rameredir/.htaccess                       |  5 ---
 web/rameredir/index.php                       |  6 ----
 8 files changed, 1 insertion(+), 81 deletions(-)
 delete mode 100755 web/mustard/clitools/estemporanei/setusers.php
 rename web/mustard/clitools/{popudb.php => populangs.php} (66%)
 rename web/mustard/clitools/{estemporanei => unatantum}/.htaccess (100%)
 rename web/mustard/clitools/{estemporanei => unatantum}/UPDATE.php (100%)
 rename web/mustard/clitools/{estemporanei => unatantum}/setinstactpos.php (100%)
 rename web/mustard/clitools/{estemporanei => unatantum}/setlangnames.php (100%)
 delete mode 100644 web/rameredir/.htaccess
 delete mode 100644 web/rameredir/index.php

diff --git a/web/mustard/clitools/estemporanei/setusers.php b/web/mustard/clitools/estemporanei/setusers.php
deleted file mode 100755
index 014d2a8..0000000
--- a/web/mustard/clitools/estemporanei/setusers.php
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/php
-<?php
-
-define('N',"\n");
-
-use function mysqli_real_escape_string as myesc;
-
-function mexit($msg,$code) {
-	echo($msg);
-	exit($code);
-}
-
-$iniarr=parse_ini_file('../sec/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);
-mysqli_set_charset($link,'utf8mb4');
-
-mysqli_query($link,"UPDATE Admins SET Password='".myesc($link,password_hash("password",PASSWORD_DEFAULT))."'")
-	or mexit(mysqli_error($link).N,2);
-
-mysqli_query($link,"UPDATE Admins SET Email='pongrebio@insicuri.net' WHERE Email='pezcurrel@tiscali.it'")
-	or mexit(mysqli_error($link).N,2);
-
-mysqli_query($link,"UPDATE Admins SET Email='mastodon@bida.im' WHERE Email='bida@badile.bi'")
-	or mexit(mysqli_error($link).N,2);
-
-mysqli_query($link,"DELETE FROM Admins WHERE ID=2")
-	or mexit(mysqli_error($link).N,2);
-
-mysqli_close($link);
-
-exit(0);
-
-?>
diff --git a/web/mustard/clitools/popudb.php b/web/mustard/clitools/populangs.php
similarity index 66%
rename from web/mustard/clitools/popudb.php
rename to web/mustard/clitools/populangs.php
index 7d41959..43beb6a 100755
--- a/web/mustard/clitools/popudb.php
+++ b/web/mustard/clitools/populangs.php
@@ -30,15 +30,13 @@ $link=@mysqli_connect($iniarr['db_host'],$iniarr['db_admin_name'],$iniarr['db_ad
 mysqli_set_charset($link,'utf8mb4')
 	or mexit(mysqli_error($link).N,1);
 
-require(__DIR__.'/../include/tables.php');
-$tables=tables($link);
-
 $localesfp='locales.json';
 $locales=@file_get_contents($localesfp);
 if ($locales===false)
 	mexit('Non ho potuto aprire il file «'.$localesfp.'».'.N,1);
 $locales=json_decode($locales,true);
 print_r($locales);
+//mexit('Ecco.'.N,1);
 foreach ($locales as $key=>$val) {
 	$code=myesc($link,$key);
 	$NameOrig=myesc($link,mb_ucfirst(locale_get_display_name($key,$key)));
@@ -65,36 +63,4 @@ function mexit($msg,$rv) {
 	exit($rv);
 }
 
-function truncs($str,$tab,$col,$ctx) {
-	global $tables, $tronconi, $iswin;
-	if ($iswin)
-		$tab=strtolower($tab);
-	$size=$tables[$tab][$col];
-	$len=mb_strlen($str,'UTF-8');
-	if ($len>$size) {
-		$tronconi[]=array('id'=>null,'tab'=>$tab,'col'=>$col,'ctx'=>$ctx,'len'=>$len,'size'=>$size);
-		$str=mb_substr($str,0,$size-1,'UTF-8').'…';
-	}
-	return($str);
-}
-
-function truncn($num,$tab,$col,$ctx) {
-	global $tables, $iswin;
-	if ($iswin)
-		$tab=strtolower($tab);
-	if (is_numeric($num)) {
-		if ($num>$tables[$tab][$col]['max']) {
-			notify($ctx.': ho dovuto troncare «'.$num.'» al valore massimo «'.$tables[$tab][$col]['max'].'» che può avere nella colonna «'.$col.'» della tabella «'.$tab.'»).',2);
-			$num=$tables[$tab][$col]['max'];
-		} elseif ($num<$tables[$tab][$col]['min']) {
-			notify($ctx.': ho dovuto troncare «'.$num.'» al valore minimo «'.$tables[$tab][$col]['min'].'» che può avere nella colonna «'.$col.'» della tabella «'.$tab.'»).',2);
-			$num=$tables[$tab][$col]['min'];
-		}
-	} else {
-		notify($ctx.': truncn(): mi aspettavo un numero, invece non lo era; ritorno «0».',3);
-		$num=0;
-	}
-	return($num);
-}
-
 ?>
diff --git a/web/mustard/clitools/estemporanei/.htaccess b/web/mustard/clitools/unatantum/.htaccess
similarity index 100%
rename from web/mustard/clitools/estemporanei/.htaccess
rename to web/mustard/clitools/unatantum/.htaccess
diff --git a/web/mustard/clitools/estemporanei/UPDATE.php b/web/mustard/clitools/unatantum/UPDATE.php
similarity index 100%
rename from web/mustard/clitools/estemporanei/UPDATE.php
rename to web/mustard/clitools/unatantum/UPDATE.php
diff --git a/web/mustard/clitools/estemporanei/setinstactpos.php b/web/mustard/clitools/unatantum/setinstactpos.php
similarity index 100%
rename from web/mustard/clitools/estemporanei/setinstactpos.php
rename to web/mustard/clitools/unatantum/setinstactpos.php
diff --git a/web/mustard/clitools/estemporanei/setlangnames.php b/web/mustard/clitools/unatantum/setlangnames.php
similarity index 100%
rename from web/mustard/clitools/estemporanei/setlangnames.php
rename to web/mustard/clitools/unatantum/setlangnames.php
diff --git a/web/rameredir/.htaccess b/web/rameredir/.htaccess
deleted file mode 100644
index fc2fcfb..0000000
--- a/web/rameredir/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-RewriteEngine On
-#RewriteBase "/mastostart"
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^.*$ index.php [L,QSA]
diff --git a/web/rameredir/index.php b/web/rameredir/index.php
deleted file mode 100644
index 4280a81..0000000
--- a/web/rameredir/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-define('N',"\n");
-$rurl='https://mastodon.help/'.preg_replace('#^/[^/]*/#','',$_SERVER['REQUEST_URI']);
-header('HTTP/1.1 301 Moved Permanently');
-header('Location: '.$rurl);
-?>