fix to allow '&' in attached files (needs to be quoted ('%26') in the download-link)

and preserving Linebreaks in InfoLog entries
This commit is contained in:
Ralf Becker 2002-10-15 13:30:23 +00:00
parent 1abe24ce47
commit 3693a818bd

View File

@ -90,6 +90,7 @@
$info = $this->bo->read($id); $info = $this->bo->read($id);
$info['anzSubs'] = $this->bo->anzSubs($id); $info['anzSubs'] = $this->bo->anzSubs($id);
$info += $this->formatInfo($info,$action,$action_id); $info += $this->formatInfo($info,$action,$action_id);
$info['info_des'] = nl2br($info['info_des']);
$readonlys["edit[$id]"] = !$this->bo->check_access($id,PHPGW_ACL_EDIT); $readonlys["edit[$id]"] = !$this->bo->check_access($id,PHPGW_ACL_EDIT);
$readonlys["delete[$id]"] = !$this->bo->check_access($id,PHPGW_ACL_DELETE); $readonlys["delete[$id]"] = !$this->bo->check_access($id,PHPGW_ACL_DELETE);
@ -520,7 +521,7 @@
$links .= $this->html->a_href($name,'/index.php', $links .= $this->html->a_href($name,'/index.php',
$this->menuaction('get_file') + array( $this->menuaction('get_file') + array(
'info_id' => $info['info_id'], 'info_id' => $info['info_id'],
'filename' => $name 'filename' => str_replace('&','%26',$name)
),'target=_blank'); ),'target=_blank');
if ($comment) $links .= ' (' . $comment . ')'; if ($comment) $links .= ' (' . $comment . ')';
} }