From 535f5d3688d1c1fafbe4e48efa9ce8d526cd256b Mon Sep 17 00:00:00 2001
From: fisharebest <fisharebest@gmail.com>
Date: Sun, 23 Jun 2013 21:05:50 +0000
Subject: Use PHP5.3 language features in gedcom-record classes

---
 .../_MEDIA/media_0_inverselink.php                 |  4 +-
 modules_v3/GEDFact_assistant/module.php            |  2 +-
 modules_v3/clippings/clippings_ctrl.php            |  8 ++--
 modules_v3/clippings/module.php                    | 47 ++++++++++------------
 modules_v3/gedcom_favorites/module.php             |  6 +--
 modules_v3/review_changes/module.php               | 13 ++----
 modules_v3/user_favorites/module.php               |  4 +-
 7 files changed, 37 insertions(+), 47 deletions(-)

(limited to 'modules_v3')

diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 0ed585a5e8..3ec3cb93ba 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -139,11 +139,11 @@ if ($action == 'choose' && $paramok) {
 			echo "<td align='center'><input alt='", WT_I18N::translate('Keep Link in list'), "', title='", WT_I18N::translate('Keep Link in list'), "' type='radio' id='", $record->getXref(), "_off' name='", $record->getXref(), "' checked></td>";
 			echo "<td align='center'><input alt='", WT_I18N::translate('Remove Link from list'), "', title='", WT_I18N::translate('Remove Link from list'), "' type='radio' id='", $record->getXref(), "_on'  name='", $record->getXref(), "'></td>";
 	
-			if ($record->getType()=='INDI') {
+			if ($record instanceof WT_Person) {
 				?>
 				<td align="center"><a href="#" class="icon-button_family" title="<?php echo WT_I18N::translate('Family navigator'); ?>" name="family_'<?php echo $record->getXref(); ?>'" onclick="openFamNav('<?php echo $record->getXref(); ?>'); return false;"></a></td>
 				<?php
-			} elseif ($record->getType()=='FAM') {
+			} elseif ($record instanceof WT_Family) {
 				if ($record->getHusband()) {
 					$head=$record->getHusband()->getXref();
 				} elseif ($record->getWife()) {
diff --git a/modules_v3/GEDFact_assistant/module.php b/modules_v3/GEDFact_assistant/module.php
index 61f40cd640..1a7da95c02 100644
--- a/modules_v3/GEDFact_assistant/module.php
+++ b/modules_v3/GEDFact_assistant/module.php
@@ -180,7 +180,7 @@ class GEDFact_assistant_WT_Module extends WT_Module {
 		$record=WT_GedcomRecord::getInstance($iid2);
 		if ($record) {
 			$headjs='';
-			if ($record->getType()=='FAM') {
+			if ($record instanceof WT_Family) {
 				if ($record->getHusband()) {
 					$headjs=$record->getHusband()->getXref();
 				} elseif ($record->getWife()) {
diff --git a/modules_v3/clippings/clippings_ctrl.php b/modules_v3/clippings/clippings_ctrl.php
index 2f01fc6bae..21f5d286c8 100644
--- a/modules_v3/clippings/clippings_ctrl.php
+++ b/modules_v3/clippings/clippings_ctrl.php
@@ -100,7 +100,7 @@ class WT_Controller_Clippings {
 					$this->id="";
 					$this->action="";
 				}
-				else $this->type = strtolower($obj->getType());
+				else $this->type = strtolower($obj::RECORD_TYPE);
 			}
 			else if (empty($this->id)) $this->action="";
 			if (!empty($this->id) && $this->type != 'fam' && $this->type != 'indi' && $this->type != 'sour')
@@ -220,7 +220,7 @@ class WT_Controller_Clippings {
 					if ($convert=='yes') {
 						$record=utf8_decode($record);
 					}
-					switch ($object->getType()) {
+					switch ($object::RECORD_TYPE) {
 					case 'INDI':
 						$filetext .= $record."\n";
 						$filetext .= "1 SOUR @WEBTREES@\n";
@@ -396,7 +396,7 @@ class WT_Controller_Clippings {
 		$a=WT_GedcomRecord::getInstance($a);
 		$b=WT_GedcomRecord::getInstance($b);
 		if ($a && $b) {
-			switch ($a->getType()) {
+			switch ($a::RECORD_TYPE) {
 			case 'INDI': $t1=1; break;
 			case 'FAM':  $t1=2; break;
 			case 'SOUR': $t1=3; break;
@@ -405,7 +405,7 @@ class WT_Controller_Clippings {
 			case 'NOTE': $t1=6; break;
 			default:     $t1=7; break;
 			}
-			switch ($b->getType()) {
+			switch ($b::RECORD_TYPE) {
 			case 'INDI': $t2=1; break;
 			case 'FAM':  $t2=2; break;
 			case 'SOUR': $t2=3; break;
diff --git a/modules_v3/clippings/module.php b/modules_v3/clippings/module.php
index 4c159820ad..32bdd50c8c 100644
--- a/modules_v3/clippings/module.php
+++ b/modules_v3/clippings/module.php
@@ -282,14 +282,14 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 				foreach (array_keys($WT_SESSION->cart[WT_GED_ID]) as $xref) {
 					$record=WT_GedcomRecord::getInstance($xref);
 					if ($record) {
-						switch ($tag = $record->getType()) {
-						case 'INDI': $icon='icon-indis'; break;
-						case 'FAM': $icon='icon-sfamily'; break;
-						case 'SOUR': $icon='icon-source'; break;
+						switch ($record::RECORD_TYPE) {
+						case 'INDI': $icon='icon-indis';      break;
+						case 'FAM':  $icon='icon-sfamily';    break;
+						case 'SOUR': $icon='icon-source';     break;
 						case 'REPO': $icon='icon-repository'; break;
-						case 'NOTE': $icon='icon-note'; break;
-						case 'OBJE': $icon='icon-media'; break;
-						default:     $icon='icon-clippings'; break;
+						case 'NOTE': $icon='icon-note';       break;
+						case 'OBJE': $icon='icon-media';      break;
+						default:     $icon='icon-clippings';  break;
 						}
 						?>
 						<tr><td class="list_value">
@@ -388,7 +388,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			$record = WT_GedcomRecord::getInstance($add);
 			if ($record) {
 				$clip_ctrl->id=$record->getXref();
-				$clip_ctrl->type=$record->getType();
+				$clip_ctrl->type=$record::RECORD_TYPE;
 				$ret = $clip_ctrl->add_clipping($record);
 				if ($ret) return $this->askAddOptions($record);
 			}
@@ -396,7 +396,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			$record = WT_Person::getInstance($add1);
 			if ($record) {
 				$clip_ctrl->id=$record->getXref();
-				$clip_ctrl->type=strtolower($record->getType());
+				$clip_ctrl->type=strtolower($record::RECORD_TYPE);
 				if ($others == 'parents') {
 					foreach ($record->getChildFamilies() as $family) {
 						$clip_ctrl->add_clipping($family);
@@ -442,24 +442,21 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			$out='<ul>';
 			foreach (array_keys($WT_SESSION->cart[WT_GED_ID]) as $xref) {
 				$record=WT_GedcomRecord::getInstance($xref);
-				if ($record && ($record->getType()=='INDI' || $record->getType()=='FAM')) { // Just show INDI/FAM in the sidbar
-					switch ($tag = $record->getType()) {
-					case 'INDI': $icon='icon-indis'; break;
+				if ($record && ($record::RECORD_TYPE=='INDI' || $record::RECORD_TYPE=='FAM')) { // Just show INDI/FAM in the sidbar
+					switch ($record::RECORD_TYPE) {
+					case 'INDI': $icon='icon-indis';  break;
 					case 'FAM': $icon='icon-sfamily'; break;
-					case 'SOUR': $icon='icon-source'; break;
-					case 'REPO': $icon='icon-repository'; break;
-					case 'NOTE': $icon='icon-note'; break;
-					case 'OBJE': $icon='icon-media'; break;
-					default:     $icon='icon-clippings'; break;
 					}
 					$out .= '<li>';
 					if (!empty($icon)) {
 						$out .= '<i class="'.$icon.'"></i>';
 					}
 					$out .= '<a href="'.$record->getHtmlUrl().'">';
-					if ($record->getType()=="INDI") $out .=$record->getSexImage();
+					if ($record::RECORD_TYPE == 'INDI') {
+						$out .=$record->getSexImage();
+					}
 					$out .= ' '.$record->getFullName().' ';
-					if ($record->getType()=="INDI" && $record->canDisplayDetails()) {
+					if ($record::RECORD_TYPE == 'INDI' && $record->canDisplayDetails()) {
 						$out .= ' ('.$record->getLifeSpan().')';
 					}
 					$out .= '</a>';
@@ -497,7 +494,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 				jQuery("#sb_clippings_content").load(link);
 			}';
 		$out .= '</script>';
-		if ($person->getType()=='FAM') {
+		if ($person::RECORD_TYPE=='FAM') {
 
 			$out .= '<form action="module.php" method="get" onsubmit="continueAjax(this); return false;">
 			<input type="hidden" name="mod" value="clippings">
@@ -505,7 +502,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			<table>
 			<tr><td class="topbottombar">'.WT_I18N::translate('Which other links from this family would you like to add?').'
 			<input type="hidden" name="pid" value="'.$person->getXref().'">
-			<input type="hidden" name="type" value="'.$person->getType().'">
+			<input type="hidden" name="type" value="'.$person::RECORD_TYPE.'">
 			<input type="hidden" name="action" value="add1"></td></tr>
 			<tr><td class="optionbox"><input type="radio" name="others" checked value="none">'.WT_I18N::translate('Add just this family record.').'</td></tr>
 			<tr><td class="optionbox"><input type="radio" name="others" value="parents">'.WT_I18N::translate('Add parents\' records together with this family record.').'</td></tr>
@@ -515,13 +512,13 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			</table>
 			</form>';
 		}
-		else if ($person->getType()=='INDI') {
+		else if ($person::RECORD_TYPE=='INDI') {
 			$out .= '<form action="module.php" method="get" onsubmit="continueAjax(this); return false;">
 			<input type="hidden" name="mod" value="clippings">
 			<input type="hidden" name="mod_action" value="index">
 		'.WT_I18N::translate('Which links from this person would you also like to add?').'
 		<input type="hidden" name="pid" value="'.$person->getXref().'">
-		<input type="hidden" name="type" value="'.$person->getType().'">
+		<input type="hidden" name="type" value="'.$person::RECORD_TYPE.'">
 		<input type="hidden" name="action" value="add1">
 		<ul>
 		<li><input type="radio" name="others" checked value="none">'.WT_I18N::translate('Add just this person.').'</li>
@@ -536,14 +533,14 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 		</ul>
 		<input type="submit" value="'.WT_I18N::translate('Continue Adding').'">
 		</form>';
-		} else if ($person->getType()=='SOUR')  {
+		} else if ($person::RECORD_TYPE == 'SOUR')  {
 			$out .= '<form action="module.php" method="get" onsubmit="continueAjax(this); return false;">
 		<input type="hidden" name="mod" value="clippings">
 		<input type="hidden" name="mod_action" value="index">
 		<table>
 		<tr><td class="topbottombar">'.WT_I18N::translate('Which records linked to this source should be added?').'
 		<input type="hidden" name="pid" value="'.$person->getXref().'">
-		<input type="hidden" name="type" value="'.$person->getType().'">
+		<input type="hidden" name="type" value="'.$person::RECORD_TYPE.'">
 		<input type="hidden" name="action" value="add1"></td></tr>
 		<tr><td class="optionbox"><input type="radio" name="others" checked value="none">'.WT_I18N::translate('Add just this source.').'</td></tr>
 		<tr><td class="optionbox"><input type="radio" name="others" value="linked">'.WT_I18N::translate('Add this source and families/people linked to it.').'</td></tr>
diff --git a/modules_v3/gedcom_favorites/module.php b/modules_v3/gedcom_favorites/module.php
index 2d1795f625..d65769338e 100644
--- a/modules_v3/gedcom_favorites/module.php
+++ b/modules_v3/gedcom_favorites/module.php
@@ -2,7 +2,7 @@
 // Classes and libraries for module system
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2012 webtrees development team.
+// Copyright (C) 2013 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2010 John Finlay
@@ -69,7 +69,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 						'user_id'  =>$ctype=='user' ? WT_USER_ID : null,
 						'gedcom_id'=>WT_GED_ID,
 						'gid'      =>$record->getXref(),
-						'type'     =>$record->getType(),
+						'type'     =>$record::RECORD_TYPE,
 						'url'      =>null,
 						'note'     =>$favnote,
 						'title'    =>$favtitle,
@@ -132,7 +132,7 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block {
 				} else {
 					$record=WT_GedcomRecord::getInstance($favorite['gid']);
 					if ($record && $record->canDisplayDetails()) {
-						if ($record->getType()=='INDI') {
+						if ($record instanceof WT_Person) {
 							$content .= '<div id="box'.$favorite["gid"].'.0" class="person_box action_header';
 							switch($record->getsex()) {
 								case 'M':
diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php
index d365775988..3d6e3206c2 100644
--- a/modules_v3/review_changes/module.php
+++ b/modules_v3/review_changes/module.php
@@ -2,7 +2,7 @@
 // Classes and libraries for module system
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2012 webtrees development team.
+// Copyright (C) 2013 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2010 John Finlay
@@ -121,15 +121,8 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 					$record=WT_GedcomRecord::getInstance($change->xref);
 					if ($record->canDisplayDetails()) {
 						$content.='<b>'.$record->getFullName().'</b>';
-						switch ($record->getType()) {
-						case 'INDI':
-						case 'FAM':
-						case 'SOUR':
-						case 'OBJE':
-							$content.=$block ? '<br>' : ' ';
-							$content.='<a href="'.$record->getHtmlUrl().'">'.WT_I18N::translate('View the changes').'</a>';
-							break;
-						}
+						$content.=$block ? '<br>' : ' ';
+						$content.='<a href="'.$record->getHtmlUrl().'">'.WT_I18N::translate('View the changes').'</a>';
 						$content.='<br>';
 					}
 				}
diff --git a/modules_v3/user_favorites/module.php b/modules_v3/user_favorites/module.php
index 04a0a52bf6..662a359678 100644
--- a/modules_v3/user_favorites/module.php
+++ b/modules_v3/user_favorites/module.php
@@ -2,7 +2,7 @@
 // Classes and libraries for module system
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2011 webtrees development team.
+// Copyright (C) 2013 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2010 John Finlay
@@ -72,7 +72,7 @@ class user_favorites_WT_Module extends gedcom_favorites_WT_Module {
 					'user_id'  =>WT_USER_ID,
 					'gedcom_id'=>$record->getGedId(),
 					'gid'      =>$record->getXref(),
-					'type'     =>$record->getType(),
+					'type'     =>$record::RECORD_TYPE,
 					'url'      =>null,
 					'note'     =>null,
 					'title'    =>null,
-- 
cgit v1.3