diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 19:39:21 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-09 19:39:21 -0700 |
| commit | eb6a1f838724504f0034d51a28567ea9a8119b54 (patch) | |
| tree | 6771f131d715e93a5ef3329b3fcb1a63b8c4e6e1 /mod/admin.php | |
| parent | 03357481f73d506ae36be9858dc757842408c6a9 (diff) | |
| parent | 9592f7f3e6884e2b8b77c713634393fdf4e2ff7c (diff) | |
| download | volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.tar.gz volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.tar.bz2 volse-hubzilla-eb6a1f838724504f0034d51a28567ea9a8119b54.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mod/admin.php b/mod/admin.php index 0141f655f..eaaf67c8d 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -280,6 +280,7 @@ function admin_page_site_post(&$a){ $register_text = ((x($_POST,'register_text')) ? notags(trim($_POST['register_text'])) : ''); $frontpage = ((x($_POST,'frontpage')) ? notags(trim($_POST['frontpage'])) : ''); + $mirror_frontpage = ((x($_POST,'mirror_frontpage')) ? intval(trim($_POST['mirror_frontpage'])) : 0); $allowed_sites = ((x($_POST,'allowed_sites')) ? notags(trim($_POST['allowed_sites'])) : ''); $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); @@ -309,6 +310,7 @@ function admin_page_site_post(&$a){ set_config('system', 'poll_interval', $poll_interval); set_config('system', 'maxloadavg', $maxloadavg); set_config('system', 'frontpage', $frontpage); + set_config('system', 'mirror_frontpage', $mirror_frontpage); set_config('system', 'sitename', $sitename); set_config('system', 'login_on_homepage', $login_on_homepage); set_config('system', 'verify_email', $verify_email); @@ -472,6 +474,7 @@ function admin_page_site(&$a) { '$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 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.")), + '$mirror_frontpage' => array('mirror_frontpage', t("Preserve site homepage URL"), get_config('system','mirror_frontpage'), t('Present the site homepage in a frame at the original location instead of redirecting')), '$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")), |