Merge pull request #3773 from annando/force-republish

Force a republish to the directory server

mod/admin.php

@@ -692,11 +692,16 @@ function admin_page_summary(App $a) {
  * @param App $a
  */
 function admin_page_site_post(App $a) {
-	if (!x($_POST,"page_site")) {
+	check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+
+	if (!empty($_POST['republish_directory'])) {
+		proc_run(PRIORITY_LOW, 'include/directory.php');
 		return;
 	}
 
-	check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+	if (!x($_POST,"page_site")) {
+		return;
+	}
 
 	// relocate
 	if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url'] != "") {
@@ -1152,6 +1157,7 @@ function admin_page_site(App $a) {
 		'$title' => t('Administration'),
 		'$page' => t('Site'),
 		'$submit' => t('Save Settings'),
+		'$republish' => t('Republish users to directory'),
 		'$registration' => t('Registration'),
 		'$upload' => t('File upload'),
 		'$corporate' => t('Policies'),

view/templates/admin_site.tpl

@@ -103,6 +103,7 @@
 	{{/if}}
 	{{include file="field_checkbox.tpl" field=$dfrn_only}}
 	{{include file="field_input.tpl" field=$global_directory}}
+	<div class="submit"><input type="submit" name="republish_directory" value="{{$republish|escape:'html'}}" /></div>
 	{{include file="field_checkbox.tpl" field=$thread_allow}}
 	{{include file="field_checkbox.tpl" field=$newuser_private}}
 	{{include file="field_checkbox.tpl" field=$enotify_no_content}}