"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "mrbs-1.9.4/web/functions_view.inc" between
mrbs-1.9.4.tar.gz and mrbs-1.10.0.tar.gz

About: MRBS is a web application for booking meeting rooms or other resources (using PHP and MySQL/pgsql).

functions_view.inc  (mrbs-1.9.4)	:	functions_view.inc  (mrbs-1.10.0)
skipping to change at line 74		skipping to change at line 74
$hide_this_field = $keep_private && isset($is_private_field["entry.$key"]) & & $is_private_field["entry.$key"];		$hide_this_field = $keep_private && isset($is_private_field["entry.$key"]) & & $is_private_field["entry.$key"];
// We could just test each column against $is_private_field["entry.$key"]		// We could just test each column against $is_private_field["entry.$key"]
// but restricting the test to the columns below guards against the possibil ity		// but restricting the test to the columns below guards against the possibil ity
// that somebody has accidentally configured a 'system' field to be private		// that somebody has accidentally configured a 'system' field to be private
switch ($key)		switch ($key)
{		{
case 'name':		case 'name':
case 'description':		case 'description':
case 'room_name':		case 'room_name':
case 'area_name':		case 'area_name':
case 'type':
case 'room_id':		case 'room_id':
case 'entry_info_time':		case 'entry_info_time':
case 'entry_info_user':		case 'entry_info_user':
case 'entry_info_text':		case 'entry_info_text':
case 'repeat_info_time':		case 'repeat_info_time':
case 'repeat_info_user':		case 'repeat_info_user':
case 'repeat_info_text':		case 'repeat_info_text':
$data[$key] = $hide_this_field ? $private_text : $data[$key];		$data[$key] = $hide_this_field ? $private_text : $data[$key];
break;		break;
		case 'type':
		$data[$key] = $hide_this_field ? $private_text : get_type_vocab($data[$k
		ey]);
		break;
case 'create_by':		case 'create_by':
case 'modified_by':		case 'modified_by':
$data[$key] = $hide_this_field ? $private_text : get_display_name($data[ $key]);		$data[$key] = $hide_this_field ? $private_text : get_display_name($data[ $key]);
break;		break;
default:		default:
if (!in_array($key, $standard_fields['entry']))		if (!in_array($key, $standard_fields['entry']))
{		{
$data[$key] = $hide_this_field ? $private_text : $data[$key];		$data[$key] = $hide_this_field ? $private_text : $data[$key];
}		}
skipping to change at line 215		skipping to change at line 218
{		{
$end_date = time_date_string($data['end_time']);		$end_date = time_date_string($data['end_time']);
}		}
$tbody .= create_details_row(get_vocab("end_date"), $end_date, $as_html) ;		$tbody .= create_details_row(get_vocab("end_date"), $end_date, $as_html) ;
break;		break;
case 'type':		case 'type':
// Type		// Type
if (isset($booking_types) && (count($booking_types) > 1))		if (isset($booking_types) && (count($booking_types) > 1))
{		{
$type = get_type_vocab($data['type']);		$class = ($keep_private && !empty($is_private_field['entry.type'])) ?
$value = (empty($type)) ? "?${data['type']}?" : $type;		"private" : "";
$tbody .= create_details_row(get_vocab("type"), $value, $as_html);		$tbody .= create_details_row(get_vocab("type"), $data['type'], $as_htm
		l, $class);
}		}
break;		break;
case 'create_by':		case 'create_by':
// Created by		// Created by
$class = ($keep_private && !empty($is_private_field['entry.create_by'])) ? "private" : "";		$class = ($keep_private && !empty($is_private_field['entry.create_by'])) ? "private" : "";
$tbody .= create_details_row(get_vocab("createdby"), $data['create_by'], $as_html, $class);		$tbody .= create_details_row(get_vocab("createdby"), $data['create_by'], $as_html, $class);
break;		break;
case 'modified_by':		case 'modified_by':
End of changes. 3 change blocks.
4 lines changed or deleted		9 lines changed or added

---