Percentuale di risposta ai nostri check: '.round($width,1).'%
';
+ $attr.='Percentuale di risposta ai nostri check ('.$csres.'): '.round($width,1).'%
';
$attr.=''.N;
mysqli_data_seek($sres,0);
$srow=mysqli_fetch_assoc($sres);
@@ -461,14 +499,28 @@ if (mysqli_num_rows($res)<1) {
$attr.='
Non disponibili
'.N;
}
$out.='Questa istanza è blacklistata per questo motivo: '.hspech($srow['PublicComment']).'
'.N;
+ } else {
+ $out.='Questa istanza è blacklistata, ma nella blacklist non è specificato il motivo.
'.N;
+ }
+ } else {
+ $out.='Questa istanza risulta blacklistata nella tabella delle istanze, ma nella tabella “Blacklist” non è presente: probabilmente è stata rimossa dalla tabella “Blacklist” e il crawler non l’ha ancora aggiornata.
'.N;
+ }
+ }
$out.=''.$cols['Instances.URI']['name'].': '.$row['URI'].'
'.N;
$out.=''.$cols['Instances.Title']['name'].': '.nully($row['Title'],false,'strip').'
'.N;
$out.=''.$cols['Instances.Thumb']['name'].': '.nully($row['Thumb'],true,'image').'
'.N;
$out.=''.$cols['Instances.ShortDesc']['name'].': '.nully($row['ShortDesc'],true,'strip').'
'.N;
$out.=''.$cols['Instances.LongDesc']['name'].': '.nully($row['LongDesc'],true,'strip').'
'.N;
// 'strip' o 'htmlent' per la descrizione nostra?
- $out.=''.$cols['Instances.OurDesc']['name'].': '.nully($row['OurDesc'],true,'strip').'
'.N;
- $out.=''.$cols['Localities.Locality']['name'].': ';
+ $out.='
-
--->
'.trimname($cols['Instances.OurDesc']['name']).': '.nully($row['OurDesc'],true,'strip').'
'.N;
+ $out.=''.trimname($cols['Localities.Locality']['name']).': ';
if (!is_null($row['LocalityID'])) {
$sres=mysqli_query($link,'SELECT * FROM Localities LEFT JOIN Provinces ON Provinces.ID=Localities.ProvinceID LEFT JOIN Regions ON Regions.ID=Provinces.RegionID LEFT JOIN States ON States.ID=Regions.StateID WHERE Localities.ID='.$row['LocalityID'])
or muoribene(mysqli_error($link),true);
@@ -499,9 +551,9 @@ if (mysqli_num_rows($res)<1) {
$i++;
$buf[]=$i.': '.hspech($srow['Code'].' ['.$srow['NameIT'].']');
}
- $out.='Mastodon Startpage Admin - Istanze
+Mastodon Startpage Admin - Elenco istanze
@@ -611,21 +662,6 @@ function ulsh(el,sh) {
else
el.style.display='none';
}
-function golang(lang) {
- var loc=document.location.href;
- loc=loc.replace(/#.*$/,'');
- loc=loc.replace(/\/$/,'');
- if (document.documentElement.lang=='en') {
- if (lang!='en')
- document.location.href=loc+'/'+lang;
- } else {
- if (lang!='en')
- document.location.href=loc.substr(0,loc.length-3)+'/'+lang;
- else
- document.location.href=loc.substr(0,loc.length-3);
- }
-}
-
function shideplancia() {
var plancia=document.getElementById('plancia');
var plctrl=document.getElementById('plctrl');
@@ -637,7 +673,9 @@ function shideplancia() {
plctrl.innerHTML='Nascondi plancia';
}
}
-
+function hent(str) {
+ return str.replace(/&/g,'&').replace(/>/g,'>').replace(/=0; i--)
@@ -752,47 +790,55 @@ function popusels(index,valselval) {
}
function addrow(index,refresh) {
var table=document.getElementById('planciafil');
- var newrow=table.insertRow(index);
- var newcell0=newrow.insertCell(0);
- var newcell1=newrow.insertCell(1);
- var newcell2=newrow.insertCell(2);
- var newcell3=newrow.insertCell(3);
- var newcell4=newrow.insertCell(4);
- var newcell5=newrow.insertCell(5);
- var newcell6=newrow.insertCell(6);
- var newcell7=newrow.insertCell(7);
- newcell0.innerHTML='';
- newcell1.innerHTML='';
- newcell2.innerHTML='';
- newcell3.innerHTML='';
- newcell4.innerHTML='';
- newcell5.innerHTML='';
- newcell6.innerHTML='
';
- newcell6.style.width='22px';
- newcell7.innerHTML='
';
- newcell7.style.width='22px';
- if (refresh) {
- synctai();
- popusels(index,false);
+ if (table.rows.length<9) {
+ var newrow=table.insertRow(index);
+ var newcell0=newrow.insertCell(0);
+ var newcell1=newrow.insertCell(1);
+ var newcell2=newrow.insertCell(2);
+ var newcell3=newrow.insertCell(3);
+ var newcell4=newrow.insertCell(4);
+ var newcell5=newrow.insertCell(5);
+ var newcell6=newrow.insertCell(6);
+ var newcell7=newrow.insertCell(7);
+ newcell0.innerHTML='';
+ newcell1.innerHTML='';
+ newcell2.innerHTML='';
+ newcell3.innerHTML='';
+ newcell4.innerHTML='';
+ newcell5.innerHTML='';
+ newcell6.innerHTML='';
+ newcell6.style.width='22px';
+ newcell7.innerHTML='';
+ newcell7.style.width='22px';
+ if (refresh) {
+ synctai();
+ popusels(index,false);
+ }
+ } else {
+ alerta('Non è possibile impostare più di 8 criteri di ricerca.');
}
}
function ordaddrow(index,refresh) {
var table=document.getElementById('planciaord');
- var newrow=table.insertRow(index);
- var newcell0=newrow.insertCell(0);
- var newcell1=newrow.insertCell(1);
- var newcell2=newrow.insertCell(2);
- var newcell3=newrow.insertCell(3);
- newcell0.style.width='97%';
- newcell1.style.width='1%';
- newcell2.style.width='1%';
- newcell3.style.width='1%';
- newcell0.innerHTML='';
- newcell1.innerHTML='';
- newcell2.innerHTML='';
- newcell3.innerHTML='';
- if (refresh)
- synctoi();
+ if (table.rows.length<7) {
+ var newrow=table.insertRow(index);
+ var newcell0=newrow.insertCell(0);
+ var newcell1=newrow.insertCell(1);
+ var newcell2=newrow.insertCell(2);
+ var newcell3=newrow.insertCell(3);
+ newcell0.style.width='97%';
+ newcell1.style.width='1%';
+ newcell2.style.width='1%';
+ newcell3.style.width='1%';
+ newcell0.innerHTML='';
+ newcell1.innerHTML='';
+ newcell2.innerHTML='';
+ newcell3.innerHTML='';
+ if (refresh)
+ synctoi();
+ } else {
+ alerta('Non è possibile impostare più di 6 criteri di ordinamento.');
+ }
}
function synctai() {
var i=0;
@@ -1010,7 +1056,6 @@ function pupwait(on) {
pup.style.display='none';
}
}
-
//function setrow(index,openparv,fieldselv,condselv,valueselv,valueinpv,closeparv,andorv)
function loadpres() {
let pres=document.getElementById('presets');
@@ -1020,7 +1065,7 @@ function loadpres() {
formdata.append('act','load');
formdata.append('pid',pres.value);
let xhr=new XMLHttpRequest();
- xhr.open('POST','loadsavepres.php');
+ xhr.open('POST','loadsaverempres.php');
xhr.responseType='json';
xhr.send(formdata);
xhr.onload=function() {
@@ -1057,6 +1102,27 @@ function loadpres() {
alerta('
@@ -1161,13 +1240,12 @@ function pupoff() {
'.$cols['InstOurLangs']['name'].': '.implode('; ',$buf).'
'.N;
+ $out.=''.trimname($cols['InstOurLangs']['name']).': '.implode('; ',$buf).'
'.N;
} else {
- $out.=''.$cols['InstOurLangs']['name'].': Non definite
'.N;
+ $out.=''.trimname($cols['InstOurLangs']['name']).': Non definite
'.N;
}
$sres=mysqli_query($link,'SELECT * FROM InstFinancing LEFT JOIN Financing ON Financing.ID=FinID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
or muoribene(mysqli_error($link),true);
@@ -512,9 +564,9 @@ if (mysqli_num_rows($res)<1) {
$i++;
$buf[]=$i.': '.hspech($srow['Type']);
}
- $out.=''.$cols['InstFinancing']['name'].': '.implode('; ',$buf).'
'.N;
+ $out.=''.trimname($cols['InstFinancing']['name']).': '.implode('; ',$buf).'
'.N;
} else {
- $out.=''.$cols['InstFinancing']['name'].': Non definite
'.N;
+ $out.=''.trimname($cols['InstFinancing']['name']).': Non definite
'.N;
}
$sres=mysqli_query($link,'SELECT * FROM InstPolicies LEFT JOIN Policies ON Policies.ID=PolID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
or muoribene(mysqli_error($link),true);
@@ -525,9 +577,9 @@ if (mysqli_num_rows($res)<1) {
$i++;
$buf[]=$i.': '.hspech($srow['Name']);
}
- $out.=''.$cols['InstPolicies']['name'].': '.implode('; ',$buf).'
'.N;
+ $out.=''.trimname($cols['InstPolicies']['name']).': '.implode('; ',$buf).'
'.N;
} else {
- $out.=''.$cols['InstPolicies']['name'].': Non definite
'.N;
+ $out.=''.trimname($cols['InstPolicies']['name']).': Non definite
'.N;
}
$sres=mysqli_query($link,'SELECT * FROM InstTags LEFT JOIN Tags ON Tags.ID=TagID WHERE InstID='.$row['IID'].' ORDER BY Pos ASC')
or muoribene(mysqli_error($link),true);
@@ -538,9 +590,9 @@ if (mysqli_num_rows($res)<1) {
$i++;
$buf[]=$i.': '.hspech($srow['Name']);
}
- $out.=''.$cols['InstTags']['name'].': '.implode('; ',$buf).'
'.N;
+ $out.=''.trimname($cols['InstTags']['name']).': '.implode('; ',$buf).'
'.N;
} else {
- $out.=''.$cols['InstTags']['name'].': Non definite
'.N;
+ $out.=''.trimname($cols['InstTags']['name']).': Non definite
'.N;
}
$out.=''.$cols['Instances.Email']['name'].': '.nully($row['Email'],true,'email').'
'.N;
$out.=''.$cols['Instances.Software']['name'].': '.nully($row['Software'],false,'strip').'
'.N;
@@ -566,7 +618,6 @@ if (mysqli_num_rows($res)<1) {
$out.='';
}
-
$presid=0;
if (array_key_exists('presets',$_POST) && preg_match('/^[0-9]+$/',$_POST['presets'])===1)
$presid=$_POST['presets'];
@@ -586,7 +637,7 @@ mysqli_close($link);
-';
- newcell6.style.width='22px';
- newcell7.innerHTML='';
- newcell7.style.width='22px';
- if (refresh) {
- synctai();
- popusels(index,false);
+ if (table.rows.length<9) {
+ var newrow=table.insertRow(index);
+ var newcell0=newrow.insertCell(0);
+ var newcell1=newrow.insertCell(1);
+ var newcell2=newrow.insertCell(2);
+ var newcell3=newrow.insertCell(3);
+ var newcell4=newrow.insertCell(4);
+ var newcell5=newrow.insertCell(5);
+ var newcell6=newrow.insertCell(6);
+ var newcell7=newrow.insertCell(7);
+ newcell0.innerHTML='';
+ newcell1.innerHTML='';
+ newcell2.innerHTML='';
+ newcell3.innerHTML='';
+ newcell4.innerHTML='';
+ newcell5.innerHTML='';
+ newcell6.innerHTML='';
+ newcell6.style.width='22px';
+ newcell7.innerHTML='';
+ newcell7.style.width='22px';
+ if (refresh) {
+ synctai();
+ popusels(index,false);
+ }
+ } else {
+ alerta('Non è possibile impostare più di 8 criteri di ricerca.');
}
}
function ordaddrow(index,refresh) {
var table=document.getElementById('planciaord');
- var newrow=table.insertRow(index);
- var newcell0=newrow.insertCell(0);
- var newcell1=newrow.insertCell(1);
- var newcell2=newrow.insertCell(2);
- var newcell3=newrow.insertCell(3);
- newcell0.style.width='97%';
- newcell1.style.width='1%';
- newcell2.style.width='1%';
- newcell3.style.width='1%';
- newcell0.innerHTML='';
- newcell1.innerHTML='';
- newcell2.innerHTML='';
- newcell3.innerHTML='';
- if (refresh)
- synctoi();
+ if (table.rows.length<7) {
+ var newrow=table.insertRow(index);
+ var newcell0=newrow.insertCell(0);
+ var newcell1=newrow.insertCell(1);
+ var newcell2=newrow.insertCell(2);
+ var newcell3=newrow.insertCell(3);
+ newcell0.style.width='97%';
+ newcell1.style.width='1%';
+ newcell2.style.width='1%';
+ newcell3.style.width='1%';
+ newcell0.innerHTML='';
+ newcell1.innerHTML='';
+ newcell2.innerHTML='';
+ newcell3.innerHTML='';
+ if (refresh)
+ synctoi();
+ } else {
+ alerta('Non è possibile impostare più di 6 criteri di ordinamento.');
+ }
}
function synctai() {
var i=0;
@@ -1010,7 +1056,6 @@ function pupwait(on) {
pup.style.display='none';
}
}
-
//function setrow(index,openparv,fieldselv,condselv,valueselv,valueinpv,closeparv,andorv)
function loadpres() {
let pres=document.getElementById('presets');
@@ -1020,7 +1065,7 @@ function loadpres() {
formdata.append('act','load');
formdata.append('pid',pres.value);
let xhr=new XMLHttpRequest();
- xhr.open('POST','loadsavepres.php');
+ xhr.open('POST','loadsaverempres.php');
xhr.responseType='json';
xhr.send(formdata);
xhr.onload=function() {
@@ -1057,6 +1102,27 @@ function loadpres() {
alerta('Non hai selezionato alcun preset ;)
'); } } +function rempres() { + pupwait(true); + let pres=document.getElementById('presets'); + let formdata=new FormData(document.forms.f); + formdata.append('act','remove'); + formdata.append('pid',pres.value); + let xhr=new XMLHttpRequest(); + xhr.open('POST','loadsaverempres.php'); + xhr.responseType='json'; + xhr.send(formdata); + xhr.onload=function() { + console.log(xhr.response); + pres.remove(pres.selectedIndex); + pres.selectedIndex=0; + pupwait(false); + }; + xhr.onerror=function() { + pupwait(false); + alert('La richiesta è fallita.'); + }; +} function savepres(txt,asnew) { pupwait(true); let pres=document.getElementById('presets'); @@ -1066,7 +1132,7 @@ function savepres(txt,asnew) { if (!asnew) formdata.append('pid',pres.value); let xhr=new XMLHttpRequest(); - xhr.open('POST','loadsavepres.php'); + xhr.open('POST','loadsaverempres.php'); xhr.responseType='json'; xhr.send(formdata); xhr.onload=function() { @@ -1092,12 +1158,21 @@ function pupsavepres(asnew) { var prestext=pres.options[pres.selectedIndex].text; var pre='Se vuoi puoi modificare il nome del preset che stai per sovrascrivere
'; if (asnew) pre='Dai un nuovo nome al nuovo preset che stai per salvare
'; - inpup.innerHTML=''+pre+'
';
+ inpup.innerHTML=''+pre+'
';
pup.style.display='table';
} else {
alerta('Non hai selezionato alcun preset ;)
'); } } +function puprempres() { + var pres=document.getElementById('presets'); + if (pres.value!='null') { + var prestext=pres.options[pres.selectedIndex].text; + confirma('Confermi l’eliminazione del preset «'+hent(prestext)+'»?','rempres()'); + } else { + alerta('Non hai selezionato alcun preset ;)
'); + } +} function ckpresname(asnew) { var pres=document.getElementById('presets'); var presname=document.getElementById('presname').value; @@ -1136,7 +1211,10 @@ function pupoff() { inpup.innerHTML='...
';
pup.style.display='none';
}
-
+function gotopage(pi) {
+ document.getElementById('p').value=pi;
+ ckf();
+}
//-->
@@ -1149,7 +1227,8 @@ function pupoff() {
@@ -1184,7 +1262,8 @@ function pupoff() {
-
+
+
diff --git a/web/admin/loadsavepres.php b/web/admin/loadsaverempres.php
similarity index 90%
rename from web/admin/loadsavepres.php
rename to web/admin/loadsaverempres.php
index 76a5dbc..b7fe071 100644
--- a/web/admin/loadsavepres.php
+++ b/web/admin/loadsaverempres.php
@@ -106,7 +106,16 @@ if (array_key_exists('act',$_POST)) {
or muoribene(mysqli_error($link),true);
}
} elseif ($_POST['act']=='remove' && array_key_exists('pid',$_POST) && preg_match('/^[0-9]+$/',$_POST['pid'])===1) {
- echo(json_encode($_POST));
+ $pid=$_POST['pid'];
+ $query='DELETE FROM PresFiltConds WHERE PresID='.$pid;
+ mysqli_query($link,$query)
+ or muoribene(mysqli_error($link),true);
+ $query='DELETE FROM PresOrdConds WHERE PresID='.$pid;
+ mysqli_query($link,$query)
+ or muoribene(mysqli_error($link),true);
+ $query='DELETE FROM Presets WHERE ID='.$pid;
+ mysqli_query($link,$query)
+ or muoribene(mysqli_error($link),true);
}
}
diff --git a/web/admin/theme.css b/web/admin/theme.css
index 54ceb50..33c6afc 100644
--- a/web/admin/theme.css
+++ b/web/admin/theme.css
@@ -60,7 +60,7 @@ p {
padding: 3px;
color: white;
height: 30px;
- background-color: #916f6f;
+ background-color: #6f8a91;
border-radius: 5px;
text-align: center;
vertical-align: middle;
@@ -68,6 +68,10 @@ p {
font-size: 12pt;
font-weight: bold;
}
+.bigtab .insthead a {
+ color: #1c2224;
+ /*text-decoration: underline;*/
+}
.bigtab img {
max-width: 100%;
display: block;
@@ -459,6 +463,78 @@ input {
min-width: 320px;
}
+.edtab {
+ background-color: white;
+ font-size: 10pt;
+ margin-left: auto;
+ margin-right: auto;
+ width: 400px;
+ margin-top: 32px;
+}
+.edtab .insthead {
+ padding: 3px;
+ color: white;
+ height: 30px;
+ background-color: #916f6f;
+ border-radius: 5px;
+ text-align: center;
+ vertical-align: middle;
+ color: white;
+ font-size: 12pt;
+ font-weight: bold;
+}
+.edtab input {
+ width: auto;
+ font-size: 10pt;
+ padding: 0;
+}
+.edtab img {
+ max-width: 100%;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+/*720x1280*/
+.edtab td {
+ padding: 3px;
+ text-align: left;
+ vertical-align: top;
+/* word-break: break-word;*/
+ background-color: lightgrey;
+ border-radius: 5px;
+}
+.edtab .left {
+ width: 1%;
+ text-align: right;
+}
+.edtab .right {
+ width: 99%;
+}
+.edtab .tarea {
+ width: 100%;
+ resize: none;
+ padding: 3px;
+ border-radius: 3px;
+ border: 1px;
+}
+
+.cbtab {
+ background-color: red;
+ border-spacing: 0;
+}
+.cbtab td {
+ border-radius: 0;
+ padding: 0;
+ border: none;
+}
+
+#pageselect {
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ margin-top: 5px;
+}
+
#debug {
position: fixed;
left: 0;
@@ -467,6 +543,20 @@ input {
height: 240px;
font-size: 8pt;
overflow: auto;
+ display: none;
+}
+
+#intro {
+ width:800px;
+ margin-left:auto;
+ margin-right:auto;
+ padding:10px;
+ font-size:14pt;
+ line-height: 18pt;
+ background-color:lightgrey;
+}
+#intro p {
+ margin-bottom: 0;
}
@media only screen and (max-width:720px) {
diff --git a/web/admin/zzz-materiali/mastostart_struttura_e_dati.sql.gz b/web/admin/zzz-materiali/mastostart_struttura_e_dati.sql.gz
index 1201c41..894dd92 100644
Binary files a/web/admin/zzz-materiali/mastostart_struttura_e_dati.sql.gz and b/web/admin/zzz-materiali/mastostart_struttura_e_dati.sql.gz differ
| Preset: |  |  |  | |
| Preset: | | | | |