From 892ef4547459ba89a83155a5324159e9465dc255 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 13:13:38 +0200 Subject: [PATCH 1/7] Warning, that profile published in local directory may be visible in public --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 5c9c439e0a..3c7e59ac6c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1174,7 +1174,7 @@ function settings_content(App $a) { if (strlen(get_config('system','directory'))) { $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))), + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_dire ctory,t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), )); } else { $profile_in_net_dir = ''; From 4c9c83e8e8b41e285fc23a13c74e615c289b8413 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 13:21:35 +0200 Subject: [PATCH 2/7] Warning, that profile published in local directory may be visible in public --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 3c7e59ac6c..367d3c2100 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1174,7 +1174,7 @@ function settings_content(App $a) { if (strlen(get_config('system','directory'))) { $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_dire ctory,t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_directory,t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), )); } else { $profile_in_net_dir = ''; From bcfbfeeba442ad025d83c4781cbd145a6ac343f4 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 13:52:37 +0200 Subject: [PATCH 3/7] adding space for readability --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 367d3c2100..d6eacbd4e3 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1174,7 +1174,7 @@ function settings_content(App $a) { if (strlen(get_config('system','directory'))) { $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_directory,t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_directory, t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), )); } else { $profile_in_net_dir = ''; From 895a6254a0065acd93fb49ad4220886342a9dd22 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 15:48:15 +0200 Subject: [PATCH 4/7] Correction of 1177 and added modification to 1171 --- mod/settings.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index d6eacbd4e3..6dae149b8b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1168,14 +1168,13 @@ function settings_content(App $a) { $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))), + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Depending on the server settings your profile may be visible in public."), array(t('No'),t('Yes'))), )); } if (strlen(get_config('system','directory'))) { $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile_in_directory, t("Depending on the server settings your profile may be visible in public."), $profile['net-publish'], '', array(t('No'),t('Yes'))), - )); + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),)); } else { $profile_in_net_dir = ''; } From 7320327fa199901b25b98a3c6c52ca46a008847c Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 16:37:18 +0200 Subject: [PATCH 5/7] Deleted the lone comma between paratheses --- mod/settings.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 6dae149b8b..58b64e77e3 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1168,8 +1168,7 @@ function settings_content(App $a) { $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Depending on the server settings your profile may be visible in public."), array(t('No'),t('Yes'))), - )); + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Depending on the server settings your profile may be visible in public."), array(t('No'),t('Yes'))))); } if (strlen(get_config('system','directory'))) { From d8a8fa9baae53b3d8e9bdb39d3f692f9a9d5b019 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 16:48:11 +0200 Subject: [PATCH 6/7] Modified the warning message --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 58b64e77e3..e40cd8d138 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1168,7 +1168,7 @@ function settings_content(App $a) { $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Depending on the server settings your profile may be visible in public."), array(t('No'),t('Yes'))))); + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'),t('Yes'))))); } if (strlen(get_config('system','directory'))) { From 050675a6295767becb247b2f7b65ce932a8e2514 Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Sat, 8 Apr 2017 18:07:30 +0200 Subject: [PATCH 7/7] The other lone comma in 1177 --- mod/settings.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index e40cd8d138..67aa40de5b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1168,12 +1168,14 @@ function settings_content(App $a) { $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'),t('Yes'))))); + '$field' => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], t("Your profile may be visible in public."), array(t('No'),t('Yes'))) + )); } if (strlen(get_config('system','directory'))) { $profile_in_net_dir = replace_macros($opt_tpl,array( - '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),)); + '$field' => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))) + )); } else { $profile_in_net_dir = ''; }