Merge branch 'android_branch' into android_bt

This commit is contained in:
Eric House 2012-02-27 18:28:17 -08:00
commit 1892ccf640

View file

@ -84,6 +84,12 @@ function strip_quotes($str) {
return trim( $str, '"'); return trim( $str, '"');
} }
function print_date( $str ) {
$str = strip_quotes( $str );
$time = strtotime( $str );
return strftime( "%x@%R", $time );
}
$cols = array( new Column("dead", "D", "capitalize", false ), $cols = array( new Column("dead", "D", "capitalize", false ),
new Column("pub", "P", "capitalize", false ), new Column("pub", "P", "capitalize", false ),
new Column("room", "Room", "identity", false ), new Column("room", "Room", "identity", false ),
@ -94,8 +100,8 @@ $cols = array( new Column("dead", "D", "capitalize", false ),
new Column("ack", "A", "identity", true ), new Column("ack", "A", "identity", true ),
new Column("nsent", "Sent", "identity", false ), new Column("nsent", "Sent", "identity", false ),
new Column("addrs", "Dev. addr", "ip_to_host", true ), new Column("addrs", "Dev. addr", "ip_to_host", true ),
new Column("ctime", "Created", "strip_quotes", false ), new Column("ctime", "Created", "print_date", false ),
new Column("mtimes", "Last contact", "strip_quotes", true ), new Column("mtimes", "Last contact", "print_date", true ),
); );
$colnames = array(); $colnames = array();