Default settings on new blocks inconsistent, both yes/no radio buttons empty

17 files changed, 234 insertions, 253 deletions

diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php
index 10219a500d..ed150141fa 100644
--- a/modules_v3/charts/module.php
+++ b/modules_v3/charts/module.php
@@ -42,9 +42,10 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$PEDIGREE_ROOT_ID = $WT_TREE->getPreference('PEDIGREE_ROOT_ID');
 
-		$details = get_block_setting($block_id, 'details', false);
+		$details = get_block_setting($block_id, 'details', '0');
 		$type    = get_block_setting($block_id, 'type', 'pedigree');
 		$pid     = get_block_setting($block_id, 'pid', Auth::check() ? (WT_USER_GEDCOM_ID ? WT_USER_GEDCOM_ID : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
+
 		if ($cfg) {
 			foreach (array('details', 'type', 'pid', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -184,10 +185,9 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'details', WT_Filter::postBool('details'));
 			set_block_setting($block_id, 'type', WT_Filter::post('type', 'pedigree|descendants|hourglass|treenav', 'pedigree'));
 			set_block_setting($block_id, 'pid', WT_Filter::post('pid', WT_REGEX_XREF));
-			exit;
 		}
 
-		$details = get_block_setting($block_id, 'details', false);
+		$details = get_block_setting($block_id, 'details', '0');
 		$type    = get_block_setting($block_id, 'type', 'pedigree');
 		$pid     = get_block_setting($block_id, 'pid', Auth::check() ? (WT_USER_GEDCOM_ID ? WT_USER_GEDCOM_ID : $PEDIGREE_ROOT_ID) : $PEDIGREE_ROOT_ID);
 
diff --git a/modules_v3/gedcom_favorites/module.php b/modules_v3/gedcom_favorites/module.php
index b556809995..a38cbf8be6 100644
--- a/modules_v3/gedcom_favorites/module.php
+++ b/modules_v3/gedcom_favorites/module.php
@@ -87,7 +87,8 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 			break;
 		}
 
-		$block = get_block_setting($block_id, 'block', false);
+		$block = get_block_setting($block_id, 'block', '0');
+
 		if ($cfg) {
 			foreach (array('block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -237,12 +238,12 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 	public function configureBlock($block_id) {
 		if (WT_Filter::postBool('save') && WT_Filter::checkCsrf()) {
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$block = get_block_setting($block_id, 'block', false);
+		$block = get_block_setting($block_id, 'block', '0');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/gedcom_news/module.php b/modules_v3/gedcom_news/module.php
index 5fe5f704bd..a5ec4485d8 100644
--- a/modules_v3/gedcom_news/module.php
+++ b/modules_v3/gedcom_news/module.php
@@ -59,10 +59,10 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 
 		if (isset($_REQUEST['gedcom_news_archive'])) {
 			$limit = 'nolimit';
-			$flag  = 0;
+			$flag  = '0';
 		} else {
 			$flag = get_block_setting($block_id, 'flag', 0);
-			if ($flag == 0) {
+			if ($flag === '0') {
 				$limit = 'nolimit';
 			} else {
 				$limit = get_block_setting($block_id, 'limit', 'nolimit');
@@ -158,13 +158,13 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 		if (WT_Filter::postBool('save') && WT_Filter::checkCsrf()) {
 			set_block_setting($block_id, 'limit', WT_Filter::post('limit'));
 			set_block_setting($block_id, 'flag', WT_Filter::post('flag'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		// Limit Type
 		$limit = get_block_setting($block_id, 'limit', 'nolimit');
+		$flag  = get_block_setting($block_id, 'flag', 0);
+
 		echo
 			'<tr><td class="descriptionbox wrap width33">',
 			WT_I18N::translate('Limit display by:'), help_link('gedcom_news_limit'),
@@ -175,8 +175,6 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block {
 			'<option value="count" ' . ($limit == 'count' ? 'selected' : '') . ">" . WT_I18N::translate('Number of items') . "</option>",
 			'</select></td></tr>';
 
-		// Flag to look for
-		$flag = get_block_setting($block_id, 'flag', 0);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Limit:'), help_link('gedcom_news_flag');
 		echo '</td><td class="optionbox"><input type="text" name="flag" size="4" maxlength="4" value="' . $flag . '"></td></tr>';
diff --git a/modules_v3/gedcom_stats/module.php b/modules_v3/gedcom_stats/module.php
index 13db65aff8..c5e1a35903 100644
--- a/modules_v3/gedcom_stats/module.php
+++ b/modules_v3/gedcom_stats/module.php
@@ -40,26 +40,29 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $WT_TREE, $ctype;
 
-		$show_last_update    = get_block_setting($block_id, 'show_last_update', true);
-		$show_common_surnames = get_block_setting($block_id, 'show_common_surnames', true);
-		$stat_indi           = get_block_setting($block_id, 'stat_indi', true);
-		$stat_fam            = get_block_setting($block_id, 'stat_fam', true);
-		$stat_sour           = get_block_setting($block_id, 'stat_sour', true);
-		$stat_media          = get_block_setting($block_id, 'stat_media', true);
-		$stat_repo           = get_block_setting($block_id, 'stat_repo', true);
-		$stat_surname        = get_block_setting($block_id, 'stat_surname', true);
-		$stat_events         = get_block_setting($block_id, 'stat_events', true);
-		$stat_users          = get_block_setting($block_id, 'stat_users', true);
-		$stat_first_birth    = get_block_setting($block_id, 'stat_first_birth', true);
-		$stat_last_birth     = get_block_setting($block_id, 'stat_last_birth', true);
-		$stat_first_death    = get_block_setting($block_id, 'stat_first_death', true);
-		$stat_last_death     = get_block_setting($block_id, 'stat_last_death', true);
-		$stat_long_life      = get_block_setting($block_id, 'stat_long_life', true);
-		$stat_avg_life       = get_block_setting($block_id, 'stat_avg_life', true);
-		$stat_most_chil      = get_block_setting($block_id, 'stat_most_chil', true);
-		$stat_avg_chil       = get_block_setting($block_id, 'stat_avg_chil', true);
-		$stat_link           = get_block_setting($block_id, 'stat_link', true);
-		$block               = get_block_setting($block_id, 'block', false);
+		$show_last_update     = get_block_setting($block_id, 'show_last_update', '1');
+		$show_common_surnames = get_block_setting($block_id, 'show_common_surnames', '1');
+		$stat_indi            = get_block_setting($block_id, 'stat_indi', '1');
+		$stat_fam             = get_block_setting($block_id, 'stat_fam', '1');
+		$stat_sour            = get_block_setting($block_id, 'stat_sour', '1');
+		$stat_media           = get_block_setting($block_id, 'stat_media', '1');
+		$stat_repo            = get_block_setting($block_id, 'stat_repo', '1');
+		$stat_surname         = get_block_setting($block_id, 'stat_surname', '1');
+		$stat_events          = get_block_setting($block_id, 'stat_events', '1');
+		$stat_users           = get_block_setting($block_id, 'stat_users', '1');
+		$stat_first_birth     = get_block_setting($block_id, 'stat_first_birth', '1');
+		$stat_last_birth      = get_block_setting($block_id, 'stat_last_birth', '1');
+		$stat_first_death     = get_block_setting($block_id, 'stat_first_death', '1');
+		$stat_last_death      = get_block_setting($block_id, 'stat_last_death', '1');
+		$stat_long_life       = get_block_setting($block_id, 'stat_long_life', '1');
+		$stat_avg_life        = get_block_setting($block_id, 'stat_avg_life', '1');
+		$stat_most_chil       = get_block_setting($block_id, 'stat_most_chil', '1');
+		$stat_avg_chil        = get_block_setting($block_id, 'stat_avg_chil', '1');
+
+		// This can be overriden when embedding in an HTML block
+		$block     = '0';
+		$stat_link = '1';
+
 		if ($cfg) {
 			foreach (array('show_common_surnames', 'stat_indi', 'stat_fam', 'stat_sour', 'stat_media', 'stat_surname', 'stat_events', 'stat_users', 'stat_first_birth', 'stat_last_birth', 'stat_first_death', 'stat_last_death', 'stat_long_life', 'stat_avg_life', 'stat_most_chil', 'stat_avg_chil', 'stat_link', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -248,42 +251,41 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'stat_avg_life', WT_Filter::postBool('stat_avg_life'));
 			set_block_setting($block_id, 'stat_most_chil', WT_Filter::postBool('stat_most_chil'));
 			set_block_setting($block_id, 'stat_avg_chil', WT_Filter::postBool('stat_avg_chil'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$show_last_update = get_block_setting($block_id, 'show_last_update', true);
+		$show_last_update     = get_block_setting($block_id, 'show_last_update', '1');
+		$show_common_surnames = get_block_setting($block_id, 'show_common_surnames', '1');
+		$stat_indi            = get_block_setting($block_id, 'stat_indi', '1');
+		$stat_fam             = get_block_setting($block_id, 'stat_fam', '1');
+		$stat_sour            = get_block_setting($block_id, 'stat_sour', '1');
+		$stat_media           = get_block_setting($block_id, 'stat_media', '1');
+		$stat_repo            = get_block_setting($block_id, 'stat_repo', '1');
+		$stat_surname         = get_block_setting($block_id, 'stat_surname', '1');
+		$stat_events          = get_block_setting($block_id, 'stat_events', '1');
+		$stat_users           = get_block_setting($block_id, 'stat_users', '1');
+		$stat_first_birth     = get_block_setting($block_id, 'stat_first_birth', '1');
+		$stat_last_birth      = get_block_setting($block_id, 'stat_last_birth', '1');
+		$stat_first_death     = get_block_setting($block_id, 'stat_first_death', '1');
+		$stat_last_death      = get_block_setting($block_id, 'stat_last_death', '1');
+		$stat_long_life       = get_block_setting($block_id, 'stat_long_life', '1');
+		$stat_avg_life        = get_block_setting($block_id, 'stat_avg_life', '1');
+		$stat_most_chil       = get_block_setting($block_id, 'stat_most_chil', '1');
+		$stat_avg_chil        = get_block_setting($block_id, 'stat_avg_chil', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for yes/no option */ WT_I18N::translate('Show date of last update?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('show_last_update', $show_last_update);
 		echo '</td></tr>';
 
-		$show_common_surnames = get_block_setting($block_id, 'show_common_surnames', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show common surnames?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('show_common_surnames', $show_common_surnames);
 		echo '</td></tr>';
 
-		$stat_indi           = get_block_setting($block_id, 'stat_indi', true);
-		$stat_fam            = get_block_setting($block_id, 'stat_fam', true);
-		$stat_sour           = get_block_setting($block_id, 'stat_sour', true);
-		$stat_other          = get_block_setting($block_id, 'stat_other', true);
-		$stat_media          = get_block_setting($block_id, 'stat_media', true);
-		$stat_repo           = get_block_setting($block_id, 'stat_repo', true);
-		$stat_surname        = get_block_setting($block_id, 'stat_surname', true);
-		$stat_events         = get_block_setting($block_id, 'stat_events', true);
-		$stat_users          = get_block_setting($block_id, 'stat_users', true);
-		$stat_first_birth    = get_block_setting($block_id, 'stat_first_birth', true);
-		$stat_last_birth     = get_block_setting($block_id, 'stat_last_birth', true);
-		$stat_first_death    = get_block_setting($block_id, 'stat_first_death', true);
-		$stat_last_death     = get_block_setting($block_id, 'stat_last_death', true);
-		$stat_long_life      = get_block_setting($block_id, 'stat_long_life', true);
-		$stat_avg_life       = get_block_setting($block_id, 'stat_avg_life', true);
-		$stat_most_chil      = get_block_setting($block_id, 'stat_most_chil', true);
-		$stat_avg_chil       = get_block_setting($block_id, 'stat_avg_chil', true);
 ?>
 	<tr>
 	<td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Select the stats to show in this block'); ?></td>
@@ -377,8 +379,8 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 			<tr>
 				<td>
 					<label>
-						<input type="checkbox" value="yes" name="stat_other" <?php echo $stat_other ? 'checked' : ''; ?>>
-						<?php echo WT_I18N::translate('Other records'); ?>
+						<input type="checkbox" value="yes" name="stat_events" <?php echo $stat_events ? 'checked' : ''; ?>>
+						<?php echo WT_I18N::translate('Total events'); ?>
 					</label>
 				</td>
 				<td>
@@ -391,8 +393,8 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 			<tr>
 				<td>
 					<label>
-						<input type="checkbox" value="yes" name="stat_events" <?php echo $stat_events ? 'checked' : ''; ?>>
-						<?php echo WT_I18N::translate('Total events'); ?>
+						<input type="checkbox" value="yes" name="stat_users" <?php echo $stat_users ? 'checked' : ''; ?>>
+						<?php echo WT_I18N::translate('Total users'); ?>
 					</label>
 				</td>
 				<td>
@@ -402,16 +404,6 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block {
 					</label>
 				</td>
 			</tr>
-			<tr>
-				<td>
-					<label>
-						<input type="checkbox" value="yes" name="stat_users" <?php echo $stat_users ? 'checked' : ''; ?>>
-						<?php echo WT_I18N::translate('Total users'); ?>
-					</label>
-				</td>
-				<td>
-				</td>
-			</tr>
 		</tbody>
 	</table>
 	</td>
diff --git a/modules_v3/html/module.php b/modules_v3/html/module.php
index 253dbdae13..2177b0c0e7 100644
--- a/modules_v3/html/module.php
+++ b/modules_v3/html/module.php
@@ -40,8 +40,13 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype, $GEDCOM;
 
+		$title          = get_block_setting($block_id, 'title');
+		$html           = get_block_setting($block_id, 'html');
+		$gedcom         = get_block_setting($block_id, 'gedcom');
+		$show_timestamp = get_block_setting($block_id, 'show_timestamp', '0');
+		$languages      = get_block_setting($block_id, 'languages');
+
 		// Only show this block for certain languages
-		$languages = get_block_setting($block_id, 'languages');
 		if ($languages && !in_array(WT_LOCALE, explode(',', $languages))) {
 			return;
 		}
@@ -49,7 +54,6 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		/*
 		 * Select GEDCOM
 		 */
-		$gedcom = get_block_setting($block_id, 'gedcom');
 		switch ($gedcom) {
 		case '__current__':
 			break;
@@ -72,12 +76,9 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		/*
 		* Retrieve text, process embedded variables
 		*/
-		$title_tmp = get_block_setting($block_id, 'title');
-		$html = get_block_setting($block_id, 'html');
-
-		if ((strpos($title_tmp, '#') !== false) || (strpos($html, '#') !== false)) {
+		if ((strpos($title, '#') !== false) || (strpos($html, '#') !== false)) {
 			$stats = new WT_Stats($GEDCOM);
-			$title_tmp = $stats->embedTags($title_tmp);
+			$title = $stats->embedTags($title);
 			$html = $stats->embedTags($html);
 		}
 
@@ -92,22 +93,16 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		$id = $this->getName() . $block_id;
 		$class = $this->getName() . '_block';
 		if ($ctype === 'gedcom' && WT_USER_GEDCOM_ADMIN || $ctype === 'user' && Auth::check()) {
-			$title = '<i class="icon-admin" title="' . WT_I18N::translate('Configure') . '" onclick="modalDialog(\'block_edit.php?block_id=' . $block_id . '\', \'' . $this->getTitle() . '\');"></i>';
-		} else {
-			$title = '';
+			$title = '<i class="icon-admin" title="' . WT_I18N::translate('Configure') . '" onclick="modalDialog(\'block_edit.php?block_id=' . $block_id . '\', \'' . $this->getTitle() . '\');"></i>' . $title;
 		}
-		$title .= $title_tmp;
 
 		$content = $html;
 
-		if (get_block_setting($block_id, 'show_timestamp', false)) {
+		if ($show_timestamp) {
 			$content .= '<br>' . format_timestamp(get_block_setting($block_id, 'timestamp', WT_TIMESTAMP));
 		}
 
 		if ($template) {
-			if (get_block_setting($block_id, 'block', false)) {
-				$class .= ' small_inner_block';
-			}
 			return Theme::theme()->formatBlock($id, $title, $class, $content);
 		} else {
 			return $content;
@@ -144,7 +139,6 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 				}
 			}
 			set_block_setting($block_id, 'languages', implode(',', $languages));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
@@ -258,9 +252,12 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 			</div>'
 		);
 
-		$title = get_block_setting($block_id, 'title');
-		$html = get_block_setting($block_id, 'html');
-		// title
+		$title          = get_block_setting($block_id, 'title');
+		$html           = get_block_setting($block_id, 'html');
+		$gedcom         = get_block_setting($block_id, 'gedcom');
+		$show_timestamp = get_block_setting($block_id, 'show_timestamp', '0');
+		$languages      = get_block_setting($block_id, 'languages');
+
 		echo '<tr><td class="descriptionbox wrap">',
 			WT_Gedcom_Tag::getLabel('TITL'),
 			'</td><td class="optionbox"><input type="text" name="title" size="30" value="', WT_Filter::escapeHtml($title), '"></td></tr>';
@@ -283,8 +280,6 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		}
 		echo '</select></td></tr>';
 
-		// gedcom
-		$gedcom = get_block_setting($block_id, 'gedcom');
 		if (count(WT_Tree::getAll()) > 1) {
 			if ($gedcom == '__current__') {$sel_current = 'selected'; } else {$sel_current = ''; }
 			if ($gedcom == '__default__') {$sel_default = 'selected'; } else {$sel_default = ''; }
@@ -310,7 +305,6 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		echo '<textarea name="html" class="html-edit" rows="10" style="width:98%;">', WT_Filter::escapeHtml($html), '</textarea>';
 		echo '</td></tr>';
 
-		$show_timestamp = get_block_setting($block_id, 'show_timestamp', false);
 		echo '<tr><td class="descriptionbox wrap">';
 		echo WT_I18N::translate('Show the date and time of update');
 		echo '</td><td class="optionbox">';
@@ -318,7 +312,6 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		echo '<input type="hidden" name="timestamp" value="', WT_TIMESTAMP, '">';
 		echo '</td></tr>';
 
-		$languages = get_block_setting($block_id, 'languages');
 		echo '<tr><td class="descriptionbox wrap">';
 		echo WT_I18N::translate('Show this block for which languages?');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php
index 079a983a6f..b54f336004 100644
--- a/modules_v3/random_media/module.php
+++ b/modules_v3/random_media/module.php
@@ -40,10 +40,9 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype;
 
-		$filter  = get_block_setting($block_id, 'filter', 'all');
-		$controls = get_block_setting($block_id, 'controls', true);
-		$start   = get_block_setting($block_id, 'start', false) || WT_Filter::getBool('start');
-		$block   = get_block_setting($block_id, 'block', true);
+		$filter   = get_block_setting($block_id, 'filter', 'all');
+		$controls = get_block_setting($block_id, 'controls', '1');
+		$start    = get_block_setting($block_id, 'start', '0') || WT_Filter::getBool('start');
 
 		// We can apply the filters using SQL
 		// Do not use "ORDER BY RAND()" - it is very slow on large tables.  Use PHP::array_rand() instead.
@@ -54,36 +53,36 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 			" AND m_type IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '')"
 		)->execute(array(
 			WT_GED_ID,
-			get_block_setting($block_id, 'filter_avi', false) ? 'avi' : null,
-			get_block_setting($block_id, 'filter_bmp', true) ? 'bmp' : null,
-			get_block_setting($block_id, 'filter_gif', true) ? 'gif' : null,
-			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpg' : null,
-			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpeg' : null,
-			get_block_setting($block_id, 'filter_mp3', false) ? 'mp3' : null,
-			get_block_setting($block_id, 'filter_ole', true) ? 'ole' : null,
-			get_block_setting($block_id, 'filter_pcx', true) ? 'pcx' : null,
-			get_block_setting($block_id, 'filter_pdf', false) ? 'pdf' : null,
-			get_block_setting($block_id, 'filter_png', true) ? 'png' : null,
-			get_block_setting($block_id, 'filter_tiff', true) ? 'tiff' : null,
-			get_block_setting($block_id, 'filter_wav', false) ? 'wav' : null,
-			get_block_setting($block_id, 'filter_audio', false) ? 'audio' : null,
-			get_block_setting($block_id, 'filter_book', true) ? 'book' : null,
-			get_block_setting($block_id, 'filter_card', true) ? 'card' : null,
-			get_block_setting($block_id, 'filter_certificate', true) ? 'certificate' : null,
-			get_block_setting($block_id, 'filter_coat', true) ? 'coat' : null,
-			get_block_setting($block_id, 'filter_document', true) ? 'document' : null,
-			get_block_setting($block_id, 'filter_electronic', true) ? 'electronic' : null,
-			get_block_setting($block_id, 'filter_fiche', true) ? 'fiche' : null,
-			get_block_setting($block_id, 'filter_film', true) ? 'film' : null,
-			get_block_setting($block_id, 'filter_magazine', true) ? 'magazine' : null,
-			get_block_setting($block_id, 'filter_manuscript', true) ? 'manuscript' : null,
-			get_block_setting($block_id, 'filter_map', true) ? 'map' : null,
-			get_block_setting($block_id, 'filter_newspaper', true) ? 'newspaper' : null,
-			get_block_setting($block_id, 'filter_other', true) ? 'other' : null,
-			get_block_setting($block_id, 'filter_painting', true) ? 'painting' : null,
-			get_block_setting($block_id, 'filter_photo', true) ? 'photo' : null,
-			get_block_setting($block_id, 'filter_tombstone', true) ? 'tombstone' : null,
-			get_block_setting($block_id, 'filter_video', false) ? 'video' : null,
+			get_block_setting($block_id, 'filter_avi', '0') ? 'avi' : null,
+			get_block_setting($block_id, 'filter_bmp', '1') ? 'bmp' : null,
+			get_block_setting($block_id, 'filter_gif', '1') ? 'gif' : null,
+			get_block_setting($block_id, 'filter_jpeg', '1') ? 'jpg' : null,
+			get_block_setting($block_id, 'filter_jpeg', '1') ? 'jpeg' : null,
+			get_block_setting($block_id, 'filter_mp3', '0') ? 'mp3' : null,
+			get_block_setting($block_id, 'filter_ole', '1') ? 'ole' : null,
+			get_block_setting($block_id, 'filter_pcx', '1') ? 'pcx' : null,
+			get_block_setting($block_id, 'filter_pdf', '0') ? 'pdf' : null,
+			get_block_setting($block_id, 'filter_png', '1') ? 'png' : null,
+			get_block_setting($block_id, 'filter_tiff', '1') ? 'tiff' : null,
+			get_block_setting($block_id, 'filter_wav', '0') ? 'wav' : null,
+			get_block_setting($block_id, 'filter_audio', '0') ? 'audio' : null,
+			get_block_setting($block_id, 'filter_book', '1') ? 'book' : null,
+			get_block_setting($block_id, 'filter_card', '1') ? 'card' : null,
+			get_block_setting($block_id, 'filter_certificate', '1') ? 'certificate' : null,
+			get_block_setting($block_id, 'filter_coat', '1') ? 'coat' : null,
+			get_block_setting($block_id, 'filter_document', '1') ? 'document' : null,
+			get_block_setting($block_id, 'filter_electronic', '1') ? 'electronic' : null,
+			get_block_setting($block_id, 'filter_fiche', '1') ? 'fiche' : null,
+			get_block_setting($block_id, 'filter_film', '1') ? 'film' : null,
+			get_block_setting($block_id, 'filter_magazine', '1') ? 'magazine' : null,
+			get_block_setting($block_id, 'filter_manuscript', '1') ? 'manuscript' : null,
+			get_block_setting($block_id, 'filter_map', '1') ? 'map' : null,
+			get_block_setting($block_id, 'filter_newspaper', '1') ? 'newspaper' : null,
+			get_block_setting($block_id, 'filter_other', '1') ? 'other' : null,
+			get_block_setting($block_id, 'filter_painting', '1') ? 'painting' : null,
+			get_block_setting($block_id, 'filter_photo', '1') ? 'photo' : null,
+			get_block_setting($block_id, 'filter_tombstone', '1') ? 'tombstone' : null,
+			get_block_setting($block_id, 'filter_video', '0') ? 'video' : null,
 		))->fetchOneColumn();
 
 		// Keep looking through the media until a suitable one is found.
@@ -158,21 +157,10 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 				$content .= '<script>togglePlay();</script>';
 			}
 			$content .= '<div class="center" id="random_picture_content' . $block_id . '">';
-			$content .= '<table id="random_picture_box"><tr><td';
-
-			if ($block) {
-				$content .= ' class="details1"';
-			} else {
-				$content .= ' class="details2"';
-			}
-			$content .= ' >';
+			$content .= '<table id="random_picture_box"><tr><td class="details1">';
 			$content .= $random_media->displayImage();
 
-			if ($block) {
-				$content .= '<br>';
-			} else {
-				$content .= '</td><td class="details2">';
-			}
+			$content .= '<br>';
 			$content .= '<a href="' . $random_media->getHtmlUrl() . '"><b>' . $random_media->getFullName() . '</b></a><br>';
 			foreach ($random_media->linkedIndividuals('OBJE') as $individual) {
 				$content .= '<a href="' . $individual->getHtmlUrl() . '">' . WT_I18N::translate('View person') . ' — ' . $individual->getFullname() . '</a><br>';
@@ -249,12 +237,15 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'filter_photo', WT_Filter::postBool('filter_photo'));
 			set_block_setting($block_id, 'filter_tombstone', WT_Filter::postBool('filter_tombstone'));
 			set_block_setting($block_id, 'filter_video', WT_Filter::postBool('filter_video'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$filter = get_block_setting($block_id, 'filter', 'all');
+
+		$filter   = get_block_setting($block_id, 'filter', 'all');
+		$controls = get_block_setting($block_id, 'controls', '1');
+		$start    = get_block_setting($block_id, 'start', '0') || WT_Filter::getBool('start');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show only individuals, events, or all?');
 		echo '</td><td class="optionbox">';
@@ -262,35 +253,35 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 		echo '</td></tr>';
 
 		$filters = array(
-			'avi'        =>get_block_setting($block_id, 'filter_avi', false),
-			'bmp'        =>get_block_setting($block_id, 'filter_bmp', true),
-			'gif'        =>get_block_setting($block_id, 'filter_gif', true),
-			'jpeg'       =>get_block_setting($block_id, 'filter_jpeg', true),
-			'mp3'        =>get_block_setting($block_id, 'filter_mp3', false),
-			'ole'        =>get_block_setting($block_id, 'filter_ole', true),
-			'pcx'        =>get_block_setting($block_id, 'filter_pcx', true),
-			'pdf'        =>get_block_setting($block_id, 'filter_pdf', false),
-			'png'        =>get_block_setting($block_id, 'filter_png', true),
-			'tiff'       =>get_block_setting($block_id, 'filter_tiff', true),
-			'wav'        =>get_block_setting($block_id, 'filter_wav', false),
-			'audio'      =>get_block_setting($block_id, 'filter_audio', false),
-			'book'       =>get_block_setting($block_id, 'filter_book', true),
-			'card'       =>get_block_setting($block_id, 'filter_card', true),
-			'certificate'=>get_block_setting($block_id, 'filter_certificate', true),
-			'coat'       =>get_block_setting($block_id, 'filter_coat', true),
-			'document'   =>get_block_setting($block_id, 'filter_document', true),
-			'electronic' =>get_block_setting($block_id, 'filter_electronic', true),
-			'fiche'      =>get_block_setting($block_id, 'filter_fiche', true),
-			'film'       =>get_block_setting($block_id, 'filter_film', true),
-			'magazine'   =>get_block_setting($block_id, 'filter_magazine', true),
-			'manuscript' =>get_block_setting($block_id, 'filter_manuscript', true),
-			'map'        =>get_block_setting($block_id, 'filter_map', true),
-			'newspaper'  =>get_block_setting($block_id, 'filter_newspaper', true),
-			'other'      =>get_block_setting($block_id, 'filter_other', true),
-			'painting'   =>get_block_setting($block_id, 'filter_painting', true),
-			'photo'      =>get_block_setting($block_id, 'filter_photo', true),
-			'tombstone'  =>get_block_setting($block_id, 'filter_tombstone', true),
-			'video'      =>get_block_setting($block_id, 'filter_video', false),
+			'avi'        =>get_block_setting($block_id, 'filter_avi', '0'),
+			'bmp'        =>get_block_setting($block_id, 'filter_bmp', '1'),
+			'gif'        =>get_block_setting($block_id, 'filter_gif', '1'),
+			'jpeg'       =>get_block_setting($block_id, 'filter_jpeg', '1'),
+			'mp3'        =>get_block_setting($block_id, 'filter_mp3', '0'),
+			'ole'        =>get_block_setting($block_id, 'filter_ole', '1'),
+			'pcx'        =>get_block_setting($block_id, 'filter_pcx', '1'),
+			'pdf'        =>get_block_setting($block_id, 'filter_pdf', '0'),
+			'png'        =>get_block_setting($block_id, 'filter_png', '1'),
+			'tiff'       =>get_block_setting($block_id, 'filter_tiff', '1'),
+			'wav'        =>get_block_setting($block_id, 'filter_wav', '0'),
+			'audio'      =>get_block_setting($block_id, 'filter_audio', '0'),
+			'book'       =>get_block_setting($block_id, 'filter_book', '1'),
+			'card'       =>get_block_setting($block_id, 'filter_card', '1'),
+			'certificate'=>get_block_setting($block_id, 'filter_certificate', '1'),
+			'coat'       =>get_block_setting($block_id, 'filter_coat', '1'),
+			'document'   =>get_block_setting($block_id, 'filter_document', '1'),
+			'electronic' =>get_block_setting($block_id, 'filter_electronic', '1'),
+			'fiche'      =>get_block_setting($block_id, 'filter_fiche', '1'),
+			'film'       =>get_block_setting($block_id, 'filter_film', '1'),
+			'magazine'   =>get_block_setting($block_id, 'filter_magazine', '1'),
+			'manuscript' =>get_block_setting($block_id, 'filter_manuscript', '1'),
+			'map'        =>get_block_setting($block_id, 'filter_map', '1'),
+			'newspaper'  =>get_block_setting($block_id, 'filter_newspaper', '1'),
+			'other'      =>get_block_setting($block_id, 'filter_other', '1'),
+			'painting'   =>get_block_setting($block_id, 'filter_painting', '1'),
+			'photo'      =>get_block_setting($block_id, 'filter_photo', '1'),
+			'tombstone'  =>get_block_setting($block_id, 'filter_tombstone', '1'),
+			'video'      =>get_block_setting($block_id, 'filter_video', '0'),
 		);
 
 		echo '<tr><td class="descriptionbox wrap width33">';
@@ -401,14 +392,12 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 
 	<?php
 
-		$controls = get_block_setting($block_id, 'controls', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show slide show controls?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('controls', $controls);
 		echo '</td></tr>';
 
-		$start = get_block_setting($block_id, 'start', false);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Start slide show on page load?');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/recent_changes/module.php b/modules_v3/recent_changes/module.php
index 612b8259a2..8e73b47b7a 100644
--- a/modules_v3/recent_changes/module.php
+++ b/modules_v3/recent_changes/module.php
@@ -44,13 +44,15 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 		global $ctype;
 		require_once WT_ROOT . 'includes/functions/functions_print_lists.php';
 
-		$days = get_block_setting($block_id, 'days', self::DEFAULT_DAYS);
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
-		$sortStyle = get_block_setting($block_id, 'sortStyle', 'date_desc');
-		$hide_empty = get_block_setting($block_id, 'hide_empty', false);
-		$block = get_block_setting($block_id, 'block', true);
+		$days       = get_block_setting($block_id, 'days', self::DEFAULT_DAYS);
+		$infoStyle  = get_block_setting($block_id, 'infoStyle', 'table');
+		$sortStyle  = get_block_setting($block_id, 'sortStyle', 'date_desc');
+		$block      = get_block_setting($block_id, 'block', '1');
+		$hide_empty = get_block_setting($block_id, 'hide_empty', '0');
+
+
 		if ($cfg) {
-			foreach (array('days', 'infoStyle', 'show_parents', 'sortStyle', 'hide_empty', 'block') as $name) {
+			foreach (array('days', 'infoStyle', 'sortStyle', 'hide_empty', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
 					$$name = $cfg[$name];
 				}
@@ -123,12 +125,16 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'sortStyle', WT_Filter::post('sortStyle', 'name|date_asc|date_desc', 'date_desc'));
 			set_block_setting($block_id, 'hide_empty', WT_Filter::postBool('hide_empty'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$days = get_block_setting($block_id, 'days', self::DEFAULT_DAYS);
+		$days       = get_block_setting($block_id, 'days', self::DEFAULT_DAYS);
+		$infoStyle  = get_block_setting($block_id, 'infoStyle', 'table');
+		$sortStyle  = get_block_setting($block_id, 'sortStyle', 'date_desc');
+		$block      = get_block_setting($block_id, 'block', '1');
+		$hide_empty = get_block_setting($block_id, 'hide_empty', '0');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of days to show');
 		echo '</td><td class="optionbox">';
@@ -136,14 +142,12 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 		echo ' <em>', WT_I18N::plural('maximum %d day', 'maximum %d days', self::MAX_DAYS, self::MAX_DAYS), '</em>';
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list' => WT_I18N::translate('list'), 'table' => WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$sortStyle = get_block_setting($block_id, 'sortStyle', 'date');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
@@ -154,14 +158,12 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 		), null, $sortStyle, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('block', $block);
 		echo '</td></tr>';
 
-		$hide_empty = get_block_setting($block_id, 'hide_empty', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Should this block be hidden when it is empty?');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php
index 72f93c6794..42399a56d0 100644
--- a/modules_v3/review_changes/module.php
+++ b/modules_v3/review_changes/module.php
@@ -41,16 +41,10 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype;
 
-		$changes = WT_DB::prepare(
-			"SELECT 1" .
-			" FROM `##change`" .
-			" WHERE status='pending'" .
-			" LIMIT 1"
-		)->fetchOne();
+		$sendmail = get_block_setting($block_id, 'sendmail', '1');
+		$days     = get_block_setting($block_id, 'days', '1');
+		$block    = get_block_setting($block_id, 'block', '1');
 
-		$days    = get_block_setting($block_id, 'days', 1);
-		$sendmail = get_block_setting($block_id, 'sendmail', true);
-		$block   = get_block_setting($block_id, 'block', true);
 		if ($cfg) {
 			foreach (array('days', 'sendmail', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -59,6 +53,13 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 			}
 		}
 
+		$changes = WT_DB::prepare(
+			"SELECT 1" .
+			" FROM `##change`" .
+			" WHERE status='pending'" .
+			" LIMIT 1"
+		)->fetchOne();
+
 		if ($changes && $sendmail == 'yes') {
 			// There are pending changes - tell moderators/managers/administrators about them.
 			if (WT_TIMESTAMP - WT_Site::getPreference('LAST_CHANGE_EMAIL') > (60 * 60 * 24 * $days)) {
@@ -148,16 +149,17 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 	/** {@inheritdoc} */
 	public function configureBlock($block_id) {
 		if (WT_Filter::postBool('save') && WT_Filter::checkCsrf()) {
-			set_block_setting($block_id, 'days', WT_Filter::postInteger('num', 1, 180, 7));
+			set_block_setting($block_id, 'days', WT_Filter::postInteger('num', 1, 180, 1));
 			set_block_setting($block_id, 'sendmail', WT_Filter::postBool('sendmail'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$sendmail = get_block_setting($block_id, 'sendmail', true);
-		$days = get_block_setting($block_id, 'days', 7);
+		$sendmail = get_block_setting($block_id, 'sendmail', '1');
+		$days     = get_block_setting($block_id, 'days', '1');
+		$block    = get_block_setting($block_id, 'block', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Send out reminder emails?');
 		echo '</td><td class="optionbox">';
@@ -166,7 +168,6 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 		echo WT_I18N::translate('Reminder email frequency (days)') . "&nbsp;<input type='text' name='days' value='" . $days . "' size='2'>";
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/todays_events/module.php b/modules_v3/todays_events/module.php
index 841053ff59..f1cf7ca71a 100644
--- a/modules_v3/todays_events/module.php
+++ b/modules_v3/todays_events/module.php
@@ -42,11 +42,12 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		require_once WT_ROOT . 'includes/functions/functions_print_lists.php';
 
-		$filter    = get_block_setting($block_id, 'filter', true);
-		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', true);
+		$filter    = get_block_setting($block_id, 'filter', '1');
+		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', '1');
 		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
-		$block     = get_block_setting($block_id, 'block', true);
+		$block     = get_block_setting($block_id, 'block', '1');
+
 		if ($cfg) {
 			foreach (array('filter', 'onlyBDM', 'infoStyle', 'sortStyle', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -113,33 +114,34 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|table', 'table'));
 			set_block_setting($block_id, 'sortStyle', WT_Filter::post('sortStyle', 'alpha|anniv', 'alpha'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$filter = get_block_setting($block_id, 'filter', true);
+		$filter    = get_block_setting($block_id, 'filter', '1');
+		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', '1');
+		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
+		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
+		$block     = get_block_setting($block_id, 'block', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show only events of living individuals?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('filter', $filter);
 		echo '</td></tr>';
 
-		$onlyBDM = get_block_setting($block_id, 'onlyBDM', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show only births, deaths, and marriages?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('onlyBDM', $onlyBDM);
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
@@ -149,7 +151,6 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 		), null, $sortStyle, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php
index e426bde80b..413514afe8 100644
--- a/modules_v3/todo/module.php
+++ b/modules_v3/todo/module.php
@@ -41,10 +41,11 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype, $controller;
 
-		$show_unassigned = get_block_setting($block_id, 'show_unassigned', true);
-		$show_other     = get_block_setting($block_id, 'show_other', true);
-		$show_future    = get_block_setting($block_id, 'show_future', true);
-		$block          = get_block_setting($block_id, 'block', true);
+		$show_other      = get_block_setting($block_id, 'show_other', '1');
+		$show_unassigned = get_block_setting($block_id, 'show_unassigned', '1');
+		$show_future     = get_block_setting($block_id, 'show_future', '1');
+		$block           = get_block_setting($block_id, 'block', '1');
+
 		if ($cfg) {
 			foreach (array('show_unassigned', 'show_other', 'show_future', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -161,33 +162,33 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'show_unassigned', WT_Filter::postBool('show_unassigned'));
 			set_block_setting($block_id, 'show_future', WT_Filter::postBool('show_future'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$show_other = get_block_setting($block_id, 'show_other', true);
+		$show_other      = get_block_setting($block_id, 'show_other', '1');
+		$show_unassigned = get_block_setting($block_id, 'show_unassigned', '1');
+		$show_future     = get_block_setting($block_id, 'show_future', '1');
+		$block           = get_block_setting($block_id, 'block', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show research tasks that are assigned to other users');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('show_other', $show_other);
 		echo '</td></tr>';
 
-		$show_unassigned = get_block_setting($block_id, 'show_unassigned', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show research tasks that are not assigned to any user');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('show_unassigned', $show_unassigned);
 		echo '</td></tr>';
 
-		$show_future = get_block_setting($block_id, 'show_future', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show research tasks that have a date in the future');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('show_future', $show_future);
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/top10_givnnames/module.php b/modules_v3/top10_givnnames/module.php
index 00baba4753..5d9ee0a144 100644
--- a/modules_v3/top10_givnnames/module.php
+++ b/modules_v3/top10_givnnames/module.php
@@ -40,9 +40,10 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $TEXT_DIRECTION, $ctype;
 
-		$num = get_block_setting($block_id, 'num', 10);
+		$num       = get_block_setting($block_id, 'num', '10');
 		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
-		$block = get_block_setting($block_id, 'block', false);
+		$block     = get_block_setting($block_id, 'block', '0');
+
 		if ($cfg) {
 			foreach (array('num', 'infoStyle', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -131,26 +132,26 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'num', WT_Filter::postInteger('num', 1, 10000, 10));
 			set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|table', 'table'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$num = get_block_setting($block_id, 'num', 10);
+		$num       = get_block_setting($block_id, 'num', '10');
+		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
+		$block     = get_block_setting($block_id, 'block', '0');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of items to show');
 		echo '</td><td class="optionbox">';
 		echo '<input type="text" name="num" size="2" value="', $num, '">';
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', false);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/top10_pageviews/module.php b/modules_v3/top10_pageviews/module.php
index 92c42225ba..8378dd4ea9 100644
--- a/modules_v3/top10_pageviews/module.php
+++ b/modules_v3/top10_pageviews/module.php
@@ -40,9 +40,10 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype;
 
+		$num             = get_block_setting($block_id, 'num', '10');
 		$count_placement = get_block_setting($block_id, 'count_placement', 'before');
-		$num = (int) get_block_setting($block_id, 'num', 10);
-		$block = get_block_setting($block_id, 'block', false);
+		$block           = get_block_setting($block_id, 'block', '0');
+
 		if ($cfg) {
 			foreach (array('count_placement', 'num', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -125,25 +126,25 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'num', WT_Filter::postInteger('num', 1, 10000, 10));
 			set_block_setting($block_id, 'count_placement', WT_Filter::post('count_placement', 'before|after', 'before'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$num = get_block_setting($block_id, 'num', 10);
+		$num             = get_block_setting($block_id, 'num', '10');
+		$count_placement = get_block_setting($block_id, 'count_placement', 'before');
+		$block           = get_block_setting($block_id, 'block', '0');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of items to show');
 		echo '</td><td class="optionbox">';
 		echo '<input type="text" name="num" size="2" value="', $num, '">';
 		echo '</td></tr>';
 
-		$count_placement = get_block_setting($block_id, 'count_placement', 'left');
 		echo "<tr><td class=\"descriptionbox wrap width33\">";
 		echo WT_I18N::translate('Place counts before or after name?');
 		echo "</td><td class=\"optionbox\">";
 		echo select_edit_control('count_placement', array('before'=>WT_I18N::translate('before'), 'after'=>WT_I18N::translate('after')), null, $count_placement, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', false);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/top10_surnames/module.php b/modules_v3/top10_surnames/module.php
index fa3c352485..001faa4b87 100644
--- a/modules_v3/top10_surnames/module.php
+++ b/modules_v3/top10_surnames/module.php
@@ -45,9 +45,10 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 		$COMMON_NAMES_REMOVE    = $WT_TREE->getPreference('COMMON_NAMES_REMOVE');
 		$COMMON_NAMES_THRESHOLD = $WT_TREE->getPreference('COMMON_NAMES_THRESHOLD');
 
-		$num       = get_block_setting($block_id, 'num', 10);
+		$num       = get_block_setting($block_id, 'num', '10');
 		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
-		$block     = get_block_setting($block_id, 'block', false);
+		$block     = get_block_setting($block_id, 'block', '0');
+
 		if ($cfg) {
 			foreach (array('num', 'infoStyle', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -146,26 +147,26 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'num', WT_Filter::postInteger('num', 1, 10000, 10));
 			set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|array|table|tagcloud', 'table'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$num = get_block_setting($block_id, 'num', 10);
+		$num       = get_block_setting($block_id, 'num', '10');
+		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
+		$block     = get_block_setting($block_id, 'block', '0');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of items to show');
 		echo '</td><td class="optionbox">';
 		echo '<input type="text" name="num" size="2" value="', $num, '">';
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list' => WT_I18N::translate('bullet list'), 'array' => WT_I18N::translate('compact list'), 'table' => WT_I18N::translate('table'), 'tagcloud' => WT_I18N::translate('tag cloud')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', false);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/upcoming_events/module.php b/modules_v3/upcoming_events/module.php
index efbd13a33e..ec13a19c71 100644
--- a/modules_v3/upcoming_events/module.php
+++ b/modules_v3/upcoming_events/module.php
@@ -42,12 +42,13 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		require_once WT_ROOT . 'includes/functions/functions_print_lists.php';
 
-		$days      = get_block_setting($block_id, 'days', 7);
-		$filter    = get_block_setting($block_id, 'filter', true);
-		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', false);
+		$days      = get_block_setting($block_id, 'days', '7');
+		$filter    = get_block_setting($block_id, 'filter', '1');
+		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', '0');
 		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
-		$block     = get_block_setting($block_id, 'block', true);
+		$block     = get_block_setting($block_id, 'block', '1');
+
 		if ($cfg) {
 			foreach (array('days', 'filter', 'onlyBDM', 'infoStyle', 'sortStyle', 'block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -116,12 +117,17 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|table', 'table'));
 			set_block_setting($block_id, 'sortStyle', WT_Filter::post('sortStyle', 'alpha|anniv', 'alpha'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$days = get_block_setting($block_id, 'days', 7);
+		$days      = get_block_setting($block_id, 'days', '7');
+		$filter    = get_block_setting($block_id, 'filter', '1');
+		$onlyBDM   = get_block_setting($block_id, 'onlyBDM', '0');
+		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
+		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
+		$block     = get_block_setting($block_id, 'block', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of days to show');
 		echo '</td><td class="optionbox">';
@@ -129,28 +135,24 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 		echo ' <em>', WT_I18N::plural('maximum %d day', 'maximum %d days', 30, 30), '</em>';
 		echo '</td></tr>';
 
-		$filter = get_block_setting($block_id, 'filter', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show only events of living individuals?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('filter', $filter);
 		echo '</td></tr>';
 
-		$onlyBDM = get_block_setting($block_id, 'onlyBDM', false);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show only births, deaths, and marriages?');
 		echo '</td><td class="optionbox">';
 		echo edit_field_yes_no('onlyBDM', $onlyBDM);
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$sortStyle = get_block_setting($block_id, 'sortStyle', 'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
@@ -160,7 +162,6 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 		), null, $sortStyle, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/user_blog/module.php b/modules_v3/user_blog/module.php
index 45b137ef74..6e8676ef37 100644
--- a/modules_v3/user_blog/module.php
+++ b/modules_v3/user_blog/module.php
@@ -56,7 +56,7 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block {
 			}
 			break;
 		}
-		$block = get_block_setting($block_id, 'block', true);
+		$block = get_block_setting($block_id, 'block', '1');
 		if ($cfg) {
 			foreach (array('block') as $name) {
 				if (array_key_exists($name, $cfg)) {
diff --git a/modules_v3/user_messages/module.php b/modules_v3/user_messages/module.php
index 89e285d09b..dc62f8cebf 100644
--- a/modules_v3/user_messages/module.php
+++ b/modules_v3/user_messages/module.php
@@ -49,7 +49,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block {
 				WT_DB::prepare("DELETE FROM `##message` WHERE message_id=?")->execute(array($message_id));
 			}
 		}
-		$block = get_block_setting($block_id, 'block', true);
+		$block = get_block_setting($block_id, 'block', '1');
 		if ($cfg) {
 			foreach (array('block') as $name) {
 				if (array_key_exists($name, $cfg)) {
@@ -147,12 +147,11 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block {
 	public function configureBlock($block_id) {
 		if (WT_Filter::postBool('save') && WT_Filter::checkCsrf()) {
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$block = get_block_setting($block_id, 'block', true);
+		$block = get_block_setting($block_id, 'block', '1');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/yahrzeit/module.php b/modules_v3/yahrzeit/module.php
index 0d407b9a7d..aa01d5c630 100644
--- a/modules_v3/yahrzeit/module.php
+++ b/modules_v3/yahrzeit/module.php
@@ -42,10 +42,10 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 	public function getBlock($block_id, $template = true, $cfg = null) {
 		global $ctype, $controller;
 
-		$days      = get_block_setting($block_id, 'days', 7);
+		$days      = get_block_setting($block_id, 'days', '7');
 		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		$calendar  = get_block_setting($block_id, 'calendar', 'jewish');
-		$block     = get_block_setting($block_id, 'block', true);
+		$block     = get_block_setting($block_id, 'block', '1');
 
 		if ($cfg) {
 			foreach (array('days', 'infoStyle', 'block') as $name) {
@@ -241,12 +241,15 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 			set_block_setting($block_id, 'infoStyle', WT_Filter::post('infoStyle', 'list|table', 'table'));
 			set_block_setting($block_id, 'calendar', WT_Filter::post('calendar', 'jewish|gregorian', 'jewish'));
 			set_block_setting($block_id, 'block', WT_Filter::postBool('block'));
-			exit;
 		}
 
 		require_once WT_ROOT . 'includes/functions/functions_edit.php';
 
-		$days = get_block_setting($block_id, 'days', 7);
+		$days      = get_block_setting($block_id, 'days', '7');
+		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
+		$calendar  = get_block_setting($block_id, 'calendar', 'jewish');
+		$block     = get_block_setting($block_id, 'block', '1');
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Number of days to show');
 		echo '</td><td class="optionbox">';
@@ -254,14 +257,12 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 		echo ' <em>', WT_I18N::plural('maximum %d day', 'maximum %d days', 30, 30), '</em>';
 		echo '</td></tr>';
 
-		$infoStyle = get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
-		$calendar = get_block_setting($block_id, 'calendar');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Calendar');
 		echo '</td><td class="optionbox">';
@@ -271,7 +272,6 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 		), null, $calendar, '');
 		echo '</td></tr>';
 
-		$block = get_block_setting($block_id, 'block', true);
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo /* I18N: label for a yes/no option */ WT_I18N::translate('Add a scrollbar when block contents grow');
 		echo '</td><td class="optionbox">';