Refactoring class names and use autoloading.

15 files changed, 19 insertions, 53 deletions

diff --git a/library/WT/Controller/AdvancedSearch.php b/library/WT/Controller/AdvancedSearch.php
index 926205bdc6..a652ca60d6 100644
--- a/library/WT/Controller/AdvancedSearch.php
+++ b/library/WT/Controller/AdvancedSearch.php
@@ -2,7 +2,7 @@
 // Controller for the Advanced Search Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
@@ -28,18 +28,12 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_ADVANCED_SEARCH_PHP', '');
-
 class WT_Controller_AdvancedSearch extends WT_Controller_Search {
-
 	var $fields = array();
 	var $values = array();
 	var $plusminus = array();
 	var $errors = array();
 
-	/**
-	 * constructor
-	 */
 	function __construct() {
 		parent::__construct();
 	}
@@ -270,7 +264,7 @@ class WT_Controller_AdvancedSearch extends WT_Controller_Search {
 					$datesTable = true;
 				}
 				$sqlwhere .= " AND (d_fact='".$parts[0]."'";
-				$date = new GedcomDate($value);
+				$date = new WT_Date($value);
 				if ($date->isOK()) {
 					$jd1 = $date->date1->minJD;
 					if ($date->date2) $jd2 = $date->date2->maxJD;
diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php
index 57559fe96a..263e0c7090 100644
--- a/library/WT/Controller/Ancestry.php
+++ b/library/WT/Controller/Ancestry.php
@@ -2,7 +2,7 @@
 // Controller for the Ancestry Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_ANCESTRY_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 class WT_Controller_Ancestry extends WT_Controller_Base {
diff --git a/library/WT/Controller/Base.php b/library/WT/Controller/Base.php
index 7039031426..9b3cbddc81 100644
--- a/library/WT/Controller/Base.php
+++ b/library/WT/Controller/Base.php
@@ -2,7 +2,7 @@
 // Base controller for all controller classes
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_BASECONTROL_PHP', '');
-
 class WT_Controller_Base {
 	var $action      =null;
 	var $show_changes=null;
diff --git a/library/WT/Controller/Descendancy.php b/library/WT/Controller/Descendancy.php
index 76e091e724..a1c6bd8acf 100644
--- a/library/WT/Controller/Descendancy.php
+++ b/library/WT/Controller/Descendancy.php
@@ -2,7 +2,7 @@
 // Controller for the Descendancy Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_DESCENDANCY_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 class WT_Controller_Descendancy extends WT_Controller_Base {
diff --git a/library/WT/Controller/Family.php b/library/WT/Controller/Family.php
index 5255148186..6a8d683742 100644
--- a/library/WT/Controller/Family.php
+++ b/library/WT/Controller/Family.php
@@ -2,7 +2,7 @@
 // Controller for the Family Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2010 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FAMILY_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Hourglass.php b/library/WT/Controller/Hourglass.php
index 99a4ff7158..f44a55ca03 100644
--- a/library/WT/Controller/Hourglass.php
+++ b/library/WT/Controller/Hourglass.php
@@ -2,7 +2,7 @@
 // Controller for the Hourglass Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_HOURGLASS_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 // -- array of GEDCOM elements that will be found but should not be displayed
diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php
index b7f31d5e15..2fe4b3dc12 100644
--- a/library/WT/Controller/Individual.php
+++ b/library/WT/Controller/Individual.php
@@ -2,7 +2,7 @@
 // Controller for the Individual Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_INDIVIDUAL_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Lifespan.php b/library/WT/Controller/Lifespan.php
index e8d278bc41..63aca4506b 100644
--- a/library/WT/Controller/Lifespan.php
+++ b/library/WT/Controller/Lifespan.php
@@ -2,7 +2,7 @@
 // Controller for the timeline chart
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2010 PGV Development Team.  All rights reserved.
@@ -28,12 +28,10 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_LIFESPAN_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 function compare_people($a, $b) {
-	return GedcomDate::Compare($a->getEstimatedBirthDate(), $b->getEstimatedBirthDate());
+	return WT_Date::Compare($a->getEstimatedBirthDate(), $b->getEstimatedBirthDate());
 }
 
 class WT_Controller_Lifespan extends WT_Controller_Base {
diff --git a/library/WT/Controller/Media.php b/library/WT/Controller/Media.php
index 990e797645..866189f52b 100644
--- a/library/WT/Controller/Media.php
+++ b/library/WT/Controller/Media.php
@@ -2,7 +2,7 @@
 // Controller for the Media Menu
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_MEDIA_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Note.php b/library/WT/Controller/Note.php
index 0ee2f95a36..5047dd103e 100644
--- a/library/WT/Controller/Note.php
+++ b/library/WT/Controller/Note.php
@@ -2,7 +2,7 @@
 // Controller for the Shared Note Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2009 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_NOTE_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Pedigree.php b/library/WT/Controller/Pedigree.php
index 8f12fee31c..0ccae80ee1 100644
--- a/library/WT/Controller/Pedigree.php
+++ b/library/WT/Controller/Pedigree.php
@@ -1,6 +1,6 @@
 <?php
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
@@ -26,8 +26,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_PEDIGREE_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 class WT_Controller_Pedigree extends WT_Controller_Base {
diff --git a/library/WT/Controller/Repository.php b/library/WT/Controller/Repository.php
index d637360f80..ce9a453fa3 100644
--- a/library/WT/Controller/Repository.php
+++ b/library/WT/Controller/Repository.php
@@ -2,7 +2,7 @@
 // Controller for the Repository Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2010 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_REPOSITORY_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php
index 40187915d9..191406aebc 100644
--- a/library/WT/Controller/Search.php
+++ b/library/WT/Controller/Search.php
@@ -2,7 +2,7 @@
 // Controller for the Search Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
@@ -29,8 +29,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_SEARCH_CTRL_PHP', '');
-
 class WT_Controller_Search extends WT_Controller_Base {
 	var $isPostBack = false;
 	var $topsearch;
diff --git a/library/WT/Controller/Source.php b/library/WT/Controller/Source.php
index 1b0fcffa3b..8dc6b2b26b 100644
--- a/library/WT/Controller/Source.php
+++ b/library/WT/Controller/Source.php
@@ -2,7 +2,7 @@
 // Controller for the Source Page
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2010 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_SOURCE_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 require_once WT_ROOT.'includes/classes/class_menu.php';
 require_once WT_ROOT.'includes/functions/functions_import.php';
diff --git a/library/WT/Controller/Timeline.php b/library/WT/Controller/Timeline.php
index d3a0151fcd..883e40c4ad 100644
--- a/library/WT/Controller/Timeline.php
+++ b/library/WT/Controller/Timeline.php
@@ -2,7 +2,7 @@
 // Controller for the timeline chart
 //
 // webtrees: Web based Family History software
-// Copyright (C) 2010 webtrees development team.
+// Copyright (C) 2011 webtrees development team.
 //
 // Derived from PhpGedView
 // Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_TIMELINE_CTRL_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 class WT_Controller_Timeline extends WT_Controller_Base {
@@ -232,13 +230,13 @@ class WT_Controller_Timeline extends WT_Controller_Base {
 							$husb=$family->getHusband();
 							if (is_null($husb)) $husb = new WT_Person('');
 							$hdate=$husb->getBirthDate();
-							if ($hdate->isOK()) $ageh=get_age_at_event(GedcomDate::GetAgeGedcom($hdate, $gdate), false);
+							if ($hdate->isOK()) $ageh=get_age_at_event(WT_Date::GetAgeGedcom($hdate, $gdate), false);
 						}
 						else if ($this->pids[$p]==$wifeid) {
 							$wife=$family->getWife();
 							if (is_null($wife)) $wife = new WT_Person('');
 							$wdate=$wife->getBirthDate();
-							if ($wdate->isOK()) $agew=get_age_at_event(GedcomDate::GetAgeGedcom($wdate, $gdate), false);
+							if ($wdate->isOK()) $agew=get_age_at_event(WT_Date::GetAgeGedcom($wdate, $gdate), false);
 						}
 					}
 					if (!empty($ageh) && $ageh > 0) {