clean up the delivery reports to make them manageable, more approachable, and translateable
This commit is contained in:
parent
2c665e5e4c
commit
e558ddae3f
@ -30,9 +30,48 @@ function dreport_content(&$a) {
|
||||
$o .= '<h2>' . sprintf( t('Delivery report for %1$s'),substr($mid,0,32)) . '...' . '</h2>';
|
||||
$o .= '<table>';
|
||||
|
||||
for($x = 0; $x < count($r); $x++ ) {
|
||||
$r[$x]['name'] = escape_tags(substr($r[$x]['dreport_recip'],strpos($r[$x]['dreport_recip'],' ')));
|
||||
|
||||
switch($r[$x]['dreport_result']) {
|
||||
case 'channel sync processed':
|
||||
$r[$x]['gravity'] = 0;
|
||||
$r[$x]['dreport_result'] = t('channel sync processed');
|
||||
break;
|
||||
case 'queued':
|
||||
$r[$x]['gravity'] = 2;
|
||||
$r[$x]['dreport_result'] = t('queued');
|
||||
break;
|
||||
case 'posted':
|
||||
$r[$x]['gravity'] = 3;
|
||||
$r[$x]['dreport_result'] = t('posted');
|
||||
break;
|
||||
case 'accepted for delivery':
|
||||
$r[$x]['gravity'] = 4;
|
||||
$r[$x]['dreport_result'] = t('accepted for delivery');
|
||||
break;
|
||||
case 'updated':
|
||||
$r[$x]['gravity'] = 5;
|
||||
$r[$x]['dreport_result'] = t('updated');
|
||||
case 'update ignored':
|
||||
$r[$x]['gravity'] = 6;
|
||||
$r[$x]['dreport_result'] = t('update ignored');
|
||||
break;
|
||||
case 'permission denied':
|
||||
$r[$x]['dreport_result'] = t('permission denied');
|
||||
$r[$x]['gravity'] = 6;
|
||||
break;
|
||||
default:
|
||||
$r[$x]['gravity'] = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
usort($r,'dreport_gravity_sort');
|
||||
|
||||
|
||||
foreach($r as $rr) {
|
||||
$name = escape_tags(substr($rr['dreport_recip'],strpos($rr['dreport_recip'],' ')));
|
||||
$o .= '<tr><td>' . $name . '</td><td>' . escape_tags($rr['dreport_result']) . '</td><td>' . escape_tags($rr['dreport_time']) . '</td></tr>';
|
||||
$o .= '<tr><td width="40%">' . $rr['name'] . '</td><td width="20%">' . escape_tags($rr['dreport_result']) . '</td><td width="20%">' . escape_tags($rr['dreport_time']) . '</td></tr>';
|
||||
}
|
||||
$o .= '</table>';
|
||||
|
||||
@ -40,4 +79,13 @@ function dreport_content(&$a) {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
function dreport_gravity_sort($a,$b) {
|
||||
if($a['gravity'] == $b['gravity']) {
|
||||
if($a['name'] === $b['name'])
|
||||
return strcmp($a['dreport_time'],$b['dreport_time']);
|
||||
return strcmp($a['name'],$b['name']);
|
||||
}
|
||||
return (($a['gravity'] > $b['gravity']) ? 1 : (-1));
|
||||
}
|
Reference in New Issue
Block a user