diff --git a/plugins/calendar/config.inc.php.dist b/plugins/calendar/config.inc.php.dist index c3cdea3f..5ac25f6b 100644 --- a/plugins/calendar/config.inc.php.dist +++ b/plugins/calendar/config.inc.php.dist @@ -26,17 +26,17 @@ */ // backend type (database, google, kolab) -$rcmail_config['calendar_driver'] = "database"; +$config['calendar_driver'] = "database"; // default calendar view (agendaDay, agendaWeek, month) -$rcmail_config['calendar_default_view'] = "agendaWeek"; +$config['calendar_default_view'] = "agendaWeek"; // show a birthdays calendar from the user's address book(s) -$rcmail_config['calendar_contact_birthdays'] = false; +$config['calendar_contact_birthdays'] = false; // mapping of Roundcube date formats to calendar formats (long/short/agenda) // should be in sync with 'date_formats' in main config -$rcmail_config['calendar_date_format_sets'] = array( +$config['calendar_date_format_sets'] = array( 'yyyy-MM-dd' => array('MMM d yyyy', 'M-d', 'ddd MM-dd'), 'dd-MM-yyyy' => array('d MMM yyyy', 'd-M', 'ddd dd-MM'), 'yyyy/MM/dd' => array('MMM d yyyy', 'M/d', 'ddd MM/dd'), @@ -47,59 +47,59 @@ $rcmail_config['calendar_date_format_sets'] = array( ); // general date format (only set if different from default date format and not user configurable) -// $rcmail_config['calendar_date_format'] = "yyyy-MM-dd"; +// $config['calendar_date_format'] = "yyyy-MM-dd"; // time format (only set if different from default date format) -// $rcmail_config['calendar_time_format'] = "HH:mm"; +// $config['calendar_time_format'] = "HH:mm"; // short date format (used for column titles) -// $rcmail_config['calendar_date_short'] = 'M-d'; +// $config['calendar_date_short'] = 'M-d'; // long date format (used for calendar title) -// $rcmail_config['calendar_date_long'] = 'MMM d yyyy'; +// $config['calendar_date_long'] = 'MMM d yyyy'; // date format used for agenda view -// $rcmail_config['calendar_date_agenda'] = 'ddd MM-dd'; +// $config['calendar_date_agenda'] = 'ddd MM-dd'; // timeslots per hour (1, 2, 3, 4, 6) -$rcmail_config['calendar_timeslots'] = 2; +$config['calendar_timeslots'] = 2; // show this number of days in agenda view -$rcmail_config['calendar_agenda_range'] = 60; +$config['calendar_agenda_range'] = 60; // first day of the week (0-6) -$rcmail_config['calendar_first_day'] = 1; +$config['calendar_first_day'] = 1; // first hour of the calendar (0-23) -$rcmail_config['calendar_first_hour'] = 6; +$config['calendar_first_hour'] = 6; // working hours begin -$rcmail_config['calendar_work_start'] = 6; +$config['calendar_work_start'] = 6; // working hours end -$rcmail_config['calendar_work_end'] = 18; +$config['calendar_work_end'] = 18; // show line at current time of the day -$rcmail_config['calendar_time_indicator'] = true; +$config['calendar_time_indicator'] = true; // default alarm settings for new events. // this is only a preset when a new event dialog opens // possible values are , DISPLAY, EMAIL -$rcmail_config['calendar_default_alarm_type'] = ''; +$config['calendar_default_alarm_type'] = ''; // default alarm offset for new events. // use ical-style offset values like "-1H" (one hour before) or "+30M" (30 minutes after) -$rcmail_config['calendar_default_alarm_offset'] = '-15M'; +$config['calendar_default_alarm_offset'] = '-15M'; // how to colorize events: // 0: according to calendar color // 1: according to category color // 2: calendar for outer, category for inner color // 3: category for outer, calendar for inner color -$rcmail_config['calendar_event_coloring'] = 0; +$config['calendar_event_coloring'] = 0; // event categories -$rcmail_config['calendar_categories'] = array( +$config['calendar_categories'] = array( 'Personal' => 'c0c0c0', 'Work' => 'ff0000', 'Family' => '00ff00', @@ -107,28 +107,28 @@ $rcmail_config['calendar_categories'] = array( ); // enable users to invite/edit attendees for shared events organized by others -$rcmail_config['calendar_allow_invite_shared'] = false; +$config['calendar_allow_invite_shared'] = false; // allow users to accecpt iTip invitations who are no explicitly listed as attendee. // this can be the case if invitations are sent to mailing lists or alias email addresses. -$rcmail_config['calendar_allow_itip_uninvited'] = true; +$config['calendar_allow_itip_uninvited'] = true; // enable asynchronous free-busy triggering after data changed -$rcmail_config['calendar_freebusy_trigger'] = false; +$config['calendar_freebusy_trigger'] = false; // SMTP server host used to send (anonymous) itip messages. // Set to '' in order to use PHP's mail() function for email delivery. // To override the SMTP port or connection method, provide a full URL like 'tls://somehost:587' -$rcmail_config['calendar_itip_smtp_server'] = null; +$config['calendar_itip_smtp_server'] = null; // SMTP username used to send (anonymous) itip messages -$rcmail_config['calendar_itip_smtp_user'] = 'smtpauth'; +$config['calendar_itip_smtp_user'] = 'smtpauth'; // SMTP password used to send (anonymous) itip messages -$rcmail_config['calendar_itip_smtp_pass'] = '123456'; +$config['calendar_itip_smtp_pass'] = '123456'; // show virtual invitation calendars (Kolab driver only) -$rcmail_config['kolab_invitation_calendars'] = true; +$config['kolab_invitation_calendars'] = true; // Base URL to build fully qualified URIs to access calendars via CALDAV // The following replacement variables are supported: @@ -136,14 +136,14 @@ $rcmail_config['kolab_invitation_calendars'] = true; // %u - Current webmail user name // %n - Calendar name // %i - Calendar UUID -// $rcmail_config['calendar_caldav_url'] = 'http://%h/iRony/calendars/%u/%i'; +// $config['calendar_caldav_url'] = 'http://%h/iRony/calendars/%u/%i'; // Driver to provide a resource directory ('ldap' is the only implementation yet). // Leave empty or commented to disable resources support. -// $rcmail_config['calendar_resources_driver'] = 'ldap'; +// $config['calendar_resources_driver'] = 'ldap'; // LDAP directory configuration to find avilable resources for events -// $rcmail_config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */); +// $config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */); // Action taken after iTip request is handled. Possible values: // 0 - no action @@ -151,6 +151,6 @@ $rcmail_config['kolab_invitation_calendars'] = true; // 2 - delete the message // 3 - flag as deleted // folder_name - move the message to the specified folder -$rcmail_config['calendar_itip_after_action'] = 0; +$config['calendar_itip_after_action'] = 0; ?> diff --git a/plugins/kolab_addressbook/config.inc.php.dist b/plugins/kolab_addressbook/config.inc.php.dist index f53f0c7a..4abebb52 100644 --- a/plugins/kolab_addressbook/config.inc.php.dist +++ b/plugins/kolab_addressbook/config.inc.php.dist @@ -1,15 +1,13 @@ diff --git a/plugins/kolab_auth/config.inc.php.dist b/plugins/kolab_auth/config.inc.php.dist index 785fb78e..57ee79cc 100644 --- a/plugins/kolab_auth/config.inc.php.dist +++ b/plugins/kolab_auth/config.inc.php.dist @@ -13,48 +13,48 @@ // With this %dc variable in base_dn and groups/base_dn will be // replaced with DN string of resolved domain //--------------------------------------------------------------------- -$rcmail_config['kolab_auth_addressbook'] = ''; +$config['kolab_auth_addressbook'] = ''; // This will overwrite defined filter -$rcmail_config['kolab_auth_filter'] = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(alias=%fu)))'; +$config['kolab_auth_filter'] = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(alias=%fu)))'; // Use this fields (from fieldmap configuration) to get authentication ID -$rcmail_config['kolab_auth_login'] = 'email'; +$config['kolab_auth_login'] = 'email'; // Use this fields (from fieldmap configuration) for default identity. // If the value array contains more than one field, first non-empty will be used // Note: These aren't LDAP attributes, but field names in config // Note: If there's more than one email address, as many identities will be created -$rcmail_config['kolab_auth_name'] = array('name', 'cn'); -$rcmail_config['kolab_auth_email'] = array('email'); -$rcmail_config['kolab_auth_organization'] = array('organization'); +$config['kolab_auth_name'] = array('name', 'cn'); +$config['kolab_auth_email'] = array('email'); +$config['kolab_auth_organization'] = array('organization'); // Template for user names displayed in the UI. // You can use all attributes from the 'fieldmap' property of the 'kolab_auth_addressbook' configuration -$rcmail_config['kolab_auth_user_displayname'] = '{name} ({ou})'; +$config['kolab_auth_user_displayname'] = '{name} ({ou})'; // Login and password of the admin user. Enables "Login As" feature. -$rcmail_config['kolab_auth_admin_login'] = ''; -$rcmail_config['kolab_auth_admin_password'] = ''; +$config['kolab_auth_admin_login'] = ''; +$config['kolab_auth_admin_password'] = ''; // Enable audit logging for abuse of administrative privileges. -$rcmail_config['kolab_auth_auditlog'] = false; +$config['kolab_auth_auditlog'] = false; // Role field (from fieldmap configuration) -$rcmail_config['kolab_auth_role'] = 'role'; +$config['kolab_auth_role'] = 'role'; // The required value for the role attribute to contain should the user be allowed // to login as another user. -$rcmail_config['kolab_auth_role_value'] = ''; +$config['kolab_auth_role_value'] = ''; // Administrative group name to which user must be assigned to // which adds privilege to login as another user. -$rcmail_config['kolab_auth_group'] = ''; +$config['kolab_auth_group'] = ''; // Enable plugins on a role-by-role basis. In this example, the 'acl' plugin // is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role. // // Note that this does NOT mean the 'acl' plugin is disabled for other people. -$rcmail_config['kolab_auth_role_plugins'] = Array( +$config['kolab_auth_role_plugins'] = Array( 'cn=professional-user,dc=mykolab,dc=ch' => Array( 'acl', ), @@ -66,7 +66,7 @@ $rcmail_config['kolab_auth_role_plugins'] = Array( // do not allow the setting to be controlled through the preferences, enable the // html editor for professional users and allow them to override the setting in // the preferences. -$rcmail_config['kolab_auth_role_settings'] = Array( +$config['kolab_auth_role_settings'] = Array( 'cn=professional-user,dc=mykolab,dc=ch' => Array( 'htmleditor' => Array( 'mode' => 'override', @@ -79,6 +79,6 @@ $rcmail_config['kolab_auth_role_settings'] = Array( // List of LDAP addressbooks (keys of ldap_public configuration array) // for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN // Note: special name '*' for all LDAP addressbooks -$rcmail_config['kolab_auth_ldap_addressbooks'] = array('*'); +$config['kolab_auth_ldap_addressbooks'] = array('*'); ?> diff --git a/plugins/kolab_delegation/config.inc.php.dist b/plugins/kolab_delegation/config.inc.php.dist index 679cf00a..efa47e60 100644 --- a/plugins/kolab_delegation/config.inc.php.dist +++ b/plugins/kolab_delegation/config.inc.php.dist @@ -2,27 +2,27 @@ // This will overwrite defined LDAP filter // Note: LDAP addressbook defined for kolab_auth plugin is used -$rcmail_config['kolab_delegation_filter'] = '(objectClass=kolabInetOrgPerson)'; +$config['kolab_delegation_filter'] = '(objectClass=kolabInetOrgPerson)'; // Delegates field (from fieldmap configuration) to get delegates list // Note: This is a field name, not LDAP attribute name // Note: LDAP addressbook defined for kolab_auth plugin is used -$rcmail_config['kolab_delegation_delegate_field'] = 'kolabDelegate'; +$config['kolab_delegation_delegate_field'] = 'kolabDelegate'; // User authentication ID field (from fieldmap configuration) // See kolab_auth plugin config -$rcmail_config['kolab_delegation_login_field'] = 'email'; +$config['kolab_delegation_login_field'] = 'email'; // Use this fields (from fieldmap configuration) for identities // If the value array contains more than one field, first non-empty will be used // Note: These aren't LDAP attributes, but field names in config // Note: If there's more than one email address, as many identities will be created // See kolab_auth plugin config -$rcmail_config['kolab_delegation_name_field'] = array('name', 'cn'); -$rcmail_config['kolab_delegation_email_field'] = array('email'); +$config['kolab_delegation_name_field'] = array('name', 'cn'); +$config['kolab_delegation_email_field'] = array('email'); // Remove all user identities which do not match the user's primary or alias // addresses and delegator's addresses -$rcmail_config['kolab_delegation_purge_identities'] = false; +$config['kolab_delegation_purge_identities'] = false; ?> diff --git a/plugins/kolab_files/config.inc.php.dist b/plugins/kolab_files/config.inc.php.dist index fd3016bb..c05ed1de 100644 --- a/plugins/kolab_files/config.inc.php.dist +++ b/plugins/kolab_files/config.inc.php.dist @@ -1,18 +1,18 @@ diff --git a/plugins/kolab_folders/config.inc.php.dist b/plugins/kolab_folders/config.inc.php.dist index ffa1e15d..0c9bd126 100644 --- a/plugins/kolab_folders/config.inc.php.dist +++ b/plugins/kolab_folders/config.inc.php.dist @@ -7,32 +7,30 @@ // Note: Mail folders will be also subscribed. // Default Configuration folder -$rcmail_config['kolab_folders_configuration_default'] = ''; +$config['kolab_folders_configuration_default'] = ''; // Default Calendar folder -$rcmail_config['kolab_folders_event_default'] = ''; +$config['kolab_folders_event_default'] = ''; // Default Contacts (Addressbook) folder -$rcmail_config['kolab_folders_contact_default'] = ''; +$config['kolab_folders_contact_default'] = ''; // Default Tasks folder -$rcmail_config['kolab_folders_task_default'] = ''; +$config['kolab_folders_task_default'] = ''; // Default Notes folder -$rcmail_config['kolab_folders_note_default'] = ''; +$config['kolab_folders_note_default'] = ''; // Default Journal folder -$rcmail_config['kolab_folders_journal_default'] = ''; +$config['kolab_folders_journal_default'] = ''; // Default Files folder -$rcmail_config['kolab_folders_file_default'] = ''; +$config['kolab_folders_file_default'] = ''; // Default FreeBusy folder -$rcmail_config['kolab_folders_freebusy_default'] = ''; +$config['kolab_folders_freebusy_default'] = ''; // INBOX folder -$rcmail_config['kolab_folders_mail_inbox'] = ''; +$config['kolab_folders_mail_inbox'] = ''; // Drafts folder -$rcmail_config['kolab_folders_mail_drafts'] = ''; +$config['kolab_folders_mail_drafts'] = ''; // Sent folder -$rcmail_config['kolab_folders_mail_sentitems'] = ''; +$config['kolab_folders_mail_sentitems'] = ''; // Trash folder -$rcmail_config['kolab_folders_mail_wastebasket'] = ''; +$config['kolab_folders_mail_wastebasket'] = ''; // Others folders -$rcmail_config['kolab_folders_mail_outbox'] = ''; -$rcmail_config['kolab_folders_mail_junkemail'] = ''; - -?> +$config['kolab_folders_mail_outbox'] = ''; +$config['kolab_folders_mail_junkemail'] = ''; diff --git a/plugins/libkolab/config.inc.php.dist b/plugins/libkolab/config.inc.php.dist index b043bb72..79d2aa84 100644 --- a/plugins/libkolab/config.inc.php.dist +++ b/plugins/libkolab/config.inc.php.dist @@ -3,56 +3,56 @@ /* Configuration for libkolab */ // Enable caching of Kolab objects in local database -$rcmail_config['kolab_cache'] = true; +$config['kolab_cache'] = true; // Specify format version to write Kolab objects (must be a string value!) -$rcmail_config['kolab_format_version'] = '3.0'; +$config['kolab_format_version'] = '3.0'; // Optional override of the URL to read and trigger Free/Busy information of Kolab users // Defaults to https:///freebusy -$rcmail_config['kolab_freebusy_server'] = 'https:///'; +$config['kolab_freebusy_server'] = null; // Enables listing of only subscribed folders. This e.g. will limit // folders in calendar view or available addressbooks -$rcmail_config['kolab_use_subscriptions'] = false; +$config['kolab_use_subscriptions'] = false; // List any of 'personal','shared','other' namespaces to be excluded from groupware folder listing // example: array('other'); -$rcmail_config['kolab_skip_namespace'] = null; +$config['kolab_skip_namespace'] = null; // Enables the use of displayname folder annotations as introduced in KEP:? // for displaying resource folder names (experimental!) -$rcmail_config['kolab_custom_display_names'] = false; +$config['kolab_custom_display_names'] = false; // Configuration of HTTP requests. // See http://pear.php.net/manual/en/package.http.http-request2.config.php // for list of supported configuration options (array keys) -$rcmail_config['kolab_http_request'] = array(); +$config['kolab_http_request'] = array(); // When kolab_cache is enabled Roundcube's messages cache will be redundant // when working on kolab folders. Here we can: // 2 - bypass messages/indexes cache completely // 1 - bypass only messages, but use index cache -$rcmail_config['kolab_messages_cache_bypass'] = 0; +$config['kolab_messages_cache_bypass'] = 0; // LDAP directory to find avilable users for folder sharing. // Either contains an array with LDAP addressbook configuration or refers to entry in $config['ldap_public']. // If not specified, the configuraton from 'kolab_auth_addressbook' will be used. -$rcmail_config['kolab_users_directory'] = null; +$config['kolab_users_directory'] = null; // Filter to be used for resolving user folders in LDAP. // Defaults to the 'kolab_auth_filter' configuration option. -$rcmail_config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))'; +$config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))'; // Which property of the LDAP user record to use for user folder mapping in IMAP. // Defaults to the 'kolab_auth_login' configuration option. -$rcmail_config['kolab_users_id_attrib'] = null; +$config['kolab_users_id_attrib'] = null; // Use these attributes when searching users in LDAP -$rcmail_config['kolab_users_search_attrib'] = array('cn','mail','alias'); +$config['kolab_users_search_attrib'] = array('cn','mail','alias'); // JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects -$rcmail_config['kolab_bonnie_api'] = array( +$config['kolab_bonnie_api'] = array( 'uri' => 'https://:8080/api/rpc', 'user' => 'webclient', 'pass' => 'Welcome2KolabSystems', diff --git a/plugins/owncloud/config.inc.php.dist b/plugins/owncloud/config.inc.php.dist index 3d1f2ac7..448c6647 100644 --- a/plugins/owncloud/config.inc.php.dist +++ b/plugins/owncloud/config.inc.php.dist @@ -1,8 +1,8 @@ '; +$config['owncloud_secret'] = '';