extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed calendar-preference "color for Apple iCal", as it set a single color for all calendars you have access too, storing and returning color set by iCal (untested)

Browse Source
This commit is contained in:
Ralf Becker 2011-11-09 13:23:53 +00:00
parent 684d23326e
commit b0a22dae6a
2 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_hooks.inc.php
View File

@ -413,16 +413,6 @@ class calendar_hooks
'xmlrpc' => True,
'admin' => False
),
'display_color' => array(
'type' => 'input',
'size' => 9,
'label' => 'Select a color for this calendar',
'name' => 'display_color',
'help' => 'The Apple iCal Apps use this color to display events from this calendar.',
'forced' => '#0040A0FF',
'xmlrpc' => True,
'admin' => False
),
'default_private' => array(
'type' => 'check',
'label' => 'Set new events to private',

87
phpgwapi/inc/class.groupdav.inc.php
View File

@ -617,16 +617,6 @@ class groupdav extends HTTP_WebDAV_Server
$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
}
if (strlen($user_preferences['calendar']['display_color']) == 9 &&
$user_preferences['calendar']['display_color'][0] == '#')
{
$display_color = $user_preferences['calendar']['display_color'];
}
else
{
$display_color = '#0040A0FF';
}
$account = $this->accounts->read($account_lid);
$displayname = translation::convert($account['account_fullname'],translation::charset(),'utf-8');
@ -643,26 +633,27 @@ class groupdav extends HTTP_WebDAV_Server
'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
);
$displayname = translation::convert(lang($app).' '.
common::grab_owner_name($user),$this->egw_charset,'utf-8');
switch ($app)
{
case 'calendar':
$props['calendar-color'] = self::mkprop(groupdav::ICAL,'calendar-color',$display_color);
break;
case 'infolog':
break;
case 'inbox':
$displayname = lang('Scheduling inbox').' '.common::grab_owner_name($user);
$props['displayname'] = lang('Scheduling inbox').' '.common::grab_owner_name($user);
break;
case 'outbox':
$displayname = lang('Scheduling outbox').' '.common::grab_owner_name($user);
$props['displayname'] = lang('Scheduling outbox').' '.common::grab_owner_name($user);
break;
default:
$displayname = translation::convert(lang($app).' '.
common::grab_owner_name($user),$this->egw_charset,'utf-8');
$props['displayname'] = translation::convert(lang($app).' '.common::grab_owner_name($user),$this->egw_charset,'utf-8');
}
// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
{
list($prop,$prop4user) = explode(':', $name);
if ($prop4user == $user && isset(self::$proppatch_props[$prop]))
{
$props[$prop] = self::mkprop(self::$proppatch_props[$prop], $prop, $value);
}
}
$props['displayname'] = $displayname;
foreach((array)$this->root[$app] as $prop => $values)
{
@ -987,6 +978,58 @@ class groupdav extends HTTP_WebDAV_Server
return '501 Not Implemented';
}
/**
* props modifyable via proppatch from client, eg. calendar-color
*
* @var array name => namespace pairs
*/
static $proppatch_props = array(
'displayname' => self::DAV,
'calendar-description' => self::CALDAV,
'calendar-color' => self::ICAL,
'calendar-order' => self::ICAL,
);
/**
* PROPPATCH method handler
*
* @param array general parameter passing array
* @return mixed boolean true on success, false on failure or string with http status (eg. '404 Not Found')
*/
function PROPPATCH(&$options)
{
if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
// parse path in form [/account_lid]/app[/more]
if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix))
{
if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
return '404 Not Found';
}
/* allow handlers to implement own proppatch handler
if (($handler = self::app_handler($app)) && method_exists($handler, 'proppatch'))
{
return $handler->proppatch($options, $user);
}*/
// store selected props in preferences, eg. calendar-color, see self::$proppatch_props
foreach($options['props'] as $prop)
{
if (isset(self::$proppatch_props[$prop['name']]))
{
$GLOBALS['egw']->preferences->add($app, $prop['name'].':'.$user, $prop['val']);
$need_save = true;
}
}
if ($need_save)
{
$GLOBALS['egw']->preferences->save_repository();
return ''; // this is as the filesystem example handler does it, no true or false ...
}
return '501 Not Implemented';
}
/**
* PUT method handler
*