Merge remote branch 'upstream/master'

1 files changed, 23 insertions, 3 deletions

diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php
index 2477bb3d3..40a539079 100644
--- a/view/theme/diabook/config.php
+++ b/view/theme/diabook/config.php
@@ -13,8 +13,12 @@ function theme_content(&$a){
 	$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
 	$resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
 	$color = get_pconfig(local_user(), 'diabook', 'color' );
+	$TSearchTerm = get_pconfig(local_user(), 'diabook', 'TSearchTerm' );
+	$ELZoom = get_pconfig(local_user(), 'diabook', 'ELZoom' );
+	$ELPosX = get_pconfig(local_user(), 'diabook', 'ELPosX' );
+	$ELPosY = get_pconfig(local_user(), 'diabook', 'ELPosY' );
 	
-	return diabook_form($a,$font_size, $line_height, $resolution, $color);
+	return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY);
 }
 
 function theme_post(&$a){
@@ -26,6 +30,10 @@ function theme_post(&$a){
 		set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
 		set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
 		set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);	
+		set_pconfig(local_user(), 'diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);	
+		set_pconfig(local_user(), 'diabook', 'ELZoom', $_POST['diabook_ELZoom']);	
+		set_pconfig(local_user(), 'diabook', 'ELPosX', $_POST['diabook_ELPosX']);	
+		set_pconfig(local_user(), 'diabook', 'ELPosY', $_POST['diabook_ELPosY']);	
 	}
 }
 
@@ -35,8 +43,12 @@ function theme_admin(&$a){
 	$line_height = get_config('diabook', 'line_height' );
 	$resolution = get_config('diabook', 'resolution' );
 	$color = get_config('diabook', 'color' );	
+	$TSearchTerm = get_config('diabook', 'TSearchTerm' );	
+	$ELZoom = get_config('diabook', 'ELZoom' );
+	$ELPosX = get_config('diabook', 'ELPosX' );
+	$ELPosY = get_config('diabook', 'ELPosY' );
 	
-	return diabook_form($a,$font_size, $line_height, $resolution, $color);
+	return diabook_form($a,$font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY);
 }
 
 function theme_admin_post(&$a){
@@ -45,11 +57,15 @@ function theme_admin_post(&$a){
 		set_config('diabook', 'line_height', $_POST['diabook_line_height']);
 		set_config('diabook', 'resolution', $_POST['diabook_resolution']);
 		set_config('diabook', 'color', $_POST['diabook_color']);
+		set_config('diabook', 'TSearchTerm', $_POST['diabook_TSearchTerm']);
+		set_config('diabook', 'ELZoom', $_POST['diabook_ELZoom']);
+		set_config('diabook', 'ELPosX', $_POST['diabook_ELPosX']);
+		set_config('diabook', 'ELPosY', $_POST['diabook_ELPosY']);
 	}
 }
 
 
-function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
+function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSearchTerm, $ELZoom, $ELPosX, $ELPosY){
 	$line_heights = array(
 		"1.3"=>"1.3",
 		"---"=>"---",
@@ -95,6 +111,10 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
 		'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
 		'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
 		'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),	
+		'$TSearchTerm' => array('diabook_TSearchTerm', t('Set twitter search term'), $TSearchTerm, '', $TSearchTerm),	
+		'$ELZoom' => array('diabook_ELZoom', t('Set zoomfactor for Earth Layer'), $ELZoom, '', $ELZoom),	
+		'$ELPosX' => array('diabook_ELPosX', t('Set longitude (X) for Earth Layer'), $ELPosX, '', $ELPosX),	
+		'$ELPosY' => array('diabook_ELPosY', t('Set latitude (Y) for Earth Layer'), $ELPosY, '', $ELPosY),	
 	));
 	return $o;
 }