holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure ca(rd|l)dav_name never get copied

Browse Source
This commit is contained in:
Ralf Becker 2011-04-07 07:28:46 +00:00
parent 9ba77ce164
commit c443126893
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1,11 +1,11 @@
<?php
/**
* Addressbook - user interface
* EGroupware - Addressbook - user interface
*
* @link www.egroupware.org
* @author Cornelius Weiss <egw@von-und-zu-weiss.de>
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005-11 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005/6 by Cornelius Weiss <egw@von-und-zu-weiss.de>
* @package addressbook
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
@ -222,7 +222,7 @@ class addressbook_ui extends addressbook_bo
'manual' => $do_email ? ' ' : false, // space for the manual icon
);
$csv_export = new addressbook_csv($this);
$content['nm']['csv_fields'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] ?
$content['nm']['csv_fields'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] ?
$GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] :
$csv_export->csv_fields(null,true);
@ -1475,7 +1475,7 @@ class addressbook_ui extends addressbook_bo
// create a new contact with the content of the old
foreach($content as $key => $value)
{
if(!in_array($key, self::$copy_fields) || in_array($key, array('etag')))
if(!in_array($key, self::$copy_fields) || in_array($key, array('etag','carddav_name','uid')))
{
unset($content[$key]);
}

5
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1,11 +1,11 @@
<?php
/**
* eGroupWare - Calendar's forms of the UserInterface
* EGroupware - Calendar's forms of the UserInterface
*
* @link http://www.egroupware.org
* @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2004-10 by RalfBecker-At-outdoor-training.de
* @copyright (c) 2004-11 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
@ -479,6 +479,7 @@ class calendar_uiforms extends calendar_ui
unset($event['edit_single']); // in case it has been set
unset($event['modified']);
unset($event['modifier']);
unset($event['caldav_name']);
$event['owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
// Clear participant stati