diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-28 05:29:03 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-28 05:29:03 -0400 |
| commit | c661dc502f1ab4a6361faea1271d3c9a4aafa4ba (patch) | |
| tree | 314fc610188bf5ebd06ef2fde4909c01b8b74561 /mod/admin.php | |
| parent | 3bfa3f2a13f4e3b75b8e922eb3d946e1a31809b6 (diff) | |
| parent | f163aed66d2aec038131131c68110043de36137a (diff) | |
| download | volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.tar.gz volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.tar.bz2 volse-hubzilla-c661dc502f1ab4a6361faea1271d3c9a4aafa4ba.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
break up poller into separate processes
add tooltip title to common_tabs
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
Diabook-dark update, it's almost useable now (if you're lenient).
Added "important changes" to admin menu for admins who don't follow the github properly.
* master:
Diffstat (limited to 'mod/admin.php')
| -rw-r--r-- | mod/admin.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php index cdc45c8e3..3b6d186d5 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -235,6 +235,7 @@ function admin_page_site_post(&$a){ $proxyuser = ((x($_POST,'proxyuser')) ? notags(trim($_POST['proxyuser'])) : ''); $proxy = ((x($_POST,'proxy')) ? notags(trim($_POST['proxy'])) : ''); $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); + $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $dfrn_only = ((x($_POST,'dfrn_only')) ? True : False); $ostatus_disabled = !((x($_POST,'ostatus_disabled')) ? True : False); $diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False); @@ -281,7 +282,7 @@ function admin_page_site_post(&$a){ } } set_config('system','ssl_policy',$ssl_policy); - + set_config('system','delivery_interval',$delivery_interval); set_config('config','sitename',$sitename); if ($banner==""){ // don't know why, but del_config doesn't work... @@ -425,6 +426,7 @@ function admin_page_site(&$a) { '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")), + '$delivery_interval' => array('delivery_interval', t("Delivery interval"), (x(get_config('system','delivery_interval'))?get_config('system','delivery_interval'):2), t("Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers.")), '$form_security_token' => get_form_security_token("admin_site"), |