admin update

qa-include/app/page.php

@@ -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
 
@@ -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') ||
 	!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(
 			'url' => qa_path_html('admin'),
 			'label' => qa_lang_html('main/nav_admin'),
@@ -601,6 +599,8 @@ function qa_content_prepare($voting = false, $categoryids = array())
 		);
 	}
 
+
+
 	$qa_content['search'] = array(
 		'form_tags' => 'method="get" action="' . qa_path_html('search') . '"',
 		'form_extra' => qa_path_form_html('search'),

qa-include/pages/ask.php

@@ -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_opt('notify_users_default'), @$in['email'], @$errors['email']);
+	isset($in['notify']) ? $in['notify'] : qa_opt('notify_users_default'), @$in['email'], @$errors['email']);
 
 if ($captchareason) {
 	require_once QA_INCLUDE_DIR.'app/captcha.php';

qa-include/qa-base.php

@@ -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('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-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-category-list.php', 'qa_category_list', 'Categories');
 }

qa-lang/fr/qa-lang-main.php

@@ -103,7 +103,7 @@
 		'max_upload_size_x' => 'Taille maximale de téléchargement est ^',
 		'moved' => 'déplacé',
 		'nav_activity' => 'Toutes les activités',
-		'nav_admin' => 'Admin',
+		'nav_admin' => 'Réglages du forum',
 		'nav_ask' => 'Poser une question',
 		'nav_categories' => 'Catégories',
 		'nav_feedback' => 'Contacter le comité Cagette du futur',