aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-07 18:59:14 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-07 18:59:14 -0700
commit3c5a5a9ebfcc3acd7f4b454384a584a778144367 (patch)
treee16b9790cec3660e5abdc14c1720ea5364f34adf
parent60cfea5d1f807824525ef2e49606753d6b4860f1 (diff)
downloadvolse-hubzilla-3c5a5a9ebfcc3acd7f4b454384a584a778144367.tar.gz
volse-hubzilla-3c5a5a9ebfcc3acd7f4b454384a584a778144367.tar.bz2
volse-hubzilla-3c5a5a9ebfcc3acd7f4b454384a584a778144367.zip
more frontpage tweaks
-rw-r--r--mod/admin.php4
-rw-r--r--mod/home.php2
-rwxr-xr-xview/tpl/admin_site.tpl2
3 files changed, 4 insertions, 4 deletions
diff --git a/mod/admin.php b/mod/admin.php
index aeb2bcd41..4b80a9a32 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -308,7 +308,7 @@ function admin_page_site_post(&$a){
set_config('system', 'maxloadavg', $maxloadavg);
set_config('system', 'frontpage', $frontpage);
set_config('system', 'sitename', $sitename);
- set_config('system', 'login_on_homepage', login_on_homepage);
+ set_config('system', 'login_on_homepage', $login_on_homepage);
set_config('system', 'verify_email', $verify_email);
set_config('system', 'default_expire_days', $default_expire_days);
@@ -469,7 +469,7 @@ function admin_page_site(&$a) {
'$register_policy' => array('register_policy', t("Does this site allow new member registration?"), get_config('system','register_policy'), "", $register_choices),
'$access_policy' => array('access_policy', t("Which best describes the types of account offered by this hub?"), get_config('system','access_policy'), "This is displayed on the public server site list.", $access_choices),
'$register_text' => array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
- '$frontpage' => array('frontpage', t("Site page to show visitors (default login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream or 'include:home.html' to include a file.")),
+ '$frontpage' => array('frontpage', t("Site homepage to show visitors (default: login box)"), get_config('system','frontpage'), t("example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file.")),
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
diff --git a/mod/home.php b/mod/home.php
index aa89d9ff4..39b42b630 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -69,7 +69,7 @@ function home_content(&$a, $update = 0, $load = false) {
if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
// If there's nothing special happening, just spit out a login box
- $loginbox = get_config('system',login_on_homepage');
+ $loginbox = get_config('system','login_on_homepage');
if(intval($loginbox) || $loginbox === false)
$o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 89ce98ecf..eabb6f067 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -47,7 +47,7 @@
{{include file="field_select.tpl" field=$theme}}
{{include file="field_select.tpl" field=$theme_mobile}}
{{include file="field_input.tpl" field=$frontpage}}
- {{include file="field_checkbox.tpl" field=$no_login_on_homepage}}
+ {{include file="field_checkbox.tpl" field=$login_on_homepage}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>