Fix #394 - admin breadcrumbs shown on user page

1 files changed, 84 insertions, 59 deletions

diff --git a/modules_v3/faq/module.php b/modules_v3/faq/module.php
index 11999bf144..1f8e660533 100644
--- a/modules_v3/faq/module.php
+++ b/modules_v3/faq/module.php
@@ -77,19 +77,19 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			$block_id = WT_Filter::postInteger('block_id');
 			if ($block_id) {
 				WT_DB::prepare(
-					"UPDATE `##block` SET gedcom_id=NULLIF(?, '0'), block_order=? WHERE block_id=?"
+					"UPDATE `##block` SET gedcom_id = NULLIF(:tree_id, '0'), block_order = :block_order WHERE block_id = :block_id"
 				)->execute(array(
-					WT_Filter::postInteger('gedcom_id'),
-					WT_Filter::postInteger('block_order'),
-					$block_id
+					'tree_id'     => WT_Filter::postInteger('gedcom_id'),
+					'block_order' => WT_Filter::postInteger('block_order'),
+					'block_id'    => $block_id
 				));
 			} else {
 				WT_DB::prepare(
-					"INSERT INTO `##block` (gedcom_id, module_name, block_order) VALUES (NULLIF(?, '0'), ?, ?)"
+					"INSERT INTO `##block` (gedcom_id, module_name, block_order) VALUES (NULLIF(:tree_id, '0'), :module_name, :block_order)"
 				)->execute(array(
-					WT_Filter::postInteger('gedcom_id'),
-					$this->getName(),
-					WT_Filter::postInteger('block_order')
+					'tree_id'     => WT_Filter::postInteger('gedcom_id'),
+					'module_name' => $this->getName(),
+					'block_order' => WT_Filter::postInteger('block_order'),
 				));
 				$block_id = WT_DB::getInstance()->lastInsertId();
 			}
@@ -111,18 +111,18 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 				$header      = get_block_setting($block_id, 'header');
 				$faqbody     = get_block_setting($block_id, 'faqbody');
 				$block_order = WT_DB::prepare(
-					"SELECT block_order FROM `##block` WHERE block_id=?"
-				)->execute(array($block_id))->fetchOne();
+					"SELECT block_order FROM `##block` WHERE block_id = :block_id"
+				)->execute(array('block_id' => $block_id))->fetchOne();
 				$gedcom_id   = WT_DB::prepare(
-					"SELECT gedcom_id FROM `##block` WHERE block_id=?"
-				)->execute(array($block_id))->fetchOne();
+					"SELECT gedcom_id FROM `##block` WHERE block_id = :block_id"
+				)->execute(array('block_id' => $block_id))->fetchOne();
 			} else {
 				$controller->setPageTitle(WT_I18N::translate('Add an FAQ item'));
 				$header      = '';
 				$faqbody     = '';
 				$block_order = WT_DB::prepare(
-					"SELECT IFNULL(MAX(block_order)+1, 0) FROM `##block` WHERE module_name=?"
-				)->execute(array($this->getName()))->fetchOne();
+					"SELECT IFNULL(MAX(block_order)+1, 0) FROM `##block` WHERE module_name = :module_name"
+				)->execute(array('module_name' => $this->getName()))->fetchOne();
 				$gedcom_id   = WT_GED_ID;
 			}
 			$controller->pageHeader();
