From: Michael Vogel <icarus@dabo.de>
Date: Tue, 12 Aug 2014 22:18:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=de75d8ca7f3179fabcec1c954b92bce10080bfba;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/admin.php
---

de75d8ca7f3179fabcec1c954b92bce10080bfba
diff --cc mod/admin.php
index 55bbde34d5,176ae9f489..fa4f6d7fb4
--- a/mod/admin.php
+++ b/mod/admin.php
@@@ -361,7 -361,7 +361,8 @@@ function admin_page_site_post(&$a)
  	$temppath		=	((x($_POST,'temppath'))			? notags(trim($_POST['temppath']))		: '');
  	$basepath		=	((x($_POST,'basepath'))			? notags(trim($_POST['basepath']))		: '');
  	$singleuser		=	((x($_POST,'singleuser'))		? notags(trim($_POST['singleuser']))		: '');
 +	$proxy_disabled		=	((x($_POST,'proxy_disabled'))		? True						: False);
+ 	$enable_noscrape = ((x($_POST,'enable_noscrape')) ? true : false);
  	if($ssl_policy != intval(get_config('system','ssl_policy'))) {
  		if($ssl_policy == SSL_POLICY_FULL) {
  			q("update `contact` set
@@@ -485,7 -485,7 +486,8 @@@
  	set_config('system','lockpath', $lockpath);
  	set_config('system','temppath', $temppath);
  	set_config('system','basepath', $basepath);
 +	set_config('system','proxy_disabled', $proxy_disabled);
+ 	set_config('system','enable_noscrape', $enable_noscrape);
  
  	info( t('Site settings updated.') . EOL);
  	goaway($a->get_baseurl(true) . '/admin/site' );
@@@ -644,11 -644,11 +646,12 @@@ function admin_page_site(&$a) 
  		'$lockpath'		=> array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
  		'$temppath'		=> array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
  		'$basepath'		=> array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
 +		'$proxy_disabled'	=> array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
  
  		'$relocate_url'     => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
- 
-         '$form_security_token' => get_form_security_token("admin_site"),
+ 		
+ 		'$enable_noscrape'=> array('enable_noscrape', t("Enable noscrape"), get_config('system','enable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping.")),
+     '$form_security_token' => get_form_security_token("admin_site")
  
  	));