...

.gitignore

@@ -1,21 +0,0 @@
-/appunti.txt
-/web/zzz-materiali/
-/web/mustard/clitools/crawler.log
-/web/mustard/clitools/currinst.job
-/web/mustard/clitools/instances.job
-/web/mustard/clitools/instances.json
-/web/mustard/clitools/peers
-/web/mustard/clitools/peers.all
-/web/mustard/clitools/peerscrawl.log
-/web/mustard/clitools/crawl.log
-/web/mustard/clitools/zzz-materiali/
-/web/mustard/sec/mustard.ini
-/web/mustard/zzz-materiali/mastostart_solo_struttura.sql.gz
-/web/mustard/zzz-materiali/geonames/
-/web/mustard/zzz-materiali/locales.json
-/web/mustard/zzz-materiali/simplemaps_worldcities_basicv1.6.zip
-/web/mustard/zzz-materiali/snippettoni.php
-/web/mustard/zzz-materiali/worldcities/
-/web/mustard/zzz-materiali/fork_awesome_css/
-/web/locale/en/en_US.UTF-8/LC_MESSAGES/custard.po~
-/system/

web/clitools/addlang.php

@@ -26,7 +26,7 @@ define('N',"\n");
 
 use function mysqli_real_escape_string as myesc;
 
