diff --git a/conf/default.php b/conf/default.php index 7083be4..a910ecb 100644 --- a/conf/default.php +++ b/conf/default.php @@ -4,11 +4,11 @@ * FIXED by Simon Delage on 2014-08-30 */ -$conf['use_name_string'] = 0; // use name string instead of login string for the user's ns -$conf['use_start_page'] = 1; // use state page instead of namespace string for home page -$conf['set_permissions'] = 1; // configure acl's +$conf['use_name_string'] = 0; +$conf['use_start_page'] = 1; +$conf['set_permissions'] = 1; $conf['set_permissions_others'] = '0'; -$conf['templatepath'] = 'lib/plugins/userhomepage/_template.txt'; // the location of the template file -$conf['users_namespace'] = 'people'; // namespace storing the user namespaces -$conf['group_by_name'] = 1; // use the first character of name to group people -$conf['edit_before_create'] = 1; // allow users to edit their home pages before create +$conf['templatepath'] = 'lib/plugins/userhomepage/_template.txt'; +$conf['users_namespace'] = 'user'; +$conf['group_by_name'] = 1; +$conf['edit_before_create'] = 1; diff --git a/conf/metadata.php b/conf/metadata.php index 49b273c..dd6e37f 100644 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -4,11 +4,11 @@ * FIXED by Simon Delage on 2014-08-30 */ -$meta['use_name_string'] = array('onoff'); // use name string instead of login string for the user's namespace -$meta['use_start_page'] = array('onoff'); // use start page instead of namespace string for home page -$meta['set_permissions'] = array('onoff'); // configure permissions -$meta['set_permissions_others'] = array('multichoice','_choices'=>array('0','1','2','4','8','16')); // if enable set permission, what permission for other people? -$meta['templatepath'] = array('string','_pattern' => '/^(|[a-zA-Z\-]+)$/'); // the location of the template file -$meta['users_namespace'] = array('string','_pattern' => '/^(|[a-zA-Z\-:]+)$/'); // the namespace containing user directories -$meta['group_by_name'] = array('onoff'); // group people by the first character of name -$meta['edit_before_create'] = array('onoff'); // allow users to edit their home page before create. +$meta['use_name_string'] = array('onoff'); +$meta['use_start_page'] = array('onoff'); +$meta['set_permissions'] = array('onoff'); +$meta['set_permissions_others'] = array('multichoice','_choices'=>array('0','1','2','4','8','16')); +$meta['templatepath'] = array('string','_pattern' => '/^(|[a-zA-Z\-]+)$/'); +$meta['users_namespace'] = array('string','_pattern' => '/^(|[a-zA-Z\-:]+)$/'); +$meta['group_by_name'] = array('onoff'); +$meta['edit_before_create'] = array('onoff'); diff --git a/lang/en/settings.php b/lang/en/settings.php index c231072..f1a6cf4 100644 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -5,10 +5,10 @@ * FIXED by Simon Delage on 2014-08-30 */ -$lang['use_name_string'] = 'Use names strings for the user\'s namespace (alt. login strings).'; -$lang['use_start_page'] = 'Use the wiki\'s start page string instead of the user\'s namespace string for the home page.'; -$lang['set_permissions'] = 'Configure acl\'s to permit user full access to their home namespace.'; -$lang['set_permissions_others'] = 'If set permission enabled, what permission for other people?'; +$lang['use_name_string'] = 'Use user\'s full name instead of login for his namespace.'; +$lang['use_start_page'] = 'Use the wiki\'s start page string instead of the user\'s namespace name set above for the home page of his namespace (This option is kept for backward compatibiliyt but should be left enabled).'; +$lang['set_permissions'] = 'Automatically configure acl for user\'s namespace.'; +$lang['set_permissions_others'] = 'If set permission is enabled, what permission for other people (both @ALL and @user groups)?'; $lang['set_permissions_others_o_0'] = 'None'; $lang['set_permissions_others_o_1'] = 'Read'; $lang['set_permissions_others_o_2'] = 'Edit'; @@ -16,6 +16,6 @@ $lang['set_permissions_others_o_4'] = 'Create'; $lang['set_permissions_others_o_8'] = 'Upload'; $lang['set_permissions_others_o_16'] = 'Delete'; $lang['templatepath'] = 'Doku relative path to the template file.'; -$lang['users_namespace'] = 'Namespace under which user namespaces are created.'; -$lang['group_by_name'] = 'Group home pages by the first character of user name?'; -$lang['edit_before_create'] = 'Allow users to edit their home pages before create'; +$lang['users_namespace'] = 'Namespace under which user namespaces are created (can be anything without messing up with Dokuwiki default behaviour, previous default was "people" but "user" makes more sense).'; +$lang['group_by_name'] = 'Group users\' namespaces by the first character of user name?'; +$lang['edit_before_create'] = 'Allow users to edit their namespace start page before create';