extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fixed not disabled delete-button for new entries or if no delete-right

Browse Source 
- fixed wrong calculation of the daystart if tz_offset != 0
This commit is contained in:
Ralf Becker 2005-12-19 04:11:42 +00:00
parent 1d96eeb3f6
commit 5cc111744f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,7 +578,6 @@
$action_id = $action_id ? $action_id : get_var('action_id',array('POST','GET')); $action_id = $action_id ? $action_id : get_var('action_id',array('POST','GET'));
$info_id = $content ? $content : get_var('info_id', array('POST','GET')); $info_id = $content ? $content : get_var('info_id', array('POST','GET'));
$type = $type ? $type : get_var('type', array('POST','GET')); $type = $type ? $type : get_var('type', array('POST','GET'));
$cat_id = get_var('cat_id',array('POST','GET'),0);
$ref=$referer = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] : $ref=$referer = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
$GLOBALS['egw']->common->get_referer('/index.php?menuaction=infolog.uiinfolog.index')); $GLOBALS['egw']->common->get_referer('/index.php?menuaction=infolog.uiinfolog.index'));
$referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer); // remove previou/old msg from referer $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer); // remove previou/old msg from referer
@ -591,7 +590,8 @@
{ {
$content['info_cat'] = (int) $_REQUEST['cat_id']; $content['info_cat'] = (int) $_REQUEST['cat_id'];
} }
$today = mktime(-$this->bo->tz_offset,0,0,date('m'),date('d'),date('Y')); // time=00:00 $now = time() + 3600*$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset']; // time() is server-time and we need a user-time
$today = mktime(0,0,0,date('m',$now),date('d',$now),date('Y',$now)); // time=00:00
if (intval($content['info_link_id']) > 0 && !$this->link->get_link($content['info_link_id'])) if (intval($content['info_link_id']) > 0 && !$this->link->get_link($content['info_link_id']))
{ {
@ -712,7 +712,7 @@
$content['info_type'] = 'note'; $content['info_type'] = 'note';
} }
} }
if (!($readonlys['delete'] = !$info_id || !$this->bo->check_access($info_id,EGW_ACL_DELETE))) if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id,EGW_ACL_DELETE)))
{ {
$content['info_anz_subs'] = $this->bo->anzSubs($info_id); // to determine js confirmation of delete or not $content['info_anz_subs'] = $this->bo->anzSubs($info_id); // to determine js confirmation of delete or not
} }