Remove some old/unused code.

3 files changed, 22 insertions, 36 deletions

diff --git a/includes/controllers/descendancy_ctrl.php b/includes/controllers/descendancy_ctrl.php
index d5afb0a9d2..898bb00c68 100644
--- a/includes/controllers/descendancy_ctrl.php
+++ b/includes/controllers/descendancy_ctrl.php
@@ -48,7 +48,6 @@ class DescendancyController extends BaseController {
 	var $SEX_COUNT = 0;
 	var $show_full;
 	var $chart_style;
-	var $sexarray = array();
 	var $generations;
 	var $personcount;
 	var $box_width;
@@ -69,10 +68,6 @@ class DescendancyController extends BaseController {
 	function init() {
 	global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full;
 
-	$this->sexarray["M"] = i18n::translate('Male');
-	$this->sexarray["F"] = i18n::translate('Female');
-	$this->sexarray["U"] = i18n::translate('unknown');
-
 	// Extract parameters from form
 	$this->pid        =safe_GET_xref('pid');
 	$this->show_full  =safe_GET('show_full', array('0', '1'), $PEDIGREE_FULL_DETAILS);
diff --git a/includes/controllers/hourglass_ctrl.php b/includes/controllers/hourglass_ctrl.php
index 5ee46732a3..6ba4df078c 100644
--- a/includes/controllers/hourglass_ctrl.php
+++ b/includes/controllers/hourglass_ctrl.php
@@ -55,7 +55,6 @@ class HourglassController extends BaseController {
 	var $name_count = 0;
 	var $total_names = 0;
 	var $SEX_COUNT = 0;
-	var $sexarray = array();
 	var $show_full = 0;
 	var $show_spouse = 0;
 	var $generations;
diff --git a/includes/controllers/individual_ctrl.php b/includes/controllers/individual_ctrl.php
index c935a3e937..f5ff0d7aad 100644
--- a/includes/controllers/individual_ctrl.php
+++ b/includes/controllers/individual_ctrl.php
@@ -48,7 +48,6 @@ class IndividualController extends BaseController {
 	var $name_count = 0;
 	var $total_names = 0;
 	var $SEX_COUNT = 0;
-	var $sexarray = array();
 	var $tabs;
 	var $Fam_Navigator = 'YES';
 	var $NAME_LINENUM = 1;
@@ -60,10 +59,6 @@ class IndividualController extends BaseController {
 		global $DEFAULT_PIN_STATE, $DEFAULT_SB_CLOSED_STATE, $pid;
 		global $Fam_Navigator;
 
-		$this->sexarray["M"] = i18n::translate('Male');
-		$this->sexarray["F"] = i18n::translate('Female');
-		$this->sexarray["U"] = i18n::translate('unknown');
-
 		$this->pid = safe_GET_xref('pid');
 
 		$pid = $this->pid;
@@ -101,13 +96,6 @@ class IndividualController extends BaseController {
 		$this->indi = new Person($gedrec, false);
 		$this->indi->ged_id=WT_GED_ID; // This record is from a file
 
-		//-- if the person is from another gedcom then forward to the correct site
-		/*
-		if ($this->indi->isRemote()) {
-			header('Location: '.encode_url(decode_url($this->indi->getLinkUrl()), false));
-			exit;
-		}
-		*/
 		//-- perform the desired action
 		switch($this->action) {
 		case 'addfav':
@@ -448,26 +436,30 @@ class IndividualController extends BaseController {
 				echo ' class="nameblue"';
 			}
 			echo '>';
-				echo '<dl><dt class="label">', i18n::translate('Gender'), '</dt>';
-				echo '<span class="field">', $this->sexarray[$sex];
-					if ($sex=='M') {
-						echo Person::sexImage('M', 'small', '', i18n::translate('Male'));
-					} elseif ($sex=='F') {
-						echo Person::sexImage('F', 'small', '', i18n::translate('Female'));
+			echo '<dl><dt class="label">', i18n::translate('Gender'), '</dt>';
+			echo '<span class="field">';
+			switch ($sex) {
+			case 'M':
+				echo i18n::translate('Male'), Person::sexImage('M', 'small', '', i18n::translate('Male'));
+				break;
+			case 'F':
+				echo i18n::translate('Female'), Person::sexImage('F', 'small', '', i18n::translate('Female'));
+				break;
+			case 'U':
+				echo i18n::translate('unknown'), Person::sexImage('U', 'small', '', i18n::translate('unknown'));
+				break;
+			}
+			if ($this->SEX_COUNT>1) {
+				if ($this->userCanEdit() && strpos($factrec, "WT_OLD")===false) {
+					if ($event->getLineNumber()=="new") {
+						echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"add_new_record('".$this->pid."', 'SEX'); return false;\">".i18n::translate('Edit')."</a>";
 					} else {
-						echo Person::sexImage('U', 'small', '', i18n::translate('unknown'));
+							echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"edit_record('".$this->pid."', ".$event->getLineNumber()."); return false;\">".i18n::translate('Edit')."</a> | ";
+							echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"delete_record('".$this->pid."', ".$event->getLineNumber()."); return false;\">".i18n::translate('Delete')."</a>\n";
 					}
-					if ($this->SEX_COUNT>1) {
-						if ($this->userCanEdit() && strpos($factrec, "WT_OLD")===false) {
-							if ($event->getLineNumber()=="new") {
-								echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"add_new_record('".$this->pid."', 'SEX'); return false;\">".i18n::translate('Edit')."</a>";
-							} else {
-									echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"edit_record('".$this->pid."', ".$event->getLineNumber()."); return false;\">".i18n::translate('Edit')."</a> | ";
-									echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"delete_record('".$this->pid."', ".$event->getLineNumber()."); return false;\">".i18n::translate('Delete')."</a>\n";
-							}
-						}
-					}
-				echo '</span>';
+				}
+			}
+			echo '</span>';
 			echo '</dl>';
 			// -- find sources
 	//		print "&nbsp;&nbsp;&nbsp;";