From cdf608898a1371a0dd5071d72e95944d809e2d79 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Thu, 10 Oct 2013 19:18:33 +0100
Subject: Various schema issues.

---
 view/theme/redbasic/php/config.php |  8 ++++----
 view/theme/redbasic/php/style.php  | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'view/theme/redbasic/php')

diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index deadbe2b1..4455cc427 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -5,7 +5,7 @@ function theme_content(&$a) {
 
 	$schema = get_pconfig(local_user(),'redbasic', 'schema' );
 	$nav_colour = get_pconfig(local_user(),'redbasic', 'nav_colour' );
-	$background_colour = get_pconfig(local_user(),'redbasic', 'background_colour' );
+	$bgcolour = get_pconfig(local_user(),'redbasic', 'bgcolour' );
 	$background_image = get_pconfig(local_user(),'redbasic', 'background_image' );
 	$item_colour = get_pconfig(local_user(),'redbasic', 'item_colour' );
 	$item_opacity = get_pconfig(local_user(),'redbasic', 'item_opacity' );
@@ -13,7 +13,7 @@ function theme_content(&$a) {
 	$font_colour = get_pconfig(local_user(),'redbasic', 'font_colour' );
 	$radius = get_pconfig(local_user(),'redbasic', 'radius' );
 	$shadow = get_pconfig(local_user(),'redbasic', 'photo_shadow' );
-	return redbasic_form($a, $schema, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
+	return redbasic_form($a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
 		$font_size, $font_colour, $radius, $shadow);
 }
 
@@ -34,7 +34,7 @@ function theme_post(&$a) {
 	}
 }
 
-function redbasic_form(&$a, $schema, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
+function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image, $item_colour, $item_opacity, 
 		$font_size, $font_colour, $radius, $shadow) {
 
 	$scheme_choices = array();
@@ -66,7 +66,7 @@ if(feature_enabled(local_user(),'expert'))
 		'$title' => t("Theme settings"),
 		'$schema' => array('redbasic_schema', t('Set scheme'), $schema, '', $scheme_choices),
 		'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $nav_colour, '', $nav_colours),
-		'$background_colour' => array('redbasic_background_colour', t('Set the background colour'), $background_colour),
+		'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $bgcolour),
 		'$background_image' => array('redbasic_background_image', t('Set the background image'), $background_image),
 		'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $item_colour),
 		'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $item_opacity),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index ad8dca9a2..738f98726 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -30,7 +30,7 @@
 		}
 
 // Load the owners pconfig
-	    $background_colour = get_pconfig($uid, "redbasic", "background_colour");	
+	    $bgcolour = get_pconfig($uid, "redbasic", "background_colour");	
 	    $background_image = get_pconfig($uid, "redbasic", "background_image");	
 	    $item_colour = get_pconfig($uid, "redbasic", "item_colour");	
 	    $item_opacity = get_pconfig($uid, "redbasic", "item_opacity");	
@@ -47,15 +47,15 @@
 		if (($schema) && ($schema != '---')) {
 			$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
 			require_once ($schemefile);
-		}
-
-// If we haven't got a schema, load the default.  We shouldn't touch this - we
-// should leave it for admins to define for themselves.
-		if (! $schema) {
-		    	if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
-			$schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
-			  require_once ($schemefile);
-			  }
+		
+		// If we haven't got a schema, load the default.  We shouldn't touch this - we
+		// should leave it for admins to define for themselves.
+			if (! $schema) {
+			      if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
+				    $schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
+				    require_once ($schemefile);
+				    }
+			}
 		}
 		
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
@@ -68,8 +68,8 @@
 			$nav_bg_3 = "#f00";
 			$nav_bg_4 = "#b00";
 		}
-	if (! $background_colour)
-		$background_colour = "fff";
+	if (! $bgcolour)
+		$bgcolour = "fff";
 	if (! $background_image)
 		$background_image ='';
 	if (! $item_colour)
@@ -97,7 +97,7 @@ $options = array (
 '$nav_bg_3' => $nav_bg_3,
 '$nav_bg_4' => $nav_bg_4,
 '$search_background' => $search_background,
-'$background_colour' => $background_colour,
+'$bgcolour' => $bgcolour,
 '$background_image' => $background_image,
 '$item_colour' => $item_colour,
 '$item_opacity' => $item_opacity,
-- 
cgit v1.2.3