Merge branch 'dev'

1 files changed, 11 insertions, 2 deletions

diff --git a/Zotlabs/Module/Settings/Profiles.php b/Zotlabs/Module/Settings/Profiles.php
index 2dc037317..fb6abf664 100644
--- a/Zotlabs/Module/Settings/Profiles.php
+++ b/Zotlabs/Module/Settings/Profiles.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Module\Settings;
 
+require_once('include/selectors.php');
 
 class Profiles {
 
@@ -14,6 +15,9 @@ class Profiles {
 		$features = get_module_features($module);
 
 		process_module_features_post(local_channel(), $features, $_POST);
+
+		$profile_assign  = ((x($_POST,'profile_assign')) ? notags(trim($_POST['profile_assign'])) : '');
+		set_pconfig(local_channel(),'system','profile_assign',$profile_assign);
 		
 		build_sync_packet();
 
@@ -30,6 +34,10 @@ class Profiles {
 		$features = get_module_features($module);
 		$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
 
+		$extra_settings_html = '';
+		if(feature_enabled(local_channel(),'multi_profiles'))
+			$extra_settings_html = contact_profile_assign(get_pconfig(local_channel(),'system','profile_assign',''));
+
 		$tpl = get_markup_template("settings_module.tpl");
 
 		$o .= replace_macros($tpl, array(
@@ -37,8 +45,9 @@ class Profiles {
 			'$action_url' => 'settings/' . $module,
 			'$form_security_token' => get_form_security_token('settings_' . $module),
 			'$title' => t('Profiles Settings'),
-			'$features'  => process_module_features_get(local_channel(), $features),
-			'$submit'    => t('Submit')
+			'$features' => process_module_features_get(local_channel(), $features),
+			'$extra_settings_html' => $extra_settings_html,
+			'$submit' => t('Submit')
 		));
 	
 		return $o;