Index: trunk/core/module_help/config_list_users.txt
===================================================================
diff -u -N
--- trunk/core/module_help/config_list_users.txt (revision 0)
+++ trunk/core/module_help/config_list_users.txt (revision 4665)
@@ -0,0 +1,14 @@
+This section allows the administrator to define the default values for various community settings.
+
+- Allow new user registration � this flag sets the user registration mode for the system. � Instant' setting will allow the visitors to register and become users automatically. This is useful for the web sites will a large amount of users, whose administrators do not want to control each individual user.
+
- Minimum user name length � this field sets the minimum user name length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
+
- Minimum password length � this field sets the minimum password length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
+
- Assign registered users to group � this dropdown allows to select the default group, to which all newly registered users are assigned.
+
- Assign users not logged in to group - this dropdown allows to select the default group, which manages permissions for all guests � site visitors who have not logged in.
+
- Assign mailing list subscribers to group - this dropdown allows to select the default group, to which all of the users who sign up for a mailing list will be assigned.
+
- Assign password automatically - this option will let the In-portal platform automatically generate random passwords for new users, and send them to the user in the registration email. This is a good way to verify the existence of a user's email � if they do not receive the email with the password, they will not be able to log in. The users will be able to set their own password later.
+
- Root Password � this field allows the administrator to change the root user's password. Leave this field blank to keep the existing password. Please remember that root user has the highest-level security access, and that his password cannot be retrieved. Please take extra caution not to forget or disclose this password.
+
- Verify Root Password � this field is used to verify the root password when it is being changed. If the text in this field does not match with the text in the �root password' field, the password will not be changed and an error will occur.
+
- Number of days to deny multiple votes from the same user - this setting controls how often the same user can vote on the same resource or item. For example, if you set it to 3 days, a user will not be able to vote on the same link for 3 days after their first vote.
+
- Number of days to deny multiple reviews from the same user - this setting controls how often the same user can create reviews for the same item. For example, if you set it to 3 days, a user will not be able to create a new review for the same link for 3 days after their first one.
+
\ No newline at end of file
Index: trunk/admin/icons/icon46_user_settings.gif
===================================================================
diff -u -N -r13 -r4665
Binary files differ
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4663)
+++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 4665)
@@ -100,7 +100,7 @@
'parent' => 'in-portal:site',
'icon' => 'cat_settings',
'label' => 'la_tab_Settings',
- 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
'priority' => 4,
'type' => stTREE,
Index: trunk/core/units/admin/admin_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4663)
+++ trunk/core/units/admin/admin_config.php (.../admin_config.php) (revision 4665)
@@ -107,7 +107,7 @@
'parent' => 'in-portal:system',
'icon' => 'conf_general',
'label' => 'la_tab_General',
- 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view'),
'priority' => 1,
'type' => stTREE,
Index: trunk/core/module_help/config_list_categories.txt
===================================================================
diff -u -N
--- trunk/core/module_help/config_list_categories.txt (revision 0)
+++ trunk/core/module_help/config_list_categories.txt (revision 4665)
@@ -0,0 +1,12 @@
+This section allows the administrator to define the default values for various In-portal platform settings.
+
+ - Order categories by � this setting specifies the default primary sort order for category listings. It applies both on the front end, and in the administrative console � in the catalog. The first dropdown allows to select the field (an attribute of the category element), and the second dropdown � the direction.
+
- And then by � this setting specifies the default secondary sort order. It is set in the same way as the primary, and used when the primary order values are ambiguous. For example, when the primary sort value is �Category Name', the secondary order will be used to sort among categories with the same name.
+
- Number of categories per page � specifies the default number of categories shown per page. This value applies both to the front end and to the administrative console. In the latter, this value can be changed for each session through the View menu.
+
- Categories Per Page (Shortlist) � this setting is similar to the � Number of categories per page', but it applies to the front end, short category lists only. It can be overridden by setting the tag attributes in the appropriate templates.
+
- Number of days for a cat. to be NEW � specifies the number of days, from the date of creation, during which the category will be automatically marked �New' by the system. This setting will only apply to the categories with the �New' flag set to �Automatic'.
+
- Display editor PICKs above regular categories � this setting will force all categories, marked as �Editor's pick' to be displayed above the other categories, regardless of their priority or sort order. Among themselves, �Editor's pick' categories will be sorted according to the regular rules.
+
- Root category name (language variable) � this setting specifies the name of the language variable which contains the name of the root category. By default, the root category name is �Home' in English, and the label name is �lu_rootcategory_name'. There is rarely a need to change the name of the variable � since the name of the category itself can be simply changed by changing the value of the variable.
+
- Default META Keywords � this field contains the default META keywords value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
+
- Default META description - this field contains the default META description value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
+
\ No newline at end of file
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4663)
+++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 4665)
@@ -100,7 +100,7 @@
'parent' => 'in-portal:site',
'icon' => 'cat_settings',
'label' => 'la_tab_Settings',
- 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
'priority' => 4,
'type' => stTREE,
Index: trunk/kernel/units/admin/admin_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4663)
+++ trunk/kernel/units/admin/admin_config.php (.../admin_config.php) (revision 4665)
@@ -107,7 +107,7 @@
'parent' => 'in-portal:system',
'icon' => 'conf_general',
'label' => 'la_tab_General',
- 'url' => Array('index_file' => 'config/edit_config.php', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view'),
'priority' => 1,
'type' => stTREE,
Index: trunk/kernel/module_help/config_list_categories.txt
===================================================================
diff -u -N
--- trunk/kernel/module_help/config_list_categories.txt (revision 0)
+++ trunk/kernel/module_help/config_list_categories.txt (revision 4665)
@@ -0,0 +1,12 @@
+This section allows the administrator to define the default values for various In-portal platform settings.
+
+ - Order categories by � this setting specifies the default primary sort order for category listings. It applies both on the front end, and in the administrative console � in the catalog. The first dropdown allows to select the field (an attribute of the category element), and the second dropdown � the direction.
+
- And then by � this setting specifies the default secondary sort order. It is set in the same way as the primary, and used when the primary order values are ambiguous. For example, when the primary sort value is �Category Name', the secondary order will be used to sort among categories with the same name.
+
- Number of categories per page � specifies the default number of categories shown per page. This value applies both to the front end and to the administrative console. In the latter, this value can be changed for each session through the View menu.
+
- Categories Per Page (Shortlist) � this setting is similar to the � Number of categories per page', but it applies to the front end, short category lists only. It can be overridden by setting the tag attributes in the appropriate templates.
+
- Number of days for a cat. to be NEW � specifies the number of days, from the date of creation, during which the category will be automatically marked �New' by the system. This setting will only apply to the categories with the �New' flag set to �Automatic'.
+
- Display editor PICKs above regular categories � this setting will force all categories, marked as �Editor's pick' to be displayed above the other categories, regardless of their priority or sort order. Among themselves, �Editor's pick' categories will be sorted according to the regular rules.
+
- Root category name (language variable) � this setting specifies the name of the language variable which contains the name of the root category. By default, the root category name is �Home' in English, and the label name is �lu_rootcategory_name'. There is rarely a need to change the name of the variable � since the name of the category itself can be simply changed by changing the value of the variable.
+
- Default META Keywords � this field contains the default META keywords value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
+
- Default META description - this field contains the default META description value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
+
\ No newline at end of file
Index: trunk/admin/icons/icon46_cat_settings.gif
===================================================================
diff -u -N -r13 -r4665
Binary files differ
Index: trunk/kernel/admin/include/help/configure_categories.txt
===================================================================
diff -u -N
--- trunk/kernel/admin/include/help/configure_categories.txt (revision 49)
+++ trunk/kernel/admin/include/help/configure_categories.txt (revision 0)
@@ -1,12 +0,0 @@
-This section allows the administrator to define the default values for various In-portal platform settings.
-
- - Order categories by � this setting specifies the default primary sort order for category listings. It applies both on the front end, and in the administrative console � in the catalog. The first dropdown allows to select the field (an attribute of the category element), and the second dropdown � the direction.
-
- And then by � this setting specifies the default secondary sort order. It is set in the same way as the primary, and used when the primary order values are ambiguous. For example, when the primary sort value is �Category Name', the secondary order will be used to sort among categories with the same name.
-
- Number of categories per page � specifies the default number of categories shown per page. This value applies both to the front end and to the administrative console. In the latter, this value can be changed for each session through the View menu.
-
- Categories Per Page (Shortlist) � this setting is similar to the � Number of categories per page', but it applies to the front end, short category lists only. It can be overridden by setting the tag attributes in the appropriate templates.
-
- Number of days for a cat. to be NEW � specifies the number of days, from the date of creation, during which the category will be automatically marked �New' by the system. This setting will only apply to the categories with the �New' flag set to �Automatic'.
-
- Display editor PICKs above regular categories � this setting will force all categories, marked as �Editor's pick' to be displayed above the other categories, regardless of their priority or sort order. Among themselves, �Editor's pick' categories will be sorted according to the regular rules.
-
- Root category name (language variable) � this setting specifies the name of the language variable which contains the name of the root category. By default, the root category name is �Home' in English, and the label name is �lu_rootcategory_name'. There is rarely a need to change the name of the variable � since the name of the category itself can be simply changed by changing the value of the variable.
-
- Default META Keywords � this field contains the default META keywords value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
-
- Default META description - this field contains the default META description value, which is displayed on the home page, or whenever a category does not have them defined. For more information, see the section describing General Category settings - V.2.1.1.1.1 .
-
\ No newline at end of file
Index: trunk/kernel/admin_templates/img/icons/icon46_settings_users.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/core/kernel/globals.php
===================================================================
diff -u -N -r4446 -r4665
--- trunk/core/kernel/globals.php (.../globals.php) (revision 4446)
+++ trunk/core/kernel/globals.php (.../globals.php) (revision 4665)
@@ -479,7 +479,7 @@
if ($module_section) {
// substitute section instead of #section# parameter in title preset name
$module_section = explode(':', $module_section);
- $section = preg_replace('/configuration_(.*)/i', '\\1', $module_section[1]);
+ $section = preg_replace('/(configuration|configure)_(.*)/i', '\\2', $module_section[1]);
$string = str_replace('#section#', strtolower($section), $string);
}
return $string;
Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/core/units/users/users_config.php (.../users_config.php) (revision 4663)
+++ trunk/core/units/users/users_config.php (.../users_config.php) (revision 4665)
@@ -108,7 +108,7 @@
'parent' => 'in-portal:users',
'icon' => 'users_settings',
'label' => 'la_tab_ConfigSettings',
- 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
'priority' => 3,
'type' => stTREE,
Index: trunk/kernel/units/users/users_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4663)
+++ trunk/kernel/units/users/users_config.php (.../users_config.php) (revision 4665)
@@ -108,7 +108,7 @@
'parent' => 'in-portal:users',
'icon' => 'users_settings',
'label' => 'la_tab_ConfigSettings',
- 'url' => Array('index_file' => 'config/edit_config.php', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
+ 'url' => Array('t' => 'config/config_universal', 'module' => 'In-Portal:Users', 'pass_section' => true, 'pass' => 'm'),
'permissions' => Array('view', 'edit'),
'priority' => 3,
'type' => stTREE,
Index: trunk/kernel/admin/include/help/configure_users.txt
===================================================================
diff -u -N
--- trunk/kernel/admin/include/help/configure_users.txt (revision 55)
+++ trunk/kernel/admin/include/help/configure_users.txt (revision 0)
@@ -1,14 +0,0 @@
-This section allows the administrator to define the default values for various community settings.
-
-- Allow new user registration � this flag sets the user registration mode for the system. � Instant' setting will allow the visitors to register and become users automatically. This is useful for the web sites will a large amount of users, whose administrators do not want to control each individual user.
-
- Minimum user name length � this field sets the minimum user name length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
-
- Minimum password length � this field sets the minimum password length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
-
- Assign registered users to group � this dropdown allows to select the default group, to which all newly registered users are assigned.
-
- Assign users not logged in to group - this dropdown allows to select the default group, which manages permissions for all guests � site visitors who have not logged in.
-
- Assign mailing list subscribers to group - this dropdown allows to select the default group, to which all of the users who sign up for a mailing list will be assigned.
-
- Assign password automatically - this option will let the In-portal platform automatically generate random passwords for new users, and send them to the user in the registration email. This is a good way to verify the existence of a user's email � if they do not receive the email with the password, they will not be able to log in. The users will be able to set their own password later.
-
- Root Password � this field allows the administrator to change the root user's password. Leave this field blank to keep the existing password. Please remember that root user has the highest-level security access, and that his password cannot be retrieved. Please take extra caution not to forget or disclose this password.
-
- Verify Root Password � this field is used to verify the root password when it is being changed. If the text in this field does not match with the text in the �root password' field, the password will not be changed and an error will occur.
-
- Number of days to deny multiple votes from the same user - this setting controls how often the same user can vote on the same resource or item. For example, if you set it to 3 days, a user will not be able to vote on the same link for 3 days after their first vote.
-
- Number of days to deny multiple reviews from the same user - this setting controls how often the same user can create reviews for the same item. For example, if you set it to 3 days, a user will not be able to create a new review for the same link for 3 days after their first one.
-
\ No newline at end of file
Index: trunk/core/units/configuration/configuration_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 4663)
+++ trunk/core/units/configuration/configuration_config.php (.../configuration_config.php) (revision 4665)
@@ -22,6 +22,9 @@
'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+
+ 'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+ 'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
),
'TableName' => TABLE_PREFIX.'ConfigurationValues',
Index: trunk/kernel/units/help/help_tag_processor.php
===================================================================
diff -u -N -r4216 -r4665
--- trunk/kernel/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 4216)
+++ trunk/kernel/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 4665)
@@ -27,6 +27,10 @@
{
$module = $this->Application->GetVar('h_module');
if (!$module) $module = $this->Application->RecallVar('module');
+
+ $module = explode(':', $module);
+ $module = $module[0];
+
$title_preset = $this->Application->GetVar('h_title_preset');
$sql = 'SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name)='.$this->Conn->qstr( strtolower($module) );
Index: trunk/kernel/units/configuration/configuration_config.php
===================================================================
diff -u -N -r4663 -r4665
--- trunk/kernel/units/configuration/configuration_config.php (.../configuration_config.php) (revision 4663)
+++ trunk/kernel/units/configuration/configuration_config.php (.../configuration_config.php) (revision 4665)
@@ -22,6 +22,9 @@
'config_list_general' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
'config_list_output' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
'config_list_contacts' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+
+ 'config_list_categories' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
+ 'config_list_users' => Array('prefixes' => Array('conf_List'), 'format' => "!la_updating_config!"),
),
'TableName' => TABLE_PREFIX.'ConfigurationValues',
Index: trunk/core/units/help/help_tag_processor.php
===================================================================
diff -u -N -r4216 -r4665
--- trunk/core/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 4216)
+++ trunk/core/units/help/help_tag_processor.php (.../help_tag_processor.php) (revision 4665)
@@ -27,6 +27,10 @@
{
$module = $this->Application->GetVar('h_module');
if (!$module) $module = $this->Application->RecallVar('module');
+
+ $module = explode(':', $module);
+ $module = $module[0];
+
$title_preset = $this->Application->GetVar('h_title_preset');
$sql = 'SELECT Path FROM '.TABLE_PREFIX.'Modules WHERE LOWER(Name)='.$this->Conn->qstr( strtolower($module) );
Index: trunk/kernel/admin_templates/img/icons/icon46_settings_categories.gif
===================================================================
diff -u -N
Binary files differ
Index: trunk/kernel/module_help/config_list_users.txt
===================================================================
diff -u -N
--- trunk/kernel/module_help/config_list_users.txt (revision 0)
+++ trunk/kernel/module_help/config_list_users.txt (revision 4665)
@@ -0,0 +1,14 @@
+This section allows the administrator to define the default values for various community settings.
+
+- Allow new user registration � this flag sets the user registration mode for the system. � Instant' setting will allow the visitors to register and become users automatically. This is useful for the web sites will a large amount of users, whose administrators do not want to control each individual user.
+
- Minimum user name length � this field sets the minimum user name length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
+
- Minimum password length � this field sets the minimum password length acceptable for the front-end registration. This restriction is not in effect when a user is created through the administrative console.
+
- Assign registered users to group � this dropdown allows to select the default group, to which all newly registered users are assigned.
+
- Assign users not logged in to group - this dropdown allows to select the default group, which manages permissions for all guests � site visitors who have not logged in.
+
- Assign mailing list subscribers to group - this dropdown allows to select the default group, to which all of the users who sign up for a mailing list will be assigned.
+
- Assign password automatically - this option will let the In-portal platform automatically generate random passwords for new users, and send them to the user in the registration email. This is a good way to verify the existence of a user's email � if they do not receive the email with the password, they will not be able to log in. The users will be able to set their own password later.
+
- Root Password � this field allows the administrator to change the root user's password. Leave this field blank to keep the existing password. Please remember that root user has the highest-level security access, and that his password cannot be retrieved. Please take extra caution not to forget or disclose this password.
+
- Verify Root Password � this field is used to verify the root password when it is being changed. If the text in this field does not match with the text in the �root password' field, the password will not be changed and an error will occur.
+
- Number of days to deny multiple votes from the same user - this setting controls how often the same user can vote on the same resource or item. For example, if you set it to 3 days, a user will not be able to vote on the same link for 3 days after their first vote.
+
- Number of days to deny multiple reviews from the same user - this setting controls how often the same user can create reviews for the same item. For example, if you set it to 3 days, a user will not be able to create a new review for the same link for 3 days after their first one.
+
\ No newline at end of file