@@ -181,12 +181,12 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 		$block_id = WT_Filter::getInteger('block_id');
 
 		WT_DB::prepare(
-			"DELETE FROM `##block_setting` WHERE block_id=?"
-		)->execute(array($block_id));
+			"DELETE FROM `##block_setting` WHERE block_id = :block_id"
+		)->execute(array('block_id' => $block_id));
 
 		WT_DB::prepare(
-			"DELETE FROM `##block` WHERE block_id=?"
-		)->execute(array($block_id));
+			"DELETE FROM `##block` WHERE block_id = :block_id"
+		)->execute(array('block_id' => $block_id));
 	}
 
 	/**
@@ -196,24 +196,34 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 		$block_id = WT_Filter::getInteger('block_id');
 
 		$block_order = WT_DB::prepare(
-			"SELECT block_order FROM `##block` WHERE block_id=?"
-		)->execute(array($block_id))->fetchOne();
+			"SELECT block_order FROM `##block` WHERE block_id = :block_id"
+		)->execute(array('block_id' => $block_id))->fetchOne();
 
 		$swap_block = WT_DB::prepare(
 			"SELECT block_order, block_id" .
 			" FROM `##block`" .
-			" WHERE block_order=(" .
-			"  SELECT MAX(block_order) FROM `##block` WHERE block_order < ? AND module_name=?" .
-			" ) AND module_name=?" .
+			" WHERE block_order = (" .
+			"  SELECT MAX(block_order) FROM `##block` WHERE block_order < :block_order AND module_name = :module_name_1" .
+			" ) AND module_name = :module_name_2" .
 			" LIMIT 1"
-		)->execute(array($block_order, $this->getName(), $this->getName()))->fetchOneRow();
+		)->execute(array(
+			'block_order'   => $block_order,
+			'module_name_1' => $this->getName(),
+			'module_name_2' => $this->getName()
+		))->fetchOneRow();
 		if ($swap_block) {
 			WT_DB::prepare(
-				"UPDATE `##block` SET block_order=? WHERE block_id=?"
-			)->execute(array($swap_block->block_order, $block_id));
+				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+			)->execute(array(
+				'block_order' => $swap_block->block_order,
+				'block_id'    => $block_id,
+			));
 			WT_DB::prepare(
-				"UPDATE `##block` SET block_order=? WHERE block_id=?"
-			)->execute(array($block_order, $swap_block->block_id));
+				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+			)->execute(array(
+				'block_order' => $block_order,
+				'block_id'    => $swap_block->block_id,
+			));
 		}
 	}
 
@@ -224,24 +234,36 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 		$block_id = WT_Filter::get('block_id');
 
 		$block_order = WT_DB::prepare(
-			"SELECT block_order FROM `##block` WHERE block_id=?"
-		)->execute(array($block_id))->fetchOne();
+			"SELECT block_order FROM `##block` WHERE block_id = :block_id"
+		)->execute(array(
+			'block_id' => $block_id,
+		))->fetchOne();
 
 		$swap_block = WT_DB::prepare(
 			"SELECT block_order, block_id" .
 			" FROM `##block`" .
 			" WHERE block_order=(" .
-			"  SELECT MIN(block_order) FROM `##block` WHERE block_order>? AND module_name=?" .
-			" ) AND module_name=?" .
+			"  SELECT MIN(block_order) FROM `##block` WHERE block_order > :block_order AND module_name = :module_name_1" .
+			" ) AND module_name = :module_name_2" .
 			" LIMIT 1"
-		)->execute(array($block_order, $this->getName(), $this->getName()))->fetchOneRow();
+		)->execute(array(
+			'block_order'   => $block_order,
+			'module_name_1' => $this->getName(),
+			'module_name_2' => $this->getName(),
+			))->fetchOneRow();
 		if ($swap_block) {
 			WT_DB::prepare(
-				"UPDATE `##block` SET block_order=? WHERE block_id=?"
-			)->execute(array($swap_block->block_order, $block_id));
+				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+			)->execute(array(
+				'block_order' => $swap_block->block_order,
+				'block_id'    => $block_id,
+			));
 			WT_DB::prepare(
-				"UPDATE `##block` SET block_order=? WHERE block_id=?"
-			)->execute(array($block_order, $swap_block->block_id));
+				"UPDATE `##block` SET block_order = :block_order WHERE block_id = :block_id"
+			)->execute(array(
+				'block_order' => $block_order,
+				'block_id'    => $swap_block->block_id,
+			));
 		}
 	}
 
@@ -261,22 +283,17 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			" JOIN `##block_setting` bs1 USING (block_id)" .
 			" JOIN `##block_setting` bs2 USING (block_id)" .
 			" JOIN `##block_setting` bs3 USING (block_id)" .
-			" WHERE module_name=?" .
-			" AND bs1.setting_name='header'" .
-			" AND bs2.setting_name='faqbody'" .
-			" AND bs3.setting_name='languages'" .
-			" AND IFNULL(gedcom_id, ?)=?" .
+			" WHERE module_name = :module_name" .
+			" AND bs1.setting_name = 'header'" .
+			" AND bs2.setting_name = 'faqbody'" .
+			" AND bs3.setting_name = 'languages'" .
+			" AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
 			" ORDER BY block_order"
-		)->execute(array($this->getName(), WT_GED_ID, WT_GED_ID))->fetchAll();
-
-		?>
-		<ol class="breadcrumb small">
-			<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
-			<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
-			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
-		</ol>
-		<h2><?php echo $controller->getPageTitle(); ?></h2>
-		<?php
+		)->execute(array(
+			'module_name' => $this->getName(),
+			'tree_id_1'   => WT_GED_ID,
+			'tree_id_2'   => WT_GED_ID,
+		))->fetchAll();
 
 		// Define your colors for the alternating rows
 		echo '<h2 class="center">', WT_I18N::translate('Frequently asked questions'), '</h2>';
@@ -305,7 +322,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			if (!$faq->languages || in_array(WT_LOCALE, explode(',', $faq->languages))) {
 				echo '<div class="faq_title" id="faq', $id, '">', $faq->header;
 				echo '<div class="faq_top faq_italic">';
-				echo '<a href="#body">', WT_I18N::translate('back to top'), '</a>';
+				echo '<a href="#content">', WT_I18N::translate('back to top'), '</a>';
 				echo '</div>';
 				echo '</div>';
 				echo '<div class="faq_body">', substr($faq->body, 0, 1) == '<' ? $faq->body : nl2br($faq->body, false), '</div>';
@@ -330,12 +347,16 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			" FROM `##block` b" .
 			" JOIN `##block_setting` bs1 USING (block_id)" .
 			" JOIN `##block_setting` bs2 USING (block_id)" .
-			" WHERE module_name = ?" .
+			" WHERE module_name = :module_name" .
 			" AND bs1.setting_name = 'header'" .
 			" AND bs2.setting_name = 'faqbody'" .
-			" AND IFNULL(gedcom_id, ?) = ?" .
+			" AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2" .
 			" ORDER BY block_order"
-		)->execute(array($this->getName(), WT_GED_ID, WT_GED_ID))->fetchAll();
+		)->execute(array(
+			'module_name' => $this->getName(),
+			'tree_id_1'   => WT_GED_ID,
+			'tree_id_2'   => WT_GED_ID,
+			))->fetchAll();
 
 		$min_block_order = WT_DB::prepare(
 			"SELECT MIN(block_order) FROM `##block` WHERE module_name=?"
@@ -362,7 +383,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			'<p><form>',
 			WT_I18N::translate('Family tree'), ' ',
 			'<input type="hidden" name="mod", value="', $this->getName(), '">',
-			'<input type="hidden" name="mod_action", value="admin_config">',
+			'<input type="hidden" name="mod_action" value="admin_config">',
 			select_edit_control('ged', WT_Tree::getNameList(), null, WT_GEDCOM),
 			'<input type="submit" value="', WT_I18N::translate('show'), '">',
 			'</form></p>';
@@ -427,8 +448,12 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 		}
 
 		$faqs = WT_DB::prepare(
-			"SELECT block_id FROM `##block` b WHERE module_name=? AND IFNULL(gedcom_id, ?)=?"
-		)->execute(array($this->getName(), WT_GED_ID, WT_GED_ID))->fetchAll();
+			"SELECT block_id FROM `##block` WHERE module_name = :module_name AND IFNULL(gedcom_id, :tree_id_1) = :tree_id_2"
+		)->execute(array(
+			'module_name' => $this->getName(),
+			'tree_id_1'   => WT_GED_ID,
+			'tree_id_2'   => WT_GED_ID,
+		))->fetchAll();
 
 		if (!$faqs) {
 			return null;