-$inifp=__DIR__.'/../sec/mustard.ini';
+$inifp=__DIR__.'/../conf/mustard.ini';
 $iniarr=@parse_ini_file($inifp)
 	or mexit('Impossibile aprire il file di configurazione «'.$inifp.'»'.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'])

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('../sec/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);

web/clitools/crawler.php

@@ -1,6 +1,9 @@
 #!/usr/bin/php
 <?php
 
+echo(__DIR__.PHP_EOL);
+die();
+
 /*
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -203,7 +206,7 @@ if ($opts['restore']) {
 	}
 }
 
-$inifp=__DIR__.'/../sec/mustard.ini';
+$inifp=__DIR__.'/../conf/mustard.ini';
 $iniarr=@parse_ini_file($inifp)
 	or mexit('Impossibile aprire il file di configurazione «'.$inifp.'»'.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'])

web/clitools/mustool.php

@@ -80,7 +80,7 @@ function mexit($msg,$code) {
 	exit($code);
 }
 
-$inifp=__DIR__.'/../sec/mustard.ini';
+$inifp=__DIR__.'/../conf/mustard.ini';
 $iniarr=@parse_ini_file($inifp)
 	or mexit('Impossibile aprire il file di configurazione «'.$inifp.'»'.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'])

web/clitools/peerscrawl.php

@@ -23,7 +23,7 @@ require(__DIR__.'/../include/getfc.php');
 setlocale(LC_ALL,getenv('LANG'));
 
 $opts=array(
-	'inifp'=>__DIR__.'/../sec/mustard.ini',
+	'inifp'=>__DIR__.'/../conf/mustard.ini,
 	'startinst'=>'mastodon.social',
 	'peersfp'=>__DIR__.'/peers',
 	'allpeersfp'=>__DIR__.'/peers.all',

web/clitools/populangs.php

@@ -22,7 +22,7 @@ define('N',"\n");
 
 use function mysqli_real_escape_string as myesc;
 
-$inifp=__DIR__.'/../sec/mustard.ini';
+$inifp=__DIR__.'/../conf/mustard.ini';
 $iniarr=@parse_ini_file($inifp)
 	or mexit('Impossibile aprire il file di configurazione «'.$inifp.'»'.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'])

web/clitools/unatantum/UPDATE.php

@@ -10,7 +10,7 @@ function mexit($msg,$code) {
 	exit($code);
 }
 
-$iniarr=parse_ini_file('../sec/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);

web/clitools/unatantum/setinstactpos.php

@@ -10,7 +10,7 @@ function mexit($msg,$code) {
 	exit($code);
 }
 
-$iniarr=parse_ini_file('../sec/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);

web/clitools/unatantum/setlangnames.php

@@ -10,7 +10,7 @@ function mexit($msg,$code) {
 	exit($code);
 }
 
-$iniarr=parse_ini_file('../sec/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);

web/conf/mastostart.ini.sample

@@ -3,5 +3,5 @@ db_host=localhost
 db_port=3306
 db_socket=/run/mysqld/mysqld.sock
 db_name=mastostart
-db_user_name=MastoStartUser
-db_user_password=MastoStartUser
+db_user_name=MastoStartUserName
+db_user_password=MastoStartUserPassword

web/conf/mustard.ini.sample

@@ -18,7 +18,7 @@ db_admin_name=MastoStartAdmin
 
 ;; "db_admin_password" definisce la password per il collegamento
 ;; al database.
-db_admin_password=MastoStartAdmin
+db_admin_password=MastoStartPassword
 
 ;; "ref_name" definisce il nome di riferimento di mastostart, che al momento
 ;; viene usato solo nell'invio delle mail di invito per le admin delle

web/mustard/zzz-materiali/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

web/mustard/zzz-materiali/icona.svg

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
-   height="512"
-   viewBox="0 0 135.46666 135.46667"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="icona.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="217.83103"
-     inkscape:cy="232.46478"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="2037"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-161.53331)">
-    <path
-       style="fill:#000000;stroke-width:0.60455555"
-       inkscape:connector-curvature="0"
-       d="m 132.58283,242.7442 c -1.99133,9.55598 -17.83516,20.01408 -36.031803,22.04088 -9.488764,1.0561 -18.831211,2.02679 -28.793355,1.60056 -16.292162,-0.69628 -29.147806,-3.62736 -29.147806,-3.62736 0,1.47941 0.09781,2.88803 0.293419,4.20541 2.11809,14.99778 15.943189,15.89623 29.039044,16.31517 13.217918,0.42185 24.987523,-3.03984 24.987523,-3.03984 l 0.543019,11.14633 c 0,0 -9.245422,4.63092 -25.715199,5.48265 -9.081891,0.46567 -20.358551,-0.21311 -33.492748,-3.45585 C 5.7790714,286.37929 0.88015717,258.05582 0.13057087,229.31707 -0.09790411,220.78436 0.042939,212.73843 0.042939,206.00917 c 0,-29.38685 20.641795,-38.0006 20.641795,-38.0006 10.408143,-4.45868 28.267551,-6.33367 46.834294,-6.47526 h 0.456167 c 18.566742,0.14151 36.437885,2.01658 46.845245,6.47526 0,0 20.64103,8.61375 20.64103,38.0006 0,0 0.25899,21.68178 -2.87864,36.73503"
-       id="path1428" />
-    <path
-       style="fill:#ffd42a;stroke-width:0.60455555"
-       inkscape:connector-curvature="0"
-       d="m 111.11398,208.28895 v 35.58258 H 96.000965 v -34.5367 c 0,-7.2803 -3.28394,-10.97554 -9.852602,-10.97554 -7.262697,0 -10.902651,4.38349 -10.902651,13.05125 V 230.3145 H 60.221901 v -18.90396 c 0,-8.66776 -3.640737,-13.05125 -10.903432,-13.05125 -6.568664,0 -9.852603,3.69524 -9.852603,10.97554 v 34.5367 H 24.352855 v -35.58258 c 0,-7.27227 1.985076,-13.05125 5.972437,-17.32675 4.111771,-4.27549 9.496588,-6.46724 16.181053,-6.46724 7.733731,0 13.590365,2.77272 17.462707,8.31888 l 3.764364,5.88627 3.765145,-5.88627 c 3.871561,-5.54616 9.728194,-8.31888 17.462708,-8.31888 6.683683,0 12.068501,2.19175 16.181051,6.46724 3.98658,4.2755 5.97166,10.05448 5.97166,17.32675"
-       id="path1430" />
-  </g>
-</svg>

web/sec/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all