admin.php (mrbs-1.9.0) | : | admin.php (mrbs-1.9.1) | ||
---|---|---|---|---|
skipping to change at line 406 | skipping to change at line 406 | |||
foreach($fields as $field) | foreach($fields as $field) | |||
{ | { | |||
if (!in_array($field['name'], $ignore)) | if (!in_array($field['name'], $ignore)) | |||
{ | { | |||
switch ($field['name']) | switch ($field['name']) | |||
{ | { | |||
// the standard MRBS fields | // the standard MRBS fields | |||
case 'description': | case 'description': | |||
case 'capacity': | case 'capacity': | |||
case 'room_admin_email': | case 'room_admin_email': | |||
case 'invalid_types': | ||||
$text = get_vocab($field['name']); | $text = get_vocab($field['name']); | |||
break; | break; | |||
// any user defined fields | // any user defined fields | |||
default: | default: | |||
$text = get_loc_field_name(_tbl('room'), $field['name']); | $text = get_loc_field_name(_tbl('room'), $field['name']); | |||
break; | break; | |||
} | } | |||
// We don't use htmlspecialchars() here because the column names are | // We don't use htmlspecialchars() here because the column names are | |||
// trusted and some of them may deliberately contain HTML entities ( eg ) | // trusted and some of them may deliberately contain HTML entities ( eg ) | |||
echo "<th>$text</th>\n"; | echo "<th>$text</th>\n"; | |||
skipping to change at line 465 | skipping to change at line 466 | |||
switch ($field['name']) | switch ($field['name']) | |||
{ | { | |||
// the standard MRBS fields | // the standard MRBS fields | |||
case 'description': | case 'description': | |||
case 'room_admin_email': | case 'room_admin_email': | |||
echo "<td><div>" . htmlspecialchars($r[$field['name']]) . "< /div></td>\n"; | echo "<td><div>" . htmlspecialchars($r[$field['name']]) . "< /div></td>\n"; | |||
break; | break; | |||
case 'capacity': | case 'capacity': | |||
echo "<td class=\"int\"><div>" . $r[$field['name']] . "</div ></td>\n"; | echo "<td class=\"int\"><div>" . $r[$field['name']] . "</div ></td>\n"; | |||
break; | break; | |||
case 'invalid_types': | ||||
echo "<td><div>" . get_type_names($r[$field['name']]) . "</d | ||||
iv></td>\n"; | ||||
break; | ||||
// any user defined fields | // any user defined fields | |||
default: | default: | |||
if (($field['nature'] == 'boolean') || | if (($field['nature'] == 'boolean') || | |||
(($field['nature'] == 'integer') && isset($field['length ']) && ($field['length'] <= 2)) ) | (($field['nature'] == 'integer') && isset($field['length ']) && ($field['length'] <= 2)) ) | |||
{ | { | |||
// booleans: represent by a checkmark | // booleans: represent by a checkmark | |||
echo "<td class=\"boolean\"><div>"; | echo "<td class=\"boolean\"><div>"; | |||
echo (!empty($r[$field['name']])) ? "<img src=\"images/che ck.png\" alt=\"check mark\" width=\"16\" height=\"16\">" : " "; | echo (!empty($r[$field['name']])) ? "<img src=\"images/che ck.png\" alt=\"check mark\" width=\"16\" height=\"16\">" : " "; | |||
echo "</div></td>\n"; | echo "</div></td>\n"; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 5 lines changed or added |