diff --git a/web/site/mustard/edinst.php b/web/site/mustard/edinst.php index 3b3364a..fd6be07 100644 --- a/web/site/mustard/edinst.php +++ b/web/site/mustard/edinst.php @@ -326,8 +326,6 @@ function ckf() { if ($account['Level']!='guest') { ($inst['Noxious']==1) ? $disabled='' : $disabled=' disabled'; echo(' - -
 
 
 
 
diff --git a/web/site/mustard/edinstres.php b/web/site/mustard/edinstres.php index 1ffa885..cffeb76 100644 --- a/web/site/mustard/edinstres.php +++ b/web/site/mustard/edinstres.php @@ -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'; diff --git a/web/site/mustard/include/columns.php b/web/site/mustard/include/columns.php index 76fc2a8..7c1e9ea 100644 --- a/web/site/mustard/include/columns.php +++ b/web/site/mustard/include/columns.php @@ -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'), //-------------------------------- diff --git a/web/site/mustard/include/dispinst.php b/web/site/mustard/include/dispinst.php index 23079e8..15f4ec2 100644 --- a/web/site/mustard/include/dispinst.php +++ b/web/site/mustard/include/dispinst.php @@ -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;*/ diff --git a/web/site/users.php b/web/site/users.php index 0070e1b..4973823 100644 --- a/web/site/users.php +++ b/web/site/users.php @@ -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.='
'._('Noxious').' '; ($row['Noxious']==1) ? $out.=''._('Yes (see why below)').'' : $out.=''._('No').''; $out.='
'.N; - $out.='
'._('New').' '; - ($row['New']==1) ? $out.=''._('Yes!').'' : $out.=_('No'); - $out.='
'.N; $out.='
'._('Software').' '.nully(hspech(ucfirst($row['Software']))).' '.nully(hspech($row['Version'])).'
'.N; $out.='
'._('Registrations').' ';