Jones/MastodonHelp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed references to New, Good, Chosen columns, since they’re gone

Browse source
This commit is contained in:
pezcurrel 2022-12-18 18:45:39 +01:00
parent 217be70dc6
commit 8eaeaf0d96
5 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/site/mustard/edinst.php
View file

@ -326,8 +326,6 @@ function ckf() {
if ($account['Level']!='guest') {
($inst['Noxious']==1) ? $disabled='' : $disabled=' disabled';
echo('<table class="cbtab">
<tr><td><label for="New">New:</label></td><td>&nbsp;<input type="checkbox" name="New" id="New"'.check($inst,'New').'></td></tr>
<tr><td><label for="Chosen">Chosen:</label></td><td>&nbsp;<input type="checkbox" name="Chosen" id="Chosen"'.check($inst,'Chosen').'></td></tr>
<tr><td><label for="Visible">Visible:</label></td><td>&nbsp;<input type="checkbox" name="Visible" id="Visible"'.check($inst,'Visible').'></td></tr>
<tr><td><label for="Noxious">Noxious:</label></td><td>&nbsp;<input type="checkbox" name="Noxious" id="Noxious"'.check($inst,'Noxious').' onChange="swdis(\'NoxReason\');"></td></tr>
</table>

2
web/site/mustard/edinstres.php
View file

@ -54,8 +54,6 @@ if ($account['Level']!='guest') {
//$sets[]='NoxReason=NULL';
//$sets[]='NoxLastModTS=NULL';
}
(array_key_exists('New',$_POST) && $_POST['New']=='on') ? $sets[]='New=1' : $sets[]='New=0';
(array_key_exists('Chosen',$_POST) && $_POST['Chosen']=='on') ? $sets[]='Chosen=1' : $sets[]='Chosen=0';
(array_key_exists('Visible',$_POST) && $_POST['Visible']=='on') ? $sets[]='Visible=1' : $sets[]='Visible=0';
$_POST['Priority']=trim($_POST['Priority']);
(array_key_exists('Priority',$_POST) && preg_match('#^\d+#',$_POST['Priority'])===1) ? $sets[]='Priority='.$_POST['Priority'] : $sets[]='Priority=NULL';

6
web/site/mustard/include/columns.php
View file

@ -4,13 +4,10 @@
$cols=array(
'Instances.New'=>array('field'=>'Instances.New','name'=>'[Nuova]','nameEN'=>'[New]','type'=>'bool'),
'Instances.Good'=>array('field'=>'Instances.Good','name'=>'[Papabile]','nameEN'=>'[Good]','type'=>'bool'),
'Instances.Chosen'=>array('field'=>'Instances.Chosen','name'=>'[Scelta]','nameEN'=>'[Chosen]','type'=>'bool'),
'Instances.Visible'=>array('field'=>'Instances.Visible','name'=>'[Visibile]','nameEN'=>'[Visible]','type'=>'bool'),
'Instances.Noxious'=>array('field'=>'Instances.Noxious','name'=>'[Nociva]','nameEN'=>'[Noxious]','type'=>'bool'),
'Instances.NoxReason'=>array('field'=>'Instances.NoxReason','name'=>'Motivo nocività','nameEN'=>'Noxiousness reason','type'=>'text'),
'Instances.NoxLastModTS'=>array('field'=>'Instances.NoxLastModTS','name'=>'Data ult. modifica motivo nocività','nameEN'=>'Last modification date of noxiousness reason','type'=>'time'),
'Instances.Visible'=>array('field'=>'Instances.Visible','name'=>'[Visibile]','nameEN'=>'[Visible]','type'=>'bool'),
'Instances.LastCheckOk'=>array('field'=>'Instances.LastCheckOk','name'=>'[Ha risposto all’ultimo check]','nameEN'=>'[Has answered on last check]','type'=>'bool'),
'Instances.Priority'=>array('field'=>'Instances.Priority','name'=>'Priorità','nameEN'=>'Priority','type'=>'int'),
'Instances.Dead'=>array('field'=>'Instances.Dead','name'=>'[“Morta”]','nameEN'=>'[“Dead”]','type'=>'bool'),
@ -53,6 +50,7 @@ $cols=array(
'Instances.AdmURL'=>array('field'=>'Instances.AdmURL','name'=>'Pagina dell’admin','nameEN'=>'Admin’s page','type'=>'text','search'=>false,'ord'=>false),
'Instances.AdmAvatar'=>array('field'=>'Instances.AdmAvatar','name'=>'Avatar admin','nameEN'=>'Admin’s avatar','type'=>'text','search'=>false,'ord'=>false),
'Instances.AdmNote'=>array('field'=>'Instances.AdmNote','name'=>'Note dell’admin','nameEN'=>'Admin’s notes','type'=>'text'),
'Instances.InsertTS'=>array('field'=>'Instances.InsertTS','name'=>'Timestamp di inserimento del record','nameEN'=>'Record insert timestamp','type'=>'int'),
//--------------------------------

3
web/site/mustard/include/dispinst.php
View file

@ -103,9 +103,6 @@ function dispinst(&$row,&$cols,&$link,&$dlang,&$account,$showcount,$finst,$cinst
}
$attr=booly(trimname(tc('Instances.Dead')).': ',$row['Dead'],false,true).N;
$attr.=booly(trimname(tc('Instances.Noxious')).': ',$row['Noxious'],false,true).N;
$attr.=booly(trimname(tc('Instances.New')).': ',$row['New'],true).N;
$attr.=booly(trimname(tc('Instances.Good')).': ',$row['Good']).N;
$attr.=booly(trimname(tc('Instances.Chosen')).': ',$row['Chosen']).N;
$attr.=booly(trimname(tc('Instances.Visible')).': ',$row['Visible']).N;
/*$attr.=booly(tc('Instances.RegOpen')).': ',$row['RegOpen']).N;
$attr.=booly(tc('Instances.RegReqApproval').': ',$row['RegReqApproval'],true,true).N;*/

4
web/site/users.php
View file

@ -315,7 +315,6 @@ $order=array(
// 'open'=>array('t'=>_('Prima quelle con iscriz. aperte'),'q'=>'Instances.RegOpen DESC, Instances.RegReqApproval ASC'),
// 'alph'=>array('t'=>_('Alfabetico'),'q'=>'Instances.URI ASC'),
// new non ha senso di esistere visto che c'è firstseen
// 'new'=>array('t'=>_('Prima le nuove'),'q'=>'Instances.New DESC'),
// 'name'=>array('t'=>_('Nome (crescente)'),'q'=>'Instances.Title ASC'),
// 'admc'=>array('t'=>_('Data creazione account admin'),'q'=>'IF (Instances.AdmCreatedAt IS NULL, 9999999999, Instances.AdmCreatedAt) ASC'),
// 'fseena'=>array('t'=>_('Data di “avvistamento” cresc.'),'q'=>'Instances.FirstSeen ASC'),
@ -527,9 +526,6 @@ while ($if<$il && $row=mysqli_fetch_assoc($res)) {
$out.='<div><span class="ilab">'._('Noxious').'</span> ';
($row['Noxious']==1) ? $out.='<span class="ibad">'._('Yes (see why below)').'</span>' : $out.='<span class="igood">'._('No').'</span>';
$out.='</div>'.N;
$out.='<div><span class="ilab">'._('New').'</span> ';
($row['New']==1) ? $out.='<span class="ivgood">'._('Yes!').'</span>' : $out.=_('No');
$out.='</div>'.N;
$out.='<div><span class="ilab">'._('Software').'</span> '.nully(hspech(ucfirst($row['Software']))).' '.nully(hspech($row['Version'])).'</div>'.N;
$out.='<div><span class="ilab">'._('Registrations').'</span> ';