bring back photo shadows (via theme settings)

5 files changed, 14 insertions, 5 deletions

diff --git a/include/zot.php b/include/zot.php
index 8df57bb51..b250557e6 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -111,6 +111,8 @@ function zot_zot($url,$data) {
  *   does not have to be host qualified e.g. 'foo' is treated as 'foo@thishub'
  * @param: array $channel
  *   (optional), if supplied permissions will be enumerated specifically for $channel
+ * @param: boolean $autofallback
+ *   fallback/failover to http if https connection cannot be established. Default is true.
  *
  * @returns: array => see z_post_url and mod/zfinger.php
  */
@@ -1102,7 +1104,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
 
 
 	// We've validated the sender. Now make sure that the sender is the owner or author
-	// This needs to be done in each process_xxxx function because the data arrays and conditions will be different. 
 
 	if($sender['hash'] != $arr['owner_xchan'] && $sender['hash'] != $arr['author_xchan']) {
 		logger('process_delivery: sender is not owner or author');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 868da0a03..3f4a71104 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1405,7 +1405,7 @@ tr.mceLast {
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
     border-radius: $radiuspx;
     -moz-border-radius: $radiuspx;
-    /*box-shadow: 4px 4px 3px 0 #444444; */
+    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 7470c399a..c5c2be5df 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -11,8 +11,9 @@ function theme_content(&$a) {
 	$font_size = get_pconfig(local_user(),'redbasic', 'font_size' );
 	$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, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
-		$font_size, $font_colour, $radius);
+		$font_size, $font_colour, $radius, $shadow);
 }
 
 function theme_post(&$a) {
@@ -27,11 +28,12 @@ function theme_post(&$a) {
 		set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
 		set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
 		set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']);
+		set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
 	}
 }
 
 function redbasic_form(&$a, $nav_colour, $background_colour, $background_image, $item_colour, $item_opacity, 
-		$font_size, $font_colour, $radius) {
+		$font_size, $font_colour, $radius, $shadow) {
 
 		$nav_colours = array (
 		  'red' => 'red',
@@ -52,6 +54,7 @@ function redbasic_form(&$a, $nav_colour, $background_colour, $background_image,
 		'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size),
 		'$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $font_colour),
 		'$radius' => array('redbasic_radius', t('Set radius of corners'), $radius),
+		'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $shadow),
 		));
 
 	return $o;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 88bf2ceb0..d97e85668 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -33,6 +33,7 @@
 	    $font_size = get_pconfig($uid, "redbasic", "font_size");	
 	    $font_colour = get_pconfig($uid, "redbasic", "font_colour");	
 	    $radius = get_pconfig($uid, "redbasic", "radius");	
+		$shadow = get_pconfig($uid,"redbasic","photo_shadow");
 
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
@@ -58,6 +59,8 @@
 		$font_colour = "000";
 	if (! $radius)
 		$radius = "5";
+	if (! $shadow)
+		$shadow = "0";
 
 
 
@@ -76,7 +79,8 @@ $options = array (
 '$item_opacity' => $item_opacity,
 '$font_size' => $font_size,
 '$font_colour' => $font_colour,
-'$radius' => $radius
+'$radius' => $radius,
+'$shadow' => $shadow
 );
 
 echo str_replace(array_keys($options), array_values($options), $x);    
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 596670e95..412af5c44 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -6,6 +6,7 @@
 {{include file="field_input.tpl" field=$font_size}}
 {{include file="field_input.tpl" field=$font_colour}}
 {{include file="field_input.tpl" field=$radius}}
+{{include file="field_input.tpl" field=$shadow}}
 
 <div class="settings-submit-wrapper">
 	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />