extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

"bugfix: not all fields were preserved, when responsible users had the right to edit partical data"

Browse Source
This commit is contained in:
Ralf Becker 2007-04-26 11:34:46 +00:00
parent 6bacbb1eca
commit 3192eaf2c6
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
infolog/inc/class.uiinfolog.inc.php
View File

@ -658,11 +658,11 @@ class uiinfolog
{ {
//echo "uiinfolog::edit: content="; _debug_array($content); //echo "uiinfolog::edit: content="; _debug_array($content);
$info_id = $content['info_id']; $info_id = $content['info_id'];
$action = $content['action']; $action = $content['action']; unset($content['action']);
$action_id = $content['action_id']; $action_id = $content['action_id']; unset($content['action_id']);
$referer = $content['referer']; $referer = $content['referer']; unset($content['referer']);
$no_popup = $content['no_popup']; $no_popup = $content['no_popup']; unset($content['no_popup']);
$caller = $content['caller']; $caller = $content['caller']; unset($content['caller']);
// convert custom from to 0 or 1, it's unset if not checked, which starts the detection // convert custom from to 0 or 1, it's unset if not checked, which starts the detection
$content['info_custom_from'] = (int)$content['info_custom_from']; $content['info_custom_from'] = (int)$content['info_custom_from'];
@ -977,6 +977,7 @@ class uiinfolog
$content['info_owner'] = $this->user; $content['info_owner'] = $this->user;
} }
} }
$preserv = $content;
// for implizit edit of responsible user make all fields readonly, but status and percent // for implizit edit of responsible user make all fields readonly, but status and percent
if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT) && $this->bo->is_responsible($content)) if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT) && $this->bo->is_responsible($content))
{ {
@ -985,6 +986,7 @@ class uiinfolog
{ {
$readonlys[$name] = true; $readonlys[$name] = true;
} }
unset($readonlys[$tabs]);
// need to set all customfields extra, as they are not set if empty // need to set all customfields extra, as they are not set if empty
foreach($this->bo->customfields as $name => $value) foreach($this->bo->customfields as $name => $value)
{ {
@ -1034,27 +1036,13 @@ class uiinfolog
'info_priority' => $this->bo->enums['priority'], 'info_priority' => $this->bo->enums['priority'],
'info_confirm' => $this->bo->enums['confirm'], 'info_confirm' => $this->bo->enums['confirm'],
'info_status' => $this->bo->status[$content['info_type']] 'info_status' => $this->bo->status[$content['info_type']]
),$readonlys,array( // preserved values ),$readonlys,$preserv+array( // preserved values
'info_id' => $info_id, 'info_id' => $info_id,
'info_id_parent'=> $content['info_id_parent'],
'info_link_id' => $content['info_link_id'],
'info_owner' => $content['info_owner'],
'info_datemodified' => $content['info_datemodified'],
'info_modifier' => $content['info_modifier'],
'action' => $action, 'action' => $action,
'action_id' => $action_id, 'action_id' => $action_id,
'referer' => $referer, 'referer' => $referer,
'no_popup' => $no_popup, 'no_popup' => $no_popup,
'link_to' => array('to_id' => $content['link_to']['to_id']), // in case tab gets not viewed
'blur_title' => $content['blur_title'],
'old_pm_id' => $old_pm_id, 'old_pm_id' => $old_pm_id,
// preserv project fields, in case project tab is disabled, but user has rights to edit the entry
'pl_id' => $content['pl_id'],
'info_price' => $content['info_price'],
'info_used_time' => $content['info_used_time'],
'info_planned_time' => $content['info_planned_time'],
// preserve the type in case it's readonly (no delete rights from group owner)
'info_type' => $content['info_type'],
),$no_popup ? 0 : 2); ),$no_popup ? 0 : 2);
} }
@ -1195,7 +1183,7 @@ class uiinfolog
* 2. with $_GET['uid] = someuid (we come from display mail) * 2. with $_GET['uid] = someuid (we come from display mail)
* *
* @author Cornelius Weiss <nelius@cwtech.de> * @author Cornelius Weiss <nelius@cwtech.de>
* @param unknown_type $_to_emailAddress * @param string $_to_emailAddress
* @param string $_subject * @param string $_subject
* @param string $_body * @param string $_body
* @param array $_attachments * @param array $_attachments