Commit 90c90015 by Félicie

admin update

parent e06397a8
...@@ -573,13 +573,7 @@ function qa_content_prepare($voting = false, $categoryids = array()) ...@@ -573,13 +573,7 @@ function qa_content_prepare($voting = false, $categoryids = array())
); );
} }
if (qa_opt('nav_users')) {
$qa_content['navigation']['main']['user'] = array(
'url' => qa_path_html('users'),
'label' => qa_lang_html('main/nav_users'),
'selected_on' => array('users$', 'users/', 'user/'),
);
}
// Only the 'level' permission error prevents the menu option being shown - others reported on /qa-include/pages/ask.php // Only the 'level' permission error prevents the menu option being shown - others reported on /qa-include/pages/ask.php
...@@ -590,10 +584,14 @@ function qa_content_prepare($voting = false, $categoryids = array()) ...@@ -590,10 +584,14 @@ function qa_content_prepare($voting = false, $categoryids = array())
); );
} }
if (qa_get_logged_in_level() >= QA_USER_LEVEL_ADMIN || !qa_user_maximum_permit_error('permit_moderate') || if (qa_get_logged_in_level() >= QA_USER_LEVEL_ADMIN || !qa_user_maximum_permit_error('permit_moderate') ||
!qa_user_maximum_permit_error('permit_hide_show') || !qa_user_maximum_permit_error('permit_delete_hidden') !qa_user_maximum_permit_error('permit_hide_show') || !qa_user_maximum_permit_error('permit_delete_hidden')
) { ) {
$qa_content['navigation']['main']['user'] = array(
'url' => qa_path_html('users'),
'label' => qa_lang_html('main/nav_users'),
'selected_on' => array('users$', 'users/', 'user/'),
);
$qa_content['navigation']['main']['admin'] = array( $qa_content['navigation']['main']['admin'] = array(
'url' => qa_path_html('admin'), 'url' => qa_path_html('admin'),
'label' => qa_lang_html('main/nav_admin'), 'label' => qa_lang_html('main/nav_admin'),
...@@ -601,6 +599,8 @@ function qa_content_prepare($voting = false, $categoryids = array()) ...@@ -601,6 +599,8 @@ function qa_content_prepare($voting = false, $categoryids = array())
); );
} }
$qa_content['search'] = array( $qa_content['search'] = array(
'form_tags' => 'method="get" action="' . qa_path_html('search') . '"', 'form_tags' => 'method="get" action="' . qa_path_html('search') . '"',
'form_extra' => qa_path_form_html('search'), 'form_extra' => qa_path_form_html('search'),
......
...@@ -298,7 +298,7 @@ if (!isset($userid) && qa_opt('allow_anonymous_naming')) { ...@@ -298,7 +298,7 @@ if (!isset($userid) && qa_opt('allow_anonymous_naming')) {
} }
qa_set_up_notify_fields($qa_content, $qa_content['form']['fields'], 'Q', qa_get_logged_in_email(), qa_set_up_notify_fields($qa_content, $qa_content['form']['fields'], 'Q', qa_get_logged_in_email(),
qa_opt('notify_users_default'), @$in['email'], @$errors['email']); isset($in['notify']) ? $in['notify'] : qa_opt('notify_users_default'), @$in['email'], @$errors['email']);
if ($captchareason) { if ($captchareason) {
require_once QA_INCLUDE_DIR.'app/captcha.php'; require_once QA_INCLUDE_DIR.'app/captcha.php';
......
...@@ -369,8 +369,7 @@ function qa_register_core_modules() ...@@ -369,8 +369,7 @@ function qa_register_core_modules()
qa_register_module('event', 'plugins/qa-event-updates.php', 'qa_event_updates', 'Q2A Event Updates'); qa_register_module('event', 'plugins/qa-event-updates.php', 'qa_event_updates', 'Q2A Event Updates');
qa_register_module('search', 'plugins/qa-search-basic.php', 'qa_search_basic', ''); qa_register_module('search', 'plugins/qa-search-basic.php', 'qa_search_basic', '');
qa_register_module('widget', 'plugins/qa-widget-activity-count.php', 'qa_activity_count', 'Activity Count'); qa_register_module('widget', 'plugins/qa-widget-activity-count.php', 'qa_activity_count', 'Activity Count');
qa_register_module('widget', 'plugins/qa-widget-ask-box.php', 'qa_ask_box', 'Ask Box');
qa_register_module('widget', 'plugins/qa-widget-related-qs.php', 'qa_related_qs', 'Related Questions'); qa_register_module('widget', 'plugins/qa-widget-related-qs.php', 'qa_related_qs', 'Related Questions');
qa_register_module('widget', 'plugins/qa-widget-category-list.php', 'qa_category_list', 'Categories'); qa_register_module('widget', 'plugins/qa-widget-category-list.php', 'qa_category_list', 'Categories');
} }
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
'max_upload_size_x' => 'Taille maximale de téléchargement est ^', 'max_upload_size_x' => 'Taille maximale de téléchargement est ^',
'moved' => 'déplacé', 'moved' => 'déplacé',
'nav_activity' => 'Toutes les activités', 'nav_activity' => 'Toutes les activités',
'nav_admin' => 'Admin', 'nav_admin' => 'Réglages du forum',
'nav_ask' => 'Poser une question', 'nav_ask' => 'Poser une question',
'nav_categories' => 'Catégories', 'nav_categories' => 'Catégories',
'nav_feedback' => 'Contacter le comité Cagette du futur', 'nav_feedback' => 'Contacter le comité Cagette du futur',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment