bitweaver

Update of /cvsroot/bitweaver/_bit_phpgedview
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24810/phpgedview

Modified Files:
	strings.js indilist.php calendar.php source.php 
	uploadmedia.php uploadgedcom.php statisticsplot.php 
	timeline.php addmedia.php usermigrate.php bit_setup_inc.php 
	statistics.php useradmin.php usermigrate_cli.php 
	themechange.php 
Added Files:
	note.php treenav.php search_advanced.php notelist.php 
Removed Files:
	sanity_check.php upgrade33-40.php patriarchlist.php 
	accesskeyHeaders.php viewconnections.php 
Log Message:
Code update for PGV4.2 - need to restore smarty template porting in previous import

Index: strings.js
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/strings.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- strings.js	7 Jul 2008 18:01:12 -0000	1.1
+++ strings.js	30 Apr 2009 19:12:13 -0000	1.2
@@ -1,103 +1,103 @@
-/**
- * Common strings functions
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2003  John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Display
- * @version $Id$
- */
-	function trim(str) {
-		return str.replace(/(^\s*)|(\s*$)/g,'');
-	}
-	function strclean(s) {
-		if (s=='') return s;
-		// Latin-1 Supplement
-		// See http://www.unicode.org/charts/PDF/U0080.pdf
-		s=s.replace(/[\u00C0-\u00C5]/g,'A');
-		s=s.replace(/[\u00C6]/g,'AE');
-		s=s.replace(/[\u00C7]/g,'C');
-		s=s.replace(/[\u00C8-\u00CB]/g,'E');
-		s=s.replace(/[\u00CC-\u00CF]/g,'I');
-		s=s.replace(/[\u00D0\u00DE]/g,'TH');
-		s=s.replace(/[\u00D1]/g,'N');
-		s=s.replace(/[\u00D2-\u00D6]/g,'O');
-		s=s.replace(/[\u00D8]/g,'O');
-		s=s.replace(/[\u00D9-\u00DC]/g,'U');
-		s=s.replace(/[\u00DD]/g,'Y');
-		s=s.replace(/[\u00DF]/g,'ss');
-		s=s.replace(/[\u00E0-\u00E5]/g,'a');
-		s=s.replace(/[\u00E6-\u00E6]/g,'ae');
-		s=s.replace(/[\u00E7]/g,'c');
-		s=s.replace(/[\u00E8-\u00EB]/g,'e');
-		s=s.replace(/[\u00EC-\u00EF]/g,'i');
-		s=s.replace(/[\u00F0\u00FE]/g,'th');
-		s=s.replace(/[\u00F1]/g,'n');
-		s=s.replace(/[\u00F2-\u00F6]/g,'o');
-		s=s.replace(/[\u00F8]/g,'o');
-		s=s.replace(/[\u00F9-\u00FC]/g,'u');
-		s=s.replace(/[\u00FD\u00FF]/g,'y');
-		// Latin Extended-A
-		// See http://www.unicode.org/charts/PDF/U0100.pdf  
-		s=s.replace(/[\u0100\u0102\u0104]/g,'A');
-		s=s.replace(/[\u0101\u0103\u0105]/g,'a');
-		s=s.replace(/[\u0106\u0108\u010A\u010C]/g,'C');
-		s=s.replace(/[\u0107\u0109\u010B\u010D]/g,'c');
-		s=s.replace(/[\u010E\u0110]/g,'D');
-		s=s.replace(/[\u010F\u0111]/g,'d');
-		s=s.replace(/[\u0112\u0114\u0116\u0118\u011A]/g,'E');
-		s=s.replace(/[\u0113\u0115\u0117\u0119\u011B]/g,'e');
-		s=s.replace(/[\u011C\u011E\u0120\u0122]/g,'G');
-		s=s.replace(/[\u011D\u011F\u0121\u0123]/g,'g');
-		s=s.replace(/[\u0124\u0126]/g,'H');
-		s=s.replace(/[\u0125\u0127]/g,'h');
-		s=s.replace(/[\u0128\u012A\u012C\u012E\u0130]/g,'I');
-		s=s.replace(/[\u0129\u012B\u012D\u012F\u0131]/g,'i');
-		s=s.replace(/[\u0132]/g,'IJ');
-		s=s.replace(/[\u0133]/g,'ij');
-		s=s.replace(/[\u0134]/g,'J');
-		s=s.replace(/[\u0135]/g,'j');
-		s=s.replace(/[\u0136]/g,'K');
-		s=s.replace(/[\u0137\u0138]/g,'k');
-		s=s.replace(/[\u0139\u013B\u013D\u013F\u0141]/g,'L');
-		s=s.replace(/[\u013A\u013C\u013E\u0140\u0142]/g,'l');
-		s=s.replace(/[\u0143\u0145\u0147\u014A]/g,'N');
-		s=s.replace(/[\u0144\u0146\u0148\u0149\u014B]/g,'n');
-		s=s.replace(/[\u014C\u014E\u0150]/g,'O');
-		s=s.replace(/[\u014D\u014F\u0151]/g,'o');
-		s=s.replace(/[\u0152]/g,'OE');
-		s=s.replace(/[\u0153]/g,'oe');
-		s=s.replace(/[\u0154\u0156\u0158]/g,'R');
-		s=s.replace(/[\u0155\u0157\u0159]/g,'r');
-		s=s.replace(/[\u015A\u015C\u015E\u0160]/g,'S');
-		s=s.replace(/[\u015B\u015D\u015F\u0161]/g,'s');
-		s=s.replace(/[\u0162\u0164\u0166]/g,'T');
-		s=s.replace(/[\u0163\u0165\u0167]/g,'t');
-		s=s.replace(/[\u0168\u016A\u016C\u016E\u0170\u0172]/g,'U');
-		s=s.replace(/[\u0169\u016B\u016D\u016F\u0171\u0173]/g,'u');
-		s=s.replace(/[\u0174]/g,'W');
-		s=s.replace(/[\u0175]/g,'w');
-		s=s.replace(/[\u0176\u0178]/g,'Y');
-		s=s.replace(/[\u0177]/g,'y');
-		s=s.replace(/[\u0179\u017B\u017D]/g,'Z');
-		s=s.replace(/[\u017A\u017C\u017E]/g,'z');
-		s=s.replace(/[\u017F]/g,'s');
-		s=s.replace(/[\s\']/g,'-');
-		s=s.replace(/<[^>]+>/g,''); // remove html tags
-		return s;
-	}
+/**
+ * Common strings functions
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2003  John Finlay and Others
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Display
+ * @version $Id$
+ */
+	function trim(str) {
+		return str.replace(/(^\s*)|(\s*$)/g,'');
+	}
+	function strclean(s) {
+		if (s=='') return s;
+		// Latin-1 Supplement
+		// See http://www.unicode.org/charts/PDF/U0080.pdf
+		s=s.replace(/[\u00C0-\u00C5]/g,'A');
+		s=s.replace(/[\u00C6]/g,'AE');
+		s=s.replace(/[\u00C7]/g,'C');
+		s=s.replace(/[\u00C8-\u00CB]/g,'E');
+		s=s.replace(/[\u00CC-\u00CF]/g,'I');
+		s=s.replace(/[\u00D0\u00DE]/g,'TH');
+		s=s.replace(/[\u00D1]/g,'N');
+		s=s.replace(/[\u00D2-\u00D6]/g,'O');
+		s=s.replace(/[\u00D8]/g,'O');
+		s=s.replace(/[\u00D9-\u00DC]/g,'U');
+		s=s.replace(/[\u00DD]/g,'Y');
+		s=s.replace(/[\u00DF]/g,'ss');
+		s=s.replace(/[\u00E0-\u00E5]/g,'a');
+		s=s.replace(/[\u00E6-\u00E6]/g,'ae');
+		s=s.replace(/[\u00E7]/g,'c');
+		s=s.replace(/[\u00E8-\u00EB]/g,'e');
+		s=s.replace(/[\u00EC-\u00EF]/g,'i');
+		s=s.replace(/[\u00F0\u00FE]/g,'th');
+		s=s.replace(/[\u00F1]/g,'n');
+		s=s.replace(/[\u00F2-\u00F6]/g,'o');
+		s=s.replace(/[\u00F8]/g,'o');
+		s=s.replace(/[\u00F9-\u00FC]/g,'u');
+		s=s.replace(/[\u00FD\u00FF]/g,'y');
+		// Latin Extended-A
+		// See http://www.unicode.org/charts/PDF/U0100.pdf  
+		s=s.replace(/[\u0100\u0102\u0104]/g,'A');
+		s=s.replace(/[\u0101\u0103\u0105]/g,'a');
+		s=s.replace(/[\u0106\u0108\u010A\u010C]/g,'C');
+		s=s.replace(/[\u0107\u0109\u010B\u010D]/g,'c');
+		s=s.replace(/[\u010E\u0110]/g,'D');
+		s=s.replace(/[\u010F\u0111]/g,'d');
+		s=s.replace(/[\u0112\u0114\u0116\u0118\u011A]/g,'E');
+		s=s.replace(/[\u0113\u0115\u0117\u0119\u011B]/g,'e');
+		s=s.replace(/[\u011C\u011E\u0120\u0122]/g,'G');
+		s=s.replace(/[\u011D\u011F\u0121\u0123]/g,'g');
+		s=s.replace(/[\u0124\u0126]/g,'H');
+		s=s.replace(/[\u0125\u0127]/g,'h');
+		s=s.replace(/[\u0128\u012A\u012C\u012E\u0130]/g,'I');
+		s=s.replace(/[\u0129\u012B\u012D\u012F\u0131]/g,'i');
+		s=s.replace(/[\u0132]/g,'IJ');
+		s=s.replace(/[\u0133]/g,'ij');
+		s=s.replace(/[\u0134]/g,'J');
+		s=s.replace(/[\u0135]/g,'j');
+		s=s.replace(/[\u0136]/g,'K');
+		s=s.replace(/[\u0137\u0138]/g,'k');
+		s=s.replace(/[\u0139\u013B\u013D\u013F\u0141]/g,'L');
+		s=s.replace(/[\u013A\u013C\u013E\u0140\u0142]/g,'l');
+		s=s.replace(/[\u0143\u0145\u0147\u014A]/g,'N');
+		s=s.replace(/[\u0144\u0146\u0148\u0149\u014B]/g,'n');
+		s=s.replace(/[\u014C\u014E\u0150]/g,'O');
+		s=s.replace(/[\u014D\u014F\u0151]/g,'o');
+		s=s.replace(/[\u0152]/g,'OE');
+		s=s.replace(/[\u0153]/g,'oe');
+		s=s.replace(/[\u0154\u0156\u0158]/g,'R');
+		s=s.replace(/[\u0155\u0157\u0159]/g,'r');
+		s=s.replace(/[\u015A\u015C\u015E\u0160]/g,'S');
+		s=s.replace(/[\u015B\u015D\u015F\u0161]/g,'s');
+		s=s.replace(/[\u0162\u0164\u0166]/g,'T');
+		s=s.replace(/[\u0163\u0165\u0167]/g,'t');
+		s=s.replace(/[\u0168\u016A\u016C\u016E\u0170\u0172]/g,'U');
+		s=s.replace(/[\u0169\u016B\u016D\u016F\u0171\u0173]/g,'u');
+		s=s.replace(/[\u0174]/g,'W');
+		s=s.replace(/[\u0175]/g,'w');
+		s=s.replace(/[\u0176\u0178]/g,'Y');
+		s=s.replace(/[\u0177]/g,'y');
+		s=s.replace(/[\u0179\u017B\u017D]/g,'Z');
+		s=s.replace(/[\u017A\u017C\u017E]/g,'z');
+		s=s.replace(/[\u017F]/g,'s');
+		s=s.replace(/[\s\']/g,'-');
+		s=s.replace(/<[^>]+>/g,''); // remove html tags
+		return s;
+	}

--- NEW FILE: notelist.php ---
<?php
/**
 * Parses gedcom file and displays a list of the shared notes in the file.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @version $Id: notelist.php,v 1.1 2009/04/30 19:12:13 lsces Exp $
 * @package PhpGedView
 * @subpackage Lists
 */

require './config.php';

require_once 'includes/functions/functions_print_lists.php';

print_header($pgv_lang['shared_note_list']);
echo '<div class="center"><h2>'.$pgv_lang['shared_note_list'].'</h2>';
print_note_table(get_note_list(PGV_GED_ID));
echo '</div>';
print_footer();
?>

Index: indilist.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/indilist.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- indilist.php	7 Jul 2008 18:01:12 -0000	1.10
+++ indilist.php	30 Apr 2009 19:12:13 -0000	1.11
@@ -17,6 +17,9 @@
  * Beneath the details list is the option to skip the surname list or show it.
  * Depending on the current status of the list.
  *
+ * NOTE: indilist.php and famlist.php contain mostly identical code.
+ * Updates to one file almost certainly need to be made to the other one as well.
+ *
  * phpGedView: Genealogy Viewer
  * Copyright (C) 2002 to 2007  PGV Development Team
  *
@@ -51,16 +54,12 @@
 
 $gGedcom = new BitGEDCOM();
 
-global $SEARCH_SPIDER;
-// Leave until translation stuff moved over to bitweaver
-require(PHPGEDVIEW_PKG_PATH."languages/lang.en.php");
-
-if(!(empty($SEARCH_SPIDER))) {
-	$surname_sublist = "no";
-	}
-else {
-	if (empty($surname_sublist)) $surname_sublist = "yes";
-	}
+// Don't show the list until we have some filter criteria
+if (isset($alpha) || isset($surname) || $show_all=='yes') {
+	$showList = true;
+} else {
+	$showList = false;
+}
 
 if (empty($show_all_firstnames)) $show_all_firstnames = "no";
 

Index: uploadgedcom.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/uploadgedcom.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- uploadgedcom.php	7 Jul 2008 18:01:11 -0000	1.14
+++ uploadgedcom.php	30 Apr 2009 19:12:13 -0000	1.15
@@ -67,6 +67,9 @@
 	header("Location: login.php?url=uploadgedcom.php");
 	exit;
 }
+// editconfig.php and uploadgedcom.php make extensive use of
+// import_request_variables and are heavily inter-dependent.
+@import_request_variables('cgp');
 
 @ini_set('zlib.output_compression','0');
 
@@ -89,7 +92,6 @@
 if (!isset ($config_gedcom)) $config_gedcom = "";
 if (!isset ($continue)) $continue = false;
 if (!isset ($import_existing)) $import_existing = false;
-if (!isset ($skip_cleanup)) $skip_cleanup = false;
 if (!isset($utf8convert)) $utf8convert = "no";
 if (isset($_REQUEST['keepmedia']) && $_REQUEST['keepmedia']=='yes') $keepmedia=true;
 else $keepmedia = false;
@@ -105,28 +107,25 @@
 	$ok = true;
 } else if ($check == "add_new") {
 	if (((!file_exists($INDEX_DIRECTORY.$GEDFILENAME)) && !file_exists($path.$GEDFILENAME)) || $override == "yes") {
-		if ($path != "")
-		$fp = fopen($path.$GEDFILENAME, "wb");
-		else
-		$fp = fopen($INDEX_DIRECTORY.$GEDFILENAME, "wb");
+		if ($path != "") $fp = fopen($path.$GEDFILENAME, "wb");
+		else $fp = fopen($INDEX_DIRECTORY.$GEDFILENAME, "wb");
 		if ($fp) {
 			$newgedcom = gedcom_header($GEDFILENAME).
-			"0 @I1@ INDI\r\n" .
-			"1 NAME Given Names /Surname/\r\n" .
-			"1 SEX M\r\n" .
-			"1 BIRT\r\n" .
-			"2 DATE 01 JAN 1850\r\n" .
-			"2 PLAC Click edit and change me\r\n" .
-			"0 TRLR";
+			"0 @I1@ INDI\n".
+			"1 NAME Given Names /Surname/\n".
+			"1 SEX M\n".
+			"1 BIRT\n".
+			"2 DATE 01 JAN 1850\n".
+			"2 PLAC Click edit and change me\n".
+			"0 TRLR\n";
+			$newgedcom = preg_replace('/[\r\n]+/', PGV_EOL, $newgedcom);
 			fwrite($fp, $newgedcom);
 			fclose($fp);
 			$logline = AddToLog($GEDFILENAME." updated");
-			if (!empty ($COMMIT_COMMAND))
 			check_in($logline, $GEDFILENAME, $INDEX_DIRECTORY);
 			$verify = "validate_form";
 			$exists = true;
 			// NOTE: Go straight to import, no other settings needed
-			$marr_names = "no";
 			$xreftype = "NA";
 			$utf8convert = "no";
 			$ged = $GEDFILENAME;
@@ -143,13 +142,14 @@
 		$fp = fopen($INDEX_DIRECTORY.$GEDFILENAME.".bak", "wb");
 		if ($fp) {
 			$newgedcom = gedcom_header($GEDFILENAME).
-			"0 @I1@ INDI\r\n" .
-			"1 NAME Given Names /Surname/\r\n" .
-			"1 SEX M\r\n" .
-			"1 BIRT\r\n" .
-			"2 DATE 01 JAN 1850\r\n" .
-			"2 PLAC Click edit and change me\r\n" .
-			"0 TRLR";
+			"0 @I1@ INDI\n".
+			"1 NAME Given Names /Surname/\n".
+			"1 SEX M\n".
+			"1 BIRT\n".
+			"2 DATE 01 JAN 1850\n".
+			"2 PLAC Click edit and change me\n".
+			"0 TRLR\n";
+			$newgedcom = preg_replace('/[\r\n]+/', PGV_EOL, $newgedcom);
 			fwrite($fp, $newgedcom);
 			fclose($fp);
 			if ($path != "")
@@ -170,24 +170,18 @@
 		@ unlink($INDEX_DIRECTORY.$GEDFILENAME);
 	}
 	// NOTE: Cleanup everything no longer needed
-	if (isset ($bakfile) && file_exists($bakfile))
-	unlink($bakfile);
-	if ($verify)
+	if (isset($bakfile) && file_exists($bakfile)) unlink($bakfile);
 	$verify = "";
-	if ($GEDFILENAME)
-	unset ($GEDFILENAME);
-	if ($startimport)
+	unset($GEDFILENAME);
 	$startimport = "";
-	if ($import)
 	$import = false;
-	if ($cleanup_needed)
 	$cleanup_needed = false;
 	$noupload = true;
 	header("Location: editgedcoms.php");
 }
 
 if ($cleanup_needed == "cleanup_needed" && $continue == $pgv_lang["del_proceed"]) {
-	require_once ("includes/functions_tools.php");
+	require_once ("includes/functions/functions_tools.php");
 
 	$filechanged = false;
 	if (file_is_writeable($gGedcom[$GEDFILENAME]["path"]) && (file_exists($gGedcom[$GEDFILENAME]["path"]))) {
@@ -378,11 +372,8 @@
 <td class="optionbox" dir="ltr">
 <?php
 
-if (isset ($GEDFILENAME))
-print PrintReady($path.$GEDFILENAME);
-else
-if (isset ($UPFILE))
-print PrintReady($UPFILE["name"]);
+if (isset($GEDFILENAME)) print PrintReady($path.$GEDFILENAME);
+else if (isset($UPFILE)) print PrintReady($UPFILE["name"]);
 else {
 	print "<input name=\"UPFILE\" type=\"file\" size=\"60\" />";
 	if (!$filesize = ini_get('upload_max_filesize'))
@@ -444,8 +435,13 @@
 
 if ($verify == "verify_gedcom") {
 	// NOTE: Check if GEDCOM has been imported into DB
-	$imported = check_for_import($GEDFILENAME);
-	if ($imported || $bakfile != "") {
+	$all_record_counts=count_all_records(get_id_from_gedcom($GEDFILENAME));
+	$totalRecords = 0;
+	foreach ($all_record_counts as $recordCount) {
+		$totalRecords += $recordCount;
+	}
+	$imported = !empty($totalRecords);
+	if ($imported || (!empty($bakfile) && file_exists($bakfile))) {
 		// NOTE: If GEDCOM exists show warning
 		print "<tr><td class=\"topbottombar $TEXT_DIRECTION\" colspan=\"2\">";
 		print "<a href=\"javascript: ".$pgv_lang["verify_gedcom"]."\" onclick=\"expand_layer('verify_gedcom');return false\"><img id=\"verify_gedcom_img\" src=\"".$PGV_IMAGE_DIR."/";
@@ -473,9 +469,9 @@
 		<input type="hidden" name="GEDFILENAME" value="<?php if (isset($GEDFILENAME)) print $GEDFILENAME; ?>" />
 		<input type="hidden" name="bakfile" value="<?php if (isset($bakfile)) print $bakfile; ?>" />
 		<input type="hidden" name="path" value="<?php if (isset($path)) print $path; ?>" />
-		
+
 		<?php
-		
+
 		if ($imported) {
 			print "<span class=error>".$pgv_lang["dataset_exists"]."</span><br /><br />";
 			if (!$SYNC_GEDCOM_FILE)
@@ -490,31 +486,19 @@
 				break;
 			}
 		}
-		if ($imported || $bakfile != "") {
-			print "<tr><td class=\"descriptionbox width20 wrap\">".$pgv_lang["empty_dataset"]."</td><td class=\"optionbox vmiddle\">\n";
-			print "<select name=\"override\">";
-			print "<option value=\"yes\" ";
-			if ($override == "yes")
+		print "<tr><td class=\"descriptionbox width20 wrap\">".$pgv_lang["empty_dataset"]."</td><td class=\"optionbox vmiddle\">\n";
+		print "<select name=\"override\">";
+		print "<option value=\"yes\" ";
+		if ($override == "yes")
 			print "selected=\"selected\"";
-			print ">".$pgv_lang["yes"]."</option>";
-			print "<option value=\"no\" ";
-			if ($override != "yes")
+		print ">".$pgv_lang["yes"]."</option>";
+		print "<option value=\"no\" ";
+		if ($override != "yes")
 			print "selected=\"selected\"";
-			print ">".$pgv_lang["no"]."</option>";
-			print "</select></td></tr>";
-			//-- check if there are media in the DB already
-			$mc = get_list_size('objectlist');
-			
-			$hasObje = false;
-			//-- read the gedcom and check if it has OBJE records
-			$fp = fopen($gGedcom[$GEDFILENAME]["path"], "r");
-			while (!feof($fp) && !$hasObje) {
-				$fcontents = fread($fp, 1024 * 4);
-				if (strpos($fcontents, "@ OBJE")!==false) $hasObje = true;
-			}
-			fclose($fp);
-			
-			if ($mc>0 && !$hasObje) {
+		print ">".$pgv_lang["no"]."</option>";
+		print "</select></td></tr>";
+		//-- check if there are media in the DB already
+		if (array_key_exists('OBJE', $all_record_counts)) {
 			?>
 			<tr>
 			<td class="descriptionbox wrap width20">
@@ -527,9 +511,8 @@
 			</td>
 			</tr>
 			<?php
-			}
-			print "<tr><td class=\"optionbox wrap\" colspan=\"2\">";
 		}
+		print "<tr><td class=\"optionbox wrap\" colspan=\"2\">";
 		print "</td></tr></table>";
 	} else	$verify = "validate_form";
 }
@@ -557,8 +540,8 @@
 	if (!empty ($error))
 	print "<span class=\"error\">$error</span>\n";
 
-	if ($import != true && $skip_cleanup != $pgv_lang["skip_cleanup"]) {
-		require_once ("includes/functions_tools.php");
+	if ($import != true) {
+		require_once ("includes/functions/functions_tools.php");
 		if ($override == "yes") {
 			copy($bakfile, $gGedcom[$GEDFILENAME]["path"]);
 			if (file_exists($bakfile))
@@ -581,26 +564,18 @@
 		// then we won't ask the user to choose between DMY and YMD.
 
 		//-- read the gedcom and test it in 8KB chunks
-		while (!feof($fp)) {
+		while ($fp && !feof($fp)) {
 			$fcontents = fread($fp, 1024 * 8);
-			if (!$l_BOMcleanup && need_BOM_cleanup())
-			$l_BOMcleanup = true;
-			if (!$l_headcleanup && need_head_cleanup())
-			$l_headcleanup = true;
-			if (!$l_macfilecleanup && need_macfile_cleanup())
-			$l_macfilecleanup = true;
-			if (!$l_lineendingscleanup && need_line_endings_cleanup())
-			$l_lineendingscleanup = true;
-			if (!$l_placecleanup && ($placesample = need_place_cleanup()) !== false)
-			$l_placecleanup = true;
-			if (!$l_datecleanup && ($datesample = need_date_cleanup()) !== false)
-			$l_datecleanup = true;
-			if (!$l_isansi && is_ansi())
-			$l_isansi = true;
+			if (!$l_BOMcleanup && need_BOM_cleanup()) $l_BOMcleanup = true;
+			if (!$l_headcleanup && need_head_cleanup()) $l_headcleanup = true;
+			if (!$l_macfilecleanup && need_macfile_cleanup()) $l_macfilecleanup = true;
+			if (!$l_lineendingscleanup && need_line_endings_cleanup()) $l_lineendingscleanup = true;
+			if (!$l_placecleanup && ($placesample = need_place_cleanup()) !== false) $l_placecleanup = true;
+			if (!$l_datecleanup && ($datesample = need_date_cleanup()) !== false) $l_datecleanup = true;
+			if (!$l_isansi && is_ansi()) $l_isansi = true;
 		}
 		fclose($fp);
 
-		if (!isset ($cleanup_needed))
 		$cleanup_needed = false;
 		if (!$l_datecleanup && !$l_isansi && !$l_BOMcleanup && !$l_headcleanup && !$l_macfilecleanup && !$l_placecleanup && !$l_lineendingscleanup) {
 			print $pgv_lang["valid_gedcom"];
@@ -693,12 +668,10 @@
 				print "</table>\n";
 			}
 		}
-	} else
-	if (!$cleanup_needed) {
+	} else if (!$cleanup_needed) {
 		print $pgv_lang["valid_gedcom"];
 		$import = true;
-	} else
-	$import = true;
+	} else $import = true;
 	?>
 	<input type = "hidden" name="GEDFILENAME" value="<?php if (isset($GEDFILENAME)) print $GEDFILENAME; ?>" />
 	<input type = "hidden" name="verify" value="validate_form" />
@@ -756,20 +729,6 @@
 	print "<option value=\"NO\">".$pgv_lang["no"]."</option>\n</select>";
 	print "</td></tr>";
 
-	// NOTE: Import married names
-	print "<tr><td class=\"descriptionbox width20 wrap\">";
-	print_help_link("import_marr_names_help", "qm", "import_marr_names");
-	print $pgv_lang["import_marr_names"].":";
-	print "</td><td class=\"optionbox\">";
-	if ($startimport == "true")
-	print $pgv_lang[$marr_names];
-	else {
-		print "<select name=\"marr_names\">\n";
-		print "<option value=\"yes\">".$pgv_lang["yes"]."</option>\n";
-		print "<option value=\"no\" selected=\"selected\">".$pgv_lang["no"]."</option>\n</select>";
-	}
-	print "</td></tr>";
-	
 	// NOTE: change XREF to RIN, REFN, or Don't change
 	print "<tr><td class=\"descriptionbox wrap\">";
 	print_help_link("change_indi2id_help", "qm", "change_id");
@@ -812,9 +771,6 @@
 }
 
 if ($startimport == "true") {
-	//-- set the building index flag to tell the rest of the program that we are importing and so shouldn't
-	//-- perform some of the same checks
-	$BUILDING_INDEX = true;
 	$gGedcom[$ged]["imported"] = false;
 	store_gedcoms();
 
@@ -835,39 +791,39 @@
 		<!--
 		function complete_progress(time, exectext, go_pedi, go_welc) {
 			progress = document.getElementById("progress_header");
-			if (progress) progress.innerHTML = '<span class="error"><b><?php print $pgv_lang["import_complete"]; ?></b></span><br />'+exectext+' '+time+' <?php print $pgv_lang["sec"]; ?>'; 
-			progress = document.getElementById("link1"); 
-			if (progress) progress.innerHTML = '<a href="pedigree.php?ged=<?php print preg_replace("/'/", "\'", $ged); ?>">'+go_pedi+'</a>'; 
-			progress = document.getElementById("link2"); 
-			if (progress) progress.innerHTML = '<a href="index.php?ctype=gedcom&ged=<?php print preg_replace("/'/", "\'", $ged); ?>">'+go_welc+'</a>'; 
-			progress = document.getElementById("link3"); 
+			if (progress) progress.innerHTML = '<span class="error"><b><?php print $pgv_lang["import_complete"]; ?></b></span><br />'+exectext+' '+time+' <?php print $pgv_lang["sec"]; ?>';
+			progress = document.getElementById("link1");
+			if (progress) progress.innerHTML = '<a href="pedigree.php?ged=<?php print encode_url(preg_replace("/'/", "\'", $ged)); ?>">'+go_pedi+'</a>';
+			progress = document.getElementById("link2");
+			if (progress) progress.innerHTML = '<a href="index.php?ctype=gedcom&ged=<?php print encode_url(preg_replace("/'/", "\'", $ged)); ?>">'+go_welc+'</a>';
+			progress = document.getElementById("link3");
 			if (progress) progress.innerHTML = '<a href="editgedcoms.php"><?php print $pgv_lang["manage_gedcoms"]; ?></a>';
 		}
-		function wait_progress() { 
-			progress = document.getElementById("progress_header"); 
-			if (progress) progress.innerHTML = '<?php print $pgv_lang["please_be_patient"]; ?>'; 
+		function wait_progress() {
+			progress = document.getElementById("progress_header");
+			if (progress) progress.innerHTML = '<?php print $pgv_lang["please_be_patient"]; ?>';
 		}
-		
-		var FILE_SIZE = <?php print $FILE_SIZE; ?>; 
+
+		var FILE_SIZE = <?php print $FILE_SIZE; ?>;
 		var TIME_LIMIT = <?php print $timelimit; ?>;
-		
-		function update_progress(bytes, time) { 
-			perc = Math.round(100*(bytes / FILE_SIZE)); 
-			if (perc>100) perc = 100; 
-			progress = document.getElementById("progress_div"); 
+
+		function update_progress(bytes, time) {
+			perc = Math.round(100*(bytes / FILE_SIZE));
+			if (perc>100) perc = 100;
+			progress = document.getElementById("progress_div");
 			if (progress) {
-				progress.style.width = perc+"%"; 
-				progress.innerHTML = perc+"%"; 
-			} 
-			perc = Math.round(100*(time / TIME_LIMIT)); 
-			if (perc>100) perc = 100; 
-			progress = document.getElementById("time_div"); 
+				progress.style.width = perc+"%";
+				progress.innerHTML = perc+"%";
+			}
+			perc = Math.round(100*(time / TIME_LIMIT));
+			if (perc>100) perc = 100;
+			progress = document.getElementById("time_div");
 			if (progress) {
-				progress.style.width = perc+"%"; progress.innerHTML = perc+"%"; 
-			} 
+				progress.style.width = perc+"%"; progress.innerHTML = perc+"%";
+			}
 		}
-		//--> 
-		</script> 
+		//-->
+		</script>
 		<?php
 		print "\n<table style=\"width: 800px;\"><tr><td>";
 		print "<div id=\"progress_header\" class=\"person_box\" style=\"width: 350px; margin: 10px; text-align: center;\">\n";
@@ -955,13 +911,6 @@
 	flush();
 
 	// ------------------------------------------------------ Begin importing data
-	// -- array of names
-	if (!isset ($indilist))
-	$indilist = array ();
-	if (!isset ($famlist))
-	$famlist = array ();
-	$sourcelist = array ();
-	$otherlist = array ();
 	$i = 0;
 
 	//-- as we are importing the file, a new file is being written to store any
@@ -1032,13 +981,13 @@
 
 			//-- calculate some statistics
 			if (!isset ($show_type)) {
-				$show_type = $type;
+				$show_type = $xtype;
 				$i_start = 1;
 				$exectime_start = 0;
 				$type_BYTES = 0;
 			}
 			$i ++;
-			if ($show_type != $type) {
+			if ($show_type != $xtype) {
 				$newtime = time();
 				$exectime = $newtime - $oldtime;
 				$show_exectime = $exectime - $exectime_start;
@@ -1055,7 +1004,7 @@
 					$listtype[$show_type]["bytes"] += $type_BYTES;
 					$listtype[$show_type]["i"] += $show_i;
 				}
-				$show_type = $type;
+				$show_type = $xtype;
 				$i_start = $i;
 				$exectime_start = $exectime;
 				$type_BYTES = $TOTAL_BYTES;
@@ -1068,7 +1017,6 @@
 				flush();
 			} else
 			print " ";
-			$show_gid = $gid;
 
 			//-- check if we are getting close to timing out
 			if ($i % 5 == 0) {
@@ -1108,8 +1056,7 @@
 							value="<?php print $ged; ?>" /> <input type="hidden" name="stage"
 							value="1" /> <input type="hidden" name="timelimit"
 							value="<?php print $timelimit; ?>" /> <input type="hidden"
-							name="importtime" value="<?php print $importtime; ?>" /> <input
-							type="hidden" name="marr_names" value="<?php print $marr_names; ?>" />
+							name="importtime" value="<?php print $importtime; ?>" />
 						<input type="hidden" name="xreftype" value="<?php print $xreftype; ?>" />
 						<input type="hidden" name="utf8convert"
 							value="<?php print $utf8convert; ?>" /> <input type="hidden"
@@ -1133,7 +1080,7 @@
 						});
 						//-->
 					</script>
-					<?php 
+					<?php
 					}
 					cleanup_database();
 					print_footer();
@@ -1162,7 +1109,6 @@
 	} else {
 		@unlink($INDEX_DIRECTORY.basename($GEDCOM_FILE).".new");
 		$logline = AddToLog($GEDCOM_FILE." updated");
-		if (!empty ($COMMIT_COMMAND))
 		check_in($logline, $GEDCOM_FILE, $INDEX_DIRECTORY);
 	}
 	$newtime = time();
@@ -1173,149 +1119,11 @@
 	$go_welc = $pgv_lang["welcome_page"];
 	if ($LANGUAGE == "french" || $LANGUAGE == "italian") {
 		print "<script type=\"text/javascript\">complete_progress($importtime, \"$exec_text\", \"$go_pedi\", \"$go_welc\");</script>";
-	} else
-	print "<script type=\"text/javascript\">complete_progress($importtime, '$exec_text', '$go_pedi', '$go_welc');</script>";
+	} else {
+		print "<script type=\"text/javascript\">complete_progress($importtime, '$exec_text', '$go_pedi', '$go_welc');</script>";
+	}
 	flush();
 
-	if ($marr_names == "yes") {
-		include_once ("includes/functions_edit.php");
-		$GEDCOM = $FILE;
-		get_indi_list();
-		get_fam_list();
-		read_gedcom_file();
-	
-		print "\n<table class=\"facts_table\">";
-		print "<tr><td class=\"topbottombar $TEXT_DIRECTION\" colspan=\"2\">";
-		print $pgv_lang["calc_marr_names"];
-		print "</td></tr>";
-		print "</table>";
-		//print "<tr><td class=\"optionbox\">";
-		setup_progress_bar(count($indilist));
-		//print "</td></tr>";
-	
-		$i = 0;
-		$newtime = time();
-		$exectime = $newtime - $oldtime;
-		$exectime_start = $exectime;
-		$names_added = 0;
-		$manual_save = true;
-		foreach ($indilist as $gid => $indi) {
-			if (preg_match("/1 SEX F/", $indi["gedcom"]) > 0) {
-				$ct = preg_match_all("/1\s*FAMS\s*@(.*)@/", $indi["gedcom"], $match, PREG_SET_ORDER);
-				if ($ct > 0) {
-					for ($j = 0; $j < $ct; $j ++) {
-						if (isset ($famlist[$match[$j][1]])) {
-							$marrrec = get_sub_record(1, "1 MARR", $famlist[$match[$j][1]]["gedcom"]);
-							if ($marrrec) {
-								$parents = find_parents_in_record($famlist[$match[$j][1]]["gedcom"]);
-								if ($parents["HUSB"] != $gid)
-								$spid = $parents["HUSB"];
-								else
-								$spid = $parents["WIFE"];
-								if (isset ($indilist[$spid])) {
-									$surname = $indilist[$spid]["names"][0][2];
-									if (!empty($surname) && $surname!="@N.N.") {
-										if (!preg_match("/2 _MARNM .*\/$surname\//", $indi["gedcom"])) {
-											$letter = $indilist[$spid]["names"][0][1];
-											//-- uncomment the next line to put the maiden name in the given name area
-											//$newname = preg_replace("~/(.*)/~", " $1 /".$surname."/", $indi["names"][0][0]);
-											$newname = preg_replace("~/.*/~", "/$surname/", $indi["names"][0][0]);
-											$nopnname= str_replace('@P.N. ', '', $newname);
-											$pos1 = strpos($indi["gedcom"], "1 NAME");
-											if ($pos1 !== false) {
-												$pos1 = strpos($indi["gedcom"], "\n1", $pos1 +1);
-												if ($pos1 !== false)
-													$indi["gedcom"] = substr($indi["gedcom"], 0, $pos1)."\n2 _MARNM $nopnname\r\n".substr($indi["gedcom"], $pos1 +1);
-												else
-													$indi["gedcom"] = trim($indi["gedcom"])."\r\n2 _MARNM $nopnname\r\n";
-												$indi["gedcom"] = check_gedcom($indi["gedcom"], false);
-												$pos1 = strpos($fcontents, "0 @$gid@");
-												$pos2 = strpos($fcontents, "0 @", $pos1 +1);
-												if ($pos2 === false)
-												$pos2 = strlen($fcontents);
-												$fcontents = substr($fcontents, 0, $pos1).trim($indi["gedcom"])."\r\n".substr($fcontents, $pos2);
-												add_new_name($gid, $newname, $letter, $surname, $indi["gedcom"]);
-												$names_added ++;
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			$i ++;
-			if ($i % 10 == 0) {
-				$newtime = time();
-				$exectime = $newtime - $oldtime;
-				print "\n<script type=\"text/javascript\">update_progress($i, $exectime);</script>\n";
-				flush();
-	
-				//-- check if we are getting close to timing out
-				$newtime = time();
-				$exectime = $newtime - $oldtime;
-				if (($timelimit != 0) && ($timelimit - $exectime) < 2) {
-					$importtime = $importtime + $exectime;
-					$fcontents = substr($fcontents, $pos2);
-					//-- store the resume information in the session
-					$_SESSION["media_count"] = $media_count;
-					$_SESSION["TOTAL_BYTES"] = $TOTAL_BYTES;
-					$_SESSION["fcontents"] = $fcontents;
-					$_SESSION["listtype"] = $listtype;
-					$_SESSION["exectime_start"] = $exectime_start;
-					$_SESSION["importtime"] = $importtime;
-					$_SESSION["i"] = $i;
-	
-					//-- close the file connection
-					write_file();
-					$_SESSION["resumed"]++;
-					print "\n<table class=\"facts_table\">";
-					?>
-					<tr>
-						<td class="descriptionbox"><?php print $pgv_lang["import_time_exceeded"]; ?></td>
-					</tr>
-					<tr>
-						<td class="topbottombar"><input type="hidden" name="ged"
-							value="<?php print $ged; ?>" /> <input type="hidden" name="stage"
-							value="1" /> <input type="hidden" name="timelimit"
-							value="<?php print $timelimit; ?>" /> <input type="hidden"
-							name="importtime" value="<?php print $importtime; ?>" /> <input
-							type="hidden" name="marr_names" value="<?php print $marr_names; ?>" />
-						<input type="hidden" name="xreftype" value="<?php print $xreftype; ?>" />
-						<input type="hidden" name="utf8convert"
-							value="<?php print $utf8convert; ?>" /> <input type="hidden"
-							name="verify" value="<?php print $verify; ?>" /> <input type="hidden"
-							name="startimport" value="<?php print $startimport; ?>" /> <input
-							type="hidden" name="import" value="<?php print $import; ?>" /> <input
-							type="hidden" name="FILE" value="<?php print $FILE; ?>" /> <input
-							type="submit" name="continue"
-							value="<?php print $pgv_lang["del_proceed"]; ?>" /></td>
-					</tr>
-					</table>
-					<?php
-					print_footer();
-					exit;
-				}
-			}
-		}
-		write_file();
-		$show_table_marr = "\n<table class=\"list_table\"><tr>";
-		$show_table_marr .= "<tr><td class=\"topbottombar\" colspan=\"3\">".$pgv_lang["import_marr_names"]."</td></tr>";
-		$show_table_marr .= "<td class=\"descriptionbox\">&nbsp;".$pgv_lang["exec_time"]."&nbsp;</td>";
-		$show_table_marr .= "<td class=\"descriptionbox\">&nbsp;".$pgv_lang["found_record"]."&nbsp;</td>";
-		$show_table_marr .= "<td class=\"descriptionbox\">&nbsp;".$pgv_lang["type"]."&nbsp;</td></tr>\n";
-		$newtime = time();
-		$exectime = $newtime - $oldtime;
-		$show_exectime = $exectime - $exectime_start;
-		$show_table_marr .= "<tr><td class=\"optionbox indent_rtl rtl\">$show_exectime ".$pgv_lang["sec"]."</td>\n";
-		$show_table_marr .= "<td class=\"optionbox indent_rtl rtl\">$names_added<script type=\"text/javascript\">update_progress($i, $exectime);</script></td>";
-		$show_table_marr .= "<td class=\"optionbox\">&nbsp;INDI&nbsp;</td></tr>\n";
-		$show_table_marr .= "</table>\n";
-		$stage = 10;
-		$record_count = 0;
-		flush();
-	}
 	// TODO: Layout for Hebrew
 	$show_table1 = "\n<table class=\"list_table\"><tr>";
 	$show_table1 .= "<tr><td class=\"topbottombar\" colspan=\"4\">".$pgv_lang["ged_import"]."</td></tr>";
@@ -1339,12 +1147,10 @@
 	print "</td></tr>";
 	print "<tr><td class=\"optionbox\">";
 	print "\n<table cellspacing=\"20px\"><tr><td class=\"optionbox\" style=\"vertical-align: top;\">";
-	if (isset ($skip_table))
-	print "<br />...";
-	else {
+	if (isset ($skip_table)) {
+	 print "<br />...";
+	} else {
 		print $show_table1;
-		if ($marr_names == "yes")
-		print "</td><td class=\"optionbox\">".$show_table_marr;
 	}
 	print "</td></tr></table>\n";
 	// NOTE: Finished Links
@@ -1370,10 +1176,6 @@
 
 	if ($startimport != "true")
 	print "<input type=\"submit\" name=\"continue\" value=\"".$pgv_lang["del_proceed"]."\" />&nbsp;";
-	if ($cleanup_needed && $skip_cleanup != $pgv_lang["skip_cleanup"]) {
-		print_help_link("skip_cleanup_help", "qm", "skip_cleanup");
-		print "<input type=\"submit\" name=\"skip_cleanup\" value=\"".$pgv_lang["skip_cleanup"]."\" />&nbsp;\n";
-	}
 	if ($verify && $startimport != "true")
 	print "<input type=\"button\" name=\"cancel\" value=\"".$pgv_lang["cancel"]."\" onclick=\"document.configform.override.value='no'; document.configform.no_upload.value='cancel_upload'; document.configform.submit(); \" />";
 	?></td>

Index: usermigrate.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/usermigrate.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- usermigrate.php	7 Jul 2008 18:01:13 -0000	1.5
+++ usermigrate.php	30 Apr 2009 19:12:13 -0000	1.6
@@ -1,214 +1,220 @@
-<?php
-/**
- * Exports users and their data to either SQL queries (Index mode) or 
- * authenticate.php and xxxxxx.dat files (MySQL mode).
- * 
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2006  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * @author Boudewijn Sjouke	sjouke@...
- * @package PhpGedView
- * @subpackage Admin
- * @version $Id$
- */
-require_once("includes/controllers/usermigrate_ctrl.php");
-
-print_header($controller->getPageTitle());
-
-if (!empty($controller->errorMsg)) print "<br /><span class=\"error\">".$controller->errorMsg."</span><br />";
-
-// Backup part of usermigrate
-if ($controller->proceed == "backup") {
-	// If first time, let the user choose the options
-	if ((!isset($_POST["um_config"])) && (!isset($_POST["um_gedcoms"])) && (!isset($_POST["um_gedsets"])) &&(!isset($_POST["um_logs"])) &&(!isset($_POST["um_usinfo"]))) {
-		?>
-		<div class="center"><h2><?php print $pgv_lang["um_backup"]?></h2></div>
-		<table align="center" >
-			<tr class="label">
-				<td style="text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right"; ?>;" >
-					<?php print $pgv_lang["um_bu_explain"]; ?><br />
-				</td>
-			</tr>
-		</table><br /><br />
-		<form action="usermigrate.php" method="post">
-		<table align="center">
-			<tr class="label"><td style="padding: 5px" colspan="2" class="facts_label03"><?php print $pgv_lang["options"]; ?></td></tr><br />
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_config"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_config" value="yes" checked="checked" /></td></tr>
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_gedcoms"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_gedcoms" value="yes" checked="checked" /></td></tr>
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_gedsets"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_gedsets" value="yes" checked="checked" /></td></tr>
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_logs"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_logs" value="yes" checked="checked" /></td></tr>
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_usinfo"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_usinfo" value="yes" checked="checked" /></td></tr>
-			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_media"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_media" value="yes" checked="checked" /></td></tr>
-			<tr><td style="padding: 5px" colspan="2" class="facts_label03"><button type="submit" name="submit"><?php print $pgv_lang["um_mk_bu"]; ?></button>
-			<input type="button" value="<?php print $pgv_lang["lang_back_admin"];?>"  onclick="window.location='admin.php';"/></td></tr>
-		</table></form><br /><br />
-		<?php
-		print_footer();
-		exit;
-	}
-	?>
-	<div class="center"><h2><?php print $pgv_lang["um_backup"]?></h2></div>
-	<br /><br />
-	<table align="center">
-		<tr class="label">
-			<td style="padding: 5px" class="facts_label03"><?php print $pgv_lang["um_results"]; ?></td>
-		</tr>
-	<?php	
-	// Make the zip
-	if (count($controller->flist) > 0) {
-		?>
-		<tr>
-			<td class="list_label" style="padding: 5px;" >
-			<?php if ($controller->v_list == 0) {?>
-				<?php print $controller->errorMsg; ?>
-			</td>
-		</tr>
-		<?php } else { ?>
-			<?php print $pgv_lang["um_zip_succ"]; ?>
-			</td>
-		</tr>
-		<tr>
-			<td class="list_value" style="padding: 5px;" >
-				<a href="downloadbackup.php?fname=<?php print $controller->buname; ?>" target="_blank"><?php print $pgv_lang["um_zip_dl"]; ?> <?php print $controller->fname; ?></a>  
-				( <?php printf("%.0f Kb", (filesize($controller->fname)/1024)); ?> ) <br />
-				<?php print $pgv_lang["files_in_backup"]; ?>
-				<ul>
-				<?php foreach($controller->flist as $f=>$file) { ?>
-					<li><?php print $file; ?></li>
-				<?php } ?>
-				</ul>
-			</td>
-		</tr>
-		<?php }
-	}
-	else { ?>
-			<td style="padding: 5px" class="list_label"><?php print $pgv_lang["um_nofiles"]; ?></td>
-		</tr>
-	<?php } ?>
-		<tr class="label">
-			<td style="padding: 5px" class="facts_label03">
-				<input type="button" value="<?php print $pgv_lang["lang_back_admin"]; ?>" onclick="window.location='admin.php';" />
-			</td>
-		</tr>
-	</table>
-	<br /><br />
-<?php
-	print_footer();
-	exit;
-}
-
-// User Migration part of usermigrate. The function um_export is used by backup and migrate part.
-
-if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) { ?>
-	<h2><?php print $pgv_lang["um_header"];?></h2>
-	<br /><br />
-	<?php print $pgv_lang["um_sql_index"]; ?>
-<?php } 
-if ($controller->proceed == "import") { ?>
-	<h2><?php print $pgv_lang["um_header"]; ?></h2>
-	<br /><br />
-	<?php print $pgv_lang["um_index_sql"]; ?>
-	<br /><br />
-<?php }
-if (($controller->proceed != "import") && ($controller->proceed != "export") && ($controller->proceed != "exportovr")) { ?>
-	<div class="center">
-		<h2><?php print $pgv_lang["um_header"]; ?></h2>
-		<br /><br />
-		<form action="usermigrate.php" method="post"><input type="hidden" name="proceed" value="import" />
-		<table align="center" width="75%" ><tr class="label">
-			<tr><td style="text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_explain"].$pgv_lang["um_proceed"]?><br />
-			</td></tr>
-			<tr><td><input type="submit" class="button" value="<?php print $pgv_lang["um_import"];?>" />
-			<input type="button" class="button" value="<?php print $pgv_lang["um_export"];?>" onclick="window.location='usermigrate.php?proceed=export';"/>
-			<input type="button" value="<?php print $pgv_lang["lang_back_admin"];?>"  onclick="window.location='admin.php';"/><br /><br />
-			</td></tr>
-		</table>
-		</form>
-	</div>
-	<?php
-	print_footer();
-	exit;
-}
-if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) {
-	
-	// Check if one of the files already exists
-	if ($controller->fileExists) { ?>
-		<br />
-		<?php print $pgv_lang["um_files_exist"];?>
-		<br /><br />
-		<form action="usermigrate.php" method="post">
-			<input type="hidden" class="button" value="<?php print $pgv_lang["yes"];?>" />
-			<input type="button" class="button" value="<?php print $pgv_lang["yes"];?>" onclick="window.location='usermigrate.php?proceed=exportovr';"/>
-			<input type="button" class="button" value="<?php print $pgv_lang["no"];?>" onclick="window.location='admin.php';"/>
-		</form>
-		<?php
-		print_footer();
-		exit;
-	}
-}
-if ($controller->proceed == "import") { ?>
-	<br /><br /><?php print $pgv_lang["um_imp_users"]; ?><br />
-	<?php if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) { ?>
-		<?php print $pgv_lang["um_nousers"]; ?>
-		<br /><br />
-		<a href="admin.php"><?php print $pgv_lang["lang_back_admin"]; ?></a><br /><br />
-		<?php exit;
-	}
-	
-	if ($controller->impSuccess) {
-		print $pgv_lang["um_imp_succ"]."<br /><br />";
-	}
-	else {
-		print $pgv_lang["um_imp_fail"];
-		exit;
-	}
-
-	// Get messages and import them
-	print $pgv_lang["um_imp_messages"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
-		print $pgv_lang["um_nomsg"]."<br /><br />";
-	}
-	if ($controller->msgSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get favorites and import them
-	print $pgv_lang["um_imp_favorites"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
-		print $pgv_lang["um_nofav"]."<br /><br />";
-	}
-	if ($controller->favSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get news and import it
-	print $pgv_lang["um_imp_news"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
-		print $pgv_lang["um_nonews"]."<br /><br />";
-	}
-	if ($controller->newsSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get blocks and import them
-	print $pgv_lang["um_imp_blocks"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
-		print $pgv_lang["um_noblocks"]."<br /><br />";
-	}
-	if ($controller->blockSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-}
-?>
-
-<a href="admin.php"><?php print $pgv_lang["lang_back_admin"]; ?></a><br /><br />
-
-<?php
-print_footer();
-?>
+<?php
+/**
+ * Exports users and their data to either SQL queries (Index mode) or
+ * authenticate.php and xxxxxx.dat files (MySQL mode).
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2006  PGV Development Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author Boudewijn Sjouke	sjouke@...
+ * @package PhpGedView
+ * @subpackage Admin
+ * @version $Id$
+ */
+
+require './config.php';
+
+require_once 'includes/controllers/usermigrate_ctrl.php';
+
+$controller = new UserMigrateController();
+$controller->init();
+
+print_header($controller->getPageTitle());
+
+if (!empty($controller->errorMsg)) print "<br /><span class=\"error\">".$controller->errorMsg."</span><br />";
+
+// Backup part of usermigrate
+if ($controller->proceed == "backup") {
+	// If first time, let the user choose the options
+	if ((!isset($_POST["um_config"])) && (!isset($_POST["um_gedcoms"])) && (!isset($_POST["um_gedsets"])) &&(!isset($_POST["um_logs"])) &&(!isset($_POST["um_usinfo"]))) {
+		?>
+		<div class="center"><h2><?php print $pgv_lang["um_backup"]?></h2></div>
+		<table align="center" >
+			<tr class="label">
+				<td style="text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right"; ?>;" >
+					<?php print $pgv_lang["um_bu_explain"]; ?><br />
+				</td>
+			</tr>
+		</table><br /><br />
+		<form action="usermigrate.php" method="post">
+		<table align="center">
+			<tr class="label"><td style="padding: 5px" colspan="2" class="facts_label03"><?php print $pgv_lang["options"]; ?></td></tr><br />
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_config"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_config" value="yes" checked="checked" /></td></tr>
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_gedcoms"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_gedcoms" value="yes" checked="checked" /></td></tr>
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_gedsets"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_gedsets" value="yes" checked="checked" /></td></tr>
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_logs"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_logs" value="yes" checked="checked" /></td></tr>
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_usinfo"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_usinfo" value="yes" checked="checked" /></td></tr>
+			<tr><td class="list_label" style="padding: 5px; text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_bu_media"]; ?></td><td class="list_value" style="padding: 5px;"><input type="checkbox" name="um_media" value="yes" checked="checked" /></td></tr>
+			<tr><td style="padding: 5px" colspan="2" class="facts_label03"><button type="submit" name="submit"><?php print $pgv_lang["um_mk_bu"]; ?></button>
+			<input type="button" value="<?php print $pgv_lang["lang_back_admin"];?>"  onclick="window.location='admin.php';"/></td></tr>
+		</table></form><br /><br />
+		<?php
+		print_footer();
+		exit;
+	}
+	?>
+	<div class="center"><h2><?php print $pgv_lang["um_backup"]?></h2></div>
+	<br /><br />
+	<table align="center">
+		<tr class="label">
+			<td style="padding: 5px" class="facts_label03"><?php print $pgv_lang["um_results"]; ?></td>
+		</tr>
+	<?php
+	// Make the zip
+	if (count($controller->flist) > 0) {
+		?>
+		<tr>
+			<td class="list_label" style="padding: 5px;" >
+			<?php if ($controller->v_list == 0) {?>
+				<?php print $controller->errorMsg; ?>
+			</td>
+		</tr>
+		<?php } else { ?>
+			<?php print $pgv_lang["um_zip_succ"]; ?>
+			</td>
+		</tr>
+		<tr>
+			<td class="list_value" style="padding: 5px;" >
+				<a href="downloadbackup.php?fname=<?php print $controller->buname; ?>" target="_blank"><?php print $pgv_lang["um_zip_dl"]; ?> <?php print $controller->fname; ?></a>
+				( <?php printf("%.0f Kb", (filesize($controller->fname)/1024)); ?> ) <br />
+				<?php print $pgv_lang["files_in_backup"]; ?>
+				<ul>
+				<?php foreach($controller->flist as $f=>$file) { ?>
+					<li><?php print $file; ?></li>
+				<?php } ?>
+				</ul>
+			</td>
+		</tr>
+		<?php }
+	}
+	else { ?>
+			<td style="padding: 5px" class="list_label"><?php print $pgv_lang["um_nofiles"]; ?></td>
+		</tr>
+	<?php } ?>
+		<tr class="label">
+			<td style="padding: 5px" class="facts_label03">
+				<input type="button" value="<?php print $pgv_lang["lang_back_admin"]; ?>" onclick="window.location='admin.php';" />
+			</td>
+		</tr>
+	</table>
+	<br /><br />
+<?php
+	print_footer();
+	exit;
+}
+
+// User Migration part of usermigrate. The function um_export is used by backup and migrate part.
+
+if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) { ?>
+	<h2><?php print $pgv_lang["um_header"];?></h2>
+	<br /><br />
+	<?php print $pgv_lang["um_sql_index"]; ?>
+<?php }
+if ($controller->proceed == "import") { ?>
+	<h2><?php print $pgv_lang["um_header"]; ?></h2>
+	<br /><br />
+	<?php print $pgv_lang["um_index_sql"]; ?>
+	<br /><br />
+<?php }
+if (($controller->proceed != "import") && ($controller->proceed != "export") && ($controller->proceed != "exportovr")) { ?>
+	<div class="center">
+		<h2><?php print $pgv_lang["um_header"]; ?></h2>
+		<br /><br />
+		<form action="usermigrate.php" method="post"><input type="hidden" name="proceed" value="import" />
+		<table align="center" width="75%" ><tr class="label">
+			<tr><td style="text-align:<?php if ($TEXT_DIRECTION == "ltr") print "left"; else print "right";?>; "><?php print $pgv_lang["um_explain"].$pgv_lang["um_proceed"]?><br />
+			</td></tr>
+			<tr><td><input type="submit" class="button" value="<?php print $pgv_lang["um_import"];?>" />
+			<input type="button" class="button" value="<?php print $pgv_lang["um_export"];?>" onclick="window.location='usermigrate.php?proceed=export';"/>
+			<input type="button" value="<?php print $pgv_lang["lang_back_admin"];?>"  onclick="window.location='admin.php';"/><br /><br />
+			</td></tr>
+		</table>
+		</form>
+	</div>
+	<?php
+	print_footer();
+	exit;
+}
+if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) {
+
+	// Check if one of the files already exists
+	if ($controller->fileExists) { ?>
+		<br />
+		<?php print $pgv_lang["um_files_exist"];?>
+		<br /><br />
+		<form action="usermigrate.php" method="post">
+			<input type="hidden" class="button" value="<?php print $pgv_lang["yes"];?>" />
+			<input type="button" class="button" value="<?php print $pgv_lang["yes"];?>" onclick="window.location='usermigrate.php?proceed=exportovr';"/>
+			<input type="button" class="button" value="<?php print $pgv_lang["no"];?>" onclick="window.location='admin.php';"/>
+		</form>
+		<?php
+		print_footer();
+		exit;
+	}
+}
+if ($controller->proceed == "import") { ?>
+	<br /><br /><?php print $pgv_lang["um_imp_users"]; ?><br />
+	<?php if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) { ?>
+		<?php print $pgv_lang["um_nousers"]; ?>
+		<br /><br />
+		<a href="admin.php"><?php print $pgv_lang["lang_back_admin"]; ?></a><br /><br />
+		<?php exit;
+	}
+
+	if ($controller->impSuccess) {
+		print $pgv_lang["um_imp_succ"]."<br /><br />";
+	}
+	else {
+		print $pgv_lang["um_imp_fail"];
+		exit;
+	}
+
+	// Get messages and import them
+	print $pgv_lang["um_imp_messages"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
+		print $pgv_lang["um_nomsg"]."<br /><br />";
+	}
+	if ($controller->msgSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get favorites and import them
+	print $pgv_lang["um_imp_favorites"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
+		print $pgv_lang["um_nofav"]."<br /><br />";
+	}
+	if ($controller->favSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get news and import it
+	print $pgv_lang["um_imp_news"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
+		print $pgv_lang["um_nonews"]."<br /><br />";
+	}
+	if ($controller->newsSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get blocks and import them
+	print $pgv_lang["um_imp_blocks"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
+		print $pgv_lang["um_noblocks"]."<br /><br />";
+	}
+	if ($controller->blockSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+}
+?>
+
+<a href="admin.php"><?php print $pgv_lang["lang_back_admin"]; ?></a><br /><br />
+
+<?php
+print_footer();
+?>

Index: timeline.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/timeline.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- timeline.php	7 Jul 2008 18:01:11 -0000	1.3
+++ timeline.php	30 Apr 2009 19:12:13 -0000	1.4
@@ -28,9 +28,14 @@
  * @version $Id$
  */
 
-require_once("includes/controllers/timeline_ctrl.php");
+require_once './includes/controllers/timeline_ctrl.php';
+
+$controller = new TimelineController();
+$controller->init();
 
 print_header($pgv_lang["timeline_title"]);
+
+if ($ENABLE_AUTOCOMPLETE) require './js/autocomplete.js.htm';
 ?>
 <script language="JavaScript" type="text/javascript">
 <!--
@@ -137,7 +142,9 @@
 			yearform = document.getElementById('yearform'+personnum);
 			ageform = document.getElementById('ageform'+personnum);
 			yearform.innerHTML = year+"      "+month+" <?php print get_first_letter($pgv_lang["month"]);?>   "+day+" <?php print get_first_letter($pgv_lang["day"]);?>";
-			ageform.innerHTML = (ba*yage)+" <?php print get_first_letter($pgv_lang["year"]);?>   "+(ba*mage)+" <?php print get_first_letter($pgv_lang["month"]);?>   "+(ba*dage)+" <?php print get_first_letter($pgv_lang["day"]);?>";
+			if (ba*yage>1 || ba*yage<-1 || ba*yage==0)
+				 ageform.innerHTML = (ba*yage)+" <?php print get_first_letter($pgv_lang["years"]);?>   "+(ba*mage)+" <?php print get_first_letter($pgv_lang["month"]);?>   "+(ba*dage)+" <?php print get_first_letter($pgv_lang["day"]);?>";
+			else ageform.innerHTML = (ba*yage)+" <?php print get_first_letter($pgv_lang["year"]);?>   "+(ba*mage)+" <?php print get_first_letter($pgv_lang["month"]);?>   "+(ba*dage)+" <?php print get_first_letter($pgv_lang["day"]);?>";
 			var line = document.getElementById('ageline'+personnum);
 			temp = newx-oldx;
 			if (textDirection=='rtl') temp = temp * -1;
@@ -251,7 +258,6 @@
 	if ($count>5) $half = ceil($count/2);
 	if (!$controller->isPrintPreview()) $half++;
 	foreach($controller->people as $p=>$indi) {
-		$sex = $indi->getSex();
 		$pid = $indi->getXref();
 		$col = $p % 6;
 		if ($i==$half) print "</tr><tr>";
@@ -259,32 +265,18 @@
 		?>
 		<td class="person<?php print $col; ?>" style="padding: 5px;">
 		<?php
-		if ((!is_null($indi))&&($indi->canDisplayDetails())) {
-			switch($sex) {
-			case "M":
-				$seximage = $PGV_IMAGE_DIR."/".$PGV_IMAGES["sex"]["small"];
-				?>
-				<img src="<?php print $seximage; ?>" title="<?php print $pgv_lang["male"]; ?>" alt="<?php print $pgv_lang["male"]; ?>" vspace="0" hspace="0" class="gender_image" border="0" />
-				<?php
-				break;
-			case "F":
-				$seximage = $PGV_IMAGE_DIR."/".$PGV_IMAGES["sexf"]["small"];
-				?>
-				<img src="<?php print $seximage; ?>" title="<?php print $pgv_lang["female"]; ?>" alt="<?php print $pgv_lang["female"]; ?>" vspace="0" hspace="0" class="gender_image" border="0" />
-				<?php
-				break;
-			default:
-				$seximage = $PGV_IMAGE_DIR."/".$PGV_IMAGES["sexn"]["small"];
-				?>
-				<img src="<?php print $seximage; ?>" title="<?php print $pgv_lang["sex"]." ".$pgv_lang["unknown"]; ?>" alt="<?php print $pgv_lang["sex"]." ".$pgv_lang["unknown"]; ?>" vspace="0" hspace="0" class="gender_image" border="0" />
-				<?php
-				break;
-			}
+		if ($indi && $indi->canDisplayDetails()) {
+			if ($indi->getSex()=="M")
+				echo $indi->getSexImage('large', '', $pgv_lang['male']);
+			else if ($indi->getSex()=="F")
+				echo $indi->getSexImage('large', '', $pgv_lang['female']);
+			else
+				echo $indi->getSexImage('large', '', $pgv_lang['unknown']);
 		?>
- 			<a href="individual.php?pid=<?php print $pid; ?>">&nbsp;<?php print PrintReady($indi->getName()); ?><br />
+ 			<a href="individual.php?pid=<?php print $pid; ?>">&nbsp;<?php print PrintReady($indi->getFullName()); ?><br />
  			<?php $addname = $indi->getAddName(); if (strlen($addname) > 0) print PrintReady($addname); ?>
 			</a>
-			<input type="hidden" name="pids[<?php print $p; ?>]" value="<?php print htmlentities($pid); ?>" />
+			<input type="hidden" name="pids[<?php print $p; ?>]" value="<?php print htmlentities($pid,ENT_COMPAT,'UTF-8'); ?>" />
 			<?php if (!$controller->isPrintPreview()) {
 				print "<br />";
 				print_help_link("remove_person_help", "qm");
@@ -305,7 +297,7 @@
 		else {
 			print_privacy_error($CONTACT_EMAIL);
 			?>
-			<input type="hidden" name="pids[<?php print $p; ?>]" value="<?php print htmlentities($pid); ?>" />
+			<input type="hidden" name="pids[<?php print $p; ?>]" value="<?php print htmlentities($pid,ENT_COMPAT,'UTF-8'); ?>" />
 			<?php if (!$controller->isPrintPreview()) {
 				print "<br />";
 				print_help_link("remove_person_help", "qm");
@@ -334,8 +326,8 @@
 		$scalemod = round($controller->scale*.2) + 1;
 		?>
 		<td class="list_value" style="padding: 5px">
-			<a href="<?php print $SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomin']['other']; ?>" title="<?php print $pgv_lang["zoom_in"]; ?>" border="0" /></a><br />
-			<a href="<?php print $SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomout']['other']; ?>" title="<?php print $pgv_lang["zoom_out"]; ?>" border="0" /></a><br />
+			<a href="<?php print $SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomin']['other']; ?>" title="<?php print $pgv_lang["zoom_in"]; ?>" alt="<?php print $pgv_lang["zoom_in"]; ?>" border="0" /></a><br />
+			<a href="<?php print $SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomout']['other']; ?>" title="<?php print $pgv_lang["zoom_out"]; ?>" alt="<?php print $pgv_lang["zoom_out"]; ?>" border="0" /></a><br />
 			<input type="button" value="<?php print $pgv_lang['clear_chart']; ?>" onclick="window.location = 'timeline.php?clear=1';" />
 		</td>
 	<?php } ?>

Index: uploadmedia.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/uploadmedia.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- uploadmedia.php	7 Jul 2008 18:01:12 -0000	1.5
+++ uploadmedia.php	30 Apr 2009 19:12:13 -0000	1.6
@@ -1,184 +1,92 @@
-<?php
-/**
- * Allow admin users to upload media files using a web interface.
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- * @package PhpGedView
- * @subpackage Media
- */
-require "config.php";
-
-if (!$gGedcom->isEditable()) {
-	header("Location: login.php?url=uploadmedia.php");
-	exit;
-}
-
-if (isset($_SESSION["cookie_login"]) && $_SESSION["cookie_login"]==true) {
-	header("Location: login.php?ged=$GEDCOM&url=uploadmedia.php");
-	exit;
-}
-
-print_header($pgv_lang["upload_media"]);
-$upload_errors = array($pgv_lang["file_success"], $pgv_lang["file_too_big"], $pgv_lang["file_too_big"],$pgv_lang["file_partial"], $pgv_lang["file_missing"]);
-?>
-<center>
-<?php
-	print "<span class=\"subheaders\">".str2upper($pgv_lang["upload_media"])."</span><br /><br />\n";
-	if ((isset($action)) && ($action=="upload")) {
-		for($i=1; $i<6; $i++) {
-			$error="";
-			if (!empty($_FILES['mediafile'.$i]["name"])) {
-				//-- ensure sub-folder name is properly formatted
-				if (substr($_POST["folder".$i],0,1) == "/") $_POST["folder".$i] = substr($_POST["folder".$i],1);
-				$_POST["folder".$i] .= "/";
-				$_POST["folder".$i] = str_replace("//", "/", $_POST["folder".$i]);
-				if ($_POST["folder".$i] == "/") $_POST["folder".$i] = "";
-				
-				AddToLog("Media file ".$MEDIA_DIRECTORY.$_POST["folder".$i].basename($_FILES['mediafile'.$i]['name'])." uploaded");
-				$thumbgenned = false;
-				if (!move_uploaded_file($_FILES['mediafile'.$i]['tmp_name'], $MEDIA_DIRECTORY.$_POST["folder".$i].basename($_FILES['mediafile'.$i]['name']))) {
-					$error .= $pgv_lang["upload_error"]."<br />".$upload_errors[$_FILES['mediafile'.$i]['error']]."<br />";
-				}
-				else {
-					//-- automatically generate thumbnail
-					if (!PGV_USER_GEDCOM_ADMIN || (!empty($_POST['genthumb'.$i]) && ($_POST['genthumb'.$i]=="yes"))) {
-						$filename = $MEDIA_DIRECTORY.$_POST["folder".$i].basename($_FILES['mediafile'.$i]['name']);
-						if (!is_dir($MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i])) mkdir($MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i]);
-						$thumbnail = $MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i].basename($_FILES['mediafile'.$i]['name']);
-						$thumbgenned = @generate_thumbnail($filename, $thumbnail);
-						if (!$thumbgenned) $error .= str_replace("#thumbnail#", $thumbnail, $pgv_lang["thumbgen_error"])."<br />";
-						else print str_replace("#thumbnail#", $thumbnail, $pgv_lang["thumb_genned"])."<br />";
-					}
-				}
-				if (!$thumbgenned) {
-					if (!is_dir($MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i])) mkdir($MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i]);
-					if (!move_uploaded_file($_FILES['thumbnail'.$i]['tmp_name'], $MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i].basename($_FILES['thumbnail'.$i]['name']))) {
-						$error .= $pgv_lang["upload_error"]."<br />".$upload_errors[$_FILES['thumbnail'.$i]['error']]."<br />";
-					}
-					AddToLog("Media thumbnail ".$MEDIA_DIRECTORY."thumbs/".$_POST["folder".$i].basename($_FILES['thumbnail'.$i]['name'])." uploaded");
-				}
-				if (!empty($error)) print "<span class=\"error\">".$error."</span><br />\n";
-				else {
-					print $pgv_lang["upload_successful"]."<br /><br />";
-					$imgsize = findImageSize($MEDIA_DIRECTORY.$_POST["folder".$i].$_FILES['mediafile'.$i]['name']);
-					$imgwidth = $imgsize[0]+40;
-					$imgheight = $imgsize[1]+150;
-					print "<a href=\"javascript:;\" onclick=\"return openImage('".urlencode($MEDIA_DIRECTORY.$_POST["folder".$i].$_FILES['mediafile'.$i]['name'])."',$imgwidth, $imgheight);\">".$_FILES['mediafile'.$i]['name']."</a>";
-					print"<br /><br />";
-				}
-			}
-		}
-	}
-
-	if (!is_writable($MEDIA_DIRECTORY) || !$MULTI_MEDIA) {
-		print "<span class=\"error\"><b>";
-		print $pgv_lang["no_upload"];
-		print "</b></span>";
-	} else {
-		print "<table class=\"center $TEXT_DIRECTION width70\"><tr><td>";
-		print_text("upload_media_help");
-		if (!$filesize = ini_get('upload_max_filesize')) {
-			$filesize = "2M";
-		}
-		print "<br /><br />".$pgv_lang["max_upload_size"];
-		print " $filesize<br /><br />";
-		print "</td></tr></table>";
-?>
-		<form enctype="multipart/form-data" method="post" action="uploadmedia.php">
-		<input type="hidden" name="action" value="upload" />
-		<table class="center <?php print $TEXT_DIRECTION ?> width70">
-		<tr><td colspan="2" class="topbottombar"><?php print $pgv_lang["upload_media"]; ?></td></tr>
-		<?php
-		for($i=1; $i<6; $i++) {
-			if (PGV_USER_GEDCOM_ADMIN) {
-				print "<tr>";
-					print "<td ";
-					write_align_with_textdir_check("right");
-					print " class=\"descriptionbox\">";
-						print $pgv_lang["folder"];
-						print "&nbsp;";
-					print "</td>";
-					print "<td class=\"optionbox\">";
-						print "<input type=\"text\" name=\"folder".$i."\" size=60 />";
-					print "</td>";
-				print "</tr>";
-			} else {
-				print "<input type=\"hidden\" name=\"folder{$i}\" value=\"\" />";
-			}
-			print "<tr>";
-				print "<td ";
-				write_align_with_textdir_check("right");
-				print " class=\"descriptionbox\">";
-					print $pgv_lang["media_file"];
-					print "&nbsp;";
-				print "</td>";
-				print "<td class=\"optionbox\">";
-					print "<input name=\"mediafile".$i."\" type=\"file\" size=60 />";
-				print "</td>";
-			print "</tr>";
-			if (PGV_USER_GEDCOM_ADMIN) {
-				print "<tr>";
-					print "<td ";
-					write_align_with_textdir_check("right");
-					print " class=\"descriptionbox\">";
-						print $pgv_lang["thumbnail"];
-						print "&nbsp;";
-					print "</td>";
-					print "<td class=\"optionbox\">";
-						print "<input name=\"thumbnail".$i."\" type=\"file\" size=60 />";
-					print "</td>";
-				print "</tr>";
-			}
-
-			$ThumbSupport = "";
-			if (function_exists("imagecreatefromjpeg") and function_exists("imagejpeg")) $ThumbSupport .= ", JPG";
-			if (function_exists("imagecreatefromgif") and function_exists("imagegif")) $ThumbSupport .= ", GIF";
-			if (function_exists("imagecreatefrompng") and function_exists("imagepng")) $ThumbSupport .= ", PNG";
-			if (!$AUTO_GENERATE_THUMBS) $ThumbSupport = "";
-
-			if ($ThumbSupport != "") {
-				$ThumbSupport = substr($ThumbSupport, 2);	// Trim off first ", "
-				if (PGV_USER_GEDCOM_ADMIN) {
-					print "<tr>";
-						print "<td colspan=\"2\" class=\"center\">";
-							print "<input type=\"checkbox\" name=\"genthumb".$i."\" value=\"yes\" checked/> ";
-							print $pgv_lang["generate_thumbnail"];
-							print $ThumbSupport;
-							print_help_link("generate_thumb_help", "qm");
-						print "</td>";
-					print "</tr>";
-				}
-			}
-//			print "<tr><td><br /><br /></td></tr>";
-		}
-		?>
-		<tr><td colspan="2" class="topbottombar">
-			<input type="submit" value="<?php print $pgv_lang["upload"]; ?>" />
-		</td>
-		</tr>
-		</table>
-		<br />
-		</form>
-		<br />
-		</center>
-		<?php
-	}
-	print_footer();
-?>
+<?php
+/**
+ * Allow admin users to upload media files using a web interface.
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Id$
+ * @package PhpGedView
+ * @subpackage Media
+ */
+
+require './config.php';
+
+require_once 'includes/functions/functions_mediadb.php';
+
+/**
+ * This functions checks if an existing directory is physically writeable
+ * The standard PHP function only checks for the R/O attribute and doesn't
+ * detect authorisation by ACL.
+ */
+function dir_is_writable($dir) {
+	$err_write = false;
+	$handle = @fopen(filename_decode($dir."x.y"),"w+");
+	if	($handle) {
+		$i = fclose($handle);
+		$err_write = true;
+		@unlink(filename_decode($dir."x.y"));
+	}
+	return($err_write);
+}
+
+if (!PGV_USER_CAN_EDIT) {
+	header("Location: login.php?url=uploadmedia.php");
+	exit;
+}
+
+if (isset($_SESSION["cookie_login"]) && $_SESSION["cookie_login"]==true) {
+	header("Location: ".encode_url("login.php?ged={$GEDCOM}&url=uploadmedia.php", false));
+	exit;
+}
+
+print_header($pgv_lang["upload_media"]);
+?>
+<script language="JavaScript" type="text/javascript">
+<!--
+	function checkpath(folder) {
+		value = folder.value;
+		if (value.substr(value.length-1,1) == "/") value = value.substr(0, value.length-1);
+		if (value.substr(0,1) == "/") value = value.substr(1, value.length-1);
+		result = value.split("/");
+		if (result.length > <?php print $MEDIA_DIRECTORY_LEVELS; ?>) {
+			alert('<?php print_text("max_media_depth"); ?>');
+			folder.focus();
+			return false;
+		}
+	}
+//-->
+</script>
+<center>
+<?php
+print "<span class=\"subheaders\">".UTF8_strtoupper($pgv_lang["upload_media"])."</span><br /><br />\n";
+$action = safe_POST('action');
+if ($action == "upload") {
+	process_uploadMedia_form();
+}
+
+// Check if Media Directory is writeable or if Media features are enabled
+// If one of these is not true then do not continue
+if (!dir_is_writable($MEDIA_DIRECTORY) || !$MULTI_MEDIA) {
+	print "<span class=\"error\"><b>";
+	print $pgv_lang["no_upload"];
+	print "</b></span><br />";
+} else {
+	show_mediaUpload_form('uploadmedia.php', false);		// We have the green light to upload media, print the form
+}
+print_footer();
+?>

Index: statisticsplot.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/statisticsplot.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- statisticsplot.php	7 Jul 2008 18:01:11 -0000	1.4
+++ statisticsplot.php	30 Apr 2009 19:12:13 -0000	1.5
@@ -1,631 +1,990 @@
-<?php
-/**
- * Creates some statistics out of the GEDCOM information.
- * We will start with the following possibilities
- * number of persons -> periodes of 10 years from 1700-2010
- * age -> periodes of 10 years (different for 0-1,1-5,5-10,10-20 etc)
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
[...1591 lines suppressed...]
+case '3':
+	$stats->chartDistribution($chart_shows, 'death_distribution_chart');
+	break;
+case '4':
+	$stats->chartDistribution($chart_shows, 'marriage_distribution_chart');
+	break;
+case '8':
+case '9':
+	print_sources_stats_chart($x_as);
+	break;
+default:
+	echo $pgv_lang["stpl"].$x_as.$pgv_lang["stplnoim"]."<br/>";
+	exit;
+}
+echo "<br /><div class =\"center noprint\">";
+echo "<input type=\"submit\" value=\"".$pgv_lang["back"]."\" onclick=\"javascript:history.go(-1);\" /><br /><br />";
+echo "</div>\n";
+print_footer();
+?>
\ No newline at end of file

--- upgrade33-40.php DELETED ---

--- patriarchlist.php DELETED ---

Index: source.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/source.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- source.php	7 Jul 2008 18:01:11 -0000	1.5
+++ source.php	30 Apr 2009 19:12:13 -0000	1.6
@@ -37,134 +37,126 @@
 
 // leave manual config until we can move it to bitweaver table 
 require("config.php");
-require_once("includes/functions_print_lists.php");
-require_once("includes/controllers/source_ctrl.php");
+require './includes/controllers/source_ctrl.php';
+require './includes/functions/functions_print_lists.php';
 
-global $linkToID;
+
+$controller=new SourceController();
+$controller->init();
+
+// Tell addmedia.php what to link to
+$linkToID=$controller->sid;
 
 print_header($controller->getPageTitle());
-$linkToID = $controller->sid;	// -- Tell addmedia.php what to link to
-?>
-<?php if ($controller->source->isMarkedDeleted()) print "<span class=\"error\">".$pgv_lang["record_marked_deleted"]."</span>"; ?>
-<script language="JavaScript" type="text/javascript">
-<!--
-	function show_gedcom_record() {
-		var recwin = window.open("gedrecord.php?pid=<?php print $controller->sid ?>", "_blank", "top=0,left=0,width=600,height=400,scrollbars=1,scrollable=1,resizable=1");
-	}
-	function showchanges() {
-		window.location = '<?php print $SCRIPT_NAME.normalize_query_string($QUERY_STRING."&show_changes=yes"); ?>';
+
+// If LightBox installed ---------------------------------
+if ($MULTI_MEDIA && file_exists('./modules/lightbox.php')) {
+	include './modules/lightbox/lb_defaultconfig.php';
+	if (file_exists('./modules/lightbox/lb_config.php')) {
+		include './modules/lightbox/lb_config.php';
 	}
-//-->
-</script>
-<table class="list_table">
-	<tr>
-		<td>
-<?php
-	if ($controller->accept_success) print "<b>".$pgv_lang["accept_successful"]."</b><br />";
-?>
-			<span class="name_head"><?php print PrintReady($controller->source->getTitle()); if ($SHOW_ID_NUMBERS) print " " . getLRM() . "(".$controller->sid.")" . getLRM(); ?></span><br />
-		</td>
-		<td valign="top" class="noprint">
-		<?php if (!$controller->isPrintPreview()) {
-			 $editmenu = $controller->getEditMenu();
-			 $othermenu = $controller->getOtherMenu();
-			 if ($editmenu!==false || $othermenu!==false) {
-		?>
-			<table class="sublinks_table" cellspacing="4" cellpadding="0">
-				<tr>
-					<td class="list_label <?php print $TEXT_DIRECTION?>" colspan="2"><?php print $pgv_lang['source_menu']?></td>
-				</tr>
-				<tr>
-					<?php if ($editmenu!==false) { ?>
-					<td class="sublinks_cell <?php print $TEXT_DIRECTION?>">
-					<?php $editmenu->printMenu(); ?>
-					</td>
-					<?php
-					}
-					if ($othermenu!==false) {
-					?>
+	include './modules/lightbox/functions/lb_call_js.php';
+	loadLangFile('lightbox:lang');
+}
 
-					<td class="sublinks_cell <?php print $TEXT_DIRECTION?>">
-					<?php $othermenu->printMenu(); ?>
-					</td>
-					<?php } ?>
-				</tr>
-			</table>
-			<?php }
+if ($controller->source->isMarkedDeleted()) {
+	echo '<span class="error">', $pgv_lang['record_marked_deleted'], '</span>';
+}
+
+echo PGV_JS_START;
+echo 'function show_gedcom_record() {';
+echo ' var recwin=window.open("gedrecord.php?pid=', $controller->sid, '", "_blank", "top=0,left=0,width=600,height=400,scrollbars=1,scrollable=1,resizable=1");';
+echo '}';
+echo 'function showchanges() {';
+echo ' window.location="source.php?sid=', $controller->sid, '&show_changes=yes"';
+echo '}';
+echo PGV_JS_END;
+
+echo '<table class="list_table"><tr><td>';
+if ($controller->accept_success) {
+	echo '<b>', $pgv_lang['accept_successful'], '</b><br />';
+}
+echo '<span class="name_head">', PrintReady($controller->source->getFullName());
+if ($SHOW_ID_NUMBERS) {
+	echo ' ', getLRM(), '(', $controller->sid, ')', getLRM(); 
+}
+echo '</span><br /></td><td valign="top" class="noprint">';
+if (!$controller->isPrintPreview()) {
+	$editmenu=$controller->getEditMenu();
+	$othermenu=$controller->getOtherMenu();
+	if ($editmenu || $othermenu) {
+		echo '<table class="sublinks_table" cellspacing="4" cellpadding="0">';
+		echo '<tr><td class="list_label ', $TEXT_DIRECTION, '" colspan="2">', $pgv_lang['source_menu'], '</td></tr>';
+		echo '<tr>';
+		if ($editmenu) {
+			echo '<td class="sublinks_cell ', $TEXT_DIRECTION, '">', $editmenu->printMenu(), '</td>';
 		}
-		?>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<table class="facts_table">
-<?php
-$sourcefacts = $controller->source->getSourceFacts();
-foreach($sourcefacts as $indexval => $fact) {
-	$factrec = $fact[0];
-	$linenum = $fact[1];
-	$ft = preg_match("/1\s(_?\w+)\s(.*)/", $factrec, $match);
-	if ($ft>0) $fact = $match[1];
-	else $fact="";
-	$fact = trim($fact);
-	if (!empty($fact)) {
-		if ($fact=="NOTE") {
-			print_main_notes($factrec, 1, $controller->sid, $linenum);
+		if ($othermenu) {
+			echo '<td class="sublinks_cell ', $TEXT_DIRECTION, '">', $othermenu->printMenu(), '</td>';
 		}
-		else {
-			print_fact($factrec, $controller->sid, $linenum);
+		echo '</tr></table>';
+	}
+}
+echo '</td></tr><tr><td colspan="2"><table class="facts_table">';
+
+$sourcefacts=$controller->source->getFacts();
+foreach ($sourcefacts as $fact) {
+	if ($fact) {
+		if ($fact->getTag()=='NOTE') {
+			print_main_notes($fact->getGedcomRecord(), 1, $controller->sid, $fact->getLineNumber());
+		} else {
+			print_fact($fact);
 		}
 	}
 }
+
 // Print media
 print_main_media($controller->sid);
 
-//-- new fact link
-if ((!$controller->isPrintPreview())&&($controller->userCanEdit())) {
-	print_add_new_fact($controller->sid, $sourcefacts, "SOUR");
-		// -- new media
-	print "<tr><td class=\"descriptionbox\">";
-	print_help_link("add_media_help", "qm", "add_media_lbl");
-	print $pgv_lang["add_media_lbl"] . "</td>";
-	print "<td class=\"optionbox\">";
-	print "<a href=\"javascript: ".$pgv_lang["add_media_lbl"]."\" onclick=\"window.open('addmedia.php?action=showmediaform&amp;linktoid=$controller->sid', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;\">".$pgv_lang["add_media"]."</a>";
-	print "<br />\n";
-	print '<a href="javascript:;" onclick="window.open(\'inverselink.php?linktoid='.$controller->sid.'&amp;linkto=source\', \'_blank\', \'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1\'); return false;">'.$pgv_lang["link_to_existing_media"].'</a>';
-	print "</td></tr>\n";
-
+// new fact link
+if (!$controller->isPrintPreview() && $controller->userCanEdit()) {
+	print_add_new_fact($controller->sid, $sourcefacts, 'SOUR');
+	// new media
+	echo '<tr><td class="descriptionbox">';
+	print_help_link('add_media_help', 'qm', 'add_media_lbl');
+	echo $pgv_lang['add_media_lbl'] . '</td>';
+	echo '<td class="optionbox">';
+	echo '<a href="javascript: ', $pgv_lang['add_media_lbl'], '" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->sid, '\', \'_blank\', \'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1\'); return false;">', $pgv_lang['add_media'], '</a>';
+	echo '<br />';
+	echo '<a href="javascript:;" onclick="window.open(\'inverselink.php?linktoid='.$controller->sid.'&linkto=source\', \'_blank\', \'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1\'); return false;">'.$pgv_lang['link_to_existing_media'].'</a>';
+	echo '</td></tr>';
 }
-?>
-		</table>
-		<br /><br />
-		</td></tr>
-		<tr class="center"><td colspan="2">
-<?php
-//Print the tasks table
-if (file_exists("modules/research_assistant/research_assistant.php") && ($SHOW_RESEARCH_ASSISTANT>=PGV_USER_ACCESS_LEVEL)) {
- include_once('modules/research_assistant/research_assistant.php');
- $mod = new ra_functions();
+echo '</table><br /><br /></td></tr><tr class="center"><td colspan="2">';
+
+// Print the tasks table
+if (file_exists('./modules/research_assistant/research_assistant.php') && $SHOW_RESEARCH_ASSISTANT>=PGV_USER_ACCESS_LEVEL) {
+	include_once './modules/research_assistant/research_assistant.php';
+	$mod=new ra_functions();
 	$mod->Init();
- $out = $mod->getSourceTasks($controller->sid);
- print $out;
-	echo "</td></tr>";
-	echo "<tr class=\"center\"><td colspan=\"2\">";
+	echo $mod->getSourceTasks($controller->sid), '</td></tr><tr class="center"><td colspan="2">';
 }
 
+// Individuals linked to this source
+if ($controller->source->countLinkedIndividuals()) {
+	print_indi_table($controller->source->fetchLinkedIndividuals(), $controller->source->getFullName());
+}
 
-// -- array of names
-$myindilist = $controller->source->getSourceIndis();
-$myfamlist = $controller->source->getSourceFams();
-$ci=count($myindilist);
-$cf=count($myfamlist);
+// Families linked to this source
+if ($controller->source->countLinkedFamilies()) {
+	print_fam_table($controller->source->fetchLinkedFamilies(), $controller->source->getFullName());
+}
 
-if ($ci>0) print_indi_table($myindilist, $controller->source->getTitle());
-if ($cf>0) print_fam_table($myfamlist, $controller->source->getTitle());
+// Media Items linked to this source
+if ($controller->source->countLinkedMedia()) {
+	print_media_table($controller->source->fetchLinkedMedia(), $controller->source->getFullName());
+}
+
+// TO DO Shared Notes linked to this source
+if ($controller->source->countLinkedNotes()) {
+	print_note_table($controller->source->fetchLinkedNotes(), $controller->source->getFullName());
+}
 
+echo '</td></tr></table>';
+
+print_footer();
 ?>
-	<br />
-	<br />
-	</td>
-</tr>
-</table>
-<br /><br />
-<?php print_footer(); ?>

--- accesskeyHeaders.php DELETED ---

Index: statistics.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/statistics.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- statistics.php	7 Jul 2008 18:01:11 -0000	1.4
+++ statistics.php	30 Apr 2009 19:12:13 -0000	1.5
@@ -1,511 +1,391 @@
-<?php
-/**
- * Creates some statistics out of the GEDCOM information.
- * We will start with the following possibilities
- * number of persons -> periodes of 10 years from 1700-2010
- * age -> periodes of 10 years (different for 0-1,1-5,5-10,10-20 etc)
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- * @package PhpGedView
- * @subpackage Lists
- */
-require("config.php");
-
-function get_person()
-{
-$myindilist= array();
-$keys= array();
-$values= array();
-$dates= array();
-$families= array();
-global $nrfam, $famgeg, $famgeg1, $nrpers, $persgeg, $persgeg1,$key2ind,$nrman,$nrvrouw;
-global $match1,$match2;
-
-	$myindilist= get_indi_list();
-	$keys = array_keys($myindilist);
-	$values = array_values($myindilist);
-
-	$nrpers= count($myindilist);
-	$nrman=0; $nrvrouw=0;
-	for($i=0; $i<$nrpers; $i++)
-	{
-		$value = $values[$i];
-		$key = $keys[$i];
-		$deathdate="";
-		$birthdate="";
-		$sex= "";
-		$indirec= find_person_record($key);
-		if (dateplace($indirec,"1 BIRT")!==false)
-			{$birthdate= $match1[1]; $birthplace=$match2[1];}
-//--	print ("geboorte:".$birthdate."--".$birthplace."<br/>");
-		if (dateplace($indirec,"1 DEAT")!==false)
-			{$deathdate= $match1[1]; $deathplace=$match2[1];}
-//-- print ("overleden:".$deathdate."--".$deathplace."<br/>");
-		if (stringinfo($indirec,"1 SEX") !==false)
-			{	$sex= 0;
-				if ($match1[1] == "M") {$sex= 1; $nrman++;}
-				if ($match1[1] == "F") {$sex= 2; $nrvrouw++;}
-			}
- //--print ("sexe=".$match1[1].":".$sex."<br/>");
-
-//-- get the marriage date of (the first) marriage.
-
-		$ybirth= -1; $mbirth= -1;
-		$ydeath= -1; $mdeath= -1;
-		if ($birthdate !== "") {
-			$dates = new GedcomDate($birthdate);
-			if ($dates->qual1 == "") {
-				$date  =$dates->MinDate();
-				$date  =$date->convert_to_cal('gregorian');
-				$ybirth=$date->y;
-				$mbirth=$date->m;
-			}
-		}
-
-		if ($deathdate !== "")
-		{
-			$dates = new GedcomDate($deathdate);
-			if ($dates->qual1 == "") {
-				$date  =$dates->MinDate();
-				$date  =$date->convert_to_cal('gregorian');
-				$ydeath=$date->y;
-				$mdeath=$date->m;
-			}
-		}
-//-- else {print "==== no deathdate<br/>";}
-
-		$families= find_sfamily_ids($key); //-- get the number of marriages of this person.
-//--print "families:";
-//--if (isset($families)) { print_r($families);}
-//--print ":einde<br/>";
-		$persgeg[$i]["key"]= $key;
-		$key2ind[$key]= $i;
-		$persgeg[$i]["ybirth"]= $ybirth;
-		$persgeg[$i]["mbirth"]= $mbirth;
-		$persgeg[$i]["ydeath"]= $ydeath;
-		$persgeg[$i]["mdeath"]= $mdeath;
-		$persgeg1[$i]["arfams"]= $families;
-		$persgeg[$i]["sex"]= $sex;
-	}
-}
-
-function complete_data()
-{
-// fill in the first marriages instead of the keys.
-global $nrfam, $famgeg, $famgeg1, $nrpers, $persgeg, $persgeg1,$key2ind,$nrman,$nrvrouw;
-$childs= array();
-$families= array();
-
-//look in the persgeg array for marriages that occurred
-	for($i=0; $i<$nrpers; $i++)
-	{
-		$families= $persgeg1[$i]["arfams"];
-		$ctc= count($families);
-		$marrmonth= -1; $marryear= -1;
-		$first= true;
-//-- if ($ctc > 0)
-//-- {print " eerste huwelijk. nr, aantal, key's:" . $i . " : " . $ctc . " : " ;}
-		for($j=0; $j<$ctc; $j++)
-		{
-			$keyf= $families[$j]; $k= $key2ind[$keyf]; //get the family array and month/date of marriage
-//-- print $keyf . " : ";
-			$mm= $famgeg[$k]["mmarr"];
-			$my= $famgeg[$k]["ymarr"];
-			if ($first)
-			{	$marryear= $my; $marrmonth= $mm; $marrkey= $keyf; $kb= $k; $first= false;}
-			if (($marryear < 0) or (($my < $marryear) and ($my > 0)))
-			{	$marryear= $my; $marrmonth= $mm; $marrkey= $keyf; $kb= $k; $first= false;}
-		}
-		$persgeg[$i]["ymarr1"]= $marryear;
-		$persgeg[$i]["mmarr1"]= $marrmonth;
-		$famgeg[$kb]["ymarr1"]= $marryear;
-		$famgeg[$kb]["mmarr1"]= $marrmonth;
-//-- if ($ctc > 0)
-//-- {print " keuze=:" . $kb . ":". $marrkey . " : " . $marryear . " : " . $marrmonth . "<br/>";}
-	}
-	for($i=0; $i<$nrfam; $i++)
-	{
-		$childs= $famgeg1[$i]["arfamc"];
-		$ctc= count($childs);
-		$birthmonth= -1; $birthyear= -1; $sex=3;
-		$first= true;
-//-- if ($ctc > 0)
-//-- {print " eerste kind. nr, aantal, key's:" . $i . " : " . $ctc . " : " ;}
-		for($j=0; $j<$ctc; $j++)
-		{
-			$key= $childs[$j]; $k= $key2ind[$key];
-//-- print $key . ":";
-			$bm= $persgeg[$k]["mbirth"];
-			$by= $persgeg[$k]["ybirth"];
-			$sex= $persgeg[$k]["sex"];
-			if ($first)
-			{	$birthyear= $by; $birthmonth= $bm; $childkey= $key; $sex1= $sex; $first= false;}
-			if (($birthyear < 0) or (($by < $birthyear) and ($by > 0)))
-			{	$birthyear= $by; $birthmonth= $bm; $childkey= $key; $sex1= $sex; $first= false;}
-//--{print " loop gevonden:" . $key . " : " . $sex . " : " . $by . " : " . $bm . "<br/>";}
-		}
-		$famgeg[$i]["sex1"]= $sex1;
-		$famgeg[$i]["ybirth1"]= $birthyear;
-		$famgeg[$i]["mbirth1"]= $birthmonth;
-		$persgeg[$k]["ybirth1"]= $birthyear;
-		$persgeg[$k]["mbirth1"]= $birthmonth;
-//--if ($ctc > 0)
-//--{print " gevonden:" . $childkey . " : " . $sex1 . " : " . $birthyear . " : " . $birthmonth . "<br/>";}
-	}
-}
-
-
-function get_family()
-{
-$myfamlist= array();
-$keys= array();
-$values= array();
-$parents=array();
-global $nrfam, $famgeg, $famgeg1, $nrpers, $persgeg, $persgeg1,$key2ind,$nrman,$nrvrouw;
-global $match1,$match2;
-
-$dates= array();
-	$myfamlist= get_fam_list();
-	$nrfam= count($myfamlist);
-	$keys = array_keys($myfamlist);
-	$values = array_values($myfamlist);
-
-	for($i=0; $i<$nrfam; $i++)
-	{
-		$value = $values[$i];
-		$key = $keys[$i];
-		$marriagedate=""; $ymarr= -1; $mmarr= -1;
-		$divorcedate= ""; $ydiv= -1; $mdiv= -1;
-		$indirec= find_family_record($key);
-//--	print("famrec:" . $key . ":" . $indirec . "<br/>");
-		if (dateplace($indirec,"1 MARR")!==false)
-			{$marriagedate= $match1[1]; $marriageplace=$match2[1]; $sex=1;}
-		else
-		if (dateplace($indirec,"1 MARS")!==false)
-			{$marriagedate= $match1[1]; $marriageplace=$match2[1]; $sex=0;}
-//--	 print ("gehuwd:".$marriagedate."--".$marriageplace."<br/>");
-		if (dateplace($indirec,"1 DIV")!==false)
-			{$divorcedate= $match1[1]; $divorceplace=$match2[1];}
-		if ($marriagedate !== "")
-		{
-			$dates = new GedcomDate($marriagedate);
-			if ($dates->qual1 == "") {
-				$date =$dates->MinDate();
-				$date =$date->convert_to_cal('gregorian');
-				$ymarr=$date->y;
-				$mmarr=$date->m;
-			}
-		}
-		if ($divorcedate !== "")
-		{
-			$dates = new GedcomDate($divorcedate);
-			if ($dates->qual1 == "") {
-				$date=$dates->MinDate();
-				$date=$date->convert_to_cal('gregorian');
-				$ydiv=$date->y;
-				$mdiv=$date->m;
-			}
-
-		}
-		$parents= find_parents($key);
-//--print ("parents zijn:".$parents["HUSB"].":".$parents["WIFE"]."<br/>");
-		$xfather= $parents["HUSB"]; $xmother= $parents["WIFE"];
-
-//--	check if divorcedate exists otherwise get deadthdate from husband or wife
-		if ($ydiv !== "")
-		{
-			$ydeathf= ""; $ydeathm= "";
-			if ($xfather !== "") {$indf= $key2ind[$xfather]; $ydeathf= $persgeg[$indf]["ydeath"];}
-			if ($xmother !== "") {$indm= $key2ind[$xmother]; $ydeathm= $persgeg[$indm]["ydeath"];}
-//--print(" keys en index father mother=" . $indf . ":" . $xfather . ":" . $indm . ":" . $xmother . "<br/>");
-			if (($ydeathf !== "") and ($ydeathm !== ""))
-			{	if ($ydeathf > $ydeathm)
-				{	$ydiv= $ydeathf; $mdiv= $persgeg[$indf]["mdeath"];}
-				else
-				{	$ydiv= $ydeathm; $mdiv= $persgeg[$indm]["mdeath"];};
-			}
-		};
-		$childs= preg_match_all("/1\s*CHIL\s*@(.*)@/",$indirec,$match1,PREG_SET_ORDER);
-//-- print "===kinderen:" . "Aantal=" . $childs . "=nrs=";
-//--	for($k=0; $k<$childs; $k++) {print $match1[$k][0] . " : ";} print "<br/>";
-$children= array();
-		for($k=0; $k<$childs; $k++)
-		{	$children[$k]= $match1[$k][1]; //--
- $children[$k] . " : ";
-		}
-
-
-		$famgeg[$i]["key"]= $key;
-		$key2ind[$key]= $i;
-		$famgeg[$i]["ymarr"]= $ymarr;
-		$famgeg[$i]["mmarr"]= $mmarr;
-		$famgeg[$i]["ydiv"]= $ydiv;
-		$famgeg[$i]["mdiv"]= $mdiv;
-		$famgeg[$i]["childs"]= $childs;
-		$famgeg1[$i]["arfamc"]= $children;
-		$famgeg[$i]["male"]= $xfather;
-		$famgeg[$i]["female"]= $xmother;
-	//-- print "==ouders==:" . $xfather . ":" . $xmother . "==gehuwd==" . $ymarr . "-" . $mmarr . "<br/>";
-	}
-}
-
-function stringinfo($indirec,$lookfor)
-//look for a starting string in the gedcom record of a person
-//then take the stripped comment
-{
-//-- print "start stringinfo<br/>";
-global $match1,$match2;
-	$birthrec = get_sub_record(1, $lookfor, $indirec);
-	$match1[1]="";
-	$match2[1]="";
-	if ($birthrec!==false)
-		{
-			$dct = preg_match("/".$lookfor." (.*)/", $birthrec, $match1);
-			if ($dct < 1) {$match1[1]="";}
-//--print("stringinfo:".$dct.":".$lookfor.":".$birthrec.":".$match1[1].":<br/>");
-			$match1[1]= trim($match1[1]);
-			return true;
-		}
-	else 	{	return false;}
-}
-
-
-function dateplace($indirec,$lookfor)
-//--look for a starting string in the gedcom record of a person or family
-//--then find the DATE and PLACE variables
-{
-//-- print "start dateplace<br/>";
-global $match1,$match2;
-
-	$birthrec = get_sub_record(1, $lookfor, $indirec);
-//--	$birthrec= $indirec;
-//-- You need to get the subrecord in order not to mistaken by another key with same subkeys.
-	$match1[1]="";
-	$match2[1]="";
-//-- print "dataplace:" . $lookfor . "<br/>" . $birthrec . "<br/>" . $indirec . "<br/>";
-	if ($birthrec!== "")
-		{
-			$dct = preg_match("/2 DATE (.*)/", $birthrec, $match1);
-//-- if ($dct > 0) {print("birthrec + date" . $birthrec . ":::" . $match1[1] . "<br/>");};
-//--			if ($dct>0) $match1[1]= get_number_date($match1[1]);
-//--			$pct = preg_match("/2 PLAC (.*)/", $birthrec, $match2);
-//--			if ($pct>0) print " -- ".$match2[1]."<br/>";
-			if ($dct > 0) {$match1[1]= trim($match1[1]);} else {$match1[1]="";}
-//--			if ($pct > 0) {$match2[1]= trim($match2[1]);} else {$match2[1]="";}
-			return true;
-		}
-	else 	{	return false;}
-}
-
-function put_plot_data()
-{
-	global $GEDCOM, $gGedcom, $INDEX_DIRECTORY;
-global $nrfam, $famgeg, $nrpers, $persgeg,$key2ind,$nrman,$nrvrouw;
-global $pgv_lang;
-
-	$indexfile = $INDEX_DIRECTORY.$GEDCOM."_statistiek.php";
-	$FP = fopen($indexfile, "wb");
-	if (!$FP)
-	{
-		print "<font class=\"error\">" . $pgv_lang["statutci"] . "</font>";
-		exit;
-	}
-
-	/*$lists = array("famgeg"=>$famgeg, "persgeg"=>$persgeg, "key2ind"=>$key2ind);
-	fwrite($FP, serialize($lists));
-	*/
-	fwrite($FP, 'a:3:{s:6:"famgeg";');
-	fwrite($FP, serialize($famgeg));
-	fwrite($FP, 's:7:"persgeg";');
-	fwrite($FP, serialize($persgeg));
-	fwrite($FP, 's:7:"key2ind";');
-	fwrite($FP, serialize($key2ind));
-	fwrite($FP, '}');
-	fclose($FP);
-	$logline = AddToLog($GEDCOM."_statistiek.php updated");
- 	if (!empty($COMMIT_COMMAND)) check_in($logline, $GEDCOM."_statistiek.php", $INDEX_DIRECTORY);
-}
-
-//--	========= start of main program =========
-
-$famgeg = array();
-$persgeg= array();
-$famgeg1 = array();
-$persgeg1= array();
-$key2ind= array();
-$match1= array();
-$match2= array();
-global $nrfam, $famgeg, $nrpers, $persgeg,$key2ind,$nrman,$nrvrouw;
-global $match1,$match2;
-
-	print_header($pgv_lang["statistics"]);
-//-- You should install jpgraph routines on your computer. I implemented them in gaphic/src
-//-- Please check this with any availability test
-
-//-- The info below comes from http://www.php.net when looking at functions
-
-	$mypath= ini_get("include_path");
-//--	On some servers the include path does not support the (current) directory from the calling routine
-//--	ini_set("include_path", $mypath);
-
-	$GDcheck= 1; $JPcheck= 1;
-//-- Check if GD library is loaded
-	if (!extension_loaded('gd')) {$GDcheck= 0;}
-//-- Check if JPgraph modules are available
-	if ((!file_exists( "jpgraph/jpgraph.php")) or
-	    (!file_exists( "jpgraph/jpgraph_line.php")) or
-	    (!file_exists( "jpgraph/jpgraph_bar.php")))
-		{$JPcheck= 0;}
-
-	if (($GDcheck == 0) or ($JPcheck == 0))
-	{
-		if ($GDcheck == 0)
-			{print $pgv_lang["stplGDno"] . "<br/>";}
-		if ($JPcheck == 0)
-			{print $pgv_lang["stpljpgraphno"] . "<br/>";}
-		exit;
-	}
-
-	if (!isset($_SESSION[$GEDCOM."nrpers"]))
-		{	$nrpers=0;}
-		else
-		{	$nrpers=$_SESSION[$GEDCOM . "nrpers"];
-			$nrfam=$_SESSION[$GEDCOM . "nrfam"];
-			$nrman=$_SESSION[$GEDCOM . "nrman"];
-			$nrvrouw=$_SESSION[$GEDCOM . "nrvrouw"];
-		}
-//-- if nrpers<1 means there is no intermediate file yet set in this session
-	if ($nrpers < 1)
-	{
-		get_person();
-		get_family();
-		complete_data();
-		put_plot_data();
-	}
-	print "\t<left><h3>".$pgv_lang["statistics"]."</h3>\t";
-	print ($pgv_lang["statnnames"].$nrpers."<br/>");
-	print ($pgv_lang["statnfam"].$nrfam."<br/>");
-	print ($pgv_lang["statnmale"].$nrman."<br/>");
-	print ($pgv_lang["statnfemale"].$nrvrouw."<br/>");
-	$_SESSION[$GEDCOM . "nrpers"]= $nrpers;
-	$_SESSION[$GEDCOM . "nrfam"]= $nrfam;
-	$_SESSION[$GEDCOM . "nrman"]= $nrman;
-	$_SESSION[$GEDCOM . "nrvrouw"]= $nrvrouw;
-
-{
-if (!isset($plottype)) $plottype=0;
-if (isset($_SESSION[$GEDCOM."statTicks"])) {
-	$xasGrLeeftijden = $_SESSION[$GEDCOM."statTicks"]["xasGrLeeftijden"];
-	$xasGrMaanden = $_SESSION[$GEDCOM."statTicks"]["xasGrMaanden"];
-	$xasGrAantallen = $_SESSION[$GEDCOM."statTicks"]["xasGrAantallen"];
-	$zasGrPeriode = $_SESSION[$GEDCOM."statTicks"]["zasGrPeriode"];
-} else {
-	$xasGrLeeftijden = "1,5,10,20,30,40,50,60,70,80,90,100";
-	$xasGrMaanden = "-24,-12,0,8,12,18,24,48";
-	$xasGrAantallen = "1,2,3,4,5,6,7,8,9,10";
-	$zasGrPeriode = "1700,1750,1800,1850,1900,1950,2000";
-}
-
-?>
-	<h3><?php print_help_link("stat_help","qm"); ?> <?php print $pgv_lang["statvars"]; ?></h3>
-	<form method="post" name="form" action="statisticsplot.php?action=newform">
-	<input type="hidden" name="action" value="update">
-
-	<table class="facts_table">
-	<tr>
-	<td class="descriptionbox width20 wrap"><?php print_help_link("stat_help_x","qm"); ?> <?php print $pgv_lang["statlxa"]; ?> </td>
-	<td class="optionbox"> <select name="x-as">
-		<option value= "11" selected="selected"><?php print $pgv_lang["stat_11_mb"]; ?>
-		<option value= "12"> <?php print $pgv_lang["stat_12_md"]; ?>
-		<option value= "13"> <?php print $pgv_lang["stat_13_mm"]; ?>
-		<option value= "14"> <?php print $pgv_lang["stat_14_mb1"]; ?>
-		<option value= "15"> <?php print $pgv_lang["stat_15_mm1"]; ?>
-		<option value= "16"> <?php print $pgv_lang["stat_16_mmb"]; ?>
-		<option value= "17"> <?php print $pgv_lang["stat_17_arb"]; ?>
-		<option value= "18"> <?php print $pgv_lang["stat_18_ard"]; ?>
-		<option value= "19"> <?php print $pgv_lang["stat_19_arm"]; ?>
-		<option value= "20"> <?php print $pgv_lang["stat_20_arm1"]; ?>
-		<option value= "21"> <?php print $pgv_lang["stat_21_nok"]; ?>
-	</select>
-	<tr>
-	<td class="descriptionbox width20 wrap"><?php print_help_link("stat_help_y","qm"); ?> <?php print $pgv_lang["statlya"]; ?>  </td>
-	<td class="optionbox"> <select name="y-as">
-		<option value= "201" selected="selected"> <?php print $pgv_lang["stat_201_num"]; ?>
-		<option value= "202"> <?php print $pgv_lang["stat_202_perc"]; ?>
-	</select>
-	</td>
-	</tr>
-	<tr>
-	<td class="descriptionbox width20 wrap"><?php print_help_link("stat_help_z","qm"); ?> <?php print $pgv_lang["statlza"]; ?>  </td>
-	<td class="optionbox"> <select name="z-as">
-		<option value= "300"> <?php print $pgv_lang["stat_300_none"]; ?>
-		<option value= "301"> <?php print $pgv_lang["stat_301_mf"]; ?>
-		<option value= "302" selected="selected"> <?php print $pgv_lang["stat_302_cgp"]; ?>
-	</select>
-	</td>
-	</tr>
-	</table>
-<br/>
-
-<h3><?php print $pgv_lang["statmess1"]; ?></h3>
-
-	<table class="facts_table">
-	<tr>
-	<td class="descriptionbox width20 wrap"><?php print_help_link("stat_help_gwx","qm"); ?> <?php print $pgv_lang["statar_xgl"]; ?> </td>
-	<td class="optionbox"> <input type="text" name="xas-grenzen-leeftijden" value="<?php print $xasGrLeeftijden; ?>"
-			size="60">
-	</td>
-	</tr>
-	<tr>
-	<td class="descriptionbox width20 wrap"> <?php print $pgv_lang["statar_xgm"]; ?> </td>
-	<td class="optionbox"> <input type="text" name="xas-grenzen-maanden" value="<?php print $xasGrMaanden; ?>"
-			size="60">
-	</td>
-	</tr>
-	<tr>
-	<td class="descriptionbox width20 wrap"> <?php print $pgv_lang["statar_xga"]; ?> </td>
-	<td class="optionbox"> <input type="text" name="xas-grenzen-aantallen" value="<?php print $xasGrAantallen; ?>"
-			size="60">
-	</td>
-	</tr>
-	<tr>
-	<td class="descriptionbox width20 wrap"><?php print_help_link("stat_help_gwz","qm"); ?> <?php print $pgv_lang["statar_zgp"]; ?> </td>
-	<td class="optionbox"> <input type="text" name="zas-grenzen-periode" value="<?php print $zasGrPeriode; ?>"
-			size="60">
-	</td>
-	</tr>
-	</table>
-
-</td></tr></table></center>
-<br/>
-<input type="submit" value="<?php print $pgv_lang["statsubmit"]; ?> " onclick="closeHelp();">
-<input type="reset"  value=" <?php print $pgv_lang["statreset"]; ?> "><br/>
-</form>
-<?php
-}
-
-//--print "plottype=".$plottype."<br/>";
-$_SESSION["plottype"]=$plottype;
-
-
-print "<br/>";
-print_footer();
-
-?>
+<?php
+/**
+ * Creates some statistics out of the GEDCOM information.
+ * We will start with the following possibilities
+ * number of persons -> periodes of 50 years from 1700-2000
+ * age -> periodes of 10 years (different for 0-1,1-5,5-10,10-20 etc)
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Id$
+ * @package PhpGedView
+ * @subpackage Lists
+ */
+
+require './config.php';
+
+require_once './includes/classes/class_stats.php';
+require_once './includes/functions/functions_places.php';
+
+print_header($pgv_lang["statistics"]);
+
+if ($ENABLE_AUTOCOMPLETE) require './js/autocomplete.js.htm';
+?>
+<script language="JavaScript" type="text/javascript">
+<!--
+	function statusHide(sel) {
+		var box = document.getElementById(sel);
+		box.style.display = "none";
+		var box_m = document.getElementById(sel+"_m");
+		if (box_m) box_m.style.display = "none";
+		if (sel=="map_opt") {
+			var box_axes = document.getElementById("axes");
+			if (box_axes) box_axes.style.display = "";
+			var box_zyaxes = document.getElementById("zyaxes");
+			if (box_zyaxes) box_zyaxes.style.display = "";
+		}
+	}
+	function statusShow(sel) {
+		var box = document.getElementById(sel);
+		box.style.display = "";
+		var box_m = document.getElementById(sel+"_m");
+		if (box_m) box_m.style.display = "none";
+		if (sel=="map_opt") {
+			var box_axes = document.getElementById("axes");
+			if (box_axes) box_axes.style.display = "none";
+			var box_zyaxes = document.getElementById("zyaxes");
+			if (box_zyaxes) box_zyaxes.style.display = "none";
+		}
+	}
+	function statusShowSurname(x) {
+	    if (x.value == "surname_distribution_chart") {
+			var box = document.getElementById("surname_opt");
+			box.style.display = "";
+		}
+		else if (x.value !== "surname_distribution_chart") {
+			var box = document.getElementById("surname_opt");
+			box.style.display = "none";
+		}
+	}
+//-->
+</script>
+<?php
+/*
+ * Initiate the stats object.
+ */
+$stats = new stats($GEDCOM);
+
+if (!isset($_SESSION[$GEDCOM."nrpers"])) {
+	$nrpers = 0;
+}
+else {
+	$nrpers = $_SESSION[$GEDCOM."nrpers"];
+	$nrfam = $_SESSION[$GEDCOM."nrfam"];
+	$nrmale = $_SESSION[$GEDCOM."nrmale"];
+	$nrfemale = $_SESSION[$GEDCOM."nrfemale"];
+}
+
+$_SESSION[$GEDCOM."nrpers"] = $stats->totalIndividuals();
+$_SESSION[$GEDCOM."nrfam"] = $stats->totalFamilies();
+$_SESSION[$GEDCOM."nrmale"] = $stats->totalSexMales();
+$_SESSION[$GEDCOM."nrfemale"] = $stats->totalSexFemales();
+
+
+$params[1] = "ffffff";
+$params[2] = "84beff";
+echo '<h2 class="center">', $pgv_lang['statistics'], '</h2>';
+echo "<table width=\"100%\"><tr><td class=\"facts_label\">".$pgv_lang["statnmale"]."</td>";
+echo "<td class=\"facts_label\">".$pgv_lang["statnfemale"]."</td>";
+echo "<td class=\"facts_label\">".$pgv_lang["statnfam"]."</td>";
+echo "<td class=\"facts_label\">".$pgv_lang["statnnames"]."</td></tr>";
+echo "<tr><td class=\"facts_value\" align=\"center\">".$stats->totalSexMales()."</td>";
+echo "<td class=\"facts_value\" align=\"center\">".$stats->totalSexFemales()."</td>";
+echo "<td class=\"facts_value\" align=\"center\">".$stats->totalFamilies()."</td>";
+echo "<td class=\"facts_value\" align=\"center\">".$stats->totalIndividuals()."</td></tr>";
+echo "<tr><td class=\"facts_label\" colspan=\"2\">".$pgv_lang["statnnames"]."</td>";
+echo "<td class=\"facts_label\" colspan=\"2\">".$pgv_lang["statnnames"]."</td></tr>";
+echo "<tr><td class=\"facts_value\" colspan=\"2\" align=\"center\">".$stats->chartSex()."</td>";
+echo "<td class=\"facts_value\" colspan=\"2\" align=\"center\">".$stats->chartMortality()."</td></tr>";
+echo "<tr><td class=\"facts_label\" colspan=\"2\" >".$pgv_lang["stat_surnames"]."</td>";
+echo "<td class=\"facts_label\"colspan=\"2\">".$pgv_lang["stat_media"]."</td></tr>";
+echo "<tr><td class=\"facts_value\" colspan=\"2\" align=\"center\">".$stats->chartCommonSurnames($params)."</td>";
+echo "<td class=\"facts_value\" colspan=\"2\" align=\"center\">".$stats->chartMedia($params)."</td></tr>";
+echo "<tr><td class=\"facts_label\" colspan=\"4\">".$pgv_lang["stat_21_nok"]."</td></tr>";
+echo "<tr><td class=\"facts_value\" colspan=\"4\" align=\"center\">".$stats->chartLargestFamilies($params)."</td></tr>";
+echo "</table>";
+
+if (!isset($plottype)) $plottype = 11;
+if (!isset($charttype)) $charttype = 1;
+if (!isset($plotshow)) $plotshow = 302;
+if (!isset($plotnp)) $plotnp = 201;
+
+if (isset($_SESSION[$GEDCOM."statTicks"])) {
+	$xasGrLeeftijden = $_SESSION[$GEDCOM."statTicks"]["xasGrLeeftijden"];
+	$xasGrMaanden = $_SESSION[$GEDCOM."statTicks"]["xasGrMaanden"];
+	$xasGrAantallen = $_SESSION[$GEDCOM."statTicks"]["xasGrAantallen"];
+	$zasGrPeriode = $_SESSION[$GEDCOM."statTicks"]["zasGrPeriode"];
+}
+else {
+	$xasGrLeeftijden = "1,5,10,20,30,40,50,60,70,80,90,100";
+	$xasGrMaanden = "-24,-12,0,8,12,18,24,48";
+	$xasGrAantallen = "1,2,3,4,5,6,7,8,9,10";
+	$zasGrPeriode = "1700,1750,1800,1850,1900,1950,2000";
+}
+if (isset($_SESSION[$GEDCOM."statTicks1"])) {
+	$chart_shows = $_SESSION[$GEDCOM."statTicks1"]["chart_shows"];
+	$chart_type = $_SESSION[$GEDCOM."statTicks1"]["chart_type"];
+	$surname = $_SESSION[$GEDCOM."statTicks1"]["surname"];
+}
+else {
+	$chart_shows = "world";
+	$chart_type = "indi_distribution_chart";
+	$surname = $stats->getCommonSurname();
+}
+
+?>
+	<h3><?php print_help_link("stat_help","qm"); ?> <?php echo $pgv_lang["statvars"]; ?></h3>
+	<form method="post" name="form" action="statisticsplot.php?action=newform">
+	<input type="hidden" name="action" value="update" />
+
+	<table class="facts_table">
+	<tr>
+	<td class="descriptionbox width10 wrap"><?php print_help_link("stat_help_x","qm"); ?> <?php echo $pgv_lang["statlxa"]; ?> </td>
+	<td class="optionbox">
+	<input type="radio" id="stat_11" name="x-as" value="11"
+	<?php
+	if ($plottype == "11") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_11\">".$pgv_lang["stat_11_mb"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_12\" name=\"x-as\" value=\"12\"";
+	if ($plottype == "12") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_12\">".$pgv_lang["stat_12_md"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_13\" name=\"x-as\" value=\"13\"";
+	if ($plottype == "13") echo " checked=\"checked\"";
+	echo " onclick=\"{statusChecked('z_none'); statusDisable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_13\">".$pgv_lang["stat_13_mm"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_15\" name=\"x-as\" value=\"15\"";
+	if ($plottype == "15") echo " checked=\"checked\"";
+	echo " onclick=\"{statusChecked('z_none'); statusDisable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_15\">".$pgv_lang["stat_15_mm1"]."</label><br />";
+//	echo "<input type=\"radio\" id=\"stat_14\" name=\"x-as\" value=\"14\"";
+//	if ($plottype == "14") echo " checked=\"checked\"";
+//	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+//	echo "\" /><label for=\"stat_14\">".$pgv_lang["stat_14_mb1"]."</label><br />";
+//	echo "<input type=\"radio\" id=\"stat_16\" name=\"x-as\" value=\"16\"";
+//	if ($plottype == "16") echo " checked=\"checked\"";
+//	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusShow('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+//	echo "\" /><label for=\"stat_16\">".$pgv_lang["stat_16_mmb"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_17\" name=\"x-as\" value=\"17\"";
+	if ($plottype == "17") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusShow('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_17\">".$pgv_lang["stat_17_arb"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_18\" name=\"x-as\" value=\"18\"";
+	if ($plottype == "18") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusShow('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_18\">".$pgv_lang["stat_18_ard"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_19\" name=\"x-as\" value=\"19\"";
+	if ($plottype == "19") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusShow('x_years_m'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_19\">".$pgv_lang["stat_19_arm"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_20\" name=\"x-as\" value=\"20\"";
+	if ($plottype == "20") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusShow('x_years_m'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_20\">".$pgv_lang["stat_20_arm1"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_21\" name=\"x-as\" value=\"21\"";
+	if ($plottype == "21") echo " checked=\"checked\"";
+	echo " onclick=\"{statusEnable('z_sex'); statusHide('x_years'); statusHide('x_months'); statusShow('x_numbers'); statusHide('map_opt');}";
+	echo "\" /><label for=\"stat_21\">".$pgv_lang["stat_21_nok"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_1\" name=\"x-as\" value=\"1\"";
+	if ($plottype == "1") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusShow('map_opt'); statusShow('chart_type'); statusHide('axes');}";
+	echo "\" /><label for=\"stat_1\">".$pgv_lang["stat_1_map"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_2\" name=\"x-as\" value=\"2\"";
+	if ($plottype == "2") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusShow('map_opt'); statusHide('chart_type'); statusHide('surname_opt');}";
+	echo "\" /><label for=\"stat_2\">".$pgv_lang["stat_2_map"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_4\" name=\"x-as\" value=\"4\"";
+	if ($plottype == "4") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusShow('map_opt'); statusHide('chart_type'); statusHide('surname_opt');}";
+	echo "\" /><label for=\"stat_4\">".$pgv_lang["stat_4_map"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_3\" name=\"x-as\" value=\"3\"";
+	if ($plottype == "3") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusShow('map_opt'); statusHide('chart_type'); statusHide('surname_opt');}";
+	echo "\" /><label for=\"stat_3\">".$pgv_lang["stat_3_map"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_9\" name=\"x-as\" value=\"9\"";
+	if ($plottype == "9") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt'); statusHide('axes'); statusHide('zyaxes');}";
+	echo "\" /><label for=\"stat_9\">".$pgv_lang["stat_9_indi"]."</label><br />";
+	echo "<input type=\"radio\" id=\"stat_8\" name=\"x-as\" value=\"8\"";
+	if ($plottype == "8") echo " checked=\"checked\"";
+	echo " onclick=\"{statusHide('x_years'); statusHide('x_months'); statusHide('x_numbers'); statusHide('map_opt'); statusHide('axes'); statusHide('zyaxes');}";
+	echo "\" /><label for=\"stat_8\">".$pgv_lang["stat_8_fam"]."</label><br />";
+	?>
+	<br />
+	<div id="x_years" style="display:none;">
+	<?php
+	print_help_link("stat_help_gax","qm");
+	echo $pgv_lang["statar_xgl"];
+	?>
+	<br /><select id="xas-grenzen-leeftijden" name="xas-grenzen-leeftijden">
+		<option value="1,5,10,20,30,40,50,60,70,80,90,100" selected="selected"><?php
+			echo $pgv_lang["interval"]." 10 ".$pgv_lang["years"];?></option>
+		<option value="5,20,40,60,75,80,85,90"><?php
+			echo $pgv_lang["interval"]." 20 ".$pgv_lang["years"];?></option>
+		<option value="10,25,50,75,100"><?php
+			echo $pgv_lang["interval"]." 25 ".$pgv_lang["years"];?></option>
+	</select><br />
+	</div>
+	<div id="x_years_m" style="display:none;">
+	<?php
+	print_help_link("stat_help_gbx","qm");
+	echo $pgv_lang["statar_xgl"];
+	?>
+	<br /><select id="xas-grenzen-leeftijden_m" name="xas-grenzen-leeftijden_m">
+		<option value="16,18,20,22,24,26,28,30,32,35,40,50" selected="selected"><?php
+			echo $pgv_lang["interval"]." 2 ".$pgv_lang["years2"];?></option>
+		<option value="20,25,30,35,40,45,50"><?php
+			echo $pgv_lang["interval"]." 5 ".$pgv_lang["years"];?></option>
+	</select><br />
+	</div>
+	<div id="x_months" style="display:none;">
+	<?php
+	print_help_link("stat_help_gwx","qm");
+	echo $pgv_lang["statar_xgm"];
+	?>
+	<br /><select id="xas-grenzen-maanden" name="xas-grenzen-maanden">
+		<option value="0,8,12,15,18,24,48" selected="selected"><?php echo $pgv_lang["aft_marr"];?></option>
+		<option value="-24,-12,0,8,12,18,24,48"><?php echo $pgv_lang["bef_marr"];?></option>
+		<option value="0,6,9,12,15,18,21,24"><?php echo $pgv_lang["quarters"];?></option>
+		<option value="0,6,12,18,24"><?php echo $pgv_lang["half_year"];?></option>
+	</select><br />
+	</div>
+	<div id="x_numbers" style="display:none;">
+	<?php
+	print_help_link("stat_help_gcx","qm");
+	echo $pgv_lang["statar_xga"];
+	?>
+	<br /><select id="xas-grenzen-aantallen" name="xas-grenzen-aantallen">
+		<option value="1,2,3,4,5,6,7,8,9,10" selected="selected"><?php echo $pgv_lang["one_child"];?></option>
+		<option value="2,4,6,8,10,12"><?php echo $pgv_lang["two_children"];?></option>
+	</select>
+	<br />
+	</div>
+	<div id="map_opt" style="display:none;">
+	<div id="chart_type">
+	<?php
+	print_help_link('chart_type_help', 'qm');
+	echo $pgv_lang["map_type"]
+	?>
+	<br /><select name="chart_type" onchange="statusShowSurname(this)";>
+		<option value="indi_distribution_chart" selected="selected">
+			<?php echo $pgv_lang["indi_distribution_chart"]; ?></option>
+		<option value="surname_distribution_chart">
+			<?php echo $pgv_lang["surname_distribution_chart"]; ?></option>
+	</select>
+	<br />
+	</div>
+	<div id="surname_opt" style="display:none;">
+	<?php
+	print_help_link('google_chart_surname_help', 'qm');
+	echo $factarray['SURN'], '<br /><input type="text" name="SURN" size="20" />';
+	?>
+	<br />
+	</div>
+	<?php
+	print_help_link('chart_area_help', 'qm');
+	echo $pgv_lang["area_chart"]
+	?>
+	<br /><select id="chart_shows" name="chart_shows">
+		<option value="world" selected="selected"><?php echo $pgv_lang["world_chart"]; ?></option>
+		<option value="europe"><?php echo $pgv_lang["europe_chart"]; ?></option>
+		<option value="south_america"><?php echo $pgv_lang["s_america_chart"]; ?></option>
+		<option value="asia"><?php echo $pgv_lang["asia_chart"]; ?></option>
+		<option value="middle_east"><?php echo $pgv_lang["middle_east_chart"]; ?></option>
+		<option value="africa"><?php echo $pgv_lang["africa_chart"]; ?></option>
+	</select>
+	</div>
+
+	<td class="descriptionbox width10 wrap" id="axes"><?php print_help_link("stat_help_z","qm"); ?> <?php echo $pgv_lang["statlza"]; ?>  </td>
+	<td class="optionbox" id="zyaxes">
+	<input type="radio" id="z_none" name="z-as" value="300"
+	<?php
+	if ($plotshow == "300") echo " checked=\"checked\"";
+	echo " onclick=\"statusDisable('zas-grenzen-periode');";
+	echo "\" /><label for=\"z_none\">".$pgv_lang["stat_300_none"]."</label><br />";
+	echo "<input type=\"radio\" id=\"z_sex\" name=\"z-as\" value=\"301\"";
+	if ($plotshow == "301") echo " checked=\"checked\"";
+	echo " onclick=\"statusDisable('zas-grenzen-periode');";
+	echo "\" /><label for=\"z_sex\">".$pgv_lang["stat_301_mf"]."</label><br />";
+	echo "<input type=\"radio\" id=\"z_time\" name=\"z-as\" value=\"302\"";
+	if ($plotshow == "302") echo " checked=\"checked\"";
+	echo " onclick=\"statusEnable('zas-grenzen-periode');";
+	echo "\" /><label for=\"z_time\">".$pgv_lang["stat_302_cgp"]."</label><br /><br />";
+	print_help_link("stat_help_gwz","qm");
+	echo $pgv_lang["statar_zgp"]."<br />";
+
+	// Allow special processing for different languages
+	$func="date_localisation_{$lang_short_cut[$LANGUAGE]}";
+	if (!function_exists($func))
+		$func="DefaultDateLocalisation";
+	// Localise the date
+	$q1='from'; $d1='';
+	$q2=''; $d2=''; $q3='';
+	$func($q1, $d1, $q2, $d2, $q3);
+	?>
+	<select id="zas-grenzen-periode" name="zas-grenzen-periode">
+		<option value="1700,1750,1800,1850,1900,1950,2000" selected="selected"><?php
+			$d1 = 1700;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 50 ".$pgv_lang["years"];?></option>
+		<option value="1800,1840,1880,1920,1950,1970,2000"><?php
+			$d1 = 1800;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 40 ".$pgv_lang["years"];?></option>
+		<option value="1800,1850,1900,1950,2000"><?php
+			$d1 = 1800;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 50 ".$pgv_lang["years"];?></option>
+		<option value="1900,1920,1940,1960,1980,1990,2000"><?php
+			$d1 = 1900;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 20 ".$pgv_lang["years"];?></option>
+		<option value="1900,1925,1950,1975,2000"><?php
+			$d1 = 1900;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 25 ".$pgv_lang["years"];?></option>
+		<option value="1940,1950,1960,1970,1980,1990,2000"><?php
+			$d1 = 1940;
+			echo trim("{$q1} {$d1} {$q2} {$d2} {$q3}")." ".$pgv_lang["interval"]." 10 ".$pgv_lang["years"];?></option>
+	</select>
+	<br /><br />
+	<?php
+	print_help_link("stat_help_y","qm");
+	echo $pgv_lang["statlya"]."<br />";
+	?>
+	<input type="radio" id="y_num" name="y-as" value="201"
+	<?php
+	if ($plotnp == "201") echo " checked=\"checked\"";
+	echo "\" /><label for=\"y_num\">".$pgv_lang["stat_201_num"]."</label><br />";
+	echo "<input type=\"radio\" id=\"y_perc\" name=\"y-as\" value=\"202\"";
+	if ($plotnp == "202") echo " checked=\"checked\"";
+	echo "\" /><label for=\"y_perc\">".$pgv_lang["stat_202_perc"]."</label><br />";
+	?>
+	</td>
+	</tr>
+	<td></td><td>
+	<br/>
+	<input type="submit" value="<?php echo $pgv_lang["statsubmit"]; ?> " onclick="closeHelp();" />
+	<input type="reset"  value=" <?php echo $pgv_lang["statreset"]; ?> " /><br/>
+	</td>
+	</table>
+	</form>
+
+<?php
+$_SESSION["plottype"]=$plottype;
+$_SESSION["plotshow"]=$plotshow;
+$_SESSION["plotnp"]=$plotnp;
+
+echo "<br/>";
+print_footer();
+?>

--- viewconnections.php DELETED ---

Index: calendar.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/calendar.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- calendar.php	11 Aug 2008 15:26:30 -0000	1.9
+++ calendar.php	30 Apr 2009 19:12:13 -0000	1.10
@@ -34,15 +34,7 @@
 // Initialization
 require_once( '../bit_setup_inc.php' );
 
-// Is package installed and enabled
-$gBitSystem->verifyPackage( 'phpgedview' );
-
-include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
-
-$gGedcom = new BitGEDCOM();
-
-// leave manual config until we can move it to bitweaver table 
-require_once("includes/functions_print_lists.php");
+require_once("includes/functions/functions_print_lists.php");
 
 if (isset($_REQUEST['cal'])) $cal = $_REQUEST['cal'];
 if (isset($_REQUEST['day'])) $day = $_REQUEST['day'];
@@ -88,7 +80,7 @@
 $cal=urlencode($cal);
 
 // Invalid month?  Pick a sensible one.
-if ($cal_date->CALENDAR_ESCAPE=='@#DHEBREW@' && $cal_date->m==7 && $cal_date->y!=0 && !$cal_date->IsLeapYear())
+if ($cal_date->CALENDAR_ESCAPE()=='@#DHEBREW@' && $cal_date->m==7 && $cal_date->y!=0 && !$cal_date->IsLeapYear())
 	$cal_date->m=6;
 
 // Fill in any missing bits with todays date
@@ -113,6 +105,19 @@
 // Print the header stuff
 print_header($pgv_lang['anniversary_calendar']);
 print '<div style="text-align: center;" id="calendar_page">';
+
+if ($view!='preview') {
+	// Calendar form
+	print '<form name="dateform" method="get" action="calendar.php">';
+	print "<input type=\"hidden\" name=\"cal\"      value=\"{$cal}\"         />";
+	print "<input type=\"hidden\" name=\"day\"      value=\"{$cal_date->d}\" />";
+	print "<input type=\"hidden\" name=\"month\"    value=\"{$cal_month}\"   />";
+	print "<input type=\"hidden\" name=\"year\"     value=\"{$cal_date->y}\" />";
+	print "<input type=\"hidden\" name=\"action\"   value=\"{$action}\"      />";
+	print "<input type=\"hidden\" name=\"filterev\" value=\"{$filterev}\"    />";
+	print "<input type=\"hidden\" name=\"filtersx\" value=\"{$filtersx}\"    />";
+	print "<input type=\"hidden\" name=\"filterof\" value=\"{$filterof}\"    />";
+}
 print '<table class="facts_table '.$TEXT_DIRECTION.' width100">';
 print '<tr><td class="facts_label" colspan="8"><h2>';
 
@@ -130,16 +135,6 @@
 print '</h2></td></tr>';
 
 if ($view!='preview') {
-	// Calendar form
-	print '<form name="dateform" method="get" action="calendar.php">';
-	print "<input type=\"hidden\" name=\"cal\"      value=\"{$cal}\"         />";
-	print "<input type=\"hidden\" name=\"day\"      value=\"{$cal_date->d}\" />";
-	print "<input type=\"hidden\" name=\"month\"    value=\"{$cal_month}\"   />";
-	print "<input type=\"hidden\" name=\"year\"     value=\"{$cal_date->y}\" />";
-	print "<input type=\"hidden\" name=\"action\"   value=\"{$action}\"      />";
-	print "<input type=\"hidden\" name=\"filterev\" value=\"{$filterev}\"    />";
-	print "<input type=\"hidden\" name=\"filtersx\" value=\"{$filtersx}\"    />";
-	print "<input type=\"hidden\" name=\"filterof\" value=\"{$filterof}\"    />";
 	// Day selector
 	print '<tr><td class="descriptionbox vmiddle">';
 	print_help_link('annivers_date_select_help', 'qm', 'day');
@@ -150,7 +145,7 @@
 		if ($d==$cal_date->d)
 			print "<span class=\"error\">{$d_fmt}</span>";
 		else
-			print "<a href=\"calendar.php?cal={$cal}&amp;day={$d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\">{$d_fmt}</a>";
+			print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\">{$d_fmt}</a>";
 		print ' | ';
 	}
 	$tmp=new GedcomDate($today->Format('@ A O E')); // Need a gedcom date to get localisation
@@ -160,30 +155,30 @@
 	print_help_link('annivers_month_select_help', 'qm', 'month');
 	print $pgv_lang['month'].'</td>';
 	print '<td class="optionbox" colspan="7">';
-	foreach ($cal_date->NUM_TO_MONTH as $n=>$m)
-		if (!empty($m)) {
-			if ($n==7 && $cal_date->CALENDAR_ESCAPE=='@#DHEBREW@' && !$cal_date->IsLeapYear())
-				continue;
-			if ($n==6 && $cal_date->CALENDAR_ESCAPE=='@#DHEBREW@' && $cal_date->IsLeapYear())
-				$l.='_leap_year';
-			else
-				$l='';
-			$month_name=$pgv_lang[$m.$l];
-			if ($n==$cal_date->m)
-				$month_name="<span class=\"error\">{$month_name}</span>";
-			print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$m}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\">{$month_name}</a>";
-			print ' | ';
-		}
-	print "<a href=\"calendar.php?cal={$cal}&amp;day=".min($cal_date->d, $today->DaysInMonth())."&amp;month={$today_month}&amp;year={$today->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\"><b>".$today->Format('F Y').'</b></a></td></tr>';
+	for ($n=1; $n<=$cal_date->NUM_MONTHS(); ++$n) {
+		$m=$cal_date->NUM_TO_MONTH($n);
+		if ($n==7 && $cal_date->CALENDAR_ESCAPE()=='@#DHEBREW@' && !$cal_date->IsLeapYear())
+		continue;
+		if ($n==6 && $cal_date->CALENDAR_ESCAPE()=='@#DHEBREW@' && $cal_date->IsLeapYear())
+			$l.='_leap_year';
+		else
+			$l='';
+		$month_name=$pgv_lang[$m.$l];
+		if ($n==$cal_date->m)
+			$month_name="<span class=\"error\">{$month_name}</span>";
+		print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$m}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\">{$month_name}</a>";
+		print ' | ';
+	}
+	print "<a href=\"".encode_url("calendar.php?cal={$cal}&day=".min($cal_date->d, $today->DaysInMonth())."&month={$today_month}&year={$today->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\"><b>".$today->Format('F Y').'</b></a></td></tr>';
 	// Year selector
 	print '<tr><td class="descriptionbox vmiddle">';
 	print_help_link('annivers_year_select_help', 'qm', 'year');
 	print $pgv_lang['year'].'</td>';
 	print "<td class=\"optionbox vmiddle\">";
-	print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year=".($cal_date->y==1?-1:$cal_date->y-1)."&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\">-1</a>";
+	print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year=".($cal_date->y==1?-1:$cal_date->y-1)."&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\">-1</a>";
 	print " <input type=\"text\" name=\"year\" value=\"{$year}\" size=\"7\" /> ";
-	print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year=".($cal_date->y==-1?1:$cal_date->y+1)."&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\">+1</a>";
-	print " | <a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$today->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\"><b>".$today->Format('Y')."</b></a>";
+	print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year=".($cal_date->y==-1?1:$cal_date->y+1)."&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\">+1</a>";
+	print " | <a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$today->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\"><b>".$today->Format('Y')."</b></a>";
 	print "</td> ";
 	// Filtering options
 	print "<td class=\"descriptionbox vmiddle\">";
@@ -210,25 +205,25 @@
 	print $pgv_lang["sex"].":&nbsp;</td>";
 	print "<td class=\"optionbox vmiddle\">";
 	if ($filtersx=="") {
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sex"]["small"]."\" title=\"".$pgv_lang["all"]."\" alt=\"".$pgv_lang["all"]."\" width=\"15\" height=\"15\" border=\"0\" align=\"middle\" />";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sexf"]["small"]."\" title=\"".$pgv_lang["all"]."\" alt=\"".$pgv_lang["all"]."\" width=\"15\" height=\"15\" border=\"0\" align=\"middle\" /> | ";
+		echo Person::sexImage('M', 'large', 'align="middle"', $pgv_lang['all']);
+		echo Person::sexImage('F', 'large', 'align="middle"', $pgv_lang['all']), ' | ';
 	} else {
-		print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx=&amp;action={$action}\">";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sex"]["small"]."\" title=\"".$pgv_lang["all"]."\" alt=\"".$pgv_lang["all"]."\" width=\"9\" height=\"9\" border=\"0\" align=\"middle\" />";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sexf"]["small"]."\" title=\"".$pgv_lang["all"]."\" alt=\"".$pgv_lang["all"]."\" width=\"9\" height=\"9\" border=\"0\" align=\"middle\" /></a>"." | ";
+		print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx=&action={$action}")."\">";
+		echo Person::sexImage('M', 'small', 'align="middle"', $pgv_lang['all']);
+		echo Person::sexImage('F', 'small', 'align="middle"', $pgv_lang['all']), '</a> | ';
 	}
 	if ($filtersx=="M") {
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sex"]["small"]."\" title=\"".$pgv_lang["male"]."\" alt=\"".$pgv_lang["male"]."\" width=\"15\" height=\"15\" border=\"0\" align=\"middle\" /> | ";
+		echo Person::sexImage('M', 'large', 'align="middle"', $pgv_lang['male']), ' | ';
 	} else {
-		print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx=M&amp;action={$action}\">";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sex"]["small"]."\" title=\"".$pgv_lang["male"]."\" alt=\"".$pgv_lang["male"]."\" width=\"9\" height=\"9\" border=\"0\" align=\"middle\" /></a> | ";
+		echo "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx=M&action={$action}")."\">";
+		echo Person::sexImage('M', 'small', 'align="middle"', $pgv_lang['male']), '</a> | ';
 	}
 	if ($filtersx=="F")
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sexf"]["small"]."\" title=\"".$pgv_lang["female"]."\" alt=\"".$pgv_lang["female"]."\" width=\"15\" height=\"15\" border=\"0\" align=\"middle\" />";
-	else
-		print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx=F&amp;action={$action}\">";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["sexf"]["small"]."\" title=\"".$pgv_lang["female"]."\" alt=\"".$pgv_lang["female"]."\" width=\"9\" height=\"9\" border=\"0\" align=\"middle\" /></a>";
-
+		echo Person::sexImage('F', 'large', 'align="middle"', $pgv_lang['female']), ' | ';
+	else {
+		echo "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx=F&action={$action}")."\">";
+		echo Person::sexImage('F', 'small', 'align="middle"', $pgv_lang['female']), '</a>';
+	}
 	print "</td>";
 	print "<td class=\"descriptionbox vmiddle\">";
 	print_help_link("annivers_event_help", "qm", "showcal");
@@ -290,32 +285,32 @@
 	if ($action=='today')
 		print "<span class=\"error\">{$pgv_lang['viewday']}</span>";
 	else
-		print "<a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action=today\">{$pgv_lang['viewday']}</a>";
+		print "<a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action=today")."\">{$pgv_lang['viewday']}</a>";
 
 	if ($action=='calendar')
 		print " | <span class=\"error\">{$pgv_lang['viewmonth']}</span>";
 	else
-		print " | <a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action=calendar\">{$pgv_lang['viewmonth']}</a>";
+		print " | <a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action=calendar")."\">{$pgv_lang['viewmonth']}</a>";
 
 	if ($action=='year')
 		print " | <span class=\"error\">{$pgv_lang['viewyear']}</span>";
 	else
-		print " | <a href=\"calendar.php?cal={$cal}&amp;day={$cal_date->d}&amp;month={$cal_month}&amp;year={$cal_date->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action=year\">{$pgv_lang['viewyear']}</a>";
+		print " | <a href=\"".encode_url("calendar.php?cal={$cal}&day={$cal_date->d}&month={$cal_month}&year={$cal_date->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action=year")."\">{$pgv_lang['viewyear']}</a>";
 
 	foreach (array('gregorian', 'julian', 'jewish', 'french', 'hijri') as $newcal) {
 		$tmp=$cal_date->convert_to_cal($newcal);
 		if ($tmp->InValidRange())
-			if ($tmp->CALENDAR_ESCAPE==$cal_date->CALENDAR_ESCAPE)
+			if ($tmp->CALENDAR_ESCAPE()==$cal_date->CALENDAR_ESCAPE())
 				print " | <span class=\"error\">{$pgv_lang['cal_'.$newcal]}</span>";
 			else {
-				$newcalesc=urlencode($tmp->CALENDAR_ESCAPE);
+				$newcalesc=urlencode($tmp->CALENDAR_ESCAPE());
 				$tmpmonth=$tmp->FormatGedcomMonth();
-				print " | <a href=\"calendar.php?cal={$newcalesc}&amp;day={$tmp->d}&amp;month={$tmpmonth}&amp;year={$tmp->y}&amp;filterev={$filterev}&amp;filterof={$filterof}&amp;filtersx={$filtersx}&amp;action={$action}\">{$pgv_lang['cal_'.$newcal]}</a>";
+				print " | <a href=\"".encode_url("calendar.php?cal={$newcalesc}&day={$tmp->d}&month={$tmpmonth}&year={$tmp->y}&filterev={$filterev}&filterof={$filterof}&filtersx={$filtersx}&action={$action}")."\">{$pgv_lang['cal_'.$newcal]}</a>";
 			}
 	}
 	print "</td></tr>";
 } // print preview
-print "</table>";
+print "</table>\n</form>\n";
 
 // Convert event filter option to a list of gedcom event codes
 if ($filterev=='all')
@@ -342,7 +337,7 @@
 	for ($jd=$cal_date->minJD; $jd<=$cal_date->maxJD; ++$jd)
 		foreach (apply_filter(get_anniversary_events($jd, $events), $filterof, $filtersx) as $event) {
 			$tmp=$event['date']->MinDate();
-			if ($tmp->d>=1 && $tmp->d<=$cal_date->DaysInMonth())
+			if ($tmp->d>=1 && $tmp->d<=$tmp->DaysInMonth())
 				$d=$jd-$cal_date->minJD+1;
 			else
 				$d=0;
@@ -404,32 +399,46 @@
 switch ($action) {
 case 'year':
 case 'today':
-	print "<table class=\"center {$TEXT_DIRECTION}\"><tr>";
+	print "<table class=\"center {$TEXT_DIRECTION} width100\"><tr>";
 	// Table headings
-	print "<td class=\"descriptionbox center\"><img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['indis']['small']}\" border=\"0\" title=\"{$pgv_lang['individuals']}\" alt=\"{$pgv_lang['individuals']}\" />{$pgv_lang['individuals']}</td>";
-	print "<td class=\"descriptionbox center\"><img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['cfamily']['small']}\" border=\"0\" title=\"{$pgv_lang['families']}\" alt=\"{$pgv_lang['families']}\" />{$pgv_lang['families']}</td>";
+	print "<td class=\"descriptionbox center width50\"><img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['indis']['small']}\" border=\"0\" title=\"{$pgv_lang['individuals']}\" alt=\"{$pgv_lang['individuals']}\" />&nbsp;&nbsp;&nbsp;{$pgv_lang['individuals']}</td>";
+	print "<td class=\"descriptionbox center width50\"><img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['cfamily']['small']}\" border=\"0\" title=\"{$pgv_lang['families']}\" alt=\"{$pgv_lang['families']}\" />&nbsp;&nbsp;&nbsp;{$pgv_lang['families']}</td>";
 	print "</tr><tr>";
 	// Table rows
 	$males=0;
 	$females=0;
 	$numfams=0;
-	print "<td class=\"optionbox {$TEXT_DIRECTION}\">";
-	print "<ul>";
+	print "<td class=\"optionbox {$TEXT_DIRECTION} wrap\">";
+
+	// Avoid an empty unordered list
+	ob_start();
 	print calendar_list_text($indis, "<li>", "</li>", true);
-	print '</ul>';
+	$content = ob_get_clean();
+	if (!empty($content)) {
+		echo '<ul>', $content, '</ul>';
+	}
+
 	print '</td>';
-	print "<td class=\"optionbox {$TEXT_DIRECTION}\"><ul>";
+	print "<td class=\"optionbox {$TEXT_DIRECTION} wrap\">";
+
+	// Avoid an empty unordered list
+	ob_start();
 	print calendar_list_text($fams, "<li>", "</li>", true);
-	print '</ul></td>';
+	$content = ob_get_clean();
+	if (!empty($content)) {
+		echo '<ul>', $content, '</ul>';
+	}
+
+	echo '</td>';
 	print "</tr><tr>";
 	// Table footers
 	print "<td class=\"descriptionbox\">{$pgv_lang['total_indis']} ";
 	print count($indis);
 	print "<br />";
-	print "&nbsp;<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sex']['small']}\" title=\"{$pgv_lang['male']}\" alt=\"{$pgv_lang['male']}\" class=\"sex_image\" />&nbsp;".$males."&nbsp;";
-	print "&nbsp;<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sexf']['small']}\" title=\"{$pgv_lang['female']}\" alt=\"{$pgv_lang['female']}\" class=\"sex_image\" />&nbsp;".$females;
+	echo Person::sexImage('M', 'small', 'align="middle"', $pgv_lang['all']), "&nbsp;{$males}&nbsp;&nbsp;&nbsp;&nbsp;";
+	echo Person::sexImage('F', 'small', 'align="middle"', $pgv_lang['all']), "&nbsp;{$females}&nbsp;&nbsp;&nbsp;&nbsp;";
 	if (count($indis)!=$males+$females)
-		print "&nbsp;<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sexn']['small']}\" title=\"{$pgv_lang['unknown']}\" alt=\"{$pgv_lang['unknown']}\" class=\"sex_image\" />&nbsp;".(count($indis)-$males-$females);
+		echo Person::sexImage('U', 'small', 'align="middle"', $pgv_lang['all']), '&nbsp;', count($indis)-$males-$females;
 	print "</td>";
 	print "<td class=\"descriptionbox\">{$pgv_lang['total_fams']} ".count($fams)."</td>";
 	print "</tr></table>";
@@ -440,11 +449,12 @@
 	$week_start=($WEEK_START+6)%$days_in_week;
 	// The french  calendar has a 10-day week, but our config only lets us choose
 	// mon-sun as a start day.  Force french calendars to start on primidi
-	if ($days_in_week==10)
+	if ($days_in_week==10) {
 		$week_start=0;
+	}
 	print "<table class=\"list_table width100 $TEXT_DIRECTION\"><tr>";
 	for ($week_day=0; $week_day<$days_in_week; ++$week_day) {
-		$day_name=$cal_date->DAYS_OF_WEEK[($week_day+$week_start) % $days_in_week];
+		$day_name=$cal_date->DAYS_OF_WEEK(($week_day+$week_start) % $days_in_week);
 		if (isset($pgv_lang[$day_name]))
 			$day_name=$pgv_lang[$day_name];
 		print "<td class=\"descriptionbox\" width=\"".floor(100/$days_in_week)."%\">{$day_name}</td>";
@@ -481,7 +491,7 @@
 			// Show a converted date
 			foreach (explode('_and_', $CALENDAR_FORMAT) as $convcal) {
 				$alt_date=$cal_date->convert_to_cal($convcal);
-				if ($alt_date->CALENDAR_ESCAPE!=$cal_date->CALENDAR_ESCAPE) {
+				if ($alt_date->CALENDAR_ESCAPE()!=$cal_date->CALENDAR_ESCAPE()) {
 					list($alt_date->y, $alt_date->m, $alt_date->d)=$alt_date->JDtoYMD($cal_date->minJD+$d-1);
 					$alt_date->SetJDfromYMD();
 					print "<span class=\"rtl_cal_day\">".$alt_date->Format("j M")."</span>";
@@ -521,7 +531,7 @@
 		$filtertext="({$pgv_lang['filter']}: {$filtertext})";
 	echo '<br />', get_gedcom_setting(PGV_GED_ID, 'title'), ' ', $filtertext;
 }
-print "</table>";
+// print "</table>";
 print "</div><br />";
 print_footer();
 
@@ -584,19 +594,19 @@
 	global $males, $females;
 	foreach ($list as $id=>$facts) {
 		$tmp=GedcomRecord::GetInstance($id);
-		print "{$tag1}<a href=\"".$tmp->getLinkUrl()."\">".PrintReady($tmp->getSortableName())."</a>&nbsp;";
+		print "{$tag1}<a href=\"".encode_url($tmp->getLinkUrl())."\">".PrintReady($tmp->getFullName())."</a>&nbsp;";
 		if ($show_sex_symbols && $tmp->getType()=='INDI')
 			switch ($tmp->getSex()) {
 			case 'M':
-				print "<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sex']['small']}\" title=\"{$pgv_lang['male']}\" alt=\"{$pgv_lang['male']}\" class=\"sex_image\" />";
+				echo Person::sexImage('M', 'small', 'align="middle"', $pgv_lang['all']);
 				++$males;
 				break;
 			case 'F':
-				print "<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sexf']['small']}\" title=\"{$pgv_lang['female']}\" alt=\"{$pgv_lang['female']}\" class=\"sex_image\" />";
+				echo Person::sexImage('F', 'small', 'align="middle"', $pgv_lang['all']);
 				++$females;
 				break;
 			default:
-				print "<img src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['sexn']['small']}\" title=\"{$pgv_lang['unknown']}\" alt=\"{$pgv_lang['unknown']}\" class=\"sex_image\" />";
+				echo Person::sexImage('U', 'small', 'align="middle"', $pgv_lang['all']);
 				break;
 			}
 			print "<div class=\"indent\">".$facts."</div>{$tag2}";

--- NEW FILE: treenav.php ---
<?php
/**
 * Script to test the Tree Navigation modules.
 * To embed the tree for use in mashups or on blogs use code such as this:
 * <script type="text/javascript" src="http://yourserver/phpgedview/treenav.php?navAjax=embed&rootid=I14&width=400&height=300"></script>
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * This Page Is Valid XHTML 1.0 Transitional! > 29 August 2005
 *
 * @package PhpGedView
 * @subpackage Display
 * @version $Id: treenav.php,v 1.1 2009/04/30 19:12:13 lsces Exp $
 */

require './config.php';

require_once("includes/classes/class_treenav.php");

$zoom = 0;
$rootid = '';
$name = 'nav';
if (isset($_REQUEST['zoom'])) $zoom = $_REQUEST['zoom'];
if (isset($_REQUEST['rootid'])) $rootid = $_REQUEST['rootid'];
if (!empty($_REQUEST['jsname'])) $name = $_REQUEST['jsname'];
$nav = new TreeNav($rootid, $name, $zoom);
$nav->generations=6;
$nav->zoomLevel-=1;
print_header($pgv_lang["interactive_tree"]);
$nav->drawViewport('', "", "600px");
print_footer();
?>

--- sanity_check.php DELETED ---

Index: usermigrate_cli.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/usermigrate_cli.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usermigrate_cli.php	7 Jul 2008 18:01:10 -0000	1.1
+++ usermigrate_cli.php	30 Apr 2009 19:12:13 -0000	1.2
@@ -1,166 +1,171 @@
-<?php
-/**
- * Command line utility for backups.
- * 
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * @author John Finlay
- * @package PhpGedView
- * @subpackage Admin
- * @version $Id$
- */
-
-function print_usage() {
-	?>
-	PhpGedView Command Line Backup Utility
-	Usage: 
-	usermigrate_cli.php command [options]
-	Command should be one of the following:
-	--backup [options]
-		Create a backup of PhpGedView settings, GEDCOMs, users and media files.  The following options are available:
-		-t=n	Attempt to set the PHP time limit to "n" where "n" should be a number
-		-Xc		Exclude config.php file
-		-Xu		Exclude user information
-		-Xg		Exclude GEDCOM files
-		-Xs		Exclude GEDCOM configuration and privacy settings
-		-Xl		Exclude log files
-		-Xm		Exclude media files
-		
-	--export 
-		Export user settings to corresponding files in the index directory.
-		
-	--import
-		Import user settings into databases from files in the index directory.
-	<?php
-	exit;
-}
-
-if ($argc==1 || $argv[1]=="-h" || $argv[1]=="--help") {
-	print_usage();
-}
-
-$validargs = true;
-if ($argv[1]=="--backup") {
-	$_REQUEST['proceed'] = 'backup';
-	$argsarray = array("-Xc"=>"um_config","-Xu"=>"um_usinfo","-Xg"=>"um_gedcoms","-Xs"=>"um_gedsets","-Xl"=>"um_logs","-Xm"=>"um_media");
-	for($i=2; $i<$argc; $i++) {
-		if (!isset($argsarray[$argv[$i]])) {
-			$parts = preg_split("/=/", $argv[$i]);
-			if ($parts[0]=="-t") {
-				set_time_limit($parts[1]);
-			}
-			else $validargs = false;
-		}
-		else {
-			unset($argsarray[$argv[$i]]);
-		}
-	}
-}
-else if ($argv[1]=="--export") {
-	$argsarray = array();
-	$_REQUEST['proceed'] = 'exportovr';
-}
-else $validargs = false;
-
-if (!$validargs || !isset($argsarray)) print_usage();
-else {
-	foreach($argsarray as $key=>$value) {
-		$_POST[$value] = "yes";
-	}
-}
-
-require_once("includes/controllers/usermigrate_ctrl.php");
-// load admin lang keys
-$file = "./languages/admin.".$lang_short_cut[$LANGUAGE].".php";
-if (file_exists($file)) include($file);
-
-// load the edit lang keys
-$file = "./languages/editor.".$lang_short_cut[$LANGUAGE].".php";
-if (file_exists($file)) include($file);
-
-if (!empty($controller->errorMsg)) print "\r\n\r\n*** ERROR: ".$controller->errorMsg." ***\r\n\r\n";
-
-// Backup part of usermigrate
-if ($controller->proceed == "backup") {	
-	// Make the zip
-	if (count($controller->flist) > 0) {
-		if ($controller->v_list == 0) {
-			print $controller->errorMsg;
-		} else { 
-			print $pgv_lang["um_zip_succ"]."\r\n";
-			print $pgv_lang["um_zip_dl"]." ".$controller->fname;
-			printf("(%.0f Kb)\r\n", (filesize($controller->fname)/1024));
-			print $pgv_lang["files_in_backup"];
-			foreach($controller->flist as $f=>$file) {
-				print "\t".$file."\r\n";
-			}
-		}
-	}
-	else { 
-		print $pgv_lang["um_nofiles"];
-	}
-	exit;
-}
-
-// User Migration part of usermigrate. The function um_export is used by backup and migrate part.
-if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) {
-	print "\r\n".$pgv_lang["um_sql_index"]."\r\n";
-}
-if ($controller->proceed == "import") {
-	if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) { 
-		print $pgv_lang["um_nousers"]; 
-		exit;
-	}
-	
-	if ($controller->impSuccess) {
-		print $pgv_lang["um_imp_succ"]."<br /><br />";
-	}
-	else {
-		print $pgv_lang["um_imp_fail"];
-		exit;
-	}
-
-	// Get messages and import them
-	print $pgv_lang["um_imp_messages"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
-		print $pgv_lang["um_nomsg"]."<br /><br />";
-	}
-	if ($controller->msgSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get favorites and import them
-	print $pgv_lang["um_imp_favorites"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
-		print $pgv_lang["um_nofav"]."<br /><br />";
-	}
-	if ($controller->favSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get news and import it
-	print $pgv_lang["um_imp_news"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
-		print $pgv_lang["um_nonews"]."<br /><br />";
-	}
-	if ($controller->newsSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-
-	// Get blocks and import them
-	print $pgv_lang["um_imp_blocks"]."<br />";
-	if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
-		print $pgv_lang["um_noblocks"]."<br /><br />";
-	}
-	if ($controller->blockSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
-}
-?>
\ No newline at end of file
+<?php
+/**
+ * Command line utility for backups.
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2007  PGV Development Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author John Finlay
+ * @package PhpGedView
+ * @subpackage Admin
+ * @version $Id$
+ */
+
+require './config.php';
+require_once 'includes/controllers/usermigrate_ctrl.php';
+
+$controller = new UserMigrateController();
+$controller->init();
+
+function print_usage() {
+	?>
+	PhpGedView Command Line Backup Utility
+	Usage:
+	usermigrate_cli.php command [options]
+	Command should be one of the following:
+	--backup [options]
+		Create a backup of PhpGedView settings, GEDCOMs, users and media files.  The following options are available:
+		-t=n	Attempt to set the PHP time limit to "n" where "n" should be a number
+		-Xc		Exclude config.php file
+		-Xu		Exclude user information
+		-Xg		Exclude GEDCOM files
+		-Xs		Exclude GEDCOM configuration and privacy settings
+		-Xl		Exclude log files
+		-Xm		Exclude media files
+
+	--export
+		Export user settings to corresponding files in the index directory.
+
+	--import
+		Import user settings into databases from files in the index directory.
+	<?php
+	exit;
+}
+
+if ($argc==1 || $argv[1]=="-h" || $argv[1]=="--help") {
+	print_usage();
+}
+
+$validargs = true;
+if ($argv[1]=="--backup") {
+	$_REQUEST['proceed'] = 'backup';
+	$argsarray = array("-Xc"=>"um_config","-Xu"=>"um_usinfo","-Xg"=>"um_gedcoms","-Xs"=>"um_gedsets","-Xl"=>"um_logs","-Xm"=>"um_media");
+	for($i=2; $i<$argc; $i++) {
+		if (!isset($argsarray[$argv[$i]])) {
+			$parts = explode('=', $argv[$i]);
+			if ($parts[0]=="-t") {
+				set_time_limit($parts[1]);
+			}
+			else $validargs = false;
+		}
+		else {
+			unset($argsarray[$argv[$i]]);
+		}
+	}
+}
+else if ($argv[1]=="--export") {
+	$argsarray = array();
+	$_REQUEST['proceed'] = 'exportovr';
+}
+else $validargs = false;
+
+if (!$validargs || !isset($argsarray)) print_usage();
+else {
+	foreach($argsarray as $key=>$value) {
+		$_POST[$value] = "yes";
+	}
+}
+
+// load admin lang keys
+$file = "./languages/admin.".$lang_short_cut[$LANGUAGE].".php";
+if (file_exists($file)) include($file);
+
+// load the edit lang keys
+$file = "./languages/editor.".$lang_short_cut[$LANGUAGE].".php";
+if (file_exists($file)) include($file);
+
+if (!empty($controller->errorMsg)) print "\r\n\r\n*** ERROR: ".$controller->errorMsg." ***\r\n\r\n";
+
+// Backup part of usermigrate
+if ($controller->proceed == "backup") {
+	// Make the zip
+	if (count($controller->flist) > 0) {
+		if ($controller->v_list == 0) {
+			print $controller->errorMsg;
+		} else {
+			print $pgv_lang["um_zip_succ"]."\r\n";
+			print $pgv_lang["um_zip_dl"]." ".$controller->fname;
+			printf("(%.0f Kb)\r\n", (filesize($controller->fname)/1024));
+			print $pgv_lang["files_in_backup"];
+			foreach($controller->flist as $f=>$file) {
+				print "\t".$file."\r\n";
+			}
+		}
+	}
+	else {
+		print $pgv_lang["um_nofiles"];
+	}
+	exit;
+}
+
+// User Migration part of usermigrate. The function um_export is used by backup and migrate part.
+if (($controller->proceed == "export") || ($controller->proceed == "exportovr")) {
+	print "\r\n".$pgv_lang["um_sql_index"]."\r\n";
+}
+if ($controller->proceed == "import") {
+	if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) {
+		print $pgv_lang["um_nousers"];
+		exit;
+	}
+
+	if ($controller->impSuccess) {
+		print $pgv_lang["um_imp_succ"]."<br /><br />";
+	}
+	else {
+		print $pgv_lang["um_imp_fail"];
+		exit;
+	}
+
+	// Get messages and import them
+	print $pgv_lang["um_imp_messages"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
+		print $pgv_lang["um_nomsg"]."<br /><br />";
+	}
+	if ($controller->msgSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get favorites and import them
+	print $pgv_lang["um_imp_favorites"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
+		print $pgv_lang["um_nofav"]."<br /><br />";
+	}
+	if ($controller->favSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get news and import it
+	print $pgv_lang["um_imp_news"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
+		print $pgv_lang["um_nonews"]."<br /><br />";
+	}
+	if ($controller->newsSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+
+	// Get blocks and import them
+	print $pgv_lang["um_imp_blocks"]."<br />";
+	if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
+		print $pgv_lang["um_noblocks"]."<br /><br />";
+	}
+	if ($controller->blockSuccess) print $pgv_lang["um_imp_succ"]."<br /><br />";
+}
+?>

Index: useradmin.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/useradmin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- useradmin.php	7 Jul 2008 18:01:13 -0000	1.4
+++ useradmin.php	30 Apr 2009 19:12:13 -0000	1.5
@@ -1,1152 +1,1216 @@
-<?php
-/**
- * Administrative User Interface.
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008 PGV Development Team, all rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
[...2337 lines suppressed...]
+	if ($applusers == 0) echo $pgv_lang["users_unver"];
+	else echo "<a href=\"useradmin.php?action=listusers&amp;filter=usunver\">".$pgv_lang["users_unver"]."</a>";
+	echo "</td><td class=\"font11\">".$applusers."</td></tr>";
+
+	echo "<tr><td class=\"font11\">";
+	if ($nverusers == 0) echo $pgv_lang["users_unver_admin"];
+	else echo "<a href=\"useradmin.php?action=listusers&amp;filter=admunver\">".$pgv_lang["users_unver_admin"]."</a>";
+	echo "</td><td class=\"font11\">".$nverusers."</td></tr>";
+
+	asort($userlang);
+	echo "<tr valign=\"middle\"><td class=\"font11\">".$pgv_lang["users_langs"]."</td>";
+	foreach ($userlang as $key=>$ulang) {
+		echo "\t<td class=\"font11\"><img src=\"".$language_settings[$ulang["langname"]]["flagsfile"]."\" class=\"brightflag\" alt=\"".$key."\" title=\"".$key."\" /></td><td>&nbsp;<a href=\"".encode_url("useradmin.php?action=listusers&filter=language&usrlang=".$ulang["langname"])."\">".$key."</a></td><td>".$ulang["number"]."</td></tr><tr class=\"vmiddle\"><td></td>\n";
+	}
+	echo "</tr></table>";
+	echo "</td></tr></table>";
+	?>
+<?php
+print_footer();
+?>

Index: themechange.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/themechange.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- themechange.php	7 Jul 2008 18:01:12 -0000	1.3
+++ themechange.php	30 Apr 2009 19:12:13 -0000	1.4
@@ -1,51 +1,48 @@
-<?php
-/**
- * Allow visitor to change the theme
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2003  John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @author John Finlay
- * @package PhpGedView
- * @subpackage Themes
- * @version $Id$
- */
-
-require("config.php");
-
-// Change the theme for this session
-if (!empty($_POST["mytheme"]) || !empty($_GET["mytheme"])) {
-	if (isset($_POST["mytheme"])) {
-		$theme_dir = $_POST["mytheme"];
-	}	else {
-		if (isset($_GET["mytheme"])) {
-			$theme_dir = $_GET["mytheme"];
-		}
-	}
-	$_SESSION["theme_dir"] = "$theme_dir";
-}
-
-// Make the change permanent, if allowed
-if (get_user_setting(PGV_USER_ID, 'editaccount')=='Y') {
-	set_user_setting(PGV_USER_ID, 'theme', $theme_dir);
-}
-	
-//where do we return ?
-if (isset($_POST["frompage"])) $frompage = $_POST["frompage"];
-else if (isset($_GET["frompage"])) $frompage = $_GET["frompage"];
-header("Location: ".urldecode($frompage));
-?>
+<?php
+/**
+ * Allow visitor to change the theme
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author John Finlay
+ * @package PhpGedView
+ * @subpackage Themes
+ * @version $Id$
+ */
+
+require './config.php';
+
+// Extract request variables
+$mytheme =safe_GET('mytheme');
+$frompage=safe_GET('frompage', PGV_REGEX_URL, 'index.php');
+
+// Only change to a valid theme
+foreach (get_theme_names() as $themename=>$themedir) {
+	if ($themedir==$mytheme) {
+		$_SESSION['theme_dir']=$mytheme;
+		// Make the change permanent, if allowed
+		if (get_user_setting(PGV_USER_ID, 'editaccount')=='Y') {
+			set_user_setting(PGV_USER_ID, 'theme', $mytheme);
+		}
+		break;
+	}
+}
+
+// Go back to where we came from
+header('Location: '.encode_url(decode_url($frompage), false));
+?>

Index: addmedia.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/addmedia.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- addmedia.php	7 Jul 2008 18:01:13 -0000	1.9
+++ addmedia.php	30 Apr 2009 19:12:13 -0000	1.10
@@ -43,53 +43,57 @@
 require($factsfile["english"]);
 if (file_exists($factsfile[$LANGUAGE])) require $factsfile[$LANGUAGE];
 
-require_once('includes/functions_print_lists.php');
-require_once('includes/functions_edit.php');
+require './includes/functions/functions_print_lists.php';
+require './includes/functions/functions_edit.php';
 
 if (empty($ged)) $ged = $GEDCOM;
 $GEDCOM = $ged;
-if (isset($_REQUEST['pid'])) $pid = $_REQUEST['pid'];
-if (isset($_REQUEST['mid'])) $mid = $_REQUEST['mid'];
-if (isset($_REQUEST['action'])) $action = $_REQUEST['action'];
-if (isset($_REQUEST['linktoid'])) $linktoid = $_REQUEST['linktoid'];
-if (isset($_REQUEST['gid'])) $gid = $_REQUEST['gid'];
-if (isset($_REQUEST['filename'])) $filename = $_REQUEST['filename'];
-if (isset($_REQUEST['oldFilename'])) $oldFilename = $_REQUEST['oldFilename'];
 
-if (isset($_REQUEST['m_ext'])) $m_ext = $_REQUEST['m_ext'];
-if (isset($_REQUEST['m_titl'])) $m_titl = $_REQUEST['m_titl'];
-if (isset($_REQUEST['m_file'])) $m_file = $_REQUEST['m_file'];
-if (isset($_REQUEST['level'])) $level = $_REQUEST['level'];
-if (isset($_REQUEST['text'])) $text = $_REQUEST['text'];
-if (isset($_REQUEST['tag'])) $tag = $_REQUEST['tag'];
-if (isset($_REQUEST['islink'])) $islink = $_REQUEST['islink'];
-if (isset($_REQUEST['glevels'])) $glevels= $_REQUEST['glevels'];
+if ($_SESSION["cookie_login"]) {
+	header('Location: '.encode_url("login.php?type=simple&ged={$GEDCOM}&url=addmedia.php", false));
+	exit;
+}
+
+// TODO use GET/POST, rather than $_REQUEST
+// TODO decide what validation is required on these input parameters
+$pid        =safe_REQUEST($_REQUEST, 'pid',         PGV_REGEX_XREF);
+$mid        =safe_REQUEST($_REQUEST, 'mid',         PGV_REGEX_XREF);
+$gid        =safe_REQUEST($_REQUEST, 'gid',         PGV_REGEX_XREF);
+$linktoid   =safe_REQUEST($_REQUEST, 'linktoid',    PGV_REGEX_XREF);
+$action     =safe_REQUEST($_REQUEST, 'action',      PGV_REGEX_NOSCRIPT, 'showmediaform');
+$folder     =safe_REQUEST($_REQUEST, 'folder',      PGV_REGEX_UNSAFE);
+$oldFolder  =safe_REQUEST($_REQUEST, 'oldFolder',   PGV_REGEX_UNSAFE);
+$filename   =safe_REQUEST($_REQUEST, 'filename',    PGV_REGEX_UNSAFE);
+$oldFilename=safe_REQUEST($_REQUEST, 'oldFilename', PGV_REGEX_UNSAFE, $filename);
+$level      =safe_REQUEST($_REQUEST, 'level',       PGV_REGEX_UNSAFE);
+$text       =safe_REQUEST($_REQUEST, 'text',        PGV_REGEX_UNSAFE);
+$tag        =safe_REQUEST($_REQUEST, 'tag',         PGV_REGEX_UNSAFE);
+$islink     =safe_REQUEST($_REQUEST, 'islink',      PGV_REGEX_UNSAFE);
+$glevels    =safe_REQUEST($_REQUEST, 'glevels',     PGV_REGEX_UNSAFE);
+
+$filename = decrypt($filename);
+$oldFilename = decrypt($oldFilename);
 
 print_simple_header($pgv_lang["add_media_tool"]);
 $disp = true;
 if (empty($pid) && !empty($mid)) $pid = $mid;
 if (!empty($pid)) {
-	$pid = clean_input($pid);
 	if (!isset($pgv_changes[$pid."_".$GEDCOM])) $gedrec = find_media_record($pid);
 	else $gedrec = find_updated_record($pid);
-	if (empty($gedrec)) $gedrec =  find_record_in_file($pid);
-	$disp = displayDetails($pid, "OBJE");
+	$disp = displayDetailsById($pid, "OBJE");
 }
 if ($action=="update" || $action=="newentry") {
 	if (!isset($linktoid) || $linktoid=="new") $linktoid="";
 	if (empty($linktoid) && !empty($gid)) $linktoid = $gid;
 	if (!empty($linktoid)) {
-		$linktoid = clean_input($linktoid);
-		$disp = displayDetails(find_gedcom_record($linktoid));
+		$disp = displayDetailsById($linktoid);
 	}
 }
 
-if ((!$gGedcom->isEditable())||(!$disp)||(!$ALLOW_EDIT_GEDCOM)) {
-	//print "pid: $pid<br />";
-	//print "gedrec: $gedrec<br />";
+if (!PGV_USER_CAN_EDIT || !$disp || !$ALLOW_EDIT_GEDCOM) {
 	print $pgv_lang["access_denied"];
 	//-- display messages as to why the editing access was denied
-	if (!$gGedcom->isEditable()) print "<br />".$pgv_lang["user_cannot_edit"];
+	if (!PGV_USER_CAN_EDIT) print "<br />".$pgv_lang["user_cannot_edit"];
 	if (!$ALLOW_EDIT_GEDCOM) print "<br />".$pgv_lang["gedcom_editing_disabled"];
 	if (!$disp) {
 		print "<br />".$pgv_lang["privacy_prevented_editing"];
@@ -100,9 +104,15 @@
 	exit;
 }
 
+if ($ENABLE_AUTOCOMPLETE) require './js/autocomplete.js.htm';
+echo PGV_JS_START;
 ?>
-<script language="JavaScript" type="text/javascript">
-<!--
+	// Shared Notes =========================
+	function findnote(field) {
+		pastefield = field;
+		findwin = window.open('find.php?type=note', '_blank', 'left=50,top=50,width=600,height=520,resizable=1,scrollbars=1');
+		return false;
+	}
 	var language_filter, magnify;
 	var pastefield;
 	language_filter = "";
@@ -111,20 +121,28 @@
 		window.opener.paste_id(id);
 		window.close();
 	}
-	
 	function paste_id(value) {
 		pastefield.value = value;
 	}
-	
 	function paste_char(value,lang,mag) {
 		pastefield.value += value;
 		language_filter = lang;
 		magnify = mag;
 	}
-//-->
-</script>
-
+	function checkpath(folder) {
+		value = folder.value;
+		if (value.substr(value.length-1,1) == "/") value = value.substr(0, value.length-1);
+		if (value.substr(0,1) == "/") value = value.substr(1, value.length-1);
+		result = value.split("/");
+		if (result.length > <?php print $MEDIA_DIRECTORY_LEVELS; ?>) {
+			alert('<?php print_text("max_media_depth"); ?>');
+			folder.focus();
+			return false;
+		}
+	}
 <?php
+echo PGV_JS_END;
+
 // Naming conventions used in this script:
 // folderName - this is the link to the folder in the standard media directory; the one that is stored in the gedcom.
 // serverFolderName - this is where the file is physically located.  if the media firewall is enabled it is in the protected media directory.  if not it is the same as folderName.
@@ -133,114 +151,113 @@
 
 if (empty($action)) $action="showmediaform";
 
-if (isset($filename)) {
-	$filename = stripslashes($filename);
-} else {
-	$filename = "";
-}
-
-if (!isset($m_ext)) $m_ext="";
-if (!isset($m_titl)) $m_titl="";
-if (!isset($m_file)) $m_file="";
-
 // **** begin action "newentry"
 // NOTE: Store the entered data
 if ($action=="newentry") {
 	if (empty($level)) $level = 1;
-	
+
 	$error = "";
 	$mediaFile = "";
 	$thumbFile = "";
 	if (!empty($_FILES['mediafile']["name"]) || !empty($_FILES['thumbnail']["name"])) {
-		// NOTE: Check for file upload
-		$upload_errors = array($pgv_lang["file_success"], $pgv_lang["file_too_big"], $pgv_lang["file_too_big"],$pgv_lang["file_partial"], $pgv_lang["file_missing"]);
-		$folderName = "";
-		if (!empty($_POST["folder"])) $folderName = $_POST["folder"];
 		// Validate and correct folder names
+		$folderName = trim(trim(safe_POST('folder', PGV_REGEX_NOSCRIPT)), '/');
 		$folderName = check_media_depth($folderName."/y.z", "BACK");
 		$folderName = dirname($folderName)."/";
 		$thumbFolderName = str_replace($MEDIA_DIRECTORY, $MEDIA_DIRECTORY."thumbs/", $folderName);
 
-		if (!empty($folderName)) $_SESSION["upload_folder"] = $folderName;
+		$_SESSION["upload_folder"] = $folderName; // store standard media folder in session
+		$realFolderName = $folderName;
+		$realThumbFolderName = $thumbFolderName;
+		if ($USE_MEDIA_FIREWALL) {
+			$realFolderName = get_media_firewall_path($folderName);
+			if ($MEDIA_FIREWALL_THUMBS) $realThumbFolderName = get_media_firewall_path($thumbFolderName);
+		}
+		// make sure the dirs exist
+		@mkdirs($realFolderName);
+		@mkdirs($realThumbFolderName);
 
 		$error = "";
 
 		// Determine file name on server
-		if ((!$gGedcom->isEditable()) && !empty($text[0])) {
-			$parts = pathinfo($text[0]);
-			$mediaFile = $parts["basename"];
+		if (PGV_USER_GEDCOM_ADMIN && !empty($text[0])) $fileName = trim(trim($text[0]), '/');
+		else $fileName = '';
+		$parts = pathinfo_utf($fileName);
+		if (!empty($parts["basename"])) {
+			// User supplied a name to be used on the server
+			$mediaFile = $parts["basename"];	// Use the supplied name
 			if (empty($parts["extension"]) || !in_array(strtolower($parts["extension"]), $MEDIATYPE)) {
-				if (!empty($_FILES["mediafile"]["name"])) {
-					$parts = pathinfo($_FILES["mediafile"]["name"]);
-				} else {
-					$parts = pathinfo($_FILES["thumbnail"]["name"]);
-				}
-				$mediaFile .= ".".$parts["extension"];
+				// Strip invalid extension from supplied name
+				$lastDot = strrpos($mediaFile, '.');
+				if ($lastDot !== false) $mediaFile = substr($mediaFile, 0, $lastDot);
+				// Use extension of original uploaded file name
+				if (!empty($_FILES["mediafile"]["name"])) $parts = pathinfo_utf($_FILES["mediafile"]["name"]);
+				else $parts = pathinfo_utf($_FILES["thumbnail"]["name"]);
+				if (!empty($parts["extension"])) $mediaFile .= ".".$parts["extension"];
 			}
 		} else {
-			if (!empty($_FILES["mediafile"]["name"])) {
-				$parts = pathinfo($_FILES["mediafile"]["name"]);
-			} else {
-				$parts = pathinfo($_FILES["thumbnail"]["name"]);
-			}
+			// User did not specify a name to be used on the server:  use the original uploaded file name
+			if (!empty($_FILES["mediafile"]["name"])) $parts = pathinfo_utf($_FILES["mediafile"]["name"]);
+			else $parts = pathinfo_utf($_FILES["thumbnail"]["name"]);
 			$mediaFile = $parts["basename"];
 		}
-
 		if (!empty($_FILES["mediafile"]["name"])) {
-			$newFile = $serverFolderName.$mediaFile;
-			$fileExists = file_exists(filename_decode($newFile));
+			$newFile = $realFolderName.$mediaFile;
 			// Copy main media file into the destination directory
-			if ($fileExists) {
+			if (file_exists(filename_decode($newFile))) {
 				$error .= $pgv_lang["media_exists"]."&nbsp;&nbsp;".$newFile."<br />";
 			} else {
 				if (!move_uploaded_file($_FILES["mediafile"]["tmp_name"], filename_decode($newFile))) {
 					// the file cannot be copied
-					$error .= $pgv_lang["upload_error"]."<br />".$upload_errors[$_FILES["mediafile"]["error"]]."<br />";
+					$error .= $pgv_lang["upload_error"]."<br />".file_upload_error_text($_FILES["mediafile"]["error"])."<br />";
 				} else {
+					@chmod(filename_decode($newFile), PGV_PERM_FILE);
 					AddToLog("Media file {$folderName}{$mediaFile} uploaded");
 				}
 			}
 		}
 		if ($error=="" && !empty($_FILES["thumbnail"]["name"])) {
-			$newThum = $serverThumbFolderName.$mediaFile;
-			$thumExists = file_exists(filename_decode($newThum));
+			$newThum = $realThumbFolderName.$mediaFile;
 			// Copy user-supplied thumbnail file into the destination directory
-			if ($thumExists) {
+			if (file_exists(filename_decode($newThum))) {
 				$error .= $pgv_lang["media_thumb_exists"]."&nbsp;&nbsp;".$newThum."<br />";
 			} else {
 				if (!move_uploaded_file($_FILES["thumbnail"]["tmp_name"], filename_decode($newThum))) {
 					// the file cannot be copied
-					$error .= $pgv_lang["upload_error"]."<br />".$upload_errors[$_FILES["thumbnail"]["error"]]."<br />";
+					$error .= $pgv_lang["upload_error"]."<br />".file_upload_error_text($_FILES["thumbnail"]["error"])."<br />";
 				} else {
+					@chmod(filename_decode($newThum), PGV_PERM_FILE);
 					AddToLog("Media file {$thumbFolderName}{$mediaFile} uploaded");
 				}
 			}
 		}
 		if ($error=="" && empty($_FILES["mediafile"]["name"]) && !empty($_FILES["thumbnail"]["name"])) {
 			// Copy user-supplied thumbnail file into the main destination directory
-			if (!copy(filename_decode($serverThumbFolderName.$mediaFile), filename_decode($serverFolderName.$mediaFile))) {
+			$whichFile1 = $realThumbFolderName.$mediaFile;
+			$whichFile2 = $realFolderName.$mediaFile;
+			if (!copy(filename_decode($whichFile1), filename_decode($whichFile2))) {
 				// the file cannot be copied
-				$error .= $pgv_lang["upload_error"]."<br />".$upload_errors[$_FILES["thumbnail"]["error"]]."<br />";
+				$error .= $pgv_lang["upload_error"]."<br />".print_text('copy_error', 0, 1)."<br />";
 			} else {
-				AddToLog("Media file {$folderName}{$mediaFile} uploaded");
+				@chmod(filename_decode($whichFile2), PGV_PERM_FILE);
+				AddToLog("Media file {$folderName}{$mediaFile} copied from {$thumbFolderName}{$mediaFile}");
 			}
 		}
 		if ($error=="" && !empty($_FILES["mediafile"]["name"]) && empty($_FILES["thumbnail"]["name"])) {
-			if (!empty($_POST['genthumb']) && ($_POST['genthumb']=="yes")) {
+			if (safe_POST('genthumb', 'yes', 'no') == 'yes') {
 				// Generate thumbnail from main image
-				$ct = preg_match("/\.([^\.]+)$/", $mediaFile, $match);
-				if ($ct>0) {
-					$ext = strtolower(trim($match[1]));
-					if ($ext=="jpg" || $ext=="jpeg" || $ext=="gif" || $ext=="png") {
-						// note: generate_thumbnail takes folderName and thumbFoldername as input, not serverFolderName and serverThumbFolderName
-						$okThumb = generate_thumbnail($folderName.$mediaFile, $thumbFolderName.$mediaFile, "OVERWRITE");
-						$thumbnail = $serverThumbFolderName.$mediaFile;
+				$parts = pathinfo_utf($mediaFile);
+				if (!empty($parts["extension"])) {
+					$ext = strtolower($parts["extension"]);
+					if (isImageTypeSupported($ext)) {
+						$thumbnail = $thumbFolderName.$mediaFile;
+						$okThumb = generate_thumbnail($folderName.$mediaFile, $thumbnail, "OVERWRITE");
 						if (!$okThumb) {
 							$error .= print_text("thumbgen_error",0,1);
 						} else {
 							print_text("thumb_genned");
 							print "<br />";
-							AddToLog("Media thumbnail {$thumbFolderName}{$mediaFile} generated");
+							AddToLog("Media thumbnail {$thumbnail} generated");
 						}
 					}
 				}
@@ -248,7 +265,7 @@
 		}
 		// Let's see if there are any errors generated and print it
 		if (!empty($error)) {
-			print "<span class=\"largeError\">".$error."</span><br />\n";
+			echo '<span class="error">', $error, "</span><br />\n";
 			$mediaFile = "";
 			$finalResult = false;
 		} else $finalResult = true;
@@ -269,15 +286,14 @@
 				}
 			}
 			if ($mediaFile=="") {
-				print "<span class=\"largeError\">".$pgv_lang["illegal_chars"]."</span><br />\n";
+				echo '<span class="error">', $pgv_lang["illegal_chars"], "</span><br />\n";
 				$finalResult = false;
 			} else $finalResult = true;
 		} else {
 			//-- check if the file is used in more than one gedcom
 			//-- do not allow it to be moved or renamed if it is
-			if (!isset($oldFilename)) $oldFilename = $filename;
 			$myFile = str_replace($MEDIA_DIRECTORY, "", $oldFolder.$oldFilename);
-			$sql = "SELECT 1 FROM {$TBLPREFIX}media WHERE m_file LIKE '%".$DBCONN->escapeSimple($myFile)."' AND m_gedfile<>".PGV_GED_ID;
+			$sql = "SELECT 1 FROM {$TBLPREFIX}media WHERE m_file ".PGV_DB_LIKE." '%".$DBCONN->escapeSimple($myFile)."' AND m_gedfile<>".PGV_GED_ID;
 			$res = dbquery($sql);
 			$onegedcom = true;
 			if ($row=$res->fetchRow(DB_FETCHMODE_ASSOC))
@@ -286,9 +302,9 @@
 
 			// Handle Admin request to rename or move media file
 			if ($filename!=$oldFilename) {
-				$parts = pathinfo($filename);
+				$parts = pathinfo_utf($filename);
 				if (empty($parts["extension"]) || !in_array(strtolower($parts["extension"]), $MEDIATYPE)) {
-					$parts = pathinfo($oldFilename);
+					$parts = pathinfo_utf($oldFilename);
 					$filename .= ".".$parts["extension"];
 				}
 			}
@@ -305,7 +321,7 @@
 			$finalResult = true;
 			if ($filename!=$oldFilename || $folder!=$oldFolder) {
 				if (!$onegedcom) {
-					print "<span class=\"largeError\">".$pgv_lang["multiple_gedcoms"]."<br /><br /><b>";
+					echo '<span class="error">', $pgv_lang["multiple_gedcoms"], '<br /><br /><b>';
 					if ($filename!=$oldFilename) print $pgv_lang["media_file_not_renamed"];
 					else print $pgv_lang["media_file_not_moved"];
 					print "</b></span><br />";
@@ -353,9 +369,7 @@
 						if ($okMain) print_text("main_media_ok".$mediaAction);
 						else {
 							$finalResult = false;
-							print "<span class=\"largeError\">";
-							print_text("main_media_fail".$mediaAction);
-							print "</span>";
+							echo '<span class="error">', print_text("main_media_fail".$mediaAction), '</span>';
 						}
 					}
 					print "<br />";
@@ -366,9 +380,7 @@
 						if ($okThum) print_text("thumb_media_ok".$mediaAction);
 						else {
 							$finalResult = false;
-							print "<span class=\"largeError\">";
-							print_text("thumb_media_fail".$mediaAction);
-							print "</span>";
+							echo '<span class="error">', print_text("thumb_media_fail".$mediaAction), '</span>';
 						}
 					}
 					print "<br />";
@@ -397,14 +409,14 @@
 		// NOTE: Build the gedcom record
 		// NOTE: Level 0
 		$media_id = get_new_xref("OBJE");
-		$newged = "0 @".$media_id."@ OBJE\r\n";
+		$newged = "0 @".$media_id."@ OBJE\n";
 		//-- set the FILE text to the correct file location in the standard media directory
 		if (PGV_USER_GEDCOM_ADMIN) $text[0] = $folderName.$mediaFile;
-		else $newged .= "1 FILE ".$folderName.$mediaFile."\r\n";
+		else $newged .= "1 FILE ".$folderName.$mediaFile."\n";
 
 		$newged = handle_updates($newged);
 
-		require_once 'includes/media_class.php';
+		require_once 'includes/classes/class_media.php';
 		$media_obje = new Media($newged);
 		$mediaid = Media::in_obje_list($media_obje);
 		if (!$mediaid) $mediaid = append_gedrec($newged, $linktoid);
@@ -415,10 +427,10 @@
 			if ($link) {
 				AddToChangeLog("Media ID ".$media_id." successfully added to $linktoid.");
 			} else {
-				print "<a href=\"javascript:// OBJE $mediaid\" onclick=\"openerpasteid('$mediaid'); return false;\">".$pgv_lang["paste_id_into_field"]." <b>$mediaid</b></a><br /><br />\n";
-				print "<script language=\"JavaScript\" type=\"text/javascript\">\n";
-				print "openerpasteid('".$mediaid."');\n";
-				print "</script>\n";
+				echo "<a href=\"javascript:// OBJE $mediaid\" onclick=\"openerpasteid('$mediaid'); return false;\">".$pgv_lang["paste_id_into_field"]." <b>$mediaid</b></a><br /><br />\n";
+				echo PGV_JS_START;
+				echo "openerpasteid('", $mediaid, "');";
+				echo PGV_JS_END;
 			}
 		}
 		print $pgv_lang["update_successful"];
@@ -432,12 +444,12 @@
 	//-- check if the file is used in more than one gedcom
 	//-- do not allow it to be moved or renamed if it is
 	$myFile = str_replace($MEDIA_DIRECTORY, "", $oldFolder.$oldFilename);
-	$sql = "SELECT * FROM ".PHPGEDVIEW_DB_PREFIX."media WHERE m_file LIKE ?";
-	$res = $gBitSystem->mDb->query( $sql, array( "%".$myFile ) );
+	$sql = "SELECT 1 FROM {$TBLPREFIX}media WHERE m_file ".PGV_DB_LIKE." '%".$DBCONN->escapeSimple($myFile)."' AND m_gedfile<>".PGV_GED_ID;
+	$res = dbquery($sql);
 	$onegedcom = true;
-	while($row=$res->fetchRow()) {
-		if ($row['m_gedfile']!=$gGedcom->mGEDCOMId) $onegedcom = false;
-	}
+	if ($row=$res->fetchRow(DB_FETCHMODE_ASSOC))
+		$onegedcom = false;
+	$res->free();
 
 	$isExternal = isFileExternal($oldFilename) || isFileExternal($filename);
 	$finalResult = true;
@@ -445,13 +457,14 @@
 	// Handle Admin request to rename or move media file
 	if (!$isExternal) {
 		if ($filename!=$oldFilename) {
-			$parts = pathinfo($filename);
+			$parts = pathinfo_utf($filename);
 			if (empty($parts["extension"]) || !in_array(strtolower($parts["extension"]), $MEDIATYPE)) {
-				$parts = pathinfo($oldFilename);
+				$parts = pathinfo_utf($oldFilename);
 				$filename .= ".".$parts["extension"];
 			}
 		}
 		if (!isset($folder) && isset($oldFolder)) $folder = $oldFolder;
+		$folder = trim($folder);
 		if (substr($folder,-1)!="/") $folder .= "/";
 		if ($folder=="/") $folder = "";
 		$folder = check_media_depth($folder."y.z", "BACK");
@@ -464,7 +477,7 @@
 
 	if ($filename!=$oldFilename || $folder!=$oldFolder) {
 		if (!$onegedcom) {
-			print "<span class=\"largeError\">".$pgv_lang["multiple_gedcoms"]."<br /><br /><b>";
+			echo '<span class="error">', $pgv_lang["multiple_gedcoms"], '<br /><br /><b>';
 			if ($filename!=$oldFilename) print $pgv_lang["media_file_not_renamed"];
 			else print $pgv_lang["media_file_not_moved"];
 			print "</b></span><br />";
@@ -512,9 +525,7 @@
 				if ($okMain) print_text("main_media_ok".$mediaAction);
 				else {
 					$finalResult = false;
-					print "<span class=\"largeError\">";
-					print_text("main_media_fail".$mediaAction);
-					print "</span>";
+					echo '<span class="error">', print_text("main_media_fail".$mediaAction), '</span>';
 				}
 			}
 			print "<br />";
@@ -525,9 +536,7 @@
 				if ($okThum) print_text("thumb_media_ok".$mediaAction);
 				else {
 					$finalResult = false;
-					print "<span class=\"largeError\">";
-					print_text("thumb_media_fail".$mediaAction);
-					print "</span>";
+					echo '<span class="error">', print_text("thumb_media_fail".$mediaAction), '</span>';
 				}
 			}
 			print "<br />";
@@ -550,19 +559,13 @@
 		$islink = array_merge(array(0), $islink);
 		$text = array_merge(array($folder.$filename), $text);
 
-		$newrec = "0 @$pid@ OBJE\r\n";
+		$newrec = "0 @$pid@ OBJE\n";
 		$newrec = handle_updates($newrec);
 		//print("[".$newrec."]");
 		//-- look for the old record media in the file
 		//-- if the old media record does not exist that means it was
 		//-- generated at import and we need to append it
-		//$oldrec = find_record_in_file($pid);
-		//if (!empty($oldrec)) {
-			if (replace_gedrec($pid, $newrec)) AddToChangeLog("Media ID ".$pid." successfully updated.");
-		//} else {
-		//	$pid = append_gedrec($newrec);
-		//	if ($pid) AddToChangeLog("Media ID ".$pid." successfully added.");
-		//}
+		if (replace_gedrec($pid, $newrec)) AddToChangeLog("Media ID ".$pid." successfully updated.");
 
 		if ($pid && $linktoid!="") {
 			$link = linkMedia($pid, $linktoid, $level);
@@ -585,33 +588,6 @@
 }
 // **** end action "delete"
 
-// **** begin action "showmedia"
-if ($action=="showmedia") {
-	$medialist = get_db_media_list();
-	if (count($medialist)>0) {
-		print "<table class=\"list_table\">\n";
-		print "<tr><td class=\"list_label\">".$pgv_lang["delete"]."</td><td class=\"list_label\">".$pgv_lang["title"]."</td><td class=\"list_label\">".$pgv_lang["gedcomid"]."</td>\n";
-		print "<td class=\"list_label\">".$factarray["FILE"]."</td><td class=\"list_label\">".$pgv_lang["highlighted"]."</td><td class=\"list_label\">order</td><td class=\"list_label\">gedcom</td></tr>\n";
-		foreach($medialist as $indexval => $media) {
-			print "<tr>";
-			print "<td class=\"list_value\"><a href=\"addmedia.php?action=delete&m_id=".$media["ID"]."\">delete</a></td>";
-			print "<td class=\"list_value\"><a href=\"addmedia.php?action=edit&m_id=".$media["ID"]."\">edit</a></td>";
-			print "<td class=\"list_value\">".$media["TITL"]."</td>";
-			print "<td class=\"list_value\">";
-			echo format_list_person($media['INDI'], array(get_person_name($media["INDI"]), $GEDCOM), false, '', 'div');
-			print "</td>";
-			print "<td class=\"list_value\">".$media["FILE"]."</td>";
-			print "<td class=\"list_value\">".$media["_PRIM"]."</td>";
-			print "<td class=\"list_value\">".$media["ORDER"]."</td>";
-			print "<td class=\"list_value\">".$media["GEDFILE"]."</td>";
-			print "</tr>\n";
-		}
-		print "</table>\n";
-	}
-}
-// **** end action "showmedia"
-
-
 // **** begin action "showmediaform"
 if ($action=="showmediaform") {
 	if (!isset($pid)) $pid = "";

Index: bit_setup_inc.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/bit_setup_inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bit_setup_inc.php	10 Aug 2008 11:36:20 -0000	1.7
+++ bit_setup_inc.php	30 Apr 2009 19:12:13 -0000	1.8
@@ -27,14 +27,13 @@
 }
 
 //--load common functions
-require_once("includes/functions.php");
-require_once("includes/menu.php");
+require_once("includes/functions/functions.php");
 //-- set the error handler
 $OLD_HANDLER = set_error_handler("pgv_error_handler");
 //-- load db specific functions
-require_once("includes/functions_db.php");
-require_once("includes/functions_name.php");
-require_once("includes/functions_date.php");
+require_once("includes/functions/functions_db.php");
+require_once("includes/functions/functions_name.php");
+require_once("includes/functions/functions_date.php");
 require_once("themes/bitweaver/theme.php");
 $TBLPREFIX = PHPGEDVIEW_DB_PREFIX;
 ?>

--- NEW FILE: note.php ---
<?php
/**
* Displays the details about a shared note record.  Also shows how many people and families
* reference this shared note.
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2009 PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @version $Id: note.php,v 1.1 2009/04/30 19:12:13 lsces Exp $
*/

require './config.php';
require './includes/controllers/note_ctrl.php';
require './includes/functions/functions_print_lists.php';

$controller=new NoteController();
$controller->init();


// Tell addmedia.php what to link to
$linkToID=$controller->nid;

print_header($controller->getPageTitle());

// LightBox
if ($MULTI_MEDIA && is_dir('./modules/lightbox')) {
	include './modules/lightbox/lb_defaultconfig.php';
	if (file_exists('modules/lightbox/lb_config.php')) {
		include './modules/lightbox/lb_config.php';
	}
	include './modules/lightbox/functions/lb_call_js.php';
	loadLangFile('lightbox:lang');
}

if ($controller->note->isMarkedDeleted()) {
	echo '<span class="error">', $pgv_lang['record_marked_deleted'], '</span>';
}

echo PGV_JS_START;
echo 'function show_gedcom_record() {';
echo ' var recwin=window.open("gedrecord.php?pid=', $controller->nid, '", "_blank", "top=0,left=0,width=600,height=400,scrollbars=1,scrollable=1,resizable=1");';
echo '}';
echo 'function showchanges() {';
echo ' window.location="note.php?nid=', $controller->nid, '&show_changes=yes"';
echo '}';
echo 'function edit_note() {';
echo ' var win04 = window.open("edit_interface.php?action=editnote&pid='.$linkToID.'", "win04", "top=70,left=70,width=620,height=500,resizable=1,scrollbars=1");';
echo ' if (window.focus) {win04.focus();}';
echo '}';
echo PGV_JS_END;

echo '<table class="list_table"><tr><td>';
if ($controller->accept_success) {
	echo '<b>', $pgv_lang['accept_successful'], '</b><br />';
}
echo '<span class="name_head">', PrintReady($controller->note->getFullName());
if ($SHOW_ID_NUMBERS) {
	echo ' ', getLRM(), '(', $controller->nid, ')', getLRM();
}
echo '</span><br /></td><td valign="top" class="noprint">';
if (!$controller->isPrintPreview()) {
	$editmenu=$controller->getEditMenu();
	$othermenu=$controller->getOtherMenu();
	if ($editmenu || $othermenu) {
		echo '<table class="sublinks_table" cellspacing="4" cellpadding="0">';
		echo '<tr><td class="list_label ', $TEXT_DIRECTION, '" colspan="2">', $pgv_lang['shared_note_menu'], '</td></tr>';
		echo '<tr>';
		if ($editmenu) {
			echo '<td class="sublinks_cell ', $TEXT_DIRECTION, '">', $editmenu->printMenu(), '</td>';
		}
		if ($othermenu) {
			echo '<td class="sublinks_cell ', $TEXT_DIRECTION, '">', $othermenu->printMenu(), '</td>';
		}
		echo '</tr></table>';
	}
}
echo '</td></tr><tr><td colspan="2"><table border="0" class="facts_table width80 center">';

	// Shared Note details ---------------------
	$noterec = find_gedcom_record($controller->nid);
	$nt = preg_match("/0 @$controller->nid@ NOTE(.*)/", $noterec, $n1match);
	if ($nt==1) {
		$note = print_note_record("<br />".$n1match[1], 1, $noterec, false, true);
	}else{
		$note = "No Text";
	}
	echo '<tr><td align="left" class="descriptionbox '.$TEXT_DIRECTION.'">';
		echo "<center>".$pgv_lang["shared_note"]."</center>";
		echo '<br /><br />';
		if (PGV_USER_CAN_EDIT) {
			echo "<a href=\"javascript: edit_note()\"> ";
			echo $pgv_lang['edit'];
			echo "</a>";
		}
		echo '</td><td class="optionbox wrap width80 '.$TEXT_DIRECTION.'">';
		echo $note;
		echo "<br />";
	echo "</td></tr>";

	$notefacts=$controller->note->getFacts();
	foreach ($notefacts as $fact) {
		if ($fact && $fact->getTag()!='CONT') {
			if ($fact->getTag()=='NOTE' ) {

			} else {
				print_fact($fact);
			}
		}
	}

	// Print media
	print_main_media($controller->nid);

	// new fact link
	if (!$controller->isPrintPreview() && $controller->userCanEdit()) {
		print_add_new_fact($controller->nid, $notefacts, 'NOTE');
		// new media
		echo '<tr><td class="descriptionbox '.$TEXT_DIRECTION.'">';
		print_help_link('add_media_help', 'qm', 'add_media_lbl');
		echo $pgv_lang['add_media_lbl'] . '</td>';
		echo '<td class="optionbox '.$TEXT_DIRECTION.'">';
		echo '<a href="javascript: ', $pgv_lang['add_media_lbl'], '" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->nid, '\', \'_blank\', \'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1\'); return false;">', $pgv_lang['add_media'], '</a>';
		echo '<br />';
		echo '<a href="javascript:;" onclick="window.open(\'inverselink.php?linktoid='.$controller->nid.'&linkto=note\', \'_blank\', \'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1\'); return false;">'.$pgv_lang['link_to_existing_media'].'</a>';
		echo '</td></tr>';
	}

echo '</table><br /><br /></td></tr><tr class="center"><td colspan="2">';


// Print the tasks table
// NOT WORKING YET
/*
if (file_exists('./modules/research_assistant/research_assistant.php') && $SHOW_RESEARCH_ASSISTANT>=PGV_USER_ACCESS_LEVEL) {
	include_once './modules/research_assistant/research_assistant.php';
	$mod=new ra_functions();
	$mod->Init();
	echo $mod->getNoteTasks($controller->nid), '</td></tr><tr class="center"><td colspan="2">';
}
*/

// Individuals linked to this shared note
if ($controller->note->countLinkedIndividuals()) {
	print_indi_table($controller->note->fetchLinkedIndividuals(), $controller->note->getFullName());
}

// Families linked to this shared note
if ($controller->note->countLinkedFamilies()) {
	print_fam_table($controller->note->fetchLinkedFamilies(), $controller->note->getFullName());
}

// Media Items linked to this shared note
if ($controller->note->countLinkedMedia()) {
	print_media_table($controller->note->fetchLinkedMedia(), $controller->note->getFullName());
}

// Sources linked to this shared note
if ($controller->note->countLinkedSources()) {
	print_sour_table($controller->note->fetchLinkedSources(), $controller->note->getFullName());
}

echo '</td></tr></table>';

print_footer();
?>

--- NEW FILE: search_advanced.php ---
<?php

/**
 * Searches based on user query.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2009	PGV Development Team. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Display
 * @version $Id: search_advanced.php,v 1.1 2009/04/30 19:12:13 lsces Exp $
 */

require './config.php';
require './includes/controllers/advancedsearch_ctrl.php';
require './includes/functions/functions_print_lists.php';

$controller=new AdvancedSearchController();
$controller->init();

// Print the top header
print_header($pgv_lang["advanced_search"]);
?>
<script language="JavaScript" type="text/javascript">
<!--
	function checknames(frm) {
		action = "<?php print $controller->action ?>";

		return true;
	}

	var numfields = <?php print count($controller->fields); ?>;
	/**
	 * add a row to the table of fields
	 */
	function addFields() {
		//-- get the table
		var tbl = document.getElementById('field_table').tBodies[0];
		//-- create the new row
		var trow = document.createElement('tr');
		//-- create the new label cell
		var label = document.createElement('td');
		label.className='list_label';
		//-- create a select for the user to choose the field
		var sel = document.createElement('select');
		sel.name = 'fields['+numfields+']';
		sel.rownum = numfields;
		sel.onchange = function() {
			showDate(this, this.rownum);
		};

		//-- all of the field options
		<?php foreach($controller->getOtherFields() as $field) { ?>
		opt = document.createElement('option');
		opt.value='<?php print $field; ?>';
		opt.text='<?php print $controller->getLabel($field); ?>';
		sel.options.add(opt);
		<?php } ?>
		label.appendChild(sel);
		trow.appendChild(label);
		//-- create the new value cell
		var val = document.createElement('td');
		val.id = 'vcell'+numfields;
		val.className='list_value';

		var inp = document.createElement('input');
		inp.name='values['+numfields+']';
		inp.type='text';
		inp.id='value'+numfields;
		inp.tabindex=numfields+1;
		val.appendChild(inp);
		trow.appendChild(val);
		var lastRow = tbl.lastChild.previousSibling;

		tbl.insertBefore(trow, lastRow.nextSibling);
		numfields++;
	}

	/**
	 * add the date options selection
	 */
	function showDate(sel, row) {
		var type = sel.options[sel.selectedIndex].value;
		var pm = document.getElementById('plusminus'+row);
		if (!type.match("DATE$")) {
			//-- if it is not a date do not show the date
			if (pm) pm.parentNode.removeChild(pm);
			return;
		}
		//-- if it is a date and the plusminus is already show, then leave
		if (pm) return;
		var elm = document.getElementById('vcell'+row);
		var sel = document.createElement('select');
		sel.id = 'plusminus'+row;
		sel.name = 'plusminus['+row+']';
		var opt = document.createElement('option');
		opt.value='';
		opt.text='<?php print $pgv_lang['exact']; ?>';
		sel.appendChild(opt);
		opt = document.createElement('option');
		opt.value='';
		opt.text='+/- 2 <?php print $pgv_lang['years2']; ?>';
		sel.appendChild(opt);
		opt = document.createElement('option');
		opt.value='5';
		opt.text='+/- 5 <?php print $pgv_lang['years']; ?>';
		sel.appendChild(opt);
		opt = document.createElement('option');
		opt.value='10';
		opt.text='+/- 10 <?php print $pgv_lang['years']; ?>';
		sel.appendChild(opt);
		var spc = document.createTextNode(' ');
		elm.appendChild(spc);
		elm.appendChild(sel);
	}
//-->
</script>

<h2 class="center"><?php print $controller->getPageTitle(); ?></h2>
<?php $somethingPrinted = $controller->PrintResults(); ?>
<!--	/*************************************************** Search Form Outer Table **************************************************/ -->
<form method="post" name="searchform" onsubmit="return checknames(this);" action="search_advanced.php">
<input type="hidden" name="action" value="<?php print $controller->action; ?>" />
<input type="hidden" name="isPostBack" value="true" />
<table id="field_table" class="list_table $TEXT_DIRECTION" width="35%" border="0">
	<tr>
		<td colspan="4" class="facts_label03" style="text-align:center; ">
			<?php print $pgv_lang["advanced_search"]; print_help_link("advanced_search_help", "qm"); ?>
		</td>
	</tr>
	<!-- // search terms -->
	<?php
	$fct = count($controller->fields);
	for($i=0; $i<$fct; $i++) {
		if (strpos($controller->getField($i), "FAMC:HUSB:NAME")===0) continue;
		if (strpos($controller->getField($i), "FAMC:WIFE:NAME")===0) continue;
	?>
	<tr>
		<td class="list_label">
			<?php print $controller->getLabel($controller->getField($i)); ?>
		</td>
		<td id="vcell<?php print $i; ?>" class="list_value">
			<?php 
			$currentFieldSearch = $controller->getField($i);		// Get this field's name and the search criterion
			$currentField = substr($currentFieldSearch, 0, strrpos($currentFieldSearch, ':'));		// Get the actual field name
			?>
			<input tabindex="<?php print $i+1; ?>" type="text" id="value<?php print $i; ?>" name="values[<?php print $i; ?>]" value="<?php print $controller->getValue($i); ?>" />
			<?php if (preg_match("/^NAME:/", $currentFieldSearch)>0) {
				?>
				<select name="fields[<?php print $i ?>]">
					<option value="<?php print $currentField; ?>:EXACT"<?php if (preg_match("/:EXACT$/", $currentFieldSearch)>0) print " selected=\"selected\""; ?>><?php print $pgv_lang["exact"]; ?></option>
					<option value="<?php print $currentField; ?>:BEGINS"<?php if (preg_match("/:BEGINS$/", $currentFieldSearch)>0) print " selected=\"selected\""; ?>><?php print $pgv_lang["begins_with"]; ?></option>
					<option value="<?php print $currentField; ?>:CONTAINS"<?php if (preg_match("/:CONTAINS$/", $currentFieldSearch)>0) print " selected=\"selected\""; ?>><?php print $pgv_lang["contains"]; ?></option>
					<option value="<?php print $currentField; ?>:SDX"<?php if (preg_match("/:SDX$/", $currentFieldSearch)>0) print " selected=\"selected\""; ?>><?php print $pgv_lang["sounds_like"]; ?></option>
				</select>
			<?php } else { ?>
			<input type="hidden" name="fields[<?php print $i ?>]" value="<?php print $controller->getField($i); ?>" />
			<?php }
			if (preg_match("/:DATE$/", $currentFieldSearch)>0) {
				?>
				<select name="plusminus[<?php print $i ?>]">
					<option value=""><?php print $pgv_lang["exact"]; ?></option>
					<option value="2" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i]==2) print " selected=\"selected\""; ?>>+/- 2 <?php print $pgv_lang['years2']; ?></option>
					<option value="5" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i]==5) print "selected=\"selected\""; ?>>+/- 5 <?php print $pgv_lang['years']; ?></option>
					<option value="10" <?php if (!empty($controller->plusminus[$i]) && $controller->plusminus[$i]==10) print "selected=\"selected\""; ?>>+/- 10 <?php print $pgv_lang['years']; ?></option>
				</select>
			<?php }?>
		</td>
		<?php
		//-- relative fields
		if ($i==0 && $fct>4) {
			$j=$fct;
			// Get the current options for Father's and Mother's name searches
			$fatherGivnOption = 'SDX';
			$fatherSurnOption = 'SDX';
			$motherGivnOption = 'SDX';
			$motherSurnOption = 'SDX';
			for($k=0; $k<$fct; $k++) {
				$searchField = $controller->getField($k);
				$searchOption = substr($searchField, 20);	// Assume we have something like "FAMC:HUSB:NAME:GIVN:foo"
				switch (substr($searchField, 0, 20)) {
				case 'FAMC:HUSB:NAME:GIVN:':
					$fatherGivnOption = $searchOption;
					break;
				case 'FAMC:HUSB:NAME:SURN:':
					$fatherSurnOption = $searchOption;
					break;
				case 'FAMC:WIFE:NAME:GIVN:':
					$motherGivnOption = $searchOption;
					break;
				case 'FAMC:WIFE:NAME:SURN:':
					$motherSurnOption = $searchOption;
					break;
				}
			}
			?>
			<td rowspan="100" class="list_value">&nbsp;</td>
			<td rowspan="100" class="list_value">
				<table>
					<!--  father -->
					<tr>
						<td colspan="2" class="facts_label03" style="text-align:center; ">
							<?php print $pgv_lang['father']; ?>
						</td>
					</tr>
					<tr>
						<td class="list_label">
							<?php print $factarray["GIVN"]; ?>
						</td>
						<td class="list_value">
							<input type="text" name="values[<?php print $j; ?>]" value="<?php print $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:GIVN:'.$fatherGivnOption)); ?>" />
							<select name="fields[<?php print $j ?>]">
								<option value="FAMC:HUSB:NAME:GIVN:EXACT"<?php if ($fatherGivnOption == 'EXACT') print " selected=\"selected\""; ?>><?php print $pgv_lang["exact"]; ?></option>
								<option value="FAMC:HUSB:NAME:GIVN:BEGINS"<?php if ($fatherGivnOption == 'BEGINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["begins_with"]; ?></option>
								<option value="FAMC:HUSB:NAME:GIVN:CONTAINS"<?php if ($fatherGivnOption == 'CONTAINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["contains"]; ?></option>
								<option value="FAMC:HUSB:NAME:GIVN:SDX"<?php if ($fatherGivnOption == 'SDX') print " selected=\"selected\""; ?>><?php print $pgv_lang["sounds_like"]; ?></option>
							</select>
						</td>
					</tr>
					<tr>
						<?php $j++; ?>
						<td class="list_label">
							<?php print $factarray["SURN"]; ?>
						</td>
						<td class="list_value">
							<input type="text" name="values[<?php print $j; ?>]" value="<?php print $controller->getValue($controller->getIndex('FAMC:HUSB:NAME:SURN:'.$fatherSurnOption)); ?>" />
							<select name="fields[<?php print $j ?>]">
								<option value="FAMC:HUSB:NAME:SURN:EXACT"<?php if ($fatherSurnOption == 'EXACT') print " selected=\"selected\""; ?>><?php print $pgv_lang["exact"]; ?></option>
								<option value="FAMC:HUSB:NAME:SURN:BEGINS"<?php if ($fatherSurnOption == 'BEGINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["begins_with"]; ?></option>
								<option value="FAMC:HUSB:NAME:SURN:CONTAINS"<?php if ($fatherSurnOption == 'CONTAINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["contains"]; ?></option>
								<option value="FAMC:HUSB:NAME:SURN:SDX"<?php if ($fatherSurnOption == 'SDX') print " selected=\"selected\""; ?>><?php print $pgv_lang["sounds_like"]; ?></option>
							</select>
						</td>
					</tr>
					<!--  mother -->
					<?php $j++; ?>
					<tr><td colspan="2">&nbsp;</td></tr>
					<tr>
						<td colspan="2" class="facts_label03" style="text-align:center; ">
							<?php print $pgv_lang['mother']; ?>
						</td>
					</tr>
					<tr>
						<td class="list_label">
							<?php print $factarray["GIVN"]; ?>
						</td>
						<td class="list_value">
							<input type="text" name="values[<?php print $j; ?>]" value="<?php print $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:GIVN:'.$motherGivnOption)); ?>" />
							<select name="fields[<?php print $j ?>]">
								<option value="FAMC:WIFE:NAME:GIVN:EXACT"<?php if ($motherGivnOption == 'EXACT') print " selected=\"selected\""; ?>><?php print $pgv_lang["exact"]; ?></option>
								<option value="FAMC:WIFE:NAME:GIVN:BEGINS"<?php if ($motherGivnOption == 'BEGINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["begins_with"]; ?></option>
								<option value="FAMC:WIFE:NAME:GIVN:CONTAINS"<?php if ($motherGivnOption == 'CONTAINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["contains"]; ?></option>
								<option value="FAMC:WIFE:NAME:GIVN:SDX"<?php if ($motherGivnOption == 'SDX') print " selected=\"selected\""; ?>><?php print $pgv_lang["sounds_like"]; ?></option>
							</select>
						</td>
						<?php $j++; ?>
					</tr>
					<tr>
						<td class="list_label">
							<?php print $factarray["SURN"]; ?>
						</td>
						<td class="list_value">
							<input type="text" name="values[<?php print $j; ?>]" value="<?php print $controller->getValue($controller->getIndex('FAMC:WIFE:NAME:SURN:'.$motherSurnOption)); ?>" />
							<select name="fields[<?php print $j ?>]">
								<option value="FAMC:WIFE:NAME:SURN:EXACT"<?php if ($motherSurnOption == 'EXACT') print " selected=\"selected\""; ?>><?php print $pgv_lang["exact"]; ?></option>
								<option value="FAMC:WIFE:NAME:SURN:BEGINS"<?php if ($motherSurnOption == 'BEGINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["begins_with"]; ?></option>
								<option value="FAMC:WIFE:NAME:SURN:CONTAINS"<?php if ($motherSurnOption == 'CONTAINS') print " selected=\"selected\""; ?>><?php print $pgv_lang["contains"]; ?></option>
								<option value="FAMC:WIFE:NAME:SURN:SDX"<?php if ($motherSurnOption == 'SDX') print " selected=\"selected\""; ?>><?php print $pgv_lang["sounds_like"]; ?></option>
							</select>
						</td>
						</td>
						<?php $j++; ?>
					</tr>
					<!-- spouse -->
					<tr>
					<?php $j++; ?>
					</tr>
				</table>
			</td>
		<?php } ?>
	</tr>
	<?php } ?>
	<tr>
		<td class="list_value" style="vertical-align: middle; text-align: center; padding: 5px;"  colspan="10">
			<a href="#" onclick="addFields();"><?php print $pgv_lang['more_fields']; ?></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
			<input tabindex="<?php print $i+1; ?>" type="submit" value="<?php print $pgv_lang["search"]; ?>" />
		</td>
	</tr>
</table>
</form>
<br /><br /><br /><br />
<?php
// set the focus on the first field unless multisite or some search results have been printed
if (!$somethingPrinted ) {
?>
	<script language="JavaScript" type="text/javascript">
	<!--
		document.getElementById('value0').focus();
	//-->
	</script>
<?php
}
//-- somewhere the session gedcom gets changed, so we will change it back
$_SESSION['GEDCOM'] = $GEDCOM;
print_footer();
?>

Update of /cvsroot/bitweaver/_bit_phpgedview/includes/controllers
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24536/phpgedview/includes/controllers

Modified Files:
	descendancy_ctrl.php media_ctrl.php source_ctrl.php 
	usermigrate_ctrl.php ancestry_ctrl.php pedigree_ctrl.php 
	lifespan_ctrl.php hourglass_ctrl.php timeline_ctrl.php 
	clippings_ctrl.php search_ctrl.php individual_ctrl.php 
	family_ctrl.php basecontrol.php 
Added Files:
	repository_ctrl.php remotelink_ctrl.php 
	advancedsearch_ctrl.php note_ctrl.php 
Log Message:
Code update for PGV4.2 - bw compatible edit controllers

--- NEW FILE: repository_ctrl.php ---
<?php
/**
* Controller for the repository page view
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2008 PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @subpackage Charts
* @version $Id: repository_ctrl.php,v 1.1 2009/04/30 19:09:48 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_REPOSITORY_CTRL_PHP', '');

require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_print_facts.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_repository.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_menu.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_import.php');

$nonfacts = array();
/**
* Main controller class for the repository page.
*/
class RepositoryControllerRoot extends BaseController {
	var $rid;
	var $repository = null;
	var $uname = "";
	var $diffrepository = null;
	var $accept_success = false;
	var $canedit = false;

	/**
	* constructor
	*/
	function RepositoryRootController() {
		parent::BaseController();
	}

	/**
	* initialize the controller
	*/
	function init() {
		global $pgv_lang, $CONTACT_EMAIL, $GEDCOM, $pgv_changes;

		$this->rid         =safe_GET_xref('rid');

		$repositoryrec = find_other_record($this->rid);
		if (!$repositoryrec) $repositoryrec = "0 @".$this->rid."@ REPO\n";

		$this->repository = new Repository($repositoryrec);
		$this->repository->ged_id=PGV_GED_ID; // This record is from a file

		if (!$this->repository->canDisplayDetails()) {
			print_header($pgv_lang["private"]." ".$pgv_lang["repo_info"]);
			print_privacy_error($CONTACT_EMAIL);
			print_footer();
			exit;
		}

		$this->uname = PGV_USER_NAME;

		//-- perform the desired action
		switch($this->action) {
			case "addfav":
				$this->addFavorite();
				break;
			case "accept":
				$this->acceptChanges();
				break;
			case "undo":
				$this->repository->undoChange();
				break;
		}

		//-- check for the user
		//-- if the user can edit and there are changes then get the new changes
		if ($this->show_changes && PGV_USER_CAN_EDIT && isset($pgv_changes[$this->rid."_".$GEDCOM])) {
			$newrec = find_updated_record($this->rid);
			$this->diffrepository = new Repository($newrec);
			$this->diffrepository->setChanged(true);
			$repositoryrec = $newrec;
		}

		if ($this->repository->canDisplayDetails()) {
			$this->canedit = PGV_USER_CAN_EDIT;
		}

		if ($this->show_changes && $this->canedit) {
			$this->repository->diffMerge($this->diffrepository);
		}
	}

	/**
	* Add a new favorite for the action user
	*/
	function addFavorite() {
		global $GEDCOM;
		if (empty($this->uname)) return;
		if (!empty($_REQUEST["gid"])) {
			$gid = strtoupper($_REQUEST["gid"]);
			$indirec = find_other_record($gid);
			if ($indirec) {
				$favorite = array();
				$favorite["username"] = $this->uname;
				$favorite["gid"] = $gid;
				$favorite["type"] = "REPO";
				$favorite["file"] = $GEDCOM;
				$favorite["url"] = "";
				$favorite["note"] = "";
				$favorite["title"] = "";
				addFavorite($favorite);
			}
		}
	}
	/**
	* Accept any edit changes into the database
	* Also update the indirec we will use to generate the page
	*/
	function acceptChanges() {
		global $GEDCOM;

		if (!PGV_USER_CAN_ACCEPT) return;
		if (accept_changes($this->rid."_".$GEDCOM)) {
			$this->show_changes=false;
			$this->accept_success=true;
			$indirec = find_other_record($this->rid);
			//-- check if we just deleted the record and redirect to index
			if (empty($indirec)) {
				header("Location: index.php?ctype=gedcom");
				exit;
			}
			$this->repository = new Repository($indirec);
		}
	}

	/**
	* get the title for this page
	* @return string
	*/
	function getPageTitle() {
		global $pgv_lang;
		return $this->repository->getFullName()." - ".$this->rid." - ".$pgv_lang["repo_info"];
	}
	/**
	* check if use can edit this person
	* @return boolean
	*/
	function userCanEdit() {
		return $this->canedit;
	}

	/**
	* get edit menut
	* @return Menu
	*/
	function &getEditMenu() {
		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang, $pgv_changes;
		global $SHOW_GEDCOM_RECORD;
		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
		else $ff="";

		if (!$this->userCanEdit()) {
			$tempvar = false;
			return $tempvar;
		}

		// edit repository menu
		$menu = new Menu($pgv_lang['edit_repo']);
		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN)
			$menu->addOnclick('return edit_raw(\''.$this->rid.'\');');
		if (!empty($PGV_IMAGES["edit_repo"]["small"]))
			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");

		// edit repository / edit_raw
		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
			$submenu = new Menu($pgv_lang['edit_raw']);
			$submenu->addOnclick("return edit_raw('".$this->rid."');");
			if (!empty($PGV_IMAGES["edit_repo"]["small"]))
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
			$menu->addSubmenu($submenu);
		}

		// edit repository / delete_repository
		$submenu = new Menu($pgv_lang['delete_repo']);
		$submenu->addOnclick("if (confirm('".$pgv_lang["confirm_delete_repo"]."')) return deleterepository('".$this->rid."'); else return false;");
		if (!empty($PGV_IMAGES["edit_repo"]["small"]))
			$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
		$menu->addSubmenu($submenu);

		if (isset($pgv_changes[$this->rid.'_'.$GEDCOM]))
		{
			// edit_repo / separator
			$submenu = new Menu();
			$submenu->isSeparator();
			$menu->addSubmenu($submenu);

			// edit_repo / show/hide changes
			if (!$this->show_changes)
			{
				$submenu = new Menu($pgv_lang['show_changes'], encode_url("repo.php?rid={$this->rid}&show_changes=yes"));
				if (!empty($PGV_IMAGES["edit_repo"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}
			else
			{
				$submenu = new Menu($pgv_lang['hide_changes'], encode_url("repo.php?rid={$this->rid}&show_changes=no"));
				if (!empty($PGV_IMAGES["edit_repo"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}

			if (PGV_USER_CAN_ACCEPT)
			{
				// edit_repository / accept_all
				$submenu = new Menu($pgv_lang["undo_all"], encode_url("repo.php?rid={$this->rid}&action=undo"));
				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
				if (!empty($PGV_IMAGES["edit_repo"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
				$menu->addSubmenu($submenu);
				$submenu = new Menu($pgv_lang['accept_all'], encode_url("repo.php?rid={$this->rid}&action=accept"));
				if (!empty($PGV_IMAGES["edit_repo"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_repo']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}
		}
		return $menu;
	}

	/**
	* get the other menu
	* @return Menu
	*/
	function &getOtherMenu() {
		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang;
		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;

		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
		else $ff="";

		if (!$this->repository->canDisplayDetails() || (!$SHOW_GEDCOM_RECORD && $ENABLE_CLIPPINGS_CART < PGV_USER_ACCESS_LEVEL)) {
			$tempvar = false;
			return $tempvar;
		}

			// other menu
		$menu = new Menu($pgv_lang['other']);
		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
		if ($SHOW_GEDCOM_RECORD)
		{
			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
			if ($this->show_changes && $this->userCanEdit())
			{
				$menu->addLink("javascript:show_gedcom_record('new');");
			}
			else
			{
				$menu->addLink("javascript:show_gedcom_record();");
			}
		}
		else
		{
			if (!empty($PGV_IMAGES["clippings"]["small"]))
				$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
			$menu->addLink(encode_url("clippings.php?action=add&id={$this->rid}&type=repo"));
		}
		if ($SHOW_GEDCOM_RECORD)
		{
				// other / view_gedcom
				$submenu = new Menu($pgv_lang['view_gedcom']);
				if ($this->show_changes && $this->userCanEdit())
				{
					$submenu->addLink("javascript:show_gedcom_record('new');");
				}
				else
				{
					$submenu->addLink("javascript:show_gedcom_record();");
				}
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		if ($ENABLE_CLIPPINGS_CART >= PGV_USER_ACCESS_LEVEL)
		{
				// other / add_to_cart
				$submenu = new Menu($pgv_lang['add_to_cart'], encode_url("clippings.php?action=add&id={$this->rid}&type=repo"));
				if (!empty($PGV_IMAGES["clippings"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		if ($this->repository->canDisplayDetails() && !empty($this->uname))
		{
				// other / add_to_my_favorites
				$submenu = new Menu($pgv_lang['add_to_my_favorites'], encode_url("repo.php?action=addfav&rid={$this->rid}&gid={$this->rid}"));
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		return $menu;
	}
}
// -- end of class
//-- load a user extended class if one exists
if (file_exists('includes/controllers/repository_ctrl_user.php'))
{
	include_once 'includes/controllers/repository_ctrl_user.php';
}
else
{
	class RepositoryController extends RepositoryControllerRoot
	{
	}
}

?>

Index: usermigrate_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/usermigrate_ctrl.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- usermigrate_ctrl.php	7 Jul 2008 17:57:40 -0000	1.1
+++ usermigrate_ctrl.php	30 Apr 2009 19:09:48 -0000	1.2
@@ -1,474 +1,473 @@
-<?php
-/**
- * Controller for backup and export
- * Exports users and their data to either SQL queries (Index mode) or
- * authenticate.php and xxxxxx.dat files (MySQL mode).
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @author Boudewijn Sjouke	sjouke@...
- * @package PhpGedView
- * @subpackage Admin
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-require_once("config.php");
-require_once 'includes/controllers/basecontrol.php';
-
-loadLangFile("pgv_confighelp");
-
-//-- make sure that they have admin status before they can use this page
-//-- otherwise have them login again
-if (strstr($_SERVER['SCRIPT_NAME'], "usermigrate_cli.php")) {
-	if (PGV_USER_IS_ADMIN || !isset($argc)) {
-		header("Location: usermigrate.php");
-		exit;
-	}
-}
-else if (!PGV_USER_IS_ADMIN) {
-	header("Location: login.php?url=usermigrate.php");
-	exit;
-}
-
-require_once("includes/functions_export.php");
-
-class UserMigrateControllerRoot extends BaseController {
-	var $proceed;
-	var $flist;
-	var $v_list;
-	var $fname;
-	var $buname;
-	var $errorMsg;
-	var $fileExists = false;
-	var $impSuccess = false;
-	var $msgSuccess = false;
-	var $favSuccess = false;
-	var $newsSuccess = false;
-	var $blockSuccess = false;
-
-	/**
-	 * constructor
-	 */
-	function UserMigrateControllerRoot() {
-		parent::BaseController();
-	}
-
-	/**
-	 * Initialize the controller and start the logic
-	 *
-	 */
-	function init() {
-		global $INDEX_DIRECTORY;
-		if (!isset($_REQUEST['proceed'])) $this->proceed = "backup";
-		else $this->proceed = $_REQUEST['proceed'];
-
-		if ($this->proceed == "backup") $this->backup();
-		else if ($this->proceed == "export") {
-			$i = 0;
-			if (file_exists($INDEX_DIRECTORY."authenticate.php")) $i = $i + 1;
-			if (file_exists($INDEX_DIRECTORY."news.dat")) $i = $i + 1;
-			if (file_exists($INDEX_DIRECTORY."messages.dat")) $i = $i + 1;
-			if (file_exists($INDEX_DIRECTORY."blocks.dat")) $i = $i + 1;
-			if (file_exists($INDEX_DIRECTORY."favorites.dat")) $i = $i + 1;
-			if ($i > 0) {
-				$this->fileExists = true;
-			}
-			else $this->proceed = "exportovr";
-		}
-		if ($this->proceed == "exportovr") {
-			if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
-			if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
-			if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
-			if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
-			if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
-			um_export($this->proceed);
-		}
-
-		if ($this->proceed == "import") {
-			$this->import();
-		}
-	}
-
-	/**
-	 * Return the page title
-	 *
-	 * @return string
-	 */
-	function getPageTitle() {
-		global $pgv_lang;
-
-		if ($this->proceed == "backup") return $pgv_lang["um_backup"];
-		else return $pgv_lang["um_header"];
-	}
-
-	/**
-	 * generate the backup zip file
-	 *
-	 */
-	function backup() {
-		global $INDEX_DIRECTORY, $gGedcom, $GEDCOM, $MEDIA_DIRECTORY, $SYNC_GEDCOM_FILE;
-		global $USE_MEDIA_FIREWALL, $MEDIA_FIREWALL_ROOTDIR;
-		global $VERSION, $VERSION_RELEASE;
-		$this->flist = array();
-
-		// Backup user information
-		if (isset($_POST["um_usinfo"])) {
-			// If in pure DB mode, we must first create new .dat files and authenticate.php
-			// First delete the old files
-			if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
-			if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
-			if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
-			if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
-			if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
-
-			// Then make the new ones
-			um_export($this->proceed);
-
-			// Make filelist for files to ZIP
-			if (file_exists($INDEX_DIRECTORY."authenticate.php")) $this->flist[] = $INDEX_DIRECTORY."authenticate.php";
-			if (file_exists($INDEX_DIRECTORY."news.dat")) $this->flist[] = $INDEX_DIRECTORY."news.dat";
-			if (file_exists($INDEX_DIRECTORY."messages.dat")) $this->flist[] = $INDEX_DIRECTORY."messages.dat";
-			if (file_exists($INDEX_DIRECTORY."blocks.dat")) $this->flist[] = $INDEX_DIRECTORY."blocks.dat";
-			if (file_exists($INDEX_DIRECTORY."favorites.dat")) $this->flist[] = $INDEX_DIRECTORY."favorites.dat";
-		}
-
-		// Backup config.php
-		if (isset($_POST["um_config"])) {
-			$this->flist[] = "config.php";
-		}
-
-		// Backup gedcoms
-		if (isset($_POST["um_gedcoms"])) {
-			foreach($gGedcom as $key=>$gedcom) {
-				//-- load the gedcom configuration settings
-				require(get_config_file($key));
-				//-- backup the original gedcom file
-				if (file_exists($gedcom["path"])) $this->flist[] = $gedcom["path"];
-				//else {
-					//-- recreate the GEDCOM file from the DB
-					//-- backup the DB in case of GEDCOM corruption
-					$oldged = $GEDCOM;
-					$GEDCOM = $key;
-					$gedname = $INDEX_DIRECTORY.$key.".bak";
-					$gedout = fopen(filename_decode($gedname), "wb");
-					print_gedcom('no', 'no', 'no', 'no', $gedout);
-					fclose($gedout);
-					$GEDCOM = $oldged;
-					$this->flist[] = $gedname;
-				//}
-			}
-			//-- load up the old configuration file
-			require(get_config_file($GEDCOM));
-			$this->flist[] = $INDEX_DIRECTORY."pgv_changes.php";
-		}
-
-		// Backup gedcom settings
-		if (isset($_POST["um_gedsets"])) {
-
-			// Gedcoms file
-			if (file_exists($INDEX_DIRECTORY."gedcoms.php")) $this->flist[] = $INDEX_DIRECTORY."gedcoms.php";
-
-			foreach($gGedcom as $key => $gedcom) {
-
-				// Config files
-				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."_conf.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."_conf.php";
-
-				// Privacy files
-				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."_priv.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."_priv.php";
-			}
-		}
-
-		// Backup logfiles and counters
-		if (isset($_POST["um_logs"])) {
-			foreach($gGedcom as $key => $gedcom) {
-
-				// Gedcom counters
-				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."pgv_counters.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."pgv_counters.php";
-
-				// Gedcom searchlogs and changelogs
-				$dir_var = opendir ($INDEX_DIRECTORY);
-				while ($file = readdir ($dir_var)) {
-					if ((strpos($file, ".log") > 0) && ((strstr($file, "srch-".$gedcom["gedcom"]) !== false ) || (strstr($file, "ged-".$gedcom["gedcom"]) !== false ))) $this->flist[] = $INDEX_DIRECTORY.$file;
-				}
-				closedir($dir_var);
-			}
-
-			// PhpGedView logfiles
-			$dir_var = opendir ($INDEX_DIRECTORY);
-			while ($file = readdir ($dir_var)) {
-				if ((strpos($file, ".log") > 0) && (strstr($file, "pgv-") !== false )) $this->flist[] = $INDEX_DIRECTORY.$file;
-			}
-			closedir($dir_var);
-		}
-
-		// backup media files
-		if (isset($_POST["um_media"])) {
-			$dir = dir($MEDIA_DIRECTORY);
-			while(false !== ($entry = $dir->read())) {
-				if ($entry{0} != ".") {
-					if ($entry != "thumbs") $this->flist[] = $MEDIA_DIRECTORY.$entry;
-				}
-			}
-			if ($USE_MEDIA_FIREWALL) {
-				$dir = dir($MEDIA_FIREWALL_ROOTDIR.$MEDIA_DIRECTORY);
-				while(false !== ($entry = $dir->read())) {
-					if ($entry{0} != ".") {
-						if ( ($entry != "thumbs") && ($entry != "watermark") ) $this->flist[] = $MEDIA_FIREWALL_ROOTDIR.$MEDIA_DIRECTORY.$entry;
-					}
-				}
-			}
-		}
-
-		// Make the zip
-		if (count($this->flist) > 0) {
-			require_once "includes/pclzip.lib.php";
-			$this->buname = date("YmdHis").".zip";
-			$this->fname = $INDEX_DIRECTORY.$this->buname;
-			$comment = "Created by PhpGedView ".$VERSION." ".$VERSION_RELEASE." on ".date("r").".";
-			$archive = new PclZip($this->fname);
-			//-- remove ../ from file paths when creating zip
-			$ct = preg_match("~((\.\./)+)~", $INDEX_DIRECTORY, $match);
-			$rmpath = "";
-			if ($ct>0) $rmpath = $match[1];
-				$this->v_list = $archive->create($this->flist, PCLZIP_OPT_COMMENT, $comment, PCLZIP_OPT_REMOVE_PATH, $rmpath);
-			if ($this->v_list==0) $this->errorMsg = "Error : ".$archive->errorInfo(true);
-			if (isset($_POST["um_usinfo"])) {
-				// Remove temporary files again
-				if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
-				if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
-				if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
-				if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
-				if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
-			}
-		}
-	}
-
-	/**
-	 * Import users etc. from index files
-	 *
-	 */
-	function import() {
-		global $INDEX_DIRECTORY, $TBLPREFIX, $pgv_lang, $DBCONN;
-		global $gGedcom, $GEDCOM;
-
-		if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) {
-			$this->impSuccess = false;
-			return;
-		} else {
-			require $INDEX_DIRECTORY."authenticate.php";
-			$countold = count($users);
-			$sql = "DELETE FROM ".$TBLPREFIX."users";
-			$res = dbquery($sql);
-			if (!$res || DB::isERROR($res)) {
-				$this->errorMsg = "<span class=\"error\">Unable to update <i>Users</i> table.</span><br />\n";
-				$this->impSuccess = false;
-				return;
-			}
-			foreach($users as $username=>$user) {
-				if ($user["editaccount"] == "1") $user["editaccount"] = "Y";
-				else $user["editaccount"] = "N";
-				//-- make sure fields are set for v4.0 DB
-				if (!isset($user["firstname"])) {
-					if (isset($user["fullname"])) {
-						$parts = preg_split("/ /", trim($user["fullname"]));
-						$user["lastname"] = array_pop($parts);
-						$user["firstname"] = implode(" ", $parts);
-					}
-					else {
-						$user["firstname"] = '';
-						$user["lastname"] = '';
-					}
-				}
-				if (!isset($user["comment"])) $user["comment"] = '';
-				if (!isset($user["comment_exp"])) $user["comment_exp"] = '';
-				if (!isset($user["sync_gedcom"])) $user["sync_gedcom"] = 'N';
-				if (!isset($user["relationship_privacy"])) $user["relationship_privacy"] = 'N';
-				if (!isset($user["max_relation_path"])) $user["max_relation_path"] = '2';
-				if (!isset($user["auto_accept"])) $user["auto_accept"] = 'N';
-
-				if ($user_id=create_user($user['username'], $user['password'])) {
-					set_user_setting($user_id, 'firstname',            $user["firstname"]);
-					set_user_setting($user_id, 'lastname',             $user["lastname"]);
-					set_user_setting($user_id, 'email',                $user["email"]);
-					set_user_setting($user_id, 'theme',                $user["theme"]);
-					set_user_setting($user_id, 'language',             $user["language"]);
-					set_user_setting($user_id, 'contactmethod',        $user["contactmethod"]);
-					set_user_setting($user_id, 'defaulttab',           $user["defaulttab"]);
-					set_user_setting($user_id, 'comment',              $user["comment"]);
-					set_user_setting($user_id, 'comment_exp',          $user["comment_exp"]);
-					set_user_setting($user_id, 'pwrequested',          $user["pwrequested"]);
-					set_user_setting($user_id, 'reg_timestamp',        $user["reg_timestamp"]);
-					set_user_setting($user_id, 'reg_hashcode',         $user["reg_hashcode"]);
-					set_user_setting($user_id, 'loggedin'    ,         $user["loggedin"]);
-					set_user_setting($user_id, 'sessiontime'    ,      $user["sessiontime"]);
-					set_user_setting($user_id, 'max_relation_path',    $user["max_relation_path"]);
-					set_user_setting($user_id, 'sync_gedcom',          $user["sync_gedcom"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'relationship_privacy', $user["relationship_privacy"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'auto_accept',          $user["auto_accept"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'canadmin',             $user["canadmin"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'visibleonline',        $user["visibleonline"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'editaccount',          $user["editaccount"] ? 'Y' : 'N');
-					set_user_setting($user_id, 'verified',             $user["verified"] ? 'yes' : 'no');
-					set_user_setting($user_id, 'verified_by_admin',    $user["verified_by_admin"] ? 'yes' : 'no');
-					foreach (array('gedcomid', 'rootid', 'canedit') as $var) {
-						if ($user[$var]) {
-							foreach (unserialize(stripslashes($user[$var])) as $gedcom=>$id) {
-								set_user_gedcom_setting($user_id, $gedcom, $var, $id);
-							}
-						}
-					}
-					AddToLog("added user -> {$user['username']} <-");
-				}
-			}
-			if ($countold == get_user_count()) {
-				$this->impSuccess = true;
-			}
-			else {
-				$this->impSuccess = false;
-			}
-		}
-
-		if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
-			$this->msgSuccess = false;
-		}
-		else {
-			$sql = "DELETE FROM ".$TBLPREFIX."messages";
-			$res = dbquery($sql);
-			if (!$res || DB::isError($res)) {
-				$this->errorMsg = "<span class=\"error\">Unable to update <i>Messages</i> table.</span><br />\n";
-				$this->msgSuccess = false;
-				return;
-			}
-			$messages = array();
-			$fp = fopen($INDEX_DIRECTORY."messages.dat", "rb");
-			$mstring = fread($fp, filesize($INDEX_DIRECTORY."messages.dat"));
-			fclose($fp);
-			$messages = unserialize($mstring);
-			foreach($messages as $newid => $message) {
-				$sql = "INSERT INTO ".$TBLPREFIX."messages VALUES ($newid, '".$DBCONN->escapeSimple($message["from"])."','".$DBCONN->escapeSimple($message["to"])."','".$DBCONN->escapeSimple($message["subject"])."','".$DBCONN->escapeSimple($message["body"])."','".$DBCONN->escapeSimple($message["created"])."')";
-				$res = dbquery($sql);
-				if (!$res || DB::isError($res)) {
-					$this->errorMsg = "<span class=\"error\">Unable to update <i>Messages</i> table.</span><br />\n";
-					$this->msgSuccess = false;
-					return;
-				}
-			}
-			$this->msgSuccess = true;
-		}
-
-		if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
-			$this->favSuccess = false;
-			print $pgv_lang["um_nofav"]."<br /><br />";
-		}
-		else {
-			$sql = "DELETE FROM ".$TBLPREFIX."favorites";
-			$res = dbquery($sql);
-			if (!$res || DB::isError($res)) {
-				$this->errorMsg = "<span class=\"error\">Unable to update <i>Favorites</i> table.</span><br />\n";
-				return;
-			}
-			$favorites = array();
-			$fp = fopen($INDEX_DIRECTORY."favorites.dat", "rb");
-			$mstring = fread($fp, filesize($INDEX_DIRECTORY."favorites.dat"));
-			fclose($fp);
-			$favorites = unserialize($mstring);
-
-			foreach($favorites as $newid => $favorite) {
-				$res = addFavorite($favorite);
-				if (!$res || DB::isError($res)) {
-					$this->errorMsg = "<span class=\"error\">Unable to update <i>Favorites</i> table.</span><br />\n";
-					return;
-				}
-			}
-			$this->favSuccess = true;
-		}
-
-		if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
-			$this->newsSuccess = false;
-		}
-		else {
-			$sql = "DELETE FROM ".$TBLPREFIX."news";
-			$res = dbquery($sql);
-			if (!$res) {
-				$this->errorMsg = "<span class=\"error\">Unable to update <i>News</i> table.</span><br />\n";
-				$this->newsSuccess = false;
-				return;
-			}
-			$allnews = array();
-			$fp = fopen($INDEX_DIRECTORY."news.dat", "rb");
-			$mstring = fread($fp, filesize($INDEX_DIRECTORY."news.dat"));
-			fclose($fp);
-			$allnews = unserialize($mstring);
-			foreach($allnews as $newid => $news) {
-				$res = addNews($news);
-				if (!$res) {
-					$this->errorMsg = "<span class=\"error\">Unable to update <i>News</i> table.</span><br />\n";
-					return;
-				}
-			}
-			$this->newsSuccess = true;
-		}
-
-		if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
-			$this->blockSuccess = false;
-		}
-		else {
-			$sql = "DELETE FROM ".$TBLPREFIX."blocks";
-			$res = dbquery($sql);
-			if (!$res) {
-				$this->errorMsg = "<span class=\"error\">Unable to update <i>Blocks</i> table.</span><br />\n";
-				exit;
-			}
-			$allblocks = array();
-			$fp = fopen($INDEX_DIRECTORY."blocks.dat", "rb");
-			$mstring = fread($fp, filesize($INDEX_DIRECTORY."blocks.dat"));
-			fclose($fp);
-			$allblocks = unserialize($mstring);
-			foreach($allblocks as $bid => $blocks) {
-				$username = $blocks["username"];
-				$sql = "INSERT INTO ".$TBLPREFIX."blocks VALUES ($bid, '".$DBCONN->escapeSimple($blocks["username"])."', '".$blocks["location"]."', '".$blocks["order"]."', '".$DBCONN->escapeSimple($blocks["name"])."', '".$DBCONN->escapeSimple(serialize($blocks["config"]))."')";
-				$res = dbquery($sql);
-				if (!$res || DB::isError($res)) {
-					$this->errorMsg = "<span class=\"error\">Unable to update <i>Blocks</i> table.</span><br />\n";
-					return;
-				}
-			}
-			$this->blockSuccess = true;
-		}
-	}
-}
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/usermigrate_ctrl_user.php'))
-{
-	include_once 'includes/controllers/usermigrate_ctrl_user.php';
-}
-else
-{
-	class UserMigrateController extends UserMigrateControllerRoot
-	{
-	}
-}
-$controller = new UserMigrateController();
-$controller->init();
-?>
+<?php
+/**
+ * Controller for backup and export
+ * Exports users and their data to either SQL queries (Index mode) or
+ * authenticate.php and xxxxxx.dat files (MySQL mode).
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author Boudewijn Sjouke	sjouke@...
+ * @package PhpGedView
+ * @subpackage Admin
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_USERMIGRATE_CTRL_PHP', '');
+
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_export.php');
+
+loadLangFile("pgv_confighelp");
+
+//-- make sure that they have admin status before they can use this page
+//-- otherwise have them login again
+if (strstr($_SERVER['SCRIPT_NAME'], "usermigrate_cli.php")) {
+	if (PGV_USER_IS_ADMIN || !isset($argc)) {
+		header("Location: usermigrate.php");
+		exit;
+	}
+}
+else if (!PGV_USER_IS_ADMIN) {
+	header("Location: login.php?url=usermigrate.php");
+	exit;
+}
+
+
+class UserMigrateControllerRoot extends BaseController {
+	var $proceed;
+	var $flist;
+	var $v_list;
+	var $fname;
+	var $buname;
+	var $errorMsg;
+	var $fileExists = false;
+	var $impSuccess = false;
+	var $msgSuccess = false;
+	var $favSuccess = false;
+	var $newsSuccess = false;
+	var $blockSuccess = false;
+
+	/**
+	 * constructor
+	 */
+	function UserMigrateControllerRoot() {
+		parent::BaseController();
+	}
+
+	/**
+	 * Initialize the controller and start the logic
+	 *
+	 */
+	function init() {
+		global $INDEX_DIRECTORY;
+		if (!isset($_REQUEST['proceed'])) $this->proceed = "backup";
+		else $this->proceed = $_REQUEST['proceed'];
+
+		if ($this->proceed == "backup") $this->backup();
+		else if ($this->proceed == "export") {
+			$i = 0;
+			if (file_exists($INDEX_DIRECTORY."authenticate.php")) $i = $i + 1;
+			if (file_exists($INDEX_DIRECTORY."news.dat")) $i = $i + 1;
+			if (file_exists($INDEX_DIRECTORY."messages.dat")) $i = $i + 1;
+			if (file_exists($INDEX_DIRECTORY."blocks.dat")) $i = $i + 1;
+			if (file_exists($INDEX_DIRECTORY."favorites.dat")) $i = $i + 1;
+			if ($i > 0) {
+				$this->fileExists = true;
+			}
+			else $this->proceed = "exportovr";
+		}
+		if ($this->proceed == "exportovr") {
+			if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
+			if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
+			if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
+			if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
+			if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
+			um_export($this->proceed);
+		}
+
+		if ($this->proceed == "import") {
+			$this->import();
+		}
+	}
+
+	/**
+	 * Return the page title
+	 *
+	 * @return string
+	 */
+	function getPageTitle() {
+		global $pgv_lang;
+
+		if ($this->proceed == "backup") return $pgv_lang["um_backup"];
+		else return $pgv_lang["um_header"];
+	}
+
+	/**
+	 * generate the backup zip file
+	 *
+	 */
+	function backup() {
+		global $INDEX_DIRECTORY, $GEDCOMS, $GEDCOM, $MEDIA_DIRECTORY, $SYNC_GEDCOM_FILE;
+		global $USE_MEDIA_FIREWALL, $MEDIA_FIREWALL_ROOTDIR;
+		$this->flist = array();
+
+		// Backup user information
+		if (isset($_POST["um_usinfo"])) {
+			// If in pure DB mode, we must first create new .dat files and authenticate.php
+			// First delete the old files
+			if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
+			if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
+			if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
+			if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
+			if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
+
+			// Then make the new ones
+			um_export($this->proceed);
+
+			// Make filelist for files to ZIP
+			if (file_exists($INDEX_DIRECTORY."authenticate.php")) $this->flist[] = $INDEX_DIRECTORY."authenticate.php";
+			if (file_exists($INDEX_DIRECTORY."news.dat")) $this->flist[] = $INDEX_DIRECTORY."news.dat";
+			if (file_exists($INDEX_DIRECTORY."messages.dat")) $this->flist[] = $INDEX_DIRECTORY."messages.dat";
+			if (file_exists($INDEX_DIRECTORY."blocks.dat")) $this->flist[] = $INDEX_DIRECTORY."blocks.dat";
+			if (file_exists($INDEX_DIRECTORY."favorites.dat")) $this->flist[] = $INDEX_DIRECTORY."favorites.dat";
+		}
+
+		// Backup config.php
+		if (isset($_POST["um_config"])) {
+			$this->flist[] = "config.php";
+		}
+
+		// Backup gedcoms
+		if (isset($_POST["um_gedcoms"])) {
+			foreach($GEDCOMS as $key=>$gedcom) {
+				//-- load the gedcom configuration settings
+				require(get_config_file($key));
+				//-- backup the original gedcom file
+				if (file_exists($gedcom["path"])) $this->flist[] = $gedcom["path"];
+				//else {
+					//-- recreate the GEDCOM file from the DB
+					//-- backup the DB in case of GEDCOM corruption
+					$oldged = $GEDCOM;
+					$GEDCOM = $key;
+					$gedname = $INDEX_DIRECTORY.$key.".bak";
+					$gedout = fopen(filename_decode($gedname), "wb");
+					print_gedcom('no', 'no', 'no', 'no', $gedout);
+					fclose($gedout);
+					$GEDCOM = $oldged;
+					$this->flist[] = $gedname;
+				//}
+			}
+			//-- load up the old configuration file
+			require(get_config_file($GEDCOM));
+			$this->flist[] = $INDEX_DIRECTORY."pgv_changes.php";
+		}
+
+		// Backup gedcom settings
+		if (isset($_POST["um_gedsets"])) {
+
+			// Gedcoms file
+			if (file_exists($INDEX_DIRECTORY."gedcoms.php")) $this->flist[] = $INDEX_DIRECTORY."gedcoms.php";
+
+			foreach($GEDCOMS as $key => $gedcom) {
+
+				// Config files
+				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."_conf.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."_conf.php";
+
+				// Privacy files
+				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."_priv.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."_priv.php";
+			}
+		}
+
+		// Backup logfiles and counters
+		if (isset($_POST["um_logs"])) {
+			foreach($GEDCOMS as $key => $gedcom) {
+
+				// Gedcom counters
+				if (file_exists($INDEX_DIRECTORY.$gedcom["gedcom"]."pgv_counters.php")) $this->flist[] = $INDEX_DIRECTORY.$gedcom["gedcom"]."pgv_counters.php";
+
+				// Gedcom searchlogs and changelogs
+				$dir_var = opendir ($INDEX_DIRECTORY);
+				while ($file = readdir ($dir_var)) {
+					if ((strpos($file, ".log") > 0) && ((strstr($file, "srch-".$gedcom["gedcom"]) !== false ) || (strstr($file, "ged-".$gedcom["gedcom"]) !== false ))) $this->flist[] = $INDEX_DIRECTORY.$file;
+				}
+				closedir($dir_var);
+			}
+
+			// PhpGedView logfiles
+			$dir_var = opendir ($INDEX_DIRECTORY);
+			while ($file = readdir ($dir_var)) {
+				if ((strpos($file, ".log") > 0) && (strstr($file, "pgv-") !== false )) $this->flist[] = $INDEX_DIRECTORY.$file;
+			}
+			closedir($dir_var);
+		}
+
+		// backup media files
+		if (isset($_POST["um_media"])) {
+			$dir = dir($MEDIA_DIRECTORY);
+			while(false !== ($entry = $dir->read())) {
+				if ($entry{0} != ".") {
+					if ($entry != "thumbs") $this->flist[] = $MEDIA_DIRECTORY.$entry;
+				}
+			}
+			if ($USE_MEDIA_FIREWALL) {
+				$dir = dir($MEDIA_FIREWALL_ROOTDIR.$MEDIA_DIRECTORY);
+				while(false !== ($entry = $dir->read())) {
+					if ($entry{0} != ".") {
+						if ( ($entry != "thumbs") && ($entry != "watermark") ) $this->flist[] = $MEDIA_FIREWALL_ROOTDIR.$MEDIA_DIRECTORY.$entry;
+					}
+				}
+			}
+		}
+
+		// Make the zip
+		if (count($this->flist) > 0) {
+			require_once "includes/pclzip.lib.php";
+			$this->buname = date("YmdHis").".zip";
+			$this->fname = $INDEX_DIRECTORY.$this->buname;
+			$comment = "Created by ".PGV_PHPGEDVIEW." ".PGV_VERSION_TEXT." on ".date("r").".";
+			$archive = new PclZip($this->fname);
+			//-- remove ../ from file paths when creating zip
+			$ct = preg_match("~((\.\./)+)~", $INDEX_DIRECTORY, $match);
+			$rmpath = "";
+			if ($ct>0) $rmpath = $match[1];
+				$this->v_list = $archive->create($this->flist, PCLZIP_OPT_COMMENT, $comment, PCLZIP_OPT_REMOVE_PATH, $rmpath);
+			if ($this->v_list==0) $this->errorMsg = "Error : ".$archive->errorInfo(true);
+			if (isset($_POST["um_usinfo"])) {
+				// Remove temporary files again
+				if (file_exists($INDEX_DIRECTORY."authenticate.php")) unlink($INDEX_DIRECTORY."authenticate.php");
+				if (file_exists($INDEX_DIRECTORY."news.dat")) unlink($INDEX_DIRECTORY."news.dat");
+				if (file_exists($INDEX_DIRECTORY."messages.dat")) unlink($INDEX_DIRECTORY."messages.dat");
+				if (file_exists($INDEX_DIRECTORY."blocks.dat")) unlink($INDEX_DIRECTORY."blocks.dat");
+				if (file_exists($INDEX_DIRECTORY."favorites.dat")) unlink($INDEX_DIRECTORY."favorites.dat");
+			}
+		}
+	}
+
+	/**
+	 * Import users etc. from index files
+	 *
+	 */
+	function import() {
+		global $INDEX_DIRECTORY, $TBLPREFIX, $pgv_lang, $DBCONN;
+		global $GEDCOMS, $GEDCOM;
+
+		if ((file_exists($INDEX_DIRECTORY."authenticate.php")) == false) {
+			$this->impSuccess = false;
+			return;
+		} else {
+			require $INDEX_DIRECTORY."authenticate.php";
+			$countold = count($users);
+			$sql = "DELETE FROM ".$TBLPREFIX."users";
+			$res = dbquery($sql);
+			if (!$res || DB::isERROR($res)) {
+				$this->errorMsg = "<span class=\"error\">Unable to update <i>Users</i> table.</span><br />\n";
+				$this->impSuccess = false;
+				return;
+			}
+			foreach($users as $username=>$user) {
+				if ($user["editaccount"] == "1") $user["editaccount"] = "Y";
+				else $user["editaccount"] = "N";
+				//-- make sure fields are set for v4.0 DB
+				if (!isset($user["firstname"])) {
+					if (isset($user["fullname"])) {
+						$parts = explode(' ', trim($user["fullname"]));
+						$user["lastname"] = array_pop($parts);
+						$user["firstname"] = implode(" ", $parts);
+					}
+					else {
+						$user["firstname"] = '';
+						$user["lastname"] = '';
+					}
+				}
+				if (!isset($user["comment"])) $user["comment"] = '';
+				if (!isset($user["comment_exp"])) $user["comment_exp"] = '';
+				if (!isset($user["sync_gedcom"])) $user["sync_gedcom"] = 'N';
+				if (!isset($user["relationship_privacy"])) $user["relationship_privacy"] = 'N';
+				if (!isset($user["max_relation_path"])) $user["max_relation_path"] = '2';
+				if (!isset($user["auto_accept"])) $user["auto_accept"] = 'N';
+
+				if ($user_id=create_user($user['username'], $user['password'])) {
+					set_user_setting($user_id, 'firstname',            $user["firstname"]);
+					set_user_setting($user_id, 'lastname',             $user["lastname"]);
+					set_user_setting($user_id, 'email',                $user["email"]);
+					set_user_setting($user_id, 'theme',                $user["theme"]);
+					set_user_setting($user_id, 'language',             $user["language"]);
+					set_user_setting($user_id, 'contactmethod',        $user["contactmethod"]);
+					set_user_setting($user_id, 'defaulttab',           $user["defaulttab"]);
+					set_user_setting($user_id, 'comment',              $user["comment"]);
+					set_user_setting($user_id, 'comment_exp',          $user["comment_exp"]);
+					set_user_setting($user_id, 'pwrequested',          $user["pwrequested"]);
+					set_user_setting($user_id, 'reg_timestamp',        $user["reg_timestamp"]);
+					set_user_setting($user_id, 'reg_hashcode',         $user["reg_hashcode"]);
+					set_user_setting($user_id, 'loggedin'    ,         $user["loggedin"]);
+					set_user_setting($user_id, 'sessiontime'    ,      $user["sessiontime"]);
+					set_user_setting($user_id, 'max_relation_path',    $user["max_relation_path"]);
+					set_user_setting($user_id, 'sync_gedcom',          $user["sync_gedcom"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'relationship_privacy', $user["relationship_privacy"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'auto_accept',          $user["auto_accept"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'canadmin',             $user["canadmin"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'visibleonline',        $user["visibleonline"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'editaccount',          $user["editaccount"] ? 'Y' : 'N');
+					set_user_setting($user_id, 'verified',             $user["verified"] ? 'yes' : 'no');
+					set_user_setting($user_id, 'verified_by_admin',    $user["verified_by_admin"] ? 'yes' : 'no');
+					foreach (array('gedcomid', 'rootid', 'canedit') as $var) {
+						if ($user[$var]) {
+							foreach (unserialize(stripslashes($user[$var])) as $gedcom=>$id) {
+								set_user_gedcom_setting($user_id, $gedcom, $var, $id);
+							}
+						}
+					}
+					AddToLog("added user -> {$user['username']} <-");
+				}
+			}
+			if ($countold == get_user_count()) {
+				$this->impSuccess = true;
+			}
+			else {
+				$this->impSuccess = false;
+			}
+		}
+
+		if ((file_exists($INDEX_DIRECTORY."messages.dat")) == false) {
+			$this->msgSuccess = false;
+		}
+		else {
+			$sql = "DELETE FROM ".$TBLPREFIX."messages";
+			$res = dbquery($sql);
+			if (!$res || DB::isError($res)) {
+				$this->errorMsg = "<span class=\"error\">Unable to update <i>Messages</i> table.</span><br />\n";
+				$this->msgSuccess = false;
+				return;
+			}
+			$messages = array();
+			$fp = fopen($INDEX_DIRECTORY."messages.dat", "rb");
+			$mstring = fread($fp, filesize($INDEX_DIRECTORY."messages.dat"));
+			fclose($fp);
+			$messages = unserialize($mstring);
+			foreach($messages as $newid => $message) {
+				$sql = "INSERT INTO ".$TBLPREFIX."messages VALUES ($newid, '".$DBCONN->escapeSimple($message["from"])."','".$DBCONN->escapeSimple($message["to"])."','".$DBCONN->escapeSimple($message["subject"])."','".$DBCONN->escapeSimple($message["body"])."','".$DBCONN->escapeSimple($message["created"])."')";
+				$res = dbquery($sql);
+				if (!$res || DB::isError($res)) {
+					$this->errorMsg = "<span class=\"error\">Unable to update <i>Messages</i> table.</span><br />\n";
+					$this->msgSuccess = false;
+					return;
+				}
+			}
+			$this->msgSuccess = true;
+		}
+
+		if ((file_exists($INDEX_DIRECTORY."favorites.dat")) == false) {
+			$this->favSuccess = false;
+			print $pgv_lang["um_nofav"]."<br /><br />";
+		}
+		else {
+			$sql = "DELETE FROM ".$TBLPREFIX."favorites";
+			$res = dbquery($sql);
+			if (!$res || DB::isError($res)) {
+				$this->errorMsg = "<span class=\"error\">Unable to update <i>Favorites</i> table.</span><br />\n";
+				return;
+			}
+			$favorites = array();
+			$fp = fopen($INDEX_DIRECTORY."favorites.dat", "rb");
+			$mstring = fread($fp, filesize($INDEX_DIRECTORY."favorites.dat"));
+			fclose($fp);
+			$favorites = unserialize($mstring);
+
+			foreach($favorites as $newid => $favorite) {
+				$res = addFavorite($favorite);
+				if (!$res || DB::isError($res)) {
+					$this->errorMsg = "<span class=\"error\">Unable to update <i>Favorites</i> table.</span><br />\n";
+					return;
+				}
+			}
+			$this->favSuccess = true;
+		}
+
+		if ((file_exists($INDEX_DIRECTORY."news.dat")) == false) {
+			$this->newsSuccess = false;
+		}
+		else {
+			$sql = "DELETE FROM ".$TBLPREFIX."news";
+			$res = dbquery($sql);
+			if (!$res) {
+				$this->errorMsg = "<span class=\"error\">Unable to update <i>News</i> table.</span><br />\n";
+				$this->newsSuccess = false;
+				return;
+			}
+			$allnews = array();
+			$fp = fopen($INDEX_DIRECTORY."news.dat", "rb");
+			$mstring = fread($fp, filesize($INDEX_DIRECTORY."news.dat"));
+			fclose($fp);
+			$allnews = unserialize($mstring);
+			foreach($allnews as $newid => $news) {
+				$res = addNews($news);
+				if (!$res) {
+					$this->errorMsg = "<span class=\"error\">Unable to update <i>News</i> table.</span><br />\n";
+					return;
+				}
+			}
+			$this->newsSuccess = true;
+		}
+
+		if ((file_exists($INDEX_DIRECTORY."blocks.dat")) == false) {
+			$this->blockSuccess = false;
+		}
+		else {
+			$sql = "DELETE FROM ".$TBLPREFIX."blocks";
+			$res = dbquery($sql);
+			if (!$res) {
+				$this->errorMsg = "<span class=\"error\">Unable to update <i>Blocks</i> table.</span><br />\n";
+				exit;
+			}
+			$allblocks = array();
+			$fp = fopen($INDEX_DIRECTORY."blocks.dat", "rb");
+			$mstring = fread($fp, filesize($INDEX_DIRECTORY."blocks.dat"));
+			fclose($fp);
+			$allblocks = unserialize($mstring);
+			foreach($allblocks as $bid => $blocks) {
+				$username = $blocks["username"];
+				$sql = "INSERT INTO ".$TBLPREFIX."blocks VALUES ($bid, '".$DBCONN->escapeSimple($blocks["username"])."', '".$blocks["location"]."', '".$blocks["order"]."', '".$DBCONN->escapeSimple($blocks["name"])."', '".$DBCONN->escapeSimple(serialize($blocks["config"]))."')";
+				$res = dbquery($sql);
+				if (!$res || DB::isError($res)) {
+					$this->errorMsg = "<span class=\"error\">Unable to update <i>Blocks</i> table.</span><br />\n";
+					return;
+				}
+			}
+			$this->blockSuccess = true;
+		}
+	}
+}
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/usermigrate_ctrl_user.php'))
+{
+	include_once 'includes/controllers/usermigrate_ctrl_user.php';
+}
+else
+{
+	class UserMigrateController extends UserMigrateControllerRoot
+	{
+	}
+}
+
+?>

Index: source_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/source_ctrl.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- source_ctrl.php	7 Jul 2008 17:57:40 -0000	1.4
+++ source_ctrl.php	30 Apr 2009 19:09:48 -0000	1.5
@@ -1,363 +1,343 @@
-<?php
-/**
- * Controller for the source page view
- * 
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005	PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * Initialization
- */
-require_once( '../bit_setup_inc.php' );
-
-// Is package installed and enabled
-$gBitSystem->verifyPackage( 'phpgedview' );
-
-include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
-
-$gGedcom = new BitGEDCOM();
-
-// leave manual config until we can move it to bitweaver table 
-require_once("config.php");
-require_once('includes/functions_print_facts.php');
-require_once('includes/controllers/basecontrol.php');
-require_once('includes/source_class.php');
-require_once('includes/menu.php');
-
-$nonfacts = array();
-/**
- * Main controller class for the source page.
- */
-class SourceControllerRoot extends BaseController {
-	var $sid;
-	var $show_changes = "yes";
-	var $action = "";
-	/* @var Source */
-	var $source = null;
-	var $uname = "";
-	var $diffsource = null;
-	var $accept_success = false;
-	var $canedit = false;
-	
-	/**
-	 * constructor
-	 */
-	function SourceRootController() {
-		parent::BaseController();
-	}
-	
-	/**
-	 * initialize the controller
-	 */
-	function init() {
-		global $pgv_lang, $CONTACT_EMAIL, $GEDCOM, $pgv_changes;
-		
-		//-- keep the time of this access to help with concurrent edits
-		$_SESSION['last_access_time'] = time();
-		
-		if (!empty($_REQUEST["show_changes"])) $this->show_changes = $_REQUEST["show_changes"];
-		if (!empty($_REQUEST["action"])) $this->action = $_REQUEST["action"];
-		if (!empty($_REQUEST["sid"])) $this->sid = strtoupper($_REQUEST["sid"]);
-		$this->sid = clean_input($this->sid);
-		
-		$sourcerec = find_source_record($this->sid);
-		if (!$sourcerec) $sourcerec = "0 @".$this->sid."@ SOUR\r\n";
-		
-		$this->source = new Source($sourcerec);
-		
-		if (!$this->source->canDisplayDetails()) {
-			print_header($pgv_lang["private"]." ".$pgv_lang["source_info"]);
-			print_privacy_error($CONTACT_EMAIL);
-			print_footer();
-			exit;
-		}
-		
-		$this->uname = PGV_USER_NAME;
-		
-		//-- perform the desired action
-		switch($this->action) {
-			case "addfav":
-				$this->addFavorite();
-				break;
-			case "accept":
-				$this->acceptChanges();
-				break;
-			case "undo":
-				$this->source->undoChange();
-				break;
-		}
-		
-		//-- check for the user
-		//-- if the user can edit and there are changes then get the new changes
-		if ($this->show_changes=="yes" && PGV_USER_CAN_EDIT && isset($pgv_changes[$this->sid."_".$GEDCOM])) {
-			$newrec = find_updated_record($this->sid);
-			$this->diffsource = new Source($newrec);
-			$this->diffsource->setChanged(true);
-			$sourcerec = $newrec;
-		}
-		
-		if ($this->source->canDisplayDetails()) {
-			$this->canedit = userCanEdit($this->uname);
-		}
-		
-		if ($this->show_changes=="yes" && $this->canedit) {
-			$this->source->diffMerge($this->diffsource);
-		}
-	}
-	
-	/**
-	 * Add a new favorite for the action user
-	 */
-	function addFavorite() {
-		global $GEDCOM;
-		if (empty($this->uname)) return;
-		if (!empty($_REQUEST["gid"])) {
-			$gid = strtoupper($_REQUEST["gid"]);
-			$indirec = find_source_record($gid);
-			if ($indirec) {
-				$favorite = array();
-				$favorite["username"] = $this->uname;
-				$favorite["gid"] = $gid;
-				$favorite["type"] = "SOUR";
-				$favorite["file"] = $GEDCOM;
-				$favorite["url"] = "";
-				$favorite["note"] = "";
-				$favorite["title"] = "";
-				addFavorite($favorite);
-			}
-		}
-	}
-	/**
-	 * Accept any edit changes into the database
-	 * Also update the indirec we will use to generate the page
-	 */
-	function acceptChanges() {
-		global $GEDCOM;
-		
-		if (!PGV_USER_CAN_ACCEPT) return;
-		require_once("includes/functions_import.php");
-		if (accept_changes($this->sid."_".$GEDCOM)) {
-			$this->show_changes="no";
-			$this->accept_success=true;
-			$indirec = find_source_record($this->sid);
-			//-- check if we just deleted the record and redirect to index
-			if (empty($indirec)) {
-				header("Location: index.php?ctype=gedcom");
-				exit;
-			}
-			$this->source = new Source($indirec);
-		}
-	}
-	
-	/**
-	 * get the title for this page
-	 * @return string
-	 */
-	function getPageTitle() {
-		global $pgv_lang;
-		return $this->source->getTitle()." - ".$this->sid." - ".$pgv_lang["source_info"];
-	}
-	/**
-	 * check if use can edit this person
-	 * @return boolean
-	 */
-	function userCanEdit() {
-		return $this->canedit;
-	}
-	
-	/**
-	 * get edit menut
-	 * @return Menu
-	 */
-	function &getEditMenu() {
-		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang, $pgv_changes;
-		global $SHOW_GEDCOM_RECORD;
-		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
-		else $ff="";
-		
-		if (!$this->userCanEdit()) {
-			$tempvar = false;
-			return $tempvar;
-		}
-		
-		// edit source menu
-		$menu = new Menu($pgv_lang['edit_source']);
-		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) 
-			$menu->addOnclick('return edit_raw(\''.$this->sid.'\');');
-		if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-
-		// edit source / edit_raw
-		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
-			$submenu = new Menu($pgv_lang['edit_raw']);
-			$submenu->addOnclick("return edit_raw('".$this->sid."');");
-			if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-			$menu->addSubmenu($submenu);
-		}
-		
-		// edit source / delete_source
-		$submenu = new Menu($pgv_lang['delete_source']);
-		$submenu->addOnclick("if (confirm('".$pgv_lang["confirm_delete_source"]."')) return deletesource('".$this->sid."'); else return false;");
-		if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-			$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-		$menu->addSubmenu($submenu);
-
-		if (isset($pgv_changes[$this->sid.'_'.$GEDCOM]))
-		{
-			// edit_sour / seperator
-			$submenu = new Menu();
-			$submenu->isSeperator();
-			$menu->addSubmenu($submenu);
-
-			// edit_sour / show/hide changes
-			if ($this->show_changes == 'no')
-			{
-				$submenu = new Menu($pgv_lang['show_changes'], 'source.php?sid='.$this->sid.'&amp;show_changes=yes');
-				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-			}
-			else
-			{
-				$submenu = new Menu($pgv_lang['hide_changes'], 'source.php?sid='.$this->sid.'&amp;show_changes=no');
-				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-			}
-
-			if (PGV_USER_CAN_ACCEPT)
-			{
-				// edit_source / accept_all
-				$submenu = new Menu($pgv_lang["undo_all"], "source.php?sid=".$this->sid."&amp;action=undo");
-				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-				$menu->addSubmenu($submenu);
-				$submenu = new Menu($pgv_lang['accept_all'], 'source.php?sid='.$this->sid.'&amp;action=accept');
-				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
-					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-			}
-		}
-		return $menu;
-	}
-	
-	/**
-	 * get the other menu
-	 * @return Menu
-	 */
-	function &getOtherMenu() {
-		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang;
-		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;
-		
-		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
-		else $ff="";
-		
-		if (!$this->source->canDisplayDetails() || (!$SHOW_GEDCOM_RECORD && $ENABLE_CLIPPINGS_CART < PGV_USER_ACCESS_LEVEL)) {
-			$tempvar = false;
-			return $tempvar;
-		}
-		
-			// other menu
-		$menu = new Menu($pgv_lang['other']);
-		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
-		if ($SHOW_GEDCOM_RECORD)
-		{
-			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
-			if ($this->show_changes == 'yes'  && $this->userCanEdit())
-			{
-				$menu->addLink("javascript:show_gedcom_record('new');");
-			}
-			else
-			{
-				$menu->addLink("javascript:show_gedcom_record();");
-			}
-		}
-		else
-		{
-			if (!empty($PGV_IMAGES["clippings"]["small"]))
-				$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
-			$menu->addLink('clippings.php?action=add&amp;id='.$this->sid.'&amp;type=sour');
-		}
-		if ($SHOW_GEDCOM_RECORD)
-		{
-				// other / view_gedcom
-				$submenu = new Menu($pgv_lang['view_gedcom']);
-				if ($this->show_changes == 'yes' && $this->userCanEdit())
-				{
-					$submenu->addLink("javascript:show_gedcom_record('new');");
-				}
-				else
-				{
-					$submenu->addLink("javascript:show_gedcom_record();");
-				}
-				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-		}
-		if ($ENABLE_CLIPPINGS_CART >= PGV_USER_ACCESS_LEVEL)
-		{
-				// other / add_to_cart
-				$submenu = new Menu($pgv_lang['add_to_cart'], 'clippings.php?action=add&amp;id='.$this->sid.'&amp;type=sour');
-				if (!empty($PGV_IMAGES["clippings"]["small"]))
-					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-		}
-		if ($this->source->canDisplayDetails() && !empty($this->uname))
-		{
-				// other / add_to_my_favorites
-				$submenu = new Menu($pgv_lang['add_to_my_favorites'], 'source.php?action=addfav&amp;sid='.$this->sid.'&amp;gid='.$this->sid);
-				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
-				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
-				$menu->addSubmenu($submenu);
-		}
-		return $menu;
-	}
-}
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/source_ctrl_user.php'))
-{
-	include_once 'includes/controllers/source_ctrl_user.php';
-}
-else
-{
-	class SourceController extends SourceControllerRoot
-	{
-	}
-}
-$controller = new SourceController();
-$controller->init();
-?>
+<?php
+/**
+* Controller for the source page view
+*
+* phpGedView: Genealogy Viewer
+* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+* @package PhpGedView
+* @subpackage Charts
+* @version $Id$
+*/
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_SOURCE_CTRL_PHP', '');
+
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_print_facts.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_source.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_menu.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_import.php');
+
+$nonfacts = array();
+/**
+* Main controller class for the source page.
+*/
+class SourceControllerRoot extends BaseController {
+	var $sid;
+	/* @var Source */
+	var $source = null;
+	var $uname = "";
+	var $diffsource = null;
+	var $accept_success = false;
+	var $canedit = false;
+
+	/**
+	* constructor
+	*/
+	function SourceRootController() {
+		parent::BaseController();
+	}
+
+	/**
+	* initialize the controller
+	*/
+	function init() {
+		global $pgv_lang, $CONTACT_EMAIL, $GEDCOM, $pgv_changes;
+
+		$this->sid = safe_GET_xref('sid');
+
+		$sourcerec = find_source_record($this->sid);
+		if (!$sourcerec) $sourcerec = "0 @".$this->sid."@ SOUR\n";
+
+		$this->source = new Source($sourcerec);
+		$this->source->ged_id=PGV_GED_ID; // This record is from a file
+
+		if (!$this->source->canDisplayDetails()) {
+			print_header($pgv_lang["private"]." ".$pgv_lang["source_info"]);
+			print_privacy_error($CONTACT_EMAIL);
+			print_footer();
+			exit;
+		}
+
+		$this->uname = PGV_USER_NAME;
+
+		//-- perform the desired action
+		switch($this->action) {
+			case "addfav":
+				$this->addFavorite();
+				break;
+			case "accept":
+				$this->acceptChanges();
+				break;
+			case "undo":
+				$this->source->undoChange();
+				break;
+		}
+
+		//-- check for the user
+		//-- if the user can edit and there are changes then get the new changes
+		if ($this->show_changes && PGV_USER_CAN_EDIT && isset($pgv_changes[$this->sid."_".$GEDCOM])) {
+			$newrec = find_updated_record($this->sid);
+			$this->diffsource = new Source($newrec);
+			$this->diffsource->setChanged(true);
+			$sourcerec = $newrec;
+		}
+
+		if ($this->source->canDisplayDetails()) {
+			$this->canedit = PGV_USER_CAN_EDIT;
+		}
+
+		if ($this->show_changes && $this->canedit) {
+			$this->source->diffMerge($this->diffsource);
+		}
+	}
+
+	/**
+	* Add a new favorite for the action user
+	*/
+	function addFavorite() {
+		global $GEDCOM;
+		if (empty($this->uname)) return;
+		if (!empty($_REQUEST["gid"])) {
+			$gid = strtoupper($_REQUEST["gid"]);
+			$indirec = find_source_record($gid);
+			if ($indirec) {
+				$favorite = array();
+				$favorite["username"] = $this->uname;
+				$favorite["gid"] = $gid;
+				$favorite["type"] = "SOUR";
+				$favorite["file"] = $GEDCOM;
+				$favorite["url"] = "";
+				$favorite["note"] = "";
+				$favorite["title"] = "";
+				addFavorite($favorite);
+			}
+		}
+	}
+	/**
+	* Accept any edit changes into the database
+	* Also update the indirec we will use to generate the page
+	*/
+	function acceptChanges() {
+		global $GEDCOM;
+
+		if (!PGV_USER_CAN_ACCEPT) return;
+		if (accept_changes($this->sid."_".$GEDCOM)) {
+			$this->show_changes=false;
+			$this->accept_success=true;
+			$indirec = find_source_record($this->sid);
+			//-- check if we just deleted the record and redirect to index
+			if (empty($indirec)) {
+				header("Location: index.php?ctype=gedcom");
+				exit;
+			}
+			$this->source = new Source($indirec);
+		}
+	}
+
+	/**
+	* get the title for this page
+	* @return string
+	*/
+	function getPageTitle() {
+		global $pgv_lang;
+		return $this->source->getFullName()." - ".$this->sid." - ".$pgv_lang["source_info"];
+	}
+	/**
+	* check if use can edit this person
+	* @return boolean
+	*/
+	function userCanEdit() {
+		return $this->canedit;
+	}
+
+	/**
+	* get edit menut
+	* @return Menu
+	*/
+	function &getEditMenu() {
+		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang, $pgv_changes;
+		global $SHOW_GEDCOM_RECORD;
+		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
+		else $ff="";
+
+		if (!$this->userCanEdit()) {
+			$tempvar = false;
+			return $tempvar;
+		}
+
+		// edit source menu
+		$menu = new Menu($pgv_lang['edit_source']);
+		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN)
+			$menu->addOnclick('return edit_source(\''.$this->sid.'\');');
+		if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
+
+		// edit source / edit_raw
+		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
+			$submenu = new Menu($pgv_lang['edit_raw']);
+			$submenu->addOnclick("return edit_raw('".$this->sid."');");
+			if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+			$menu->addSubmenu($submenu);
+		}
+
+		// edit source / delete_source
+		$submenu = new Menu($pgv_lang['delete_source']);
+		$submenu->addOnclick("if (confirm('".$pgv_lang["confirm_delete_source"]."')) return deletesource('".$this->sid."'); else return false;");
+		if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+			$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+		$menu->addSubmenu($submenu);
+
+		if (isset($pgv_changes[$this->sid.'_'.$GEDCOM]))
+		{
+			// edit_sour / separator
+			$submenu = new Menu();
+			$submenu->isSeparator();
+			$menu->addSubmenu($submenu);
+
+			// edit_sour / show/hide changes
+			if (!$this->show_changes)
+			{
+				$submenu = new Menu($pgv_lang['show_changes'], encode_url("source.php?sid={$this->sid}&show_changes=yes"));
+				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+			}
+			else
+			{
+				$submenu = new Menu($pgv_lang['hide_changes'], encode_url("source.php?sid={$this->sid}&show_changes=no"));
+				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+			}
+
+			if (PGV_USER_CAN_ACCEPT)
+			{
+				// edit_source / accept_all
+				$submenu = new Menu($pgv_lang["undo_all"], encode_url("source.php?sid={$this->sid}&action=undo"));
+				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+				$menu->addSubmenu($submenu);
+				$submenu = new Menu($pgv_lang['accept_all'], encode_url("source.php?sid={$this->sid}&action=accept"));
+				if (!empty($PGV_IMAGES["edit_sour"]["small"]))
+					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['edit_sour']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+			}
+		}
+		return $menu;
+	}
+
+	/**
+	* get the other menu
+	* @return Menu
+	*/
+	function &getOtherMenu() {
+		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang;
+		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;
+
+		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
+		else $ff="";
+
+		if (!$this->source->canDisplayDetails() || (!$SHOW_GEDCOM_RECORD && $ENABLE_CLIPPINGS_CART < PGV_USER_ACCESS_LEVEL)) {
+			$tempvar = false;
+			return $tempvar;
+		}
+
+			// other menu
+		$menu = new Menu($pgv_lang['other']);
+		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
+		if ($SHOW_GEDCOM_RECORD)
+		{
+			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
+			if ($this->show_changes && $this->userCanEdit())
+			{
+				$menu->addLink("javascript:show_gedcom_record('new');");
+			}
+			else
+			{
+				$menu->addLink("javascript:show_gedcom_record();");
+			}
+		}
+		else
+		{
+			if (!empty($PGV_IMAGES["clippings"]["small"]))
+				$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
+			$menu->addLink(encode_url("clippings.php?action=add&id={$this->sid}&type=sour"));
+		}
+		if ($SHOW_GEDCOM_RECORD)
+		{
+				// other / view_gedcom
+				$submenu = new Menu($pgv_lang['view_gedcom']);
+				if ($this->show_changes && $this->userCanEdit())
+				{
+					$submenu->addLink("javascript:show_gedcom_record('new');");
+				}
+				else
+				{
+					$submenu->addLink("javascript:show_gedcom_record();");
+				}
+				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+		}
+		if ($ENABLE_CLIPPINGS_CART >= PGV_USER_ACCESS_LEVEL)
+		{
+				// other / add_to_cart
+				$submenu = new Menu($pgv_lang['add_to_cart'], encode_url("clippings.php?action=add&id={$this->sid}&type=sour"));
+				if (!empty($PGV_IMAGES["clippings"]["small"]))
+					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+		}
+		if ($this->source->canDisplayDetails() && !empty($this->uname))
+		{
+				// other / add_to_my_favorites
+				$submenu = new Menu($pgv_lang['add_to_my_favorites'], encode_url("source.php?action=addfav&sid={$this->sid}&gid={$this->sid}"));
+				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
+				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+				$menu->addSubmenu($submenu);
+		}
+		return $menu;
+	}
+}
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/source_ctrl_user.php'))
+{
+	include_once 'includes/controllers/source_ctrl_user.php';
+}
+else
+{
+	class SourceController extends SourceControllerRoot
+	{
+	}
+}
+
+?>

--- NEW FILE: note_ctrl.php ---
<?php
/**
* Controller for the shared note page view
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2009 PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @subpackage Charts
* @version $Id: note_ctrl.php,v 1.1 2009/04/30 19:09:48 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_NOTE_CTRL_PHP', '');

require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_print_facts.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_note.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_menu.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_import.php');

$nonfacts = array();
/**
* Main controller class for the shared note page.
*/
class NoteControllerRoot extends BaseController {
	var $nid;
	/* @var Note */
	var $note = null;
	var $uname = "";
	var $diffnote = null;
	var $accept_success = false;
	var $canedit = false;

	/**
	* constructor
	*/
	function NoteRootController() {
		parent::BaseController();
	}

	/**
	* initialize the controller
	*/
	function init() {
		global $pgv_lang, $CONTACT_EMAIL, $GEDCOM, $pgv_changes;

		$this->nid = safe_GET_xref('nid');

		$noterec = find_other_record($this->nid);
		if (!$noterec) $noterec = "0 @".$this->nid."@ NOTE\n";

		$this->note = new Note($noterec);
		$this->note->ged_id=PGV_GED_ID; // This record is from a file

		if (!$this->note->canDisplayDetails()) {
			print_header($pgv_lang["private"]." ".$pgv_lang["shared_note_info"]);
			print_privacy_error($CONTACT_EMAIL);
			print_footer();
			exit;
		}

		$this->uname = PGV_USER_NAME;

		//-- perform the desired action
		switch($this->action) {
			case "addfav":
				$this->addFavorite();
				break;
			case "accept":
				$this->acceptChanges();
				break;
			case "undo":
				$this->note->undoChange();
				break;
		}

		//-- check for the user
		//-- if the user can edit and there are changes then get the new changes
		if ($this->show_changes && PGV_USER_CAN_EDIT && isset($pgv_changes[$this->nid."_".$GEDCOM])) {
			$newrec = find_updated_record($this->nid);
			$this->diffnote = new Note($newrec);
			$this->diffnote->setChanged(true);
			$noterec = $newrec;
		}

		if ($this->note->canDisplayDetails()) {
			$this->canedit = PGV_USER_CAN_EDIT;
		}

		if ($this->show_changes && $this->canedit) {
			$this->note->diffMerge($this->diffnote);
		}
	}

	/**
	* Add a new favorite for the action user
	*/
	function addFavorite() {
		global $GEDCOM;
		if (empty($this->uname)) return;
		if (!empty($_REQUEST["gid"])) {
			$gid = strtoupper($_REQUEST["gid"]);
			$indirec = find_other_record($gid);
			if ($indirec) {
				$favorite = array();
				$favorite["username"] = $this->uname;
				$favorite["gid"] = $gid;
				$favorite["type"] = "NOTE";
				$favorite["file"] = $GEDCOM;
				$favorite["url"] = "";
				$favorite["note"] = "";
				$favorite["title"] = "";
				addFavorite($favorite);
			}
		}
	}
	/**
	* Accept any edit changes into the database
	* Also update the indirec we will use to generate the page
	*/
	function acceptChanges() {
		global $GEDCOM;

		if (!PGV_USER_CAN_ACCEPT) return;
		if (accept_changes($this->nid."_".$GEDCOM)) {
			$this->show_changes=false;
			$this->accept_success=true;
			$indirec = find_other_record($this->nid);
			//-- check if we just deleted the record and redirect to index
			if (empty($indirec)) {
				header("Location: index.php?ctype=gedcom");
				exit;
			}
			$this->note = new Note($indirec);
		}
	}

	/**
	* get the title for this page
	* @return string
	*/
	function getPageTitle() {
		global $pgv_lang;
		return $this->note->getFullName()." - ".$this->nid." - ".$pgv_lang["shared_note_info"];
	}
	/**
	* check if use can edit this person
	* @return boolean
	*/
	function userCanEdit() {
		return $this->canedit;
	}

	/**
	* get edit menut
	* @return Menu
	*/
	function &getEditMenu() {
		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang, $pgv_changes;
		global $SHOW_GEDCOM_RECORD;
		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
		else $ff="";

		if (!$this->userCanEdit()) {
			$tempvar = false;
			return $tempvar;
		}

		// edit shared note menu
		$menu = new Menu($pgv_lang['edit_shared_note']);
		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN)
			$menu->addOnclick('return edit_note(\''.$this->nid.'\');');
		if (!empty($PGV_IMAGES["notes"]["small"]))
			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");

		// edit shared note / edit_raw
		if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
			$submenu = new Menu($pgv_lang['edit_raw']);
			$submenu->addOnclick("return edit_raw('".$this->nid."');");
			if (!empty($PGV_IMAGES["notes"]["small"]))
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
			$menu->addSubmenu($submenu);
		}

		// edit shared note / delete_shared note
		$submenu = new Menu($pgv_lang['delete_shared_note']);
		$submenu->addOnclick("if (confirm('".$pgv_lang["confirm_delete_shared_note"]."')) return deletenote('".$this->nid."'); else return false;");
		if (!empty($PGV_IMAGES["notes"]["small"]))
			$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
		$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
		$menu->addSubmenu($submenu);

		if (isset($pgv_changes[$this->nid.'_'.$GEDCOM]))
		{
			// edit_note / separator
			$submenu = new Menu();
			$submenu->isSeparator();
			$menu->addSubmenu($submenu);

			// edit_note / show/hide changes
			if (!$this->show_changes)
			{
				$submenu = new Menu($pgv_lang['show_changes'], encode_url("note.php?nid={$this->nid}&show_changes=yes"));
				if (!empty($PGV_IMAGES["notes"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}
			else
			{
				$submenu = new Menu($pgv_lang['hide_changes'], encode_url("note.php?nid={$this->nid}&show_changes=no"));
				if (!empty($PGV_IMAGES["notes"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}

			if (PGV_USER_CAN_ACCEPT)
			{
				// edit_shared note / accept_all
				$submenu = new Menu($pgv_lang["undo_all"], encode_url("note.php?nid={$this->nid}&action=undo"));
				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
				if (!empty($PGV_IMAGES["notes"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
				$menu->addSubmenu($submenu);
				$submenu = new Menu($pgv_lang['accept_all'], encode_url("note.php?nid={$this->nid}&action=accept"));
				if (!empty($PGV_IMAGES["notes"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['notes']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
			}
		}
		return $menu;
	}

	/**
	* get the other menu
	* @return Menu
	*/
	function &getOtherMenu() {
		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang;
		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;

		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
		else $ff="";

		if (!$this->note->canDisplayDetails() || (!$SHOW_GEDCOM_RECORD && $ENABLE_CLIPPINGS_CART < PGV_USER_ACCESS_LEVEL)) {
			$tempvar = false;
			return $tempvar;
		}

			// other menu
		$menu = new Menu($pgv_lang['other']);
		$menu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}", "submenu{$ff}");
		if ($SHOW_GEDCOM_RECORD)
		{
			$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
			if ($this->show_changes && $this->userCanEdit())
			{
				$menu->addLink("javascript:show_gedcom_record('new');");
			}
			else
			{
				$menu->addLink("javascript:show_gedcom_record();");
			}
		}
		else
		{
			if (!empty($PGV_IMAGES["clippings"]["small"]))
				$menu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
			$menu->addLink(encode_url("clippings.php?action=add&id={$this->nid}&type=note"));
		}
		if ($SHOW_GEDCOM_RECORD)
		{
				// other / view_gedcom
				$submenu = new Menu($pgv_lang['view_gedcom']);
				if ($this->show_changes && $this->userCanEdit())
				{
					$submenu->addLink("javascript:show_gedcom_record('new');");
				}
				else
				{
					$submenu->addLink("javascript:show_gedcom_record();");
				}
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		if ($ENABLE_CLIPPINGS_CART >= PGV_USER_ACCESS_LEVEL)
		{
				// other / add_to_cart
				$submenu = new Menu($pgv_lang['add_to_cart'], encode_url("clippings.php?action=add&id={$this->nid}&type=note"));
				if (!empty($PGV_IMAGES["clippings"]["small"]))
					$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['clippings']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		if ($this->note->canDisplayDetails() && !empty($this->uname))
		{
				// other / add_to_my_favorites
				$submenu = new Menu($pgv_lang['add_to_my_favorites'], encode_url("note.php?action=addfav&nid={$this->nid}&gid={$this->nid}"));
				$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
				$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
				$menu->addSubmenu($submenu);
		}
		return $menu;
	}
}
// -- end of class
//-- load a user extended class if one exists
if (file_exists('includes/controllers/note_ctrl_user.php'))
{
	include_once 'includes/controllers/note_ctrl_user.php';
}
else
{
	class NoteController extends NoteControllerRoot
	{
	}
}

?>

Index: timeline_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/timeline_ctrl.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- timeline_ctrl.php	11 Aug 2008 15:23:01 -0000	1.4
+++ timeline_ctrl.php	30 Apr 2009 19:09:48 -0000	1.5
@@ -1,340 +1,355 @@
-<?php
-/**
- * Controller for the timeline chart
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005	PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * Initialization
- */
-require_once( '../bit_setup_inc.php' );
-
-// Is package installed and enabled
-$gBitSystem->verifyPackage( 'phpgedview' );
-
-include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
-
-$gGedcom = new BitGEDCOM();
-
-// leave manual config until we can move it to bitweaver table 
-require_once("includes/functions_charts.php");
-require_once 'includes/controllers/basecontrol.php';
-require_once 'includes/person_class.php';
-/**
- * Main controller class for the timeline page.
- */
-class TimelineControllerRoot extends BaseController {
-	var $bheight = 30;
-	var $placements = array();
-	var $familyfacts = array();
-	var $indifacts = array();						// array to store the fact records in for sorting and displaying
-	var $birthyears=array();
-	var $birthmonths=array();
-	var $birthdays=array();
-	var $baseyear=0;
-	var $topyear=0;
-	var $pids = array();
-	var $people = array();
-	var $pidlinks = "";
-	var $scale = 2;
-	// GEDCOM elements that will be found but should not be displayed
-	var $nonfacts = "FAMS,FAMC,MAY,BLOB,OBJE,SEX,NAME,SOUR,NOTE,BAPL,ENDL,SLGC,SLGS,_TODO,CHAN,HUSB,WIFE,CHIL";
-	/**
-	 * constructor
-	 */
-	function TimelineRootController() {
-		parent::BaseController();
-	}
-	/**
-	 * Initialization function
-	 */
-	function init() {
-		$this->baseyear = date("Y");
-		//-- new pid
-		if (isset($_REQUEST['newpid'])) {
-			$newpid = clean_input($_REQUEST['newpid']);
-			$indirec = find_person_record($newpid);
-			if (empty($indirec)) {
-				if (stristr($newpid, "I")===false) $newpid = "I".$newpid;
-			}
-		}
-		
-		if (isset($_REQUEST['clear'])) unset($_SESSION['timeline_pids']);
-		else {
-			if (isset($_SESSION['timeline_pids'])) $this->pids = $_SESSION['timeline_pids'];
-			//-- pids array
-			if (isset($_REQUEST['pids'])){
-				$this->pids = $_REQUEST['pids'];
-			}
-		}
-		if (!is_array($this->pids)) $this->pids = array();
-		else {
-			//-- make sure that arrays are indexed by numbers
-			$this->pids = array_values($this->pids);
-		}
-		if (!empty($newpid) && !in_array($newpid, $this->pids)) $this->pids[] = $newpid;
-		if (count($this->pids)==0) $this->pids[] = check_rootid("");
-		$remove = "";
-		if (!empty($_REQUEST['remove'])) $remove = $_REQUEST['remove'];
-		//-- cleanup user input
-		$newpids = array();
-		foreach($this->pids as $key=>$value) {
-			if ($value!=$remove) {
-				$value = clean_input($value);
-				$newpids[] = $value;
-				$person = Person::getInstance($value);
-				if (!is_null($person)) $this->people[] = $person; 
-			}
-		}
-		$this->pids = $newpids;
-		$this->pidlinks = "";
-		foreach($this->people as $p=>$indi) {
-			if (!is_null($indi) && $indi->canDisplayDetails()) {
-				//-- setup string of valid pids for links
-				$this->pidlinks .= "pids[]=".$indi->getXref()."&amp;";
-				$bdate = $indi->getBirthDate();
-				if ($bdate->isOK()) {
-					$date = $bdate->MinDate();
-					$date = $date->convert_to_cal('gregorian');
-					if ($date->y) {
-						$this->birthyears [$indi->getXref()] = $date->y;
-						$this->birthmonths[$indi->getXref()] = max(1, $date->m);
-						$this->birthdays  [$indi->getXref()] = max(1, $date->d);
-					}
-				}
-				// find all the fact information
-				$facts = get_all_subrecords($indi->getGedcomRecord(), $this->nonfacts, true, false);
-				foreach($facts as $indexval => $factrec) {
-					//-- get the fact type
-					$ct = preg_match("/1 (\w+)(.*)/", $factrec, $match);
-					if ($ct > 0) {
-						$fact = trim($match[1]);
-						$desc = trim($match[2]);
-						//-- check for a date
-						if (preg_match("/2 DATE (.*)/", $factrec, $match)) {
-							$date=new GedcomDate($match[1]);
-							$date=$date->MinDate();
-							$date=$date->convert_to_cal('gregorian');
-							if ($date->y) {
-								$this->baseyear=min($this->baseyear, $date->y);
-								$this->topyear =max($this->topyear,  $date->y);
-
-								if (!is_dead_id($indi->getXref()))
-									$this->topyear=max($this->topyear, date('Y'));
-								$tfact = array();
-								$tfact["p"] = $p;
-								$tfact["pid"] = $indi->getXref();
-								$tfact[1] = $factrec;
-								$this->indifacts[] = $tfact;
-							}
-						}
-					}
-				}
-			}
-		}
-		$_SESSION['timeline_pids'] = $this->pids;
-		if (empty($_REQUEST['scale'])) {
-			$this->scale = round(($this->topyear-$this->baseyear)/20 * count($this->indifacts)/4);
-			if ($this->scale<6) $this->scale = 6;
-		}
-		else $this->scale = $_REQUEST['scale'];
-		if ($this->scale<2) $this->scale=2;
-		$this->baseyear -= 5;
-		$this->topyear += 5;
-	}
-	/**
-	 * check the privacy of the incoming people to make sure they can be shown
-	 */
-	function checkPrivacy() {
-		global $CONTACT_EMAIL;
-		$printed = false;
-		for($i=0; $i<count($this->people); $i++) {
-			if (!is_null($this->people[$i])) {
-				if (!$this->people[$i]->canDisplayDetails()) {
-					if ($this->people[$i]->canDisplayName()) {
-						print "&nbsp;<a href=\"individual.php?pid=".$this->people[$i]->getXref()."\">".PrintReady($this->people[$i]->getName())."</a>";
-						print_privacy_error($CONTACT_EMAIL);
-						print "<br />";
-						$printed = true;
-					}
-					else if (!$printed) {
-						print_privacy_error($CONTACT_EMAIL);
-						print "<br />";
-					}
-				}
-			}
-		}
-	}
-	function print_time_fact($factitem) {
-		global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION;
-		global $factarray, $pgv_lang, $PGV_IMAGE_DIR, $PGV_IMAGES, $SHOW_PEDIGREE_PLACES, $placements;
-		global $familyfacts, $GEDCOM;
-		$factrec = $factitem[1];
-		$ct = preg_match("/1 (\w+)(.*)/", $factrec, $match);
-		if ($ct > 0) {
-			$fact = trim($match[1]);
-			$desc = trim($match[2]);
-			if ($fact=="EVEN" || $fact=="FACT") {
-				$ct = preg_match("/2 TYPE (.*)/", $factrec, $match);
-				if ($ct>0) $fact = trim($match[1]);
-			}
-			$ct = preg_match("/2 DATE (.*)/", $factrec, $match);
-			if ($ct>0) {
-				//-- check if this is a family fact
-				$ct = preg_match("/1 _PGVFS @(.*)@/", $factrec, $fmatch);
-				if ($ct>0) {
-					$famid = trim($fmatch[1]);
-					//-- if we already showed this family fact then don't print it
-					if (isset($familyfacts[$famid.$fact])&&($familyfacts[$famid.$fact]!=$factitem["p"])) return;
-					$familyfacts[$famid.$fact] = $factitem["p"];
-				}
-				$gdate=new GedcomDate($match[1]);
-				$date=$gdate->MinDate();
-				$date=$date->convert_to_cal('gregorian');
-				$year  = $date->y;
-				$month = max(1, $date->m);
-				$day   = max(1, $date->d);
-				$xoffset = $basexoffset+20;
-				$yoffset = $baseyoffset+(($year-$this->baseyear) * $this->scale)-($this->scale);
-				$yoffset = $yoffset + (($month / 12) * $this->scale);
-				$yoffset = $yoffset + (($day / 30) * ($this->scale/12));
-				$yoffset = floor($yoffset);
-				$place = round($yoffset / $this->bheight);
-				$i=1;
-				$j=0;
-				$tyoffset = 0;
-				while(isset($placements[$place])) {
-					if ($i==$j) {
-						$tyoffset = $this->bheight * $i;
-						$i++;
-					}
-					else {
-						$tyoffset = -1 * $this->bheight * $j;
-						$j++;
-					}
-					$place = round(($yoffset+$tyoffset) / ($this->bheight));
-				}
-				$yoffset += $tyoffset;
-				$xoffset += abs($tyoffset);
-				$placements[$place] = $yoffset;
-
-				print "\n\t\t<div id=\"fact$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($xoffset):"right: ".($xoffset))."px; top:".($yoffset)."px; font-size: 8pt; height: ".($this->bheight)."px; \" onmousedown=\"factMD(this, '".$factcount."', ".($yoffset-$tyoffset).");\">\n";
-				print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"cursor: hand;\"><tr><td>\n";
-				print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-";
-				if ($TEXT_DIRECTION=="ltr") print "left";
-				else print "right";
-				print ": 3px;\" />\n";
-				$col = $factitem["p"] % 6;
-				print "</td><td valign=\"top\" class=\"person".$col."\">\n";
-				if (count($this->pids) > 6)print get_person_name($factitem["pid"])." - ";
-				if (isset($factarray[$fact])) print $factarray[$fact];
-				else if (isset($pgv_lang[$fact])) print $pgv_lang[$fact];
-				else print $fact;
-				print "--";
-				print $gdate->Display(false);
-				$indi=Person::GetInstance($factitem["pid"]); // TODO we already have this object somewhere....
-				$birth_date=$indi->getEstimatedBirthDate();
-				$age=get_age_at_event(GedcomDate::GetAgeGedcom($birth_date, $gdate), false);
-				if (!empty($age))
-					print " ({$pgv_lang['age']} {$age})";
-				print " {$desc}";
-				if ($SHOW_PEDIGREE_PLACES>0) {
-					$pct = preg_match("/2 PLAC (.*)/", $factrec, $match);
-					if ($pct>0) {
-						print " - ";
-						$plevels = preg_split("/,/", $match[1]);
-						for($plevel=0; $plevel<$SHOW_PEDIGREE_PLACES; $plevel++) {
-							if (!empty($plevels[$plevel])) {
-								if ($plevel>0) print ", ";
-								print PrintReady($plevels[$plevel]);
-							}
-						}
-					}
-				}
-				//-- print spouse name for marriage events
-				$ct = preg_match("/1 _PGVS @(.*)@/", $factrec, $match);
-				if ($ct>0) {
-					$spouse=$match[1];
-					if ($spouse!=="") {
-						for($p=0; $p<count($this->pids); $p++) {
-							if ($this->pids[$p]==$spouse) break;
-						}
-						if ($p==count($this->pids)) $p = $factitem["p"];
-						$col = $p % 6;
-						print " <span class=\"person$col\"> <a href=\"individual.php?pid=$spouse&amp;ged=$GEDCOM\">";
-						if (displayDetailsById($spouse)||showLivingNameById($spouse)) print get_person_name($spouse);
-						else print $pgv_lang["private"];
-						print "</a> </span>";
-					}
-				}
-				print "</td></tr></table>\n";
-				print "</div>";
-				if ($TEXT_DIRECTION=='ltr') {
-					$img = "dline2";
-					$ypos = "0%";
-				}
-				else {
-					$img = "dline";
-					$ypos = "100%";
-				}
-				$dyoffset = ($yoffset-$tyoffset)+$this->bheight/3;
-				if ($tyoffset<0) {
-					$dyoffset = $yoffset+$this->bheight/3;
-					if ($TEXT_DIRECTION=='ltr') {
-						$img = "dline";
-						$ypos = "100%";
-					}
-					else {
-						$img = "dline2";
-						$ypos = "0%";
-					}
-				}
-				//-- print the diagnal line
-				print "\n\t\t<div id=\"dbox$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+23):"right: ".($basexoffset+23))."px; top:".($dyoffset)."px; font-size: 8pt; height: ".(abs($tyoffset))."px; width: ".(abs($tyoffset))."px;";
-				print " background-image: url('".$PGV_IMAGE_DIR."/".$PGV_IMAGES[$img]["other"]."');";
-				print " background-position: 0% $ypos; \" >\n";
-				print "</div>\n";
-			}
-		}
-	}
-}
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/timeline_ctrl_user.php'))
-{
-	include_once 'includes/controllers/timeline_ctrl_user.php';
-}
-else
-{
-	class TimelineController extends TimelineControllerRoot
-	{
-	}
-}
-$controller = new TimelineController();
-$controller->init();
-?>
+<?php
+/**
+* Controller for the timeline chart
+*
+* phpGedView: Genealogy Viewer
+* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+* @package PhpGedView
+* @subpackage Charts
+* @version $Id$
+*/
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_TIMELINE_CTRL_PHP', '');
+
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_charts.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_person.php');
+/**
+* Main controller class for the timeline page.
+*/
+class TimelineControllerRoot extends BaseController {
+	var $bheight = 30;
+	var $placements = array();
+	var $familyfacts = array();
+	var $indifacts = array(); // array to store the fact records in for sorting and displaying
+	var $birthyears=array();
+	var $birthmonths=array();
+	var $birthdays=array();
+	var $baseyear=0;
+	var $topyear=0;
+	var $pids = array();
+	var $people = array();
+	var $pidlinks = "";
+	var $scale = 2;
+	// GEDCOM elements that may have DATE data, but should not be displayed
+	var $nonfacts = array("BAPL","ENDL","SLGC","SLGS","_TODO","CHAN");
+	/**
+	* constructor
+	*/
+	function TimelineRootController() {
+		parent::BaseController();
+	}
+	/**
+	* Initialization function
+	*/
+	function init() {
+		global $GEDCOM_ID_PREFIX;
+
+		$this->baseyear = date("Y");
+		//-- new pid
+		$newpid=safe_GET_xref('newpid');
+		if ($newpid) {
+			$indirec = find_person_record($newpid);
+			if (empty($indirec) && $GEDCOM_ID_PREFIX) {
+				if (stristr($newpid, $GEDCOM_ID_PREFIX)===false) $newpid = $GEDCOM_ID_PREFIX.$newpid;
+			}
+		}
+
+		if (safe_GET('clear', '1')=='1') {
+			unset($_SESSION['timeline_pids']);
+		} else {
+			if (isset($_SESSION['timeline_pids'])) $this->pids = $_SESSION['timeline_pids'];
+			//-- pids array
+			$this->pids=safe_GET_xref('pids');
+		}
+		if (!is_array($this->pids)) $this->pids = array();
+		else {
+			//-- make sure that arrays are indexed by numbers
+			$this->pids = array_values($this->pids);
+		}
+		if (!empty($newpid) && !in_array($newpid, $this->pids)) $this->pids[] = $newpid;
+		if (count($this->pids)==0) $this->pids[] = check_rootid("");
+		$remove = safe_GET_xref('remove');
+		//-- cleanup user input
+		$newpids = array();
+		foreach($this->pids as $key=>$value) {
+			if ($value!=$remove) {
+				$newpids[] = $value;
+				$person = Person::getInstance($value);
+				if (!is_null($person)) $this->people[] = $person;
+			}
+		}
+		$this->pids = $newpids;
+		$this->pidlinks = "";
+		/* @var $indi Person */
+		foreach($this->people as $p=>$indi) {
+			if (!is_null($indi) && $indi->canDisplayDetails()) {
+				//-- setup string of valid pids for links
+				$this->pidlinks .= "pids[]=".$indi->getXref()."&amp;";
+				$bdate = $indi->getBirthDate();
+				if ($bdate->isOK()) {
+					$date = $bdate->MinDate();
+					$date = $date->convert_to_cal('gregorian');
+					if ($date->y) {
+						$this->birthyears [$indi->getXref()] = $date->y;
+						$this->birthmonths[$indi->getXref()] = max(1, $date->m);
+						$this->birthdays  [$indi->getXref()] = max(1, $date->d);
+					}
+				}
+				// find all the fact information
+				$indi->add_family_facts(false);
+				foreach($indi->getIndiFacts() as $event) {
+					//-- get the fact type
+					$fact = $event->getTag();
+					if (!in_array($fact, $this->nonfacts)) {
+						//-- check for a date
+						$date = $event->getDate();
+						$date=$date->MinDate();
+						$date=$date->convert_to_cal('gregorian');
+						if ($date->y) {
+							$this->baseyear=min($this->baseyear, $date->y);
+							$this->topyear =max($this->topyear,  $date->y);
+	
+							if (!$indi->isDead())
+								$this->topyear=max($this->topyear, date('Y'));
+							$event->temp = $p;
+							//-- do not add the same fact twice (prevents marriages from being added multiple times)
+	 						if (!in_array($event, $this->indifacts, true)) $this->indifacts[] = $event;
+						}
+					}
+				}
+			}
+		}
+		$_SESSION['timeline_pids'] = $this->pids;
+		$scale=safe_GET_integer('scale', 0, 200, 0);
+		if ($scale==0) {
+			$this->scale = round(($this->topyear-$this->baseyear)/20 * count($this->indifacts)/4);
+			if ($this->scale<6) $this->scale = 6;
+		}
+		else $this->scale = $scale;
+		if ($this->scale<2) $this->scale=2;
+		$this->baseyear -= 5;
+		$this->topyear += 5;
+	}
+	/**
+	* check the privacy of the incoming people to make sure they can be shown
+	*/
+	function checkPrivacy() {
+		global $CONTACT_EMAIL;
+		$printed = false;
+		for($i=0; $i<count($this->people); $i++) {
+			if (!is_null($this->people[$i])) {
+				if (!$this->people[$i]->canDisplayDetails()) {
+					if ($this->people[$i]->canDisplayName()) {
+						print "&nbsp;<a href=\"".encode_url($this->people[$i]->getLinkUrl())."\">".PrintReady($this->people[$i]->getFullName())."</a>";
+						print_privacy_error($CONTACT_EMAIL);
+						print "<br />";
+						$printed = true;
+					}
+					else if (!$printed) {
+						print_privacy_error($CONTACT_EMAIL);
+						print "<br />";
+					}
+				}
+			}
+		}
+	}
+
+	function print_time_fact($event) {
+		global $basexoffset, $baseyoffset, $factcount, $TEXT_DIRECTION;
+		global $factarray, $pgv_lang, $lang_short_cut, $LANGUAGE, $PGV_IMAGE_DIR, $PGV_IMAGES, $SHOW_PEDIGREE_PLACES, $placements;
+		global $familyfacts, $GEDCOM;
+		/* @var $event Event */
+		$factrec = $event->getGedComRecord();
+			$fact = $event->getTag();
+			$desc = $event->getDetail();
+			if ($fact=="EVEN" || $fact=="FACT") {
+				$fact = $event->getType();
+			}
+				//-- check if this is a family fact
+				$famid = $event->getFamilyId();
+				if ($famid!=null) {
+					//-- if we already showed this family fact then don't print it
+					if (isset($familyfacts[$famid.$fact])&&($familyfacts[$famid.$fact]!=$event->temp)) return;
+					$familyfacts[$famid.$fact] = $event->temp;
+				}
+				$gdate=$event->getDate();
+				$date=$gdate->MinDate();
+				$date=$date->convert_to_cal('gregorian');
+				$year  = $date->y;
+				$month = max(1, $date->m);
+				$day   = max(1, $date->d);
+				$xoffset = $basexoffset+20;
+				$yoffset = $baseyoffset+(($year-$this->baseyear) * $this->scale)-($this->scale);
+				$yoffset = $yoffset + (($month / 12) * $this->scale);
+				$yoffset = $yoffset + (($day / 30) * ($this->scale/12));
+				$yoffset = floor($yoffset);
+				$place = round($yoffset / $this->bheight);
+				$i=1;
+				$j=0;
+				$tyoffset = 0;
+				while(isset($placements[$place])) {
+					if ($i==$j) {
+						$tyoffset = $this->bheight * $i;
+						$i++;
+					}
+					else {
+						$tyoffset = -1 * $this->bheight * $j;
+						$j++;
+					}
+					$place = round(($yoffset+$tyoffset) / ($this->bheight));
+				}
+				$yoffset += $tyoffset;
+				$xoffset += abs($tyoffset);
+				$placements[$place] = $yoffset;
+
+				print "\n\t\t<div id=\"fact$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($xoffset):"right: ".($xoffset))."px; top:".($yoffset)."px; font-size: 8pt; height: ".($this->bheight)."px; \" onmousedown=\"factMD(this, '".$factcount."', ".($yoffset-$tyoffset).");\">\n";
+				print "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"cursor: hand;\"><tr><td>\n";
+				print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" name=\"boxline$factcount\" id=\"boxline$factcount\" height=\"3\" align=\"left\" hspace=\"0\" width=\"10\" vspace=\"0\" alt=\"\" style=\"padding-";
+				if ($TEXT_DIRECTION=="ltr") print "left";
+				else print "right";
+				print ": 3px;\" />\n";
+				$col = $event->temp % 6;
+				print "</td><td valign=\"top\" class=\"person".$col."\">\n";
+				if (count($this->pids) > 6) print $event->getParentObject()->getFullName()." - ";
+				$indi=$event->getParentObject();
+				if ($fact=="_AKAN" || $fact=="_AKA" || $fact=="ALIA" || $fact == "_INTE") {
+					// Allow special processing for different languages
+					$func="fact_AKA_localisation_{$lang_short_cut[$LANGUAGE]}";
+					if (function_exists($func) && get_class($indi)=="Person") {
+						// Localise the facts
+						$func($fact, $indi->getXref());
+						print $factarray[$fact];
+					}
+					else print $event->getLabel();
+				}
+				else print $event->getLabel();
+				print " -- ";
+				if (get_class($indi)=="Person") {
+					print format_fact_date($event);
+				}
+				if (get_class($indi)=="Family") {
+					print $gdate->Display(false);
+					$family=$indi;
+					$husbid=$family->getHusbId();
+					$wifeid=$family->getWifeId();
+					//-- Retrieve husband and wife age
+					for($p=0; $p<count($this->pids); $p++) {
+						if ($this->pids[$p]==$husbid) {
+							$husb=$family->getHusband();
+							if (is_null($husb)) $husb = new Person('');
+							$hdate=$husb->getBirthDate();
+							if ($hdate->isOK()) $ageh=get_age_at_event(GedcomDate::GetAgeGedcom($hdate, $gdate), false);
+						}
+						else if ($this->pids[$p]==$wifeid) {
+							$wife=$family->getWife();
+							if (is_null($wife)) $wife = new Person('');
+							$wdate=$wife->getBirthDate();
+							if ($wdate->isOK()) $agew=get_age_at_event(GedcomDate::GetAgeGedcom($wdate, $gdate), false);
+						}
+					}
+					if (!empty($ageh) && $ageh > 0)
+						if (empty($agew)) print '<span class="age"> '.PrintReady("({$pgv_lang["age"]} {$ageh})").'</span>';
+						else print '<span class="age"> '.PrintReady("({$pgv_lang["husb_age"]} {$ageh},").' ';
+					if (!empty($agew) && $agew > 0)
+						if (empty($ageh)) print '<span class="age"> '.PrintReady("({$pgv_lang["age"]} {$agew})").'</span>';
+						else print PrintReady("{$pgv_lang["wife_age"]} {$agew})").'</span>';
+				}
+				print " ".PrintReady($desc);
+				if ($SHOW_PEDIGREE_PLACES>0) {
+					$place = $event->getPlace();
+					if ($place!=null) {
+						if ($desc!=null) print " - ";
+						$plevels = explode(',', $place);
+						for($plevel=0; $plevel<$SHOW_PEDIGREE_PLACES; $plevel++) {
+							if (!empty($plevels[$plevel])) {
+								if ($plevel>0) print ", ";
+								print PrintReady($plevels[$plevel]);
+							}
+						}
+					}
+				}
+				//-- print spouse name for marriage events
+				$spouse = Person::getInstance($event->getSpouseId());
+				if ($spouse) {
+					for($p=0; $p<count($this->pids); $p++) {
+						if ($this->pids[$p]==$spouse->getXref()) break;
+					}
+					if ($p==count($this->pids)) $p = $event->temp;
+					$col = $p % 6;
+					if ($spouse->getXref()!=$this->pids[$p]) {
+						echo ' <a href="', $spouse->getLinkUrl(), '">', $spouse->getFullName(), '</a>';
+					}
+					else {
+						$ct = preg_match("/2 _PGVFS @(.*)@/", $factrec, $match);
+						if ($ct>0) {
+							print " <a href=\"".encode_url("family.php?pid={$match[1]}&ged={$GEDCOM}")."\">";
+							if (displayDetailsById($match[1])||showLivingNameById($match[1])) print $event->getParentObject()->getFullName();
+							else print $pgv_lang["private"];
+							print "</a>";
+						}
+					}
+				}
+				print "</td></tr></table>\n";
+				print "</div>";
+				if ($TEXT_DIRECTION=='ltr') {
+					$img = "dline2";
+					$ypos = "0%";
+				}
+				else {
+					$img = "dline";
+					$ypos = "100%";
+				}
+				$dyoffset = ($yoffset-$tyoffset)+$this->bheight/3;
+				if ($tyoffset<0) {
+					$dyoffset = $yoffset+$this->bheight/3;
+					if ($TEXT_DIRECTION=='ltr') {
+						$img = "dline";
+						$ypos = "100%";
+					}
+					else {
+						$img = "dline2";
+						$ypos = "0%";
+					}
+				}
+				//-- print the diagnal line
+				print "\n\t\t<div id=\"dbox$factcount\" style=\"position:absolute; ".($TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+23):"right: ".($basexoffset+23))."px; top:".($dyoffset)."px; font-size: 8pt; height: ".(abs($tyoffset))."px; width: ".(abs($tyoffset))."px;";
+				print " background-image: url('".$PGV_IMAGE_DIR."/".$PGV_IMAGES[$img]["other"]."');";
+				print " background-position: 0% $ypos; \" >\n";
+				print "</div>\n";
+	}
+}
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/timeline_ctrl_user.php'))
+{
+	include_once 'includes/controllers/timeline_ctrl_user.php';
+}
+else
+{
+	class TimelineController extends TimelineControllerRoot
+	{
+	}
+}
+
+?>

Index: media_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/media_ctrl.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- media_ctrl.php	7 Jul 2008 17:57:40 -0000	1.1
+++ media_ctrl.php	30 Apr 2009 19:09:48 -0000	1.2
@@ -1,466 +1,451 @@
-<?php
-/**
- * Controller for the Media Menu
- * Extends the IndividualController class and overrides the getEditMenu() function
- * Menu options are changed to apply to a media object instead of an individual
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-require_once('includes/controllers/individual_ctrl.php');
-require_once("includes/media_class.php");
-
-class MediaControllerRoot extends IndividualController{
-
-	var $mediaobject;
-
-	function init() {
-		global $MEDIA_DIRECTORY, $USE_MEDIA_FIREWALL;
-		if (isset($_REQUEST['filename'])) $filename = $_REQUEST['filename'];
-		if (isset($_REQUEST['mid'])) $mid = $_REQUEST['mid'];
-		if (!empty($_REQUEST["show_changes"])) $this->show_changes = $_REQUEST["show_changes"];
-		if (!empty($_REQUEST["action"])) $this->action = $_REQUEST["action"];
-		
-		//-- keep the time of this access to help with concurrent edits
-		$_SESSION['last_access_time'] = time();
-
-		if ($USE_MEDIA_FIREWALL && empty($filename) && empty($mid)) {
-			// this section used by mediafirewall.php to determine what media file was requested
-
-			if (isset($_SERVER['REQUEST_URI'])) {
-				// NOTE: format of this server variable:
-				//   Apache: /phpGedView/media/a.jpg
-				//   IIS:    /phpGedView/mediafirewall.php?404;http://server/phpGedView/media/a.jpg
-				$requestedfile = $_SERVER['REQUEST_URI'];
-				// urldecode the request
-				$requestedfile = rawurldecode($requestedfile);
-				// make sure the requested file is in the media directory
-				if (strpos($requestedfile, $MEDIA_DIRECTORY) !== false) {
-					// strip off the pgv directory and media directory from the requested url so just the image information is left
-					$filename = substr($requestedfile, strpos($requestedfile, $MEDIA_DIRECTORY) + strlen($MEDIA_DIRECTORY) - 1);
-					// if user requested a thumbnail, lookup permissions based on the original image
-					$filename = str_replace('/thumbs', '', $filename);
-				}
-			}
-		}
-
-		//Checks to see if the File Name ($filename) exists
-		if (!empty($filename)){
-			//If the File Name ($filename) is set, then it will call the method to get the Media ID ($mid) from the File Name ($filename)
-			$mid = get_media_id_from_file($filename);
-			if (!$mid){
-				//This will set the Media ID to be false if the File given doesn't match to anything in the database
-				$mid = false;
-				// create a very basic gedcom record for this file so that the functions of the media object will work
-				// this is used by the media firewall when requesting an object that exists in the media firewall directory but not in the gedcom
-				$this->mediaobject = new Media("0 @"."0"."@ OBJE\n1 FILE ".$filename);
-			}
-		}
-	
-		//checks to see if the Media ID ($mid) is set. If the Media ID isn't set then there isn't any information avaliable for that picture the picture doesn't exist.
-		if (isset($mid) && $mid!=false){
-			$mid = clean_input($mid);
-			//This creates a Media Object from the getInstance method of the Media Class. It takes the Media ID ($mid) and creates the object.
-			$this->mediaobject = Media::getInstance($mid);
-			//This sets the controller ID to be the Media ID
-			$this->pid = $mid;
-
-			if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @".$mid."@ OBJE");
-		}
-
-		// one final test to be sure we have a media object defined
-		// ways this can happen:
-		//   if user failed to pass in a filename or mid to mediaviewer.php
-		//   if the server did not set the environmental variables correctly for the media firewall
-		//   if media firewall is being called from outside the media directory  
-		if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @"."0"."@ OBJE");
-
-		//-- perform the desired action
-		switch($this->action) {
-			case "addfav":
-				$this->addFavorite();
-				break;
-			case "accept":
-				$this->acceptChanges();
-				break;
-			case "undo":
-				$this->mediaobject->undoChange();
-				break;
-		}
-		
-		if ($this->mediaobject->canDisplayDetails()) {
-			$this->canedit = PGV_USER_CAN_EDIT;
-		}
-	}
-
-	/**
-	 * Add a new favorite for the action user
-	 */
-	function addFavorite() {
-		global $GEDCOM;
-		if (!PGV_USER_ID) {
-			return;
-		}
-		if (!empty($_REQUEST["gid"])) {
-			$gid = strtoupper($_REQUEST["gid"]);
-			$indirec = find_gedcom_record($gid);
-			if ($indirec) {
-				$favorite = array();
-				$favorite["username"] = PGV_USER_NAME;
-				$favorite["gid"] = $gid;
-				$favorite["type"] = "OBJE";
-				$favorite["file"] = $GEDCOM;
-				$favorite["url"] = "";
-				$favorite["note"] = "";
-				$favorite["title"] = "";
-				addFavorite($favorite);
-			}
-		}
-	}
-
-	/**
-	 * Accept any edit changes into the database
-	 * Also update the indirec we will use to generate the page
-	 */
-	function acceptChanges() {
-		global $GEDCOM, $medialist;
-		if (!PGV_USER_CAN_ACCEPT) return;
-		require_once("includes/functions_import.php");
-		if (accept_changes($this->pid."_".$GEDCOM)) {
-			$this->show_changes="no";
-			$this->accept_success=true;
-			//-- delete the record from the cache and refresh it
-			if (isset($medialist[$this->pid])) unset($medialist[$this->pid]);
-			$indirec = find_gedcom_record($this->pid);
-			//-- check if we just deleted the record and redirect to index
-			if (empty($indirec)) {
-				header("Location: index.php?ctype=gedcom");
-				exit;
-			}
-			$this->mediaobject = Media::getInstance($this->pid);
-		}
-		//This sets the controller ID to be the Media ID
-		if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @".$this->pid."@ OBJE");
-	}
-
-	/**
-	 * return the title of this page
-	 * @return string	the title of the page to go in the <title> tags
-	 */
-	function getPageTitle() {
-		global $pgv_lang, $GEDCOM;
-
-		if (!is_null($this->mediaobject)) {
-			$name = $this->mediaobject->getTitle();
-			return $name." - ".$this->mediaobject->getXref();
-		}
-		else return $pgv_lang["unknown"];
-	}
-
-	function canDisplayDetails() {
-		return $this->mediaobject->canDisplayDetails();
-	}
-
-	/**
-	 * get the edit menu
-	 * @return Menu
-	 */
-	function &getEditMenu() {
-		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $TOTAL_NAMES;
-		global $NAME_LINENUM, $SEX_LINENUM, $pgv_lang, $pgv_changes, $USE_QUICK_UPDATE;
-		global $SHOW_GEDCOM_RECORD;
-		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
-		else $ff="";
-		$links = get_media_relations($this->pid);
-		$linktoid = "new";
-		foreach ($links as $linktoid => $type) {
-			break;		// we're only interested in the key of the first list entry
-		}
-		//-- main edit menu
-		$menu = new Menu($pgv_lang["edit"]);
-		$click_link = "";
-		$click_link .= "window.open('addmedia.php?action=";
-		$click_link .= "editmedia&amp;pid=".$this->pid;
-		$click_link .= "&amp;linktoid=$linktoid";
-		$click_link .= "', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')";
-		$menu->addOnclick($click_link);
-		if (!empty($PGV_IMAGES["edit_indi"]["small"]))
-			$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["edit_indi"]["small"]);
-		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
-		if (PGV_USER_CAN_EDIT) {
-			//- plain edit option
-			$submenu = new Menu($pgv_lang["edit"]);
-			$click_link = "";
-			$click_link .= "window.open('addmedia.php?action=";
-			$click_link .= "editmedia&amp;pid=".$this->pid;
-			$click_link .= "&amp;linktoid=$linktoid";
-			$click_link .= "', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')";
-			$submenu->addOnclick($click_link);
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$menu->addSubmenu($submenu);
-			
-			if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
-				$submenu = new Menu($pgv_lang["edit_raw"]);
-				$submenu->addOnclick("return edit_raw('".$this->pid."');");
-				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-				$menu->addSubmenu($submenu);
-			}
-			//- end plain edit option
-			if (PGV_USER_GEDCOM_ADMIN) {
-				//- remove object option
-				$submenu = new Menu($pgv_lang["remove_object"]);
-				$submenu->addLink("media.php?action=removeobject&amp;xref=".$this->pid);
-				$submenu->addOnclick("return confirm('".$pgv_lang["confirm_remove_object"]."')");
-				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-				$menu->addSubmenu($submenu);
-			}
-
-			// main link displayed on page
-			$submenu = new Menu($pgv_lang["set_link"]." >");
-			$submenu->addOnclick("return ilinkitem('".$this->pid."','person');");
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
-//			$submenu->addFlyout('right');
-
-			$ssubmenu = new Menu($pgv_lang["to_person"]);
-			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','person');");
-			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$submenu->addSubMenu($ssubmenu);
-
-			$ssubmenu = new Menu($pgv_lang["to_family"]);
-			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','family');");
-			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$submenu->addSubMenu($ssubmenu);
-
-			$ssubmenu = new Menu($pgv_lang["to_source"]);
-			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','source');");
-			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$submenu->addSubMenu($ssubmenu);
-			$menu->addSubmenu($submenu);
-		}
-		if (isset($pgv_changes[$this->pid."_".$GEDCOM])) {
-			$menu->addSeperator();
-			if ($this->show_changes=="no") {
-				$label = $pgv_lang["show_changes"];
-				$link = "mediaviewer.php?mid=".$this->pid."&amp;show_changes=yes";
-			}
-			else {
-				$label = $pgv_lang["hide_changes"];
-				$link = "mediaviewer.php?mid=".$this->pid."&amp;show_changes=no";
-			}
-			$submenu = new Menu($label, $link);
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$menu->addSubmenu($submenu);
-
-			if (PGV_USER_CAN_ACCEPT) {
-				$submenu = new Menu($pgv_lang["undo_all"], "mediaviewer.php?mid=".$this->pid."&amp;action=undo");
-				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-				$menu->addSubmenu($submenu);
-				$submenu = new Menu($pgv_lang["accept_all"], "mediaviewer.php?mid=".$this->pid."&amp;action=accept");
-				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-				$menu->addSubmenu($submenu);
-			}
-		}
-		return $menu;
-	}
-
-	/**
-	 * check if we can show the other menu
-	 * @return boolean
-	 */
-	function canShowOtherMenu() {
-		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;
-		if ($this->mediaobject->canDisplayDetails() && ($SHOW_GEDCOM_RECORD || $ENABLE_CLIPPINGS_CART>=PGV_USER_ACCESS_LEVEL))
-			return true;
-		return false;
-	}
-
-	/**
-	 * get the "other" menu
-	 * @return Menu
-	 */
-	function &getOtherMenu() {
-		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $THEME_DIR;
-		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART, $pgv_lang;
-		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
-		else $ff="";
-		//-- main other menu item
-		$menu = new Menu($pgv_lang["other"]);
-		if ($SHOW_GEDCOM_RECORD) {
-			if (!empty($PGV_IMAGES["gedcom"]["small"]))
-				$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
-			if ($this->show_changes=="yes"  && PGV_USER_CAN_EDIT)
-				$menu->addOnclick("return show_gedcom_record('new');");
-			else
-				$menu->addOnclick("return show_gedcom_record('');");
-		}
-		else {
-			if (!empty($PGV_IMAGES["clippings"]["small"]))
-				$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["clippings"]["small"]);
-			$menu->addLink("clippings.php?action=add&amp;id=".$this->pid."&amp;type=obje");
-		}
-		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
-		if ($this->canShowGedcomRecord()) {
-			$submenu = new Menu($pgv_lang["view_gedcom"]);
-			if (!empty($PGV_IMAGES["gedcom"]["small"]))
-				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
-			if ($this->show_changes=="yes"  && PGV_USER_CAN_EDIT) $submenu->addOnclick("return show_gedcom_record('new');");
-			else $submenu->addOnclick("return show_gedcom_record();");
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$menu->addSubmenu($submenu);
-		}
-		if ($this->mediaobject->canDisplayDetails() && $ENABLE_CLIPPINGS_CART>=PGV_USER_ACCESS_LEVEL) {
-			$submenu = new Menu($pgv_lang["add_to_cart"], "clippings.php?action=add&amp;id=".$this->pid."&amp;type=obje");
-			if (!empty($PGV_IMAGES["clippings"]["small"]))
-				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["clippings"]["small"]);
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$menu->addSubmenu($submenu);
-		}
-		if ($this->mediaobject->canDisplayDetails() && PGV_USER_ID) {
-			$submenu = new Menu($pgv_lang["add_to_my_favorites"], "mediaviewer.php?action=addfav&amp;mid=".$this->pid."&amp;gid=".$this->pid);
-			if (!empty($PGV_IMAGES["gedcom"]["small"]))
-				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
-			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
-			$menu->addSubmenu($submenu);
-		}
-		return $menu;
-	}
-
-	/**
-	 * check if we can show the gedcom record
-	 * @return boolean
-	 */
-	function canShowGedcomRecord() {
-		global $SHOW_GEDCOM_RECORD;
-		if ($SHOW_GEDCOM_RECORD && $this->mediaobject->canDisplayDetails())
-			return true;
-	}
-
-	/**
-	 * return a list of facts
-	 * @return array
-	 */
-	function getFacts($includeFileName=true) {
-		global $pgv_changes, $GEDCOM, $pgv_lang;
-
-		$ignore = "TITL,FILE";
-		if ($this->show_changes=='yes') $ignore = '';
-		else if (PGV_USER_GEDCOM_ADMIN) $ignore = "TITL";
-		$facts = get_all_subrecords($this->mediaobject->getGedcomRecord(), $ignore);
-		if ($includeFileName) $facts[] = "1 FILE ".$this->mediaobject->getFilename();
-		$facts[] = "1 FORM ".$this->mediaobject->getFiletype();
-		$mediaType = $this->mediaobject->getMediatype();
-		if (isset($pgv_lang["TYPE__".$mediaType])) $facts[] = "1 TYPE ".$pgv_lang["TYPE__".$mediaType];
-		else $facts[] = "1 TYPE ".$pgv_lang["TYPE__other"];
-
-		if (isset($pgv_changes[$this->pid."_".$GEDCOM]) && ($this->show_changes=="yes")) {
-			$newrec = find_updated_record($this->pid);
-			$newfacts = get_all_subrecords($newrec);
-			$newmedia = new Media($newrec);
-			if ($includeFileName) $newfacts[] = "1 TYPE ".$pgv_lang["TYPE__".$mediaType];
-			$newfacts[] = "1 FORM ".$newmedia->getFiletype();
-			$mediaType = $newmedia->getMediatype();
-			if (isset($pgv_lang["TYPE__".$mediaType])) $newfacts[] = "1 TYPE ".$mediaType;
-			else $newfacts[] = "1 TYPE ".$pgv_lang["TYPE__other"];
-			//print_r($newfacts);
-			//-- loop through new facts and add them to the list if they are any changes
-			//-- compare new and old facts of the Personal Fact and Details tab 1
-			for($i=0; $i<count($facts); $i++) {
-				$found=false;
-				foreach($newfacts as $indexval => $newfact) {
-					if (trim($newfact)==trim($facts[$i])) {
-						$found=true;
-						break;
-					}
-				}
-				if (!$found) {
-					$facts[$i].="\r\nPGV_OLD\r\n";
-				}
-			}
-			foreach($newfacts as $indexval => $newfact) {
-				$found=false;
-				foreach($facts as $indexval => $fact) {
-					if (trim($fact)==trim($newfact)) {
-						$found=true;
-						break;
-					}
-				}
-				if (!$found) {
-					$newfact.="\r\nPGV_NEW\r\n";
-					$facts[]=$newfact;
-				}
-			}
-		}
-
-		if ($this->mediaobject->fileExists()) {
-			// get height and width of image, when available
-			if ($this->mediaobject->getWidth()) {
-				$facts[] = "1 EVEN " . getLRM() . $this->mediaobject->getWidth()." x ".$this->mediaobject->getHeight() . getLRM() . "\r\n2 TYPE image_size";
-			}
-			//Prints the file size
-			//Rounds the size of the image to 2 decimal places
-			$size = getLRM() . round($this->mediaobject->getFilesizeraw()/1024, 2)." kb" . getLRM();
-			$facts[] = "1 EVEN ".$size."\r\n2 TYPE file_size";
-		}
-
-		sort_facts($facts);
-		return $facts;
-	}
-
-	/**
-	 * get the relative file path of the image on the server
-	 * @return string
-	 */
-	function getLocalFilename() {
-		return $this->mediaobject->getLocalFilename();
-	}
-
-	/**
-	 * get the file name on the server
-	 * @return string
-	 */
-	function getServerFilename() {
-		return $this->mediaobject->getServerFilename();
-	}
-
-}
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/media_ctrl_user.php'))
-{
-	include_once 'includes/controllers/media_ctrl_user.php';
-}
-else
-{
-	class MediaController extends MediaControllerRoot
-	{
-	}
-}
-$controller = new MediaController();
-$controller->init();
-
-?>
+<?php
+/**
+* Controller for the Media Menu
+* Extends the IndividualController class and overrides the getEditMenu() function
+* Menu options are changed to apply to a media object instead of an individual
+*
+* phpGedView: Genealogy Viewer
+* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*
+* @package PhpGedView
+* @subpackage Charts
+* @version $Id$
+*/
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_MEDIA_CTRL_PHP', '');
+
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/individual_ctrl.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_media.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_import.php');
+
+class MediaControllerRoot extends IndividualController{
+
+	var $mid;
+	var $mediaobject;
+	var $show_changes=true;
+
+	function init() {
+		global $MEDIA_DIRECTORY, $USE_MEDIA_FIREWALL;
+
+		$filename=decrypt(safe_GET('filename'));
+		$this->mid     =safe_GET_xref('mid');
+
+		if ($USE_MEDIA_FIREWALL && empty($filename) && empty($this->mid)) {
+			// this section used by mediafirewall.php to determine what media file was requested
+
+			if (isset($_SERVER['REQUEST_URI'])) {
+				// NOTE: format of this server variable:
+				// Apache: /phpGedView/media/a.jpg
+				// IIS:    /phpGedView/mediafirewall.php?404;http://server/phpGedView/media/a.jpg
+				$requestedfile = $_SERVER['REQUEST_URI'];
+				// urldecode the request
+				$requestedfile = rawurldecode($requestedfile);
+				// make sure the requested file is in the media directory
+				if (strpos($requestedfile, $MEDIA_DIRECTORY) !== false) {
+					// strip off the pgv directory and media directory from the requested url so just the image information is left
+					$filename = substr($requestedfile, strpos($requestedfile, $MEDIA_DIRECTORY) + strlen($MEDIA_DIRECTORY) - 1);
+					// if user requested a thumbnail, lookup permissions based on the original image
+					$filename = str_replace('/thumbs', '', $filename);
+				}
+			}
+		}
+
+		//Checks to see if the File Name ($filename) exists
+		if (!empty($filename)){
+			//If the File Name ($filename) is set, then it will call the method to get the Media ID ($this->mid) from the File Name ($filename)
+			$this->mid = get_media_id_from_file($filename);
+			if (!$this->mid){
+				//This will set the Media ID to be false if the File given doesn't match to anything in the database
+				$this->mid = false;
+				// create a very basic gedcom record for this file so that the functions of the media object will work
+				// this is used by the media firewall when requesting an object that exists in the media firewall directory but not in the gedcom
+				$this->mediaobject = new Media("0 @"."0"."@ OBJE\n1 FILE ".$filename);
+			}
+		}
+
+		//checks to see if the Media ID ($this->mid) is set. If the Media ID isn't set then there isn't any information avaliable for that picture the picture doesn't exist.
+		if ($this->mid){
+			//This creates a Media Object from the getInstance method of the Media Class. It takes the Media ID ($this->mid) and creates the object.
+			$this->mediaobject = Media::getInstance($this->mid);
+			//This sets the controller ID to be the Media ID
+			$this->pid = $this->mid;
+
+			if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @".$this->mid."@ OBJE");
+		}
+
+		// one final test to be sure we have a media object defined
+		// ways this can happen:
+		// if user failed to pass in a filename or mid to mediaviewer.php
+		// if the server did not set the environmental variables correctly for the media firewall
+		// if media firewall is being called from outside the media directory
+		if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @"."0"."@ OBJE");
+		$this->mediaobject->ged_id=PGV_GED_ID; // This record is from a file
+
+		//-- perform the desired action
+		switch($this->action) {
+			case "addfav":
+				$this->addFavorite();
+				break;
+			case "accept":
+				$this->acceptChanges();
+				break;
+			case "undo":
+				$this->mediaobject->undoChange();
+				break;
+		}
+
+		if ($this->mediaobject->canDisplayDetails()) {
+			$this->canedit = PGV_USER_CAN_EDIT;
+		}
+	}
+
+	/**
+	* Add a new favorite for the action user
+	*/
+	function addFavorite() {
+		global $GEDCOM;
+		if (!PGV_USER_ID) {
+			return;
+		}
+		if (!empty($_REQUEST["gid"])) {
+			$gid = strtoupper($_REQUEST["gid"]);
+			$mediarec = find_media_record($gid);
+			if ($mediarec) {
+				$favorite = array();
+				$favorite["username"] = PGV_USER_NAME;
+				$favorite["gid"] = $gid;
+				$favorite["type"] = "OBJE";
+				$favorite["file"] = $GEDCOM;
+				$favorite["url"] = "";
+				$favorite["note"] = "";
+				$favorite["title"] = "";
+				addFavorite($favorite);
+			}
+		}
+	}
+
+	/**
+	* Accept any edit changes into the database
+	* Also update the mediarec we will use to generate the page
+	*/
+	function acceptChanges() {
+		global $GEDCOM, $medialist;
+		if (!PGV_USER_CAN_ACCEPT) return;
+		if (accept_changes($this->pid."_".$GEDCOM)) {
+			$this->show_changes=false;
+			$this->accept_success=true;
+			//-- delete the record from the cache and refresh it
+			if (isset($medialist[$this->pid])) unset($medialist[$this->pid]);
+			$mediarec = find_media_record($this->pid);
+			//-- check if we just deleted the record and redirect to index
+			if (empty($mediarec)) {
+				header("Location: index.php?ctype=gedcom");
+				exit;
+			}
+			//$this->mediaobject = Media::getInstance($this->pid);
+			$this->mediaobject = new Media($mediarec);
+		}
+		//This sets the controller ID to be the Media ID
+		if (is_null($this->mediaobject)) $this->mediaobject = new Media("0 @".$this->pid."@ OBJE");
+	}
+
+	/**
+	* return the title of this page
+	* @return string the title of the page to go in the <title> tags
+	*/
+	function getPageTitle() {
+		global $pgv_lang, $GEDCOM;
+
+		if (!is_null($this->mediaobject)) {
+			$name = $this->mediaobject->getFullName();
+			return $name." - ".$this->mediaobject->getXref();
+		}
+		else return $pgv_lang["unknown"];
+	}
+
+	function canDisplayDetails() {
+		return $this->mediaobject->canDisplayDetails();
+	}
+
+	/**
+	* get the edit menu
+	* @return Menu
+	*/
+	function &getEditMenu() {
+		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $TOTAL_NAMES;
+		global $NAME_LINENUM, $SEX_LINENUM, $pgv_lang, $pgv_changes, $USE_QUICK_UPDATE;
+		global $SHOW_GEDCOM_RECORD;
+		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
+		else $ff="";
+		$links = get_media_relations($this->pid);
+		$linktoid = "new";
+		foreach ($links as $linktoid => $type) {
+			break; // we're only interested in the key of the first list entry
+		}
+		//-- main edit menu
+		$menu = new Menu($pgv_lang["edit"]);
+		$click_link = "window.open('addmedia.php?action=editmedia&pid={$this->pid}&linktoid={$linktoid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')";
+		$menu->addOnclick($click_link);
+		if (!empty($PGV_IMAGES["edit_indi"]["small"]))
+			$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["edit_indi"]["small"]);
+		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
+		if (PGV_USER_CAN_EDIT) {
+			//- plain edit option
+			$submenu = new Menu($pgv_lang["edit"]);
+			$click_link = "window.open('addmedia.php?action=editmedia&pid={$this->pid}&linktoid={$linktoid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1')";
+			$submenu->addOnclick($click_link);
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$menu->addSubmenu($submenu);
+
+			if ($SHOW_GEDCOM_RECORD || PGV_USER_IS_ADMIN) {
+				$submenu = new Menu($pgv_lang["edit_raw"]);
+				$submenu->addOnclick("return edit_raw('".$this->pid."');");
+				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+				$menu->addSubmenu($submenu);
+			}
+			//- end plain edit option
+			if (PGV_USER_GEDCOM_ADMIN) {
+				//- remove object option
+				$submenu = new Menu($pgv_lang["remove_object"]);
+				$submenu->addLink(encode_url("media.php?action=removeobject&xref=".$this->pid));
+				$submenu->addOnclick("return confirm('".$pgv_lang["confirm_remove_object"]."')");
+				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+				$menu->addSubmenu($submenu);
+			}
+
+			// main link displayed on page
+			$submenu = new Menu($pgv_lang["set_link"]." >");
+			$submenu->addOnclick("return ilinkitem('".$this->pid."','person');");
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
+
+			$ssubmenu = new Menu($pgv_lang["to_person"]);
+			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','person');");
+			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$submenu->addSubMenu($ssubmenu);
+
+			$ssubmenu = new Menu($pgv_lang["to_family"]);
+			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','family');");
+			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$submenu->addSubMenu($ssubmenu);
+
+			$ssubmenu = new Menu($pgv_lang["to_source"]);
+			$ssubmenu->addOnclick("return ilinkitem('".$this->pid."','source');");
+			$ssubmenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$submenu->addSubMenu($ssubmenu);
+			$menu->addSubmenu($submenu);
+		}
+		if (isset($pgv_changes[$this->pid."_".$GEDCOM])) {
+			$menu->addSeparator();
+			if (!$this->show_changes) {
+				$label = $pgv_lang["show_changes"];
+				$link = "mediaviewer.php?mid={$this->pid}&show_changes=yes";
+			}
+			else {
+				$label = $pgv_lang["hide_changes"];
+				$link = "mediaviewer.php?mid={$this->pid}&show_changes=no";
+			}
+			$submenu = new Menu($label, encode_url($link));
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$menu->addSubmenu($submenu);
+
+			if (PGV_USER_CAN_ACCEPT) {
+				$submenu = new Menu($pgv_lang["undo_all"], encode_url("mediaviewer.php?mid={$this->pid}&action=undo"));
+				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+				$menu->addSubmenu($submenu);
+				$submenu = new Menu($pgv_lang["accept_all"], encode_url("mediaviewer.php?mid={$this->pid}&action=accept"));
+				$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+				$menu->addSubmenu($submenu);
+			}
+		}
+		return $menu;
+	}
+
+	/**
+	* check if we can show the other menu
+	* @return boolean
+	*/
+	function canShowOtherMenu() {
+		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART;
+		if ($this->mediaobject->canDisplayDetails() && ($SHOW_GEDCOM_RECORD || $ENABLE_CLIPPINGS_CART>=PGV_USER_ACCESS_LEVEL))
+			return true;
+		return false;
+	}
+
+	/**
+	* get the "other" menu
+	* @return Menu
+	*/
+	function &getOtherMenu() {
+		global $TEXT_DIRECTION, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $THEME_DIR;
+		global $SHOW_GEDCOM_RECORD, $ENABLE_CLIPPINGS_CART, $pgv_lang;
+		if ($TEXT_DIRECTION=="rtl") $ff="_rtl";
+		else $ff="";
+		//-- main other menu item
+		$menu = new Menu($pgv_lang["other"]);
+		if ($SHOW_GEDCOM_RECORD) {
+			if (!empty($PGV_IMAGES["gedcom"]["small"]))
+				$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
+			if ($this->show_changes && PGV_USER_CAN_EDIT)
+				$menu->addOnclick("return show_gedcom_record('new');");
+			else
+				$menu->addOnclick("return show_gedcom_record('');");
+		}
+		else {
+			if (!empty($PGV_IMAGES["clippings"]["small"]))
+				$menu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["clippings"]["small"]);
+			$menu->addLink(encode_url("clippings.php?action=add&id={$this->pid}&type=obje"));
+		}
+		$menu->addClass("submenuitem$ff", "submenuitem_hover$ff", "submenu$ff");
+		if ($this->canShowGedcomRecord()) {
+			$submenu = new Menu($pgv_lang["view_gedcom"]);
+			if (!empty($PGV_IMAGES["gedcom"]["small"]))
+				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
+			if ($this->show_changes && PGV_USER_CAN_EDIT) $submenu->addOnclick("return show_gedcom_record('new');");
+			else $submenu->addOnclick("return show_gedcom_record();");
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$menu->addSubmenu($submenu);
+		}
+		if ($this->mediaobject->canDisplayDetails() && $ENABLE_CLIPPINGS_CART>=PGV_USER_ACCESS_LEVEL) {
+			$submenu = new Menu($pgv_lang["add_to_cart"], encode_url("clippings.php?action=add&id={$this->pid}&type=obje"));
+			if (!empty($PGV_IMAGES["clippings"]["small"]))
+				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["clippings"]["small"]);
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$menu->addSubmenu($submenu);
+		}
+		if ($this->mediaobject->canDisplayDetails() && PGV_USER_ID) {
+			$submenu = new Menu($pgv_lang["add_to_my_favorites"], encode_url("mediaviewer.php?action=addfav&mid={$this->pid}&gid={$this->pid}"));
+			if (!empty($PGV_IMAGES["gedcom"]["small"]))
+				$submenu->addIcon($PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"]);
+			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff");
+			$menu->addSubmenu($submenu);
+		}
+		return $menu;
+	}
+
+	/**
+	* check if we can show the gedcom record
+	* @return boolean
+	*/
+	function canShowGedcomRecord() {
+		global $SHOW_GEDCOM_RECORD;
+		if ($SHOW_GEDCOM_RECORD && $this->mediaobject->canDisplayDetails())
+			return true;
+	}
+
+	/**
+	* return a list of facts
+	* @return array
+	*/
+	function getFacts($includeFileName=true) {
+		global $pgv_changes, $GEDCOM, $pgv_lang;
+
+		$ignore = array("TITL","FILE");
+		if ($this->show_changes) $ignore = array();
+		else if (PGV_USER_GEDCOM_ADMIN) $ignore = array("TITL");
+
+		$facts = $this->mediaobject->getFacts($ignore);
+		sort_facts($facts);
+//		if ($includeFileName) $facts[] = new Event("1 FILE ".$this->mediaobject->getFilename());
+		$mediaType = $this->mediaobject->getMediatype();
+		if (isset($pgv_lang["TYPE__".$mediaType])) $facts[] = new Event("1 TYPE ".$pgv_lang["TYPE__".$mediaType]);
+		else $facts[] = new Event("1 TYPE ".$pgv_lang["TYPE__other"]);
+
+		if (isset($pgv_changes[$this->pid."_".$GEDCOM]) && ($this->show_changes)) {
+			$newrec = find_updated_record($this->pid);
+			$newmedia = new Media($newrec);
+			$newfacts = $newmedia->getFacts($ignore);
+			if ($includeFileName) $newfacts[] = new Event("1 TYPE ".$pgv_lang["TYPE__".$mediaType]);
+			$newfacts[] = new Event("1 FORM ".$newmedia->getFiletype());
+			$mediaType = $newmedia->getMediatype();
+			if (isset($pgv_lang["TYPE__".$mediaType])) $newfacts[] = new Event("1 TYPE ".$mediaType);
+			else $newfacts[] = new Event("1 TYPE ".$pgv_lang["TYPE__other"]);
+			//-- loop through new facts and add them to the list if they are any changes
+			//-- compare new and old facts of the Personal Fact and Details tab 1
+			for($i=0; $i<count($facts); $i++) {
+				$found=false;
+				foreach($newfacts as $indexval => $newfact) {
+					if (trim($newfact->gedcomRecord)==trim($facts[$i]->gedcomRecord)) {
+						$found=true;
+						break;
+					}
+				}
+				if (!$found) {
+					$facts[$i]->gedcomRecord.="\nPGV_OLD\n";
+				}
+			}
+			foreach($newfacts as $indexval => $newfact) {
+				$found=false;
+				foreach($facts as $indexval => $fact) {
+					if (trim($fact->gedcomRecord)==trim($newfact->gedcomRecord)) {
+						$found=true;
+						break;
+					}
+				}
+				if (!$found) {
+					$newfact->gedcomRecord.="\nPGV_NEW\n";
+					$facts[]=$newfact;
+				}
+			}
+		}
+
+		if ($this->mediaobject->fileExists()) {
+			// get height and width of image, when available
+			if ($this->mediaobject->getWidth()) {
+				$facts[] = new Event("1 EVEN " . '<span dir="ltr">' . $this->mediaobject->getWidth()." x ".$this->mediaobject->getHeight() . '</span>' . "\n2 TYPE image_size");
+			}
+			//Prints the file size
+			//Rounds the size of the image to 2 decimal places
+			$facts[] = new Event("1 EVEN " . '<span dir="ltr">' . round($this->mediaobject->getFilesizeraw()/1024, 2)." kb" . '</span>' . "\n2 TYPE file_size");
+		}
+
+		sort_facts($facts);
+		return $facts;
+	}
+
+	/**
+	* get the relative file path of the image on the server
+	* @return string
+	*/
+	function getLocalFilename() {
+		return $this->mediaobject->getLocalFilename();
+	}
+
+	/**
+	* get the file name on the server
+	* @return string
+	*/
+	function getServerFilename() {
+		return $this->mediaobject->getServerFilename();
+	}
+
+}
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/media_ctrl_user.php')) {
+	include_once 'includes/controllers/media_ctrl_user.php';
+} else {
+	class MediaController extends MediaControllerRoot {
+	}
+}
+
+?>

Index: basecontrol.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/basecontrol.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- basecontrol.php	7 Jul 2008 17:57:40 -0000	1.2
+++ basecontrol.php	30 Apr 2009 19:09:48 -0000	1.3
@@ -1,47 +1,55 @@
-<?php
-/**
- * Base controller for all controller classes
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2006	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Controllers
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-class BaseController {
-	var $view = "";
-	/**
-	 * constructor for this class
-	 */
-	function BaseController() {
-		if (isset($_REQUEST["view"])) $this->view = $_REQUEST["view"];
-	}
-	/**
-	 * check if this controller should be in print preview mode
-	 */
-	function isPrintPreview() {
-		if ($this->view=="preview") return true;
-	}
-}
-?>
+<?php
+/**
+ * Base controller for all controller classes
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Controllers
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_BASECONTROL_PHP', '');
+
+class BaseController {
+	var $view        =null;
+	var $action      =null;
+	var $show_changes=null;
+
+	/**
+	 * constructor for this class
+	 */
+	function BaseController() {
+		$this->view        =safe_GET('view', 'preview');
+		$this->action      =safe_GET('action');
+		$this->show_changes=safe_GET('show_changes', 'no', 'yes')=='yes'; // if not specified, then default to "yes"
+	}
+
+	/**
+	 * check if this controller should be in print preview mode
+	 */
+	function isPrintPreview() {
+		return $this->view=='preview';
+	}
+}
+?>

Index: hourglass_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/hourglass_ctrl.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hourglass_ctrl.php	11 Aug 2008 15:23:01 -0000	1.4
+++ hourglass_ctrl.php	30 Apr 2009 19:09:48 -0000	1.5
@@ -1,635 +1,627 @@
-<?php
-/**
- * Controller for the Hourglass Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
[...1231 lines suppressed...]
+</script>
+<?php
+}
+
+}
+
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/hourglass_ctrl_user.php'))
+{
+	include_once 'includes/controllers/hourglass_ctrl_user.php';
+}
+else
+{
+	class HourglassController extends HourglassControllerRoot
+	{
+	}
+}
+
+?>

--- NEW FILE: remotelink_ctrl.php ---
<?php
/**
* Add Remote Link Page
*
* Allow a user the ability to add links to people from other servers and other gedcoms.
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* @package PhpGedView
* @subpackage Charts
* @version $Id: remotelink_ctrl.php,v 1.1 2009/04/30 19:09:48 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_REMOTELINK_CTRL_PHP', '');

require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_edit.php');
require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_serviceclient.php');

class RemoteLinkController extends BaseController {
	var $has_familysearch=null;
	var $pid=null;
	var $person=null;
	var $server_list=null;
	var $gedcom_list=null;

	// Values from the add remote link form.
	public $form_txtPID=null;
	public $form_cbRelationship='current_person';
	public $form_location=null;
	public $form_txtURL=null;
	public $form_txtTitle=null;
	public $form_txtGID=null;
	public $form_txtUsername=null;
	public $form_txtPassword=null;
	public $form_cbExistingServers=null;
	public $form_txtCB_Title=null;
	public $form_txtCB_GID=null;
	public $form_txtFS_URL=null;
	public $form_txtFS_Title=null;
	public $form_txtFS_GID=null;
	public $form_txtFS_Username=null;
	public $form_txtFS_Password=null;

	// Initialize the controller for the add remote link
	function init() {
		// Cannot edit with a "remember me" login.
		if ($_SESSION["cookie_login"]) {
			header('Location: '.encode_url("login.php?type=simple&url=".urlencode("edit_interface.php?".decode_url($QUERY_STRING)), false));
			exit;
		}

		// Coming soon ???
		$this->has_familysearch=file_exists('modules/FamilySearch/familySearchWrapper.php');
		if ($this->has_familysearch) {;
			require_once 'modules/FamilySearch/familySearchWrapper.php';
		}

		// The PID can come from a URL or a form
		$this->pid=safe_REQUEST($_REQUEST, 'pid', PGV_REGEX_XREF);

		$this->person=Person::getInstance($this->pid);
		$this->server_list=get_server_list();
		$this->gedcom_list=get_all_gedcoms();
		unset($this->gedcom_list[PGV_GED_ID]);

		// Other input values come from the form
		$this->form_txtPID           =safe_POST('txtPID', PGV_REGEX_XREF);
		$this->form_cbRelationship   =safe_POST('cbRelationship');
		$this->form_location         =safe_POST('location');
		$this->form_txtURL           =safe_POST('txtURL', PGV_REGEX_URL);
		$this->form_txtTitle         =safe_POST('txtTitle', '[^<>"%{};]+');
		$this->form_txtGID           =safe_POST('txtGID', $this->gedcom_list);
		$this->form_txtUsername      =safe_POST('txtUsername', PGV_REGEX_USERNAME);
		$this->form_txtPassword      =safe_POST('txtPassword', PGV_REGEX_PASSWORD);
		$this->form_cbExistingServers=safe_POST('cbExistingServers', array_keys($this->server_list));
		$this->form_txtCB_Title      =safe_POST('txtCB_Title', '[^<>"%{};]+');
		$this->form_txtCB_GID        =safe_POST('txtCB_GID', $this->gedcom_list);			
		$this->form_txtFS_URL        =safe_POST('txtFS_URL', PGV_REGEX_URL);
		$this->form_txtFS_Title      =safe_POST('txtFS_Title', '[^<>"%{};]+');
		$this->form_txtFS_GID        =safe_POST('txtFS_GID', $this->gedcom_list);
		$this->form_txtFS_Username   =safe_POST('txtFS_Username', PGV_REGEX_USERNAME);
		$this->form_txtFS_Password   =safe_POST('txtFS_Password', PGV_REGEX_PASSWORD);

		if (is_null($this->form_location)) {
			if ($this->server_list) {
				$this->form_location='existing';			
			} else {
				$this->form_location='remote';
			}
		}

	}

	// Perform the desired action and return true/false sucess.
	function runAction($action) {
		switch ($action) {
		case 'addlink':
			return $this->addLink();
		default:
			return false;
		}
	}

	// Add a remote phpGedView server
	//
	// @param string $title
	// @param string $url
	// @param string $gedcom_id
	// @param string $username
	// @param string $password
	// @return mixed the serverID of the server to link to
	function addRemoteServer($title, $url, $gedcom_id, $username, $password) {
		if (!$url || !$gedcom_id || !$username || !$password) {
			return null;
		}
			
		if (preg_match("/\?wsdl$/", $url)==0) {
			$url.="?wsdl";
		}

		$serverID=$this->checkExistingServer($url, $gedcom_id);
		if (!$serverID) {
			$gedcom_string="0 @new@ SOUR\n1 URL {$url}\n1 _DBID {$gedcom_id}\n2 _USER {$username}\n2 _PASS {$password}\n3 RESN confidential";
			$service=new ServiceClient($gedcom_string);
			$sid=$service->authenticate();
			if (PEAR::isError($sid)) {
				$sid='';
			}
			if (!$sid) {
				echo '<span class="error">failed to authenticate to remote site</span>';
				$serverID=null;
			}	else {
				if (!$title) {
					$title=$service->getServiceTitle();
				}
				$gedcom_string.="\n1 TITL {$title}";
				$serverID=append_gedrec($gedcom_string);
			}
		}
		return $serverID;
	}

	// Add a familySearch server
	//
	// @param string $title
	// @param string $url
	// @param string $gedcom_id
	// @param string $username
	// @param string $password
	// @return mixed the serverID of the server to link to
	function addFamilySearchServer($title, $url, $gedcom_id, $username, $password) {
		$serverID = $this->checkExistingServer($url, $gedcom_id);
		if (!$serverID) {
			$gedcom_string = "0 @new@ SOUR\n";
			$gedcom_string.= "1 URL ".$url."\n";
			$gedcom_string.= "2 TYPE FamilySearch\n";
			$gedcom_string.= "1 _DBID ".$gedcom_id."\n";
			$gedcom_string.= "2 _USER ".$username."\n";
			$gedcom_string.= "2 _PASS ".$password."\n";
			//-- only allow admin users to see password
			$gedcom_string.= "3 RESN confidential\n";
			$service = new FamilySearchWrapper($gedcom_string);
			$sid = $service->authenticate();
			if (PEAR::isError($sid)) {
				$sid = '';
			}
			if (empty($sid)) {
				echo "<span class=\"error\">failed to authenticate to remote site</span>";
			} else {
				if (empty($title)) {
					$title = $service->getServiceTitle();
				}
				$title = $service->getServiceTitle();
				$gedcom_string.= "1 TITL ".$title."\n";
				$serverID = append_gedrec($gedcom_string);
			}
		}
		return $serverID;
	}

	// Add a server record for a local remote link
	//
	// @param string $gedcom_id
	// @return mixed the serverID of the server to link to
	function addLocalServer($title, $gedcom_id) {
		global $SERVER_URL, $GEDCOMS;
		$serverID = $this->checkExistingServer($SERVER_URL, $gedcom_id);
		if ($serverID===false) {
			$gedcom_string = "0 @new@ SOUR\n";
			if (empty($title)) {
				$title = $GEDCOMS[$gedcom_id]["title"];
			}
			$gedcom_string.= "1 TITL ".$title."\n";
			$gedcom_string.= "1 URL ".$SERVER_URL."\n";
			$gedcom_string.= "1 _DBID ".$gedcom_id."\n";
			$gedcom_string.= "2 _BLOCK false\n";
			$serverID = append_gedrec($gedcom_string);
		}
		return $serverID;
	}

	// check if the server already exists
	//
	// @param string $url
	// @param string $gedcom_id
	// @return mixed the id of the server to link to or false if it does not exist
	function checkExistingServer($url, $gedcom_id='') {
		global $pgv_changes;
		//-- get rid of the protocol
		$turl = preg_replace("~^\w+://~", "", $url);
		//-- check the existing server list
		foreach ($this->server_list as $id=>$server) {
			if (stristr($server['url'], $turl)) {
				if (empty($gedcom_id) || preg_match("/\n1 _DBID {$gedcom_id}/", $server['gedcom']))
				return $id;
			}
		}

		//-- check for recent additions
		foreach ($pgv_changes as $cid=>$changes) {
			$change = $changes[count($changes) - 1];
			if ($change['type']!='delete') {
				$gid = $change["gid"];
				$indirec = $change["undo"];
				$surl = get_gedcom_value("URL", 1, $indirec);
				if (!empty($surl) && stristr($surl, $turl)) {
					if (preg_match('/^0 @('.PGV_REGEX_XREF.')@ *('.PGV_REGEX_TAG.')/', $indirec, $match)) {
						$id = $match[1];
						$type=$match[2];
						if ($type=="SOUR") {
							if (empty($gedcom_id) || preg_match("/\n1 _DBID {$gedcom_id}/", $indirec))
								return $id;
						}
					}
				}
			}
		}
		return false;
	}

	function addLink() {
		global $pgv_lang, $GEDCOM;

		switch ($this->form_location) {
		case 'remote':
			$serverID=$this->addRemoteServer(
				$this->form_txtTitle,
				$this->form_txtURL,
				$this->form_txtGID,
				$this->form_txtUsername,
				$this->form_txtPassword
			);
			break;
		case 'local':
			$serverID=$this->addLocalServer(
				$this->form_txtCB_Title,
				$this->form_txtCB_GID
			);
			break;
		case 'existing':
			$serverID=$this->form_cbExistingServers;
			break;
		case "FamilySearch":
			//TODO: Make sure that it is merging correctly
			$serverID=$this->addFamilySearchServer(
				$this->form_txtFS_URL,
				$this->form_txtFS_URL,
				$this->form_txtFS_GID,
				$this->form_txtFS_Username,
				$this->form_txtFS_Password
			);
			break;
		}

		$link_pid     =$this->form_txtPID;
		$relation_type=$this->form_cbRelationship;
		if ($serverID && $link_pid) {
			if (isset($pgv_changes[$this->pid."_".$GEDCOM])) {
				$indirec=find_updated_record($this->pid);
			} else {
				$indirec=find_person_record($this->pid);
			}
	
			switch ($relation_type) {
			case "father":
				$indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}";
				$stub_id=append_gedrec($indistub, false);
				$indistub=find_updated_record($stub_id);
	
				$gedcom_fam="0 @new@ FAM\n1 HUSB @{$stub_id}@\n1 CHIL @{$this->pid}@";
				$fam_id=append_gedrec($gedcom_fam);
	
				$indirec.= "\n1 FAMC @{$fam_id}@";
				replace_gedrec($this->pid, $indirec);

				$serviceClient=ServiceClient::getInstance($serverID);
				$indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true);
				$indistub.="\n1 FAMS @{$fam_id}@";
				replace_gedrec($stub_id, $indistub, false);
				break;
			case "mother":
				$indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}";
				$stub_id=append_gedrec($indistub, false);
				$indistub=find_updated_record($stub_id);
	
				$gedcom_fam="0 @new@ FAM\n1 WIFE @{$stub_id}@\n1 CHIL @{$this->pid}@";
				$fam_id=append_gedrec($gedcom_fam);
	
				$indirec.="\n1 FAMC @{$fam_id}@";
				replace_gedrec($this->pid, $indirec);
	
				$serviceClient=ServiceClient::getInstance($serverID);
				$indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true);
				$indistub.="\n1 FAMS @".$fam_id."@";
				replace_gedrec($stub_id, $indistub, false);
				break;
			case "husband":
				$indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}";
				$stub_id=append_gedrec($indistub, false);
				$indistub=find_updated_record($stub_id);
	
				$gedcom_fam="0 @new@ FAM\n1 MARR Y\n1 WIFE @{$this->pid}@\n1 HUSB @{$stub_id}@\n";
				$fam_id=append_gedrec($gedcom_fam);
	
				$indirec.="\n1 FAMS @{$fam_id}@";
				replace_gedrec($this->pid, $indirec);
	
				$serviceClient=ServiceClient::getInstance($serverID);
				$indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true);
			$indistub.="\n1 FAMS @{$fam_id}@";
				replace_gedrec($stub_id, $indistub, false);
				break;
			case "wife":
				$indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}";
				$stub_id=append_gedrec($indistub, false);
				$indistub=find_updated_record($stub_id);

				$gedcom_fam="0 @new@ FAM\n1 MARR Y\n1 WIFE @{$stub_id}@\n1 HUSB @{$this->pid}@";
				$fam_id=append_gedrec($gedcom_fam);
	
				$indirec.="\n1 FAMS @{$fam_id}@";
				replace_gedrec($this->pid, $indirec);
	
				$serviceClient=ServiceClient::getInstance($serverID);
				$indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true);
				$indistub.="\n1 FAMS @{$fam_id}@\n";
				replace_gedrec($stub_id, $indistub, false);
				break;
			case "son":
			case "daughter":
				$indistub="0 @new@ INDI\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}\n1 RFN {$serverID}:{$link_pid}";
				$stub_id=append_gedrec($indistub, false);
				$indistub=find_updated_record($stub_id);
	
				if (get_gedcom_value('SEX', 1, $indirec, '', false)=='F') {
					$gedcom_fam="0 @new@ FAM\n1 WIFE @{$this->pid}@\n1 CHIL @{$stub_id}@";
				} else {
					$gedcom_fam="0 @new@ FAM\n1 HUSB @{$this->pid}@\n1 CHIL @{$stub_id}@";
				}
				$fam_id=append_gedrec($gedcom_fam);
				$indirec.="\n1 FAMS @{$fam_id}@";
				replace_gedrec($this->pid, $indirec);
	
				$serviceClient=ServiceClient::getInstance($serverID);
				$indistub=$serviceClient->mergeGedcomRecord($link_pid, $indistub, true, true);
				$indistub.="\n1 FAMC @".$fam_id."@";
				replace_gedrec($stub_id, $indistub,false);
				break;
			case 'current_person':
				$indirec.="\n1 RFN {$serverID}:{$link_pid}\n1 SOUR @{$serverID}@\n2 PAGE {$link_pid}";
	
				$serviceClient = ServiceClient::getInstance($serverID);
				if (!is_null($serviceClient)) {
					//-- get rid of change date
				$pos1=strpos($indirec, "\n1 CHAN");
					if ($pos1!==false) {
						$pos2=strpos($indirec, "\n1", $pos1+5);
						$indirec=substr($indirec, 0, $pos1).substr($indirec, $pos2);
					}
				$indirec=$serviceClient->mergeGedcomRecord($link_pid, $indirec, true, true);
				} else {
					echo 'Unable to find server';
				}
				break;
			}
			echo '<b>', $pgv_lang['link_success'], '</b>';
			return true;
		}
		return false;
	}

	/**
	* whether or not the user has access to this area
	*
	* @return boolean
	*/
	function canAccess() {
		global $ALLOW_EDIT_GEDCOM;

		return $ALLOW_EDIT_GEDCOM  && PGV_USER_GEDCOM_ADMIN && $this->person->canDisplayDetails();
	}
}

?>

Index: lifespan_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/lifespan_ctrl.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lifespan_ctrl.php	10 Aug 2008 11:48:18 -0000	1.2
+++ lifespan_ctrl.php	30 Apr 2009 19:09:48 -0000	1.3
@@ -1,607 +1,606 @@
-<?php
-
-/**
- * Controller for the timeline chart
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008, PGV Development Team, all rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
[...1182 lines suppressed...]
+					$printed = true;
+				} else
+					if (!$printed) {
+						print_privacy_error($CONTACT_EMAIL);
+						print "<br />";
+					}
+			}
+		}
+	}
+}
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/timeline_ctrl_user.php')) {
+	include_once 'includes/controllers/timeline_ctrl_user.php';
+} else {
+	class LifespanController extends LifespanControllerRoot {
+	}
+}
+
+?>

Index: individual_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/individual_ctrl.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- individual_ctrl.php	11 Aug 2008 14:22:45 -0000	1.7
+++ individual_ctrl.php	30 Apr 2009 19:09:48 -0000	1.8
@@ -1,1859 +1,2207 @@
-<?php
-/**
- * Controller for the Individual Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
[...4035 lines suppressed...]
+// -----------------------------------------------------------------------------
+
+
+
+}
+// -- end of class
+
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/individual_ctrl_user.php'))
+{
+	include_once 'includes/controllers/individual_ctrl_user.php';
+}
+else
+{
+	class IndividualController extends IndividualControllerRoot
+	{
+	}
+}
+
+?>

Index: search_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/search_ctrl.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- search_ctrl.php	7 Jul 2008 17:57:40 -0000	1.5
+++ search_ctrl.php	30 Apr 2009 19:09:48 -0000	1.6
@@ -1,1664 +1,1077 @@
-<?php
-
-/**
- * Controller for the Search Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
[...2710 lines suppressed...]
+
+	function getValue($varName) {
+		if (isset ($this-> $varName)) {
+			$value = $this-> $varName;
+			return $value;
+		} else
+		return "";
+	}
+}
+// -- end of class
+
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/search_ctrl_user.php')) {
+	include_once 'includes/controllers/search_ctrl_user.php';
+} else {
+	class SearchController extends SearchControllerRoot {
+	}
+}
+
+?>

Index: ancestry_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/ancestry_ctrl.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ancestry_ctrl.php	11 Aug 2008 15:23:01 -0000	1.4
+++ ancestry_ctrl.php	30 Apr 2009 19:09:48 -0000	1.5
@@ -1,284 +1,251 @@
-<?php
-/**
- * Controller for the Ancestry Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * Initialization
- */
-require_once( '../bit_setup_inc.php' );
-
-// Is package installed and enabled
-$gBitSystem->verifyPackage( 'phpgedview' );
-
-include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
-
-$gGedcom = new BitGEDCOM();
-
-// leave manual config until we can move it to bitweaver table 
-require_once("includes/functions_charts.php");
-require_once 'includes/controllers/basecontrol.php';
-
-loadLangFile("pgv_confighelp");
-
-
-$indifacts = array();			 // -- array to store the fact records in for sorting and displaying
-$globalfacts = array();
-$otheritems = array();			  //-- notes, sources, media objects
-// -- array of GEDCOM elements that will be found but should not be displayed
-$nonfacts[] = "FAMS";
-$nonfacts[] = "FAMC";
-$nonfacts[] = "MAY";
-$nonfacts[] = "BLOB";
-$nonfacts[] = "CHIL";
-$nonfacts[] = "HUSB";
-$nonfacts[] = "WIFE";
-$nonfacts[] = "RFN";
-$nonfacts[] = "";
-$nonfamfacts[] = "UID";
-$nonfamfacts[] = "";
-/**
- * Main controller class for the Ancestry page.
- */
-class AncestryControllerRoot extends BaseController {
-	var $show_changes = "yes";
-	var $action = "";
-	var $pid = "";
-
-	var $user = false;
-	var $accept_success = false;
-	var $visibility = "visible";
-	var $position = "relative";
-	var $display = "block";
-	var $view;
-	var $max_generation;
-	var $show_cousins;
-	var $rootid;
-	var $min_generation;
-	//var	$Dbwidth;
-	//var $Dbheight;
-	var $name;
-	var $addname;
-	var $OLD_PGENS;
-	var $chart_style;
-	var $show_full;
-	var $cellwidth;
-
-	/**
-	 * constructor
-	 */
-	function AncestryControllerRoot() {
-		parent::BaseController();
-	}
-	/**
-	 * Initialization function
-	 */
-	function init() {
-		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM_DEFAULT_TAB, $pgv_changes, $pgv_lang, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
-		global $DEFAULT_PEDIGREE_GENERATIONS, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $OLD_PGENS, $box_width, $Dbwidth, $Dbheight;
-		global $show_full;
-
-		// -- args
-		if (isset($_REQUEST["show_full"])) $this->show_full = $_REQUEST["show_full"];
-		else $this->show_full = 1;
-		$show_full = $this->show_full;
-
-		if (isset($_REQUEST["chart_style"])) $this->chart_style = $_REQUEST["chart_style"];
-		else $this->chart_style = 0;
-		if (isset($_REQUEST["show_cousins"])) $this->show_cousins = $_REQUEST["show_cousins"];
-		else $this->show_cousins = 0;
-		//if (!isset($this->chart_style)) $this->chart_style = 0;
-		//if ($this->chart_style=="") $this->chart_style = 0;
-		//if (!isset($this->show_cousins)) $this->show_cousins = 0;
-		//if ($this->show_cousins == "") $this->show_cousins = 0;
-		if ((!isset($PEDIGREE_GENERATIONS)) || ($PEDIGREE_GENERATIONS == "")) $PEDIGREE_GENERATIONS = $DEFAULT_PEDIGREE_GENERATIONS;
-
-		if ($PEDIGREE_GENERATIONS > $MAX_PEDIGREE_GENERATIONS) {
-			$PEDIGREE_GENERATIONS = $MAX_PEDIGREE_GENERATIONS;
-			$this->max_generation = true;
-		}
-
-		if ($PEDIGREE_GENERATIONS < 2) {
-			$PEDIGREE_GENERATIONS = 2;
-			$thmin_generation = true;
-		}
-		$OLD_PGENS = $PEDIGREE_GENERATIONS;
-
-		if (empty($_REQUEST["rootid"])){
-			if (!isset($this->rootid)) $this->rootid = "";
-			$this->rootid = clean_input($this->rootid);
-			$this->rootid = check_rootid($this->rootid);
-		}
-		else $this->rootid = $_REQUEST["rootid"];
-
-		// -- size of the boxes
-		if (isset($_REQUEST['box_width'])) $box_width = $_REQUEST['box_width'];
-		if (empty($box_width)) $box_width = "100";
-		$box_width=max($box_width, 50);
-		$box_width=min($box_width, 300);
-		$Dbwidth*=$box_width/100;
-		$bwidth=$Dbwidth;
-		if (!$this->show_full) {
-			$bwidth = $bwidth / 1.5;
-		}
-		$bheight=$Dbheight;
-		if (!$this->show_full) {
-			$bheight = $bheight / 1.5;
-		}
-
-		$pbwidth = $bwidth+12;
-		$pbheight = $bheight+14;
-
-
-
-		if ((DisplayDetailsByID($this->rootid)) || (showLivingNameByID($this->rootid))) {
-			$this->name = get_person_name($this->rootid);
-			$this->addname = get_add_person_name($this->rootid);
-		}
-		else {
-			$this->name = $pgv_lang["private"];
-			$this->addname = "";
-		}
-
-		if (strlen($this->name)<30) $this->cellwidth="420";
-		else $this->cellwidth=(strlen($this->name)*14);
-
-
-		$this->ancestry = Person::getInstance($this->pid);
-
-		if (!$this->isPrintPreview()) {
-			$this->visibility = "hidden";
-			$this->position = "absolute";
-			$this->display = "none";
-		}
-		//-- perform the desired action
-		switch($this->action) {
-			case "addfav":
-				$this->addFavorite();
-				break;
-			case "accept":
-				$this->acceptChanges();
-				break;
-			case "undo":
-				$this->hour->undoChange();
-				break;
-		}
-
-	}
-
-	/**
-	 * print a child ascendancy
-	 *
-	 * @param string $pid individual Gedcom Id
-	 * @param int $sosa child sosa number
-	 * @param int $depth the ascendancy depth to show
-	 */
-	function print_child_ascendancy($pid, $sosa, $depth) {
-		global $pgv_lang, $TEXT_DIRECTION, $OLD_PGENS;
-		global $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent;
-		global $SHOW_EMPTY_BOXES, $pidarr, $box_width;
-
-		$person = Person::getInstance($pid);
-		// child
-		print "<li>";
-		print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td><a name=\"sosa".$sosa."\"></a>";
-		$new=($pid=="" or !isset($pidarr["$pid"]));
-		if ($sosa==1) print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
-		else {
-			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />";
-			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n";
-		}
-		print_pedigree_person($pid, 1, $this->view!="preview");
-		print "</td>";
-		print "<td>";
-		if ($TEXT_DIRECTION=="ltr") {
-			$label = $pgv_lang["ancestry_chart"].": ".$pid;
-		} else {
-			$label = $pid." :".$pgv_lang["ancestry_chart"];
-		}
-		if ($sosa>1) print_url_arrow($pid, "?rootid=$pid&amp;PEDIGREE_GENERATIONS=$OLD_PGENS&amp;show_full=$this->show_full&amp;box_width=$box_width&amp;chart_style=$this->chart_style", $label, 3);
-		print "</td>";
-		print "<td class=\"details1\">&nbsp;<span dir=\"ltr\" class=\"person_box". (($sosa==1)?"NN":(($sosa%2)?"F":"")) . "\">&nbsp;$sosa&nbsp;</span>&nbsp;";
-		print "</td><td class=\"details1\">";
-		$relation ="";
-		if (!$new) $relation = "<br />[=<a href=\"#sosa".$pidarr["$pid"]."\">".$pidarr["$pid"]."</a> - ".get_sosa_name($pidarr["$pid"])."]";
-		else $pidarr["$pid"]=$sosa;
-		print get_sosa_name($sosa).$relation;
-		print "</td>";
-		print "</tr></table>";
-
-		if (is_null($person)) return;
-		// parents
-		$famids = $person->getChildFamilies();
-		$parents = false;
-		$famrec = "";
-		$famid = "";
-		foreach($famids as $famid=>$family) {
-			if (!is_null($family)) {
-				$famrec = $family->getGedcomRecord();
-				$parents = find_parents_in_record($famrec);
-				if ($parents) break;
-			}
-		}
-
-		if (($parents or $SHOW_EMPTY_BOXES) and $new and $depth>0) {
-			// print marriage info
-			print "<span class=\"details1\" style=\"white-space: nowrap;\" >";
-			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".$pgv_lang["view_family"]."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".$pgv_lang["view_family"]."\" /></a> ";
-			print "&nbsp;<span class=\"person_box\">&nbsp;".($sosa*2)."&nbsp;</span>&nbsp;".$pgv_lang["and"];
-			print "&nbsp;<span class=\"person_boxF\">&nbsp;".($sosa*2+1)." </span>&nbsp;";
-			if (showFact("MARR", $famid)) print_simple_fact($famrec, "MARR", $parents["WIFE"]); else print $pgv_lang["private"];
-			print "</span>";
-			// display parents recursively
-			print "<ul style=\"list-style: none; display: block;\" id=\"sosa_$sosa\">";
-			$this->print_child_ascendancy($parents["HUSB"], $sosa*2, $depth-1);
-			$this->print_child_ascendancy($parents["WIFE"], $sosa*2+1, $depth-1);
-			print "</ul>\r\n";
-		}
-		print "</li>\r\n";
-	}
-
-}
-
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/ancestry_ctrl_user.php'))
-{
-	include_once 'includes/controllers/ancestry_ctrl_user.php';
-}
-else
-{
-	class AncestryController extends AncestryControllerRoot
-	{
-	}
-}
-
-$controller = new AncestryController();
-$controller->init();
-?>
+<?php
+/**
+ * Controller for the Ancestry Page
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008	PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Charts
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_ANCESTRY_CTRL_PHP', '');
+
+/**
+ * Initialization
+ */
+require_once( '../bit_setup_inc.php' );
+
+// Is package installed and enabled
+$gBitSystem->verifyPackage( 'phpgedview' );
+
+include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
+
+$gGedcom = new BitGEDCOM();
+
+// leave manual config until we can move it to bitweaver table 
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_charts.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+
+loadLangFile("pgv_confighelp");
+
+$indifacts = array();			 // -- array to store the fact records in for sorting and displaying
+$globalfacts = array();
+$otheritems = array();			  //-- notes, sources, media objects
+// -- array of GEDCOM elements that will be found but should not be displayed
+$nonfacts[] = "FAMS";
+$nonfacts[] = "FAMC";
+$nonfacts[] = "MAY";
+$nonfacts[] = "BLOB";
+$nonfacts[] = "CHIL";
+$nonfacts[] = "HUSB";
+$nonfacts[] = "WIFE";
+$nonfacts[] = "RFN";
+$nonfacts[] = "";
+$nonfamfacts[] = "UID";
+$nonfamfacts[] = "";
+/**
+ * Main controller class for the Ancestry page.
+ */
+class AncestryControllerRoot extends BaseController {
+	var $pid = "";
+
+	var $user = false;
+	var $accept_success = false;
+	var $visibility = "visible";
+	var $position = "relative";
+	var $display = "block";
+	var $show_cousins;
+	var $rootid;
+	var $name;
+	var $addname;
+	var $OLD_PGENS;
+	var $chart_style;
+	var $show_full;
+	var $cellwidth;
+
+	/**
+	 * constructor
+	 */
+	function AncestryControllerRoot() {
+		parent::BaseController();
+	}
+	/**
+	 * Initialization function
+	 */
+	function init() {
+		global $USE_RIN, $MAX_ALIVE_AGE, $GEDCOM, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM_DEFAULT_TAB, $pgv_lang, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
+		global $DEFAULT_PEDIGREE_GENERATIONS, $PEDIGREE_GENERATIONS, $MAX_PEDIGREE_GENERATIONS, $OLD_PGENS, $box_width, $Dbwidth, $Dbheight;
+		global $show_full;
+
+		// Extract form parameters
+		$this->rootid        =safe_GET_xref('rootid');
+		$this->show_full     =safe_GET('show_full',    array('0', '1'), $PEDIGREE_FULL_DETAILS);
+		$this->show_cousins  =safe_GET('show_cousins', array('0', '1'), '0');
+		$this->chart_style   =safe_GET_integer('chart_style',          0, 3, 0);
+		$box_width           =safe_GET_integer('box_width',            50, 300, 100);
+		$PEDIGREE_GENERATIONS=safe_GET_integer('PEDIGREE_GENERATIONS', 2, $MAX_PEDIGREE_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS);
+
+		// This is passed as a global.  A parameter would be better...
+		$show_full=$this->show_full;
+
+		$OLD_PGENS = $PEDIGREE_GENERATIONS;
+
+		// Validate form parameters
+		$this->rootid = check_rootid($this->rootid);
+
+		// -- size of the boxes
+		$Dbwidth*=$box_width/100;
+		$bwidth=$Dbwidth;
+		if (!$this->show_full) {
+			$bwidth = $bwidth / 1.5;
+		}
+		$bheight=$Dbheight;
+		if (!$this->show_full) {
+			$bheight = $bheight / 1.5;
+		}
+
+		$pbwidth = $bwidth+12;
+		$pbheight = $bheight+14;
+
+		$this->ancestry = Person::getInstance($this->rootid);
+		$this->name     = $this->ancestry->getFullName();
+		$this->addname  = $this->ancestry->getAddName();
+
+		if (strlen($this->name)<30) $this->cellwidth="420";
+		else $this->cellwidth=(strlen($this->name)*14);
+
+		if (!$this->isPrintPreview()) {
+			$this->visibility = "hidden";
+			$this->position = "absolute";
+			$this->display = "none";
+		}
+		//-- perform the desired action
+		switch($this->action) {
+			case "addfav":
+				$this->addFavorite();
+				break;
+			case "accept":
+				$this->acceptChanges();
+				break;
+			case "undo":
+				$this->hour->undoChange();
+				break;
+		}
+
+	}
+
+	/**
+	 * print a child ascendancy
+	 *
+	 * @param string $pid individual Gedcom Id
+	 * @param int $sosa child sosa number
+	 * @param int $depth the ascendancy depth to show
+	 */
+	function print_child_ascendancy($pid, $sosa, $depth) {
+		global $pgv_lang, $TEXT_DIRECTION, $OLD_PGENS;
+		global $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent;
+		global $SHOW_EMPTY_BOXES, $pidarr, $box_width;
+
+		$person = Person::getInstance($pid);
+		// child
+		print "\r\n<li>";
+		print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td><a name=\"sosa".$sosa."\"></a>";
+		$new=($pid=="" or !isset($pidarr["$pid"]));
+		if ($sosa==1) print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
+		else {
+			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"2\" border=\"0\" alt=\"\" />";
+			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-2)."\" border=\"0\" alt=\"\" /></td><td>\n";
+		}
+		print_pedigree_person($pid, 1, $this->view!="preview");
+		print "</td>";
+		print "<td>";
+		if ($TEXT_DIRECTION=="ltr") {
+			$label = $pgv_lang["ancestry_chart"].": ".$pid;
+		} else {
+			$label = $pid." :".$pgv_lang["ancestry_chart"];
+		}
+		if ($sosa>1) print_url_arrow($pid, encode_url("?rootid={$pid}&PEDIGREE_GENERATIONS={$OLD_PGENS}&show_full={$this->show_full}&box_width={$box_width}&chart_style={$this->chart_style}"), $label, 3);
+		print "</td>";
+		print "<td class=\"details1\">&nbsp;<span dir=\"ltr\" class=\"person_box". (($sosa==1)?"NN":(($sosa%2)?"F":"")) . "\">&nbsp;$sosa&nbsp;</span>&nbsp;";
+		print "</td><td class=\"details1\">";
+		$relation ="";
+		if (!$new) $relation = "<br />[=<a href=\"#sosa".$pidarr["$pid"]."\">".$pidarr["$pid"]."</a> - ".get_sosa_name($pidarr["$pid"])."]";
+		else $pidarr["$pid"]=$sosa;
+		print get_sosa_name($sosa).$relation;
+		print "</td>";
+		print "</tr></table>";
+
+		if (is_null($person)) {
+			print "</li>";
+			return;
+		}
+		// parents
+		$famids = $person->getChildFamilies();
+		$parents = false;
+		$famrec = "";
+		$famid = "";
+		foreach($famids as $famid=>$family) {
+			if (!is_null($family)) {
+				$famrec = $family->getGedcomRecord();
+				$parents = find_parents_in_record($famrec);
+				if ($parents) break;
+			}
+		}
+
+		if (($parents || $SHOW_EMPTY_BOXES) && $new && $depth>0) {
+			// print marriage info
+			print "<span class=\"details1\" style=\"white-space: nowrap;\" >";
+			print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"$Dindent\" border=\"0\" align=\"middle\" alt=\"\" /><a href=\"javascript: ".$pgv_lang["view_family"]."\" onclick=\"expand_layer('sosa_".$sosa."'); return false;\" class=\"top\"><img id=\"sosa_".$sosa."_img\" src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".$pgv_lang["view_family"]."\" /></a> ";
+			print "&nbsp;<span class=\"person_box\">&nbsp;".($sosa*2)."&nbsp;</span>&nbsp;".$pgv_lang["and"];
+			print "&nbsp;<span class=\"person_boxF\">&nbsp;".($sosa*2+1)." </span>&nbsp;";
+			if (!empty($family)) {
+				$marriage = $family->getMarriage();
+				if ($marriage->canShow()) $marriage->print_simple_fact(); else print $pgv_lang["private"];
+			}
+			print "</span>";
+			// display parents recursively
+			print "\r\n<ul style=\"list-style: none; display: block;\" id=\"sosa_$sosa\">";
+			$this->print_child_ascendancy($parents["HUSB"], $sosa*2, $depth-1);
+			$this->print_child_ascendancy($parents["WIFE"], $sosa*2+1, $depth-1);
+			print "</ul>\r\n";
+		}
+		print "</li>\r\n";
+	}
+
+}
+
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/ancestry_ctrl_user.php'))
+{
+	include_once 'includes/controllers/ancestry_ctrl_user.php';
+}
+else
+{
+	class AncestryController extends AncestryControllerRoot
+	{
+	}
+}
+
+?>

Index: descendancy_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/descendancy_ctrl.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- descendancy_ctrl.php	11 Aug 2008 15:23:01 -0000	1.5
+++ descendancy_ctrl.php	30 Apr 2009 19:09:48 -0000	1.6
@@ -1,386 +1,368 @@
-<?php
-/**
- * Controller for the Descendancy Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * Initialization
- */
-require_once( '../bit_setup_inc.php' );
-
-// Is package installed and enabled
-$gBitSystem->verifyPackage( 'phpgedview' );
-
-include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
-
-$gGedcom = new BitGEDCOM();
-
-// leave manual config until we can move it to bitweaver table 
-require_once 'includes/controllers/basecontrol.php';
-require_once("includes/functions_charts.php");
-
-loadLangFile("pgv_confighelp");
-
-require_once 'includes/menu.php';
-require_once 'includes/person_class.php';
-
-$indifacts = array();			 // -- array to store the fact records in for sorting and displaying
-$globalfacts = array();
-$otheritems = array();			  //-- notes, sources, media objects
-$FACT_COUNT=0;
-// -- array of GEDCOM elements that will be found but should not be displayed
-$nonfacts[] = "FAMS";
-$nonfacts[] = "FAMC";
-$nonfacts[] = "MAY";
-$nonfacts[] = "BLOB";
-$nonfacts[] = "CHIL";
-$nonfacts[] = "HUSB";
-$nonfacts[] = "WIFE";
-$nonfacts[] = "RFN";
-$nonfacts[] = "";
-$nonfamfacts[] = "UID";
-$nonfamfacts[] = "";
-/**
- * Main controller class for the individual page.
- */
-class DescendancyControllerRoot extends BaseController {
-	var $show_changes = "yes";
-	var $action = "";
-	var $pid = "";
-	var $descPerson = null;
-
-	var $diffindi = null;
-	var $NAME_LINENUM = 1;
-	var $accept_success = false;
-	var $visibility = "visible";
-	var $position = "relative";
-	var $display = "block";
-	var $canedit = false;
-	var $name_count = 0;
-	var $total_names = 0;
-	var $SEX_COUNT = 0;
-	var $show_full;
-	var $chart_style;
-	var $sexarray = array();
-	var $generations;
-	var $view;
-	var $personcount;
-	var $box_width;
-	var $Dbwidth;
-	var $Dbheight;
-	var $pbwidth;
-	var $pbheight;
-	// d'Aboville numbering system [ http://www.saintclair.org/numbers/numdob.html ]
-	var $dabo_num=array();
-	var $dabo_sex=array();
-	var $name;
-	var $cellwidth;
-	var $show_cousins;
-
-	/**
-	 * constructor
-	 */
-	function DescendancyRootController() {
-		parent::BaseController();
-	}
-	/**
-	 * Initialization function
-	 */
-	function init() {
-	global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM, $GEDCOM_DEFAULT_TAB, $pgv_changes, $pgv_lang, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS;
-	global $show_full;
-
-	$this->sexarray["M"] = $pgv_lang["male"];
-	$this->sexarray["F"] = $pgv_lang["female"];
-	$this->sexarray["U"] = $pgv_lang["unknown"];
-
-	//set arguments
-	if (isset($_REQUEST["show_full"])) $this->show_full = $_REQUEST["show_full"];
-	else $this->show_full = 1;
-	$show_full = $this->show_full;
-	if (!empty($_REQUEST["chart_style"])) $this->chart_style = $_REQUEST["chart_style"];
-	else $this->chart_style = 0;
-	if (!empty($_REQUEST["generations"])) $this->generations = $_REQUEST["generations"];
-	else $this->generations = 2;
-	if ($this->generations > $MAX_DESCENDANCY_GENERATIONS) $this->generations = $MAX_DESCENDANCY_GENERATIONS;
-	if (!isset($this->view)) $this->view="";
-	if (!isset($this->personcount)) $this->personcount = 1;
-
-	// -- size of the boxes
-	if (!isset($_REQUEST["box_width"])) $this->box_width = "100";
-	else $this->box_width = $_REQUEST["box_width"];
-	if (empty($this->box_width)) $this->box_width = "100";
-	$this->box_width=max($this->box_width, 50);
-	$this->box_width=min($this->box_width, 300);
-	$this->Dbwidth*=$this->box_width/100;
-
-	if (!$this->show_full) {
-		$bwidth *= $this->box_width / 150;
-	}
-	else {
-		$bwidth*=$this->box_width/100;
-	}
-
-	if (!$this->show_full) {
-		$bheight = $bheight / 1.5;
-	}
-
-	$pbwidth = $bwidth+12;
-	$pbheight = $bheight+14;
-
-	if (!empty($_REQUEST["show_changes"])) $this->show_changes = $_REQUEST["show_changes"];
-	if (!empty($_REQUEST["action"])) $this->action = $_REQUEST["action"];
-	if (!empty($_REQUEST["pid"])) $this->pid = strtoupper($_REQUEST["pid"]);
-
-	// -- root id
-	if (!isset($this->pid)) $this->pid="";
-	$this->pid = clean_input($this->pid);
-	$this->pid=check_rootid($this->pid);
-
-	if ((DisplayDetailsByID($this->pid))||(showLivingNameByID($this->pid))) $this->name = get_person_name($this->pid);
-	else $this->name = $pgv_lang["private"];
-
-	if (strlen($this->name)<30) $this->cellwidth="420";
-	else $this->cellwidth=(strlen($this->name)*14);
-
-	$this->descPerson = Person::getInstance($this->pid);
-
-	//-- if the person is from another gedcom then forward to the correct site
-	/*
-	if ($this->indi->isRemote()) {
-		header('Location: '.preg_replace("/&amp;/", "&", $this->indi->getLinkUrl()));
-		exit;
-	}
-	*/
-	if (!$this->isPrintPreview()) {
-		$this->visibility = "hidden";
-		$this->position = "absolute";
-		$this->display = "none";
-	}
-	//-- perform the desired action
-	switch($this->action) {
-		case "addfav":
-			$this->addFavorite();
-			break;
-		case "accept":
-			$this->acceptChanges();
-			break;
-		case "undo":
-			$this->desc->undoChange();
-			break;
-	}
-
-	}
-
-	/**
-	 * print a child family
-	 *
-	 * @param string $pid individual Gedcom Id
-	 * @param int $depth the descendancy depth to show
-	 */
-	function print_child_family(&$person, $depth, $label="1.", $gpid="") {
-		global $pgv_lang;
-		global $PGV_IMAGE_DIR, $PGV_IMAGES, $personcount;
-
-		if (is_null($person)) return;
-		$families = $person->getSpouseFamilies();
-		if ($depth<1) return;
-		foreach($families as $famid => $family) {
-			print_sosa_family($family->getXref(), "", -1, $label, $person->getXref(), $gpid, $personcount);
-			$personcount++;
-			//$children = get_children_ids($famids);
-			$children = $family->getChildren();
-			$i=1;
-
-			foreach ($children as $childid => $child) {
-			$this->print_child_family($child, $depth-1, $label.($i++).".", $person->getXref());
-			}
-		}
-	}
-
-/**
- * print a child descendancy
- *
- * @param string $pid individual Gedcom Id
- * @param int $depth the descendancy depth to show
- */
-function print_child_descendancy(&$person, $depth) {
-	global $pgv_lang;
-	global $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent;
-	global $personcount;
-
-	if (is_null($person)) return;
-	//print_r($person);
-	print "<li>";
-	print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
-	if ($depth==$this->generations) print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
-	else {
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n";
-	}
-	print_pedigree_person($person->getXref(), 1, $this->view!="preview",'',$personcount);
-	print "</td>";
-
-	// check if child has parents and add an arrow
-	print "<td>&nbsp;</td>";
-	print "<td>";
-	$sfamids = $person->getChildFamilies();
-	foreach($sfamids as $famid => $family) {
-		$parents = find_parents($famid);
-		if ($parents) {
-			$parid=$parents["HUSB"];
-			if ($parid=="") $parid=$parents["WIFE"];
-			if ($parid!="") {
-				print_url_arrow($parid.$personcount.$person->getXref(), "?pid=$parid&amp;generations=$this->generations&amp;chart_style=$this->chart_style&amp;show_full=$this->show_full&amp;box_width=$this->box_width", $pgv_lang["start_at_parents"], 2);
-				$personcount++;
-			}
-		}
-	}
-
-	// d'Aboville child number
-	$level =$this->generations-$depth;
-	if ($this->show_full) print "<br /><br />&nbsp;";
-	print "<span dir=\"ltr\">"; //needed so that RTL languages will display this properly
-	if (!isset($this->dabo_num[$level])) $this->dabo_num[$level]=0;
-	$this->dabo_num[$level]++;
-	$this->dabo_num[$level+1]=0;
-	$this->dabo_sex[$level]=$person->getSex();
-	for ($i=0; $i<=$level;$i++) {
-		$isf=$this->dabo_sex[$i];
-		if ($isf=="M") $isf="";
-		if ($isf=="U") $isf="NN";
-		print "<span class=\"person_box".$isf."\">&nbsp;".$this->dabo_num[$i]."&nbsp;</span>";
-		if ($i<$level) echo ".";
-	}
-	print "</span>";
-	print "</td></tr>";
-	print "</table>";
-	print "</li>\r\n";
-
-	// loop for each spouse
-	$sfam = $person->getSpouseFamilies();
-	foreach ($sfam as $famid => $family) {
-		$personcount++;
-		$this->print_family_descendancy($person, $family, $depth);
-	}
-}
-
-/**
- * print a family descendancy
- *
- * @param string $pid individual Gedcom Id
- * @param Family $famid family record
- * @param int $depth the descendancy depth to show
- */
-function print_family_descendancy(&$person, &$family, $depth) {
-	global $pgv_lang, $factarray;
-	global $GEDCOM, $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent, $personcount;
-
-	if (is_null($family)) return;
-	if (is_null($person)) return;
-
-	$famrec = $family->getGedcomRecord();
-	$famid = $family->getXref();
-	$parents = find_parents($famid);
-	if ($parents) {
-
-		// spouse id
-		$id = $parents["WIFE"];
-		if ($id==$person->getXref()) $id = $parents["HUSB"];
-
-		// print marriage info
-		print "<li>";
-		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />";
-		print "<span class=\"details1\" style=\"white-space: nowrap; \" >";
-		print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".$pgv_lang["view_family"]."\" /></a> ";
-		echo "<a href=\"family.php?famid=$famid&amp;ged=$GEDCOM\" class=\"details1\">";
-		if (showFact("MARR", $famid)) print_simple_fact($famrec, "MARR", $id);
-		else print $pgv_lang["private"];
-		echo "</a>";
-		print "</span>";
-
-		// print spouse
-		print "<ul style=\"list-style: none; display: block;\" id=\"".$famid.$personcount."\">";
-		print "<li>";
-		print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
-		print_pedigree_person($id, 1, $this->view!="preview",''.$personcount);
-		print "</td>";
-
-		// check if spouse has parents and add an arrow
-		print "<td>&nbsp;</td>";
-		print "<td>";
-		$sfamids = find_family_ids($id);
-		foreach($sfamids as $indexval => $sfamid) {
-			$parents = find_parents($sfamid);
-			if ($parents) {
-				$parid=$parents["HUSB"];
-				if ($parid=="") $parid=$parents["WIFE"];
-				if ($parid!="") {
-					print_url_arrow($parid.$personcount.$person->getXref(), "?pid=$parid&amp;generations=$this->generations&amp;show_full=$this->show_full&amp;box_width=$this->box_width", $pgv_lang["start_at_parents"], 2);
-					$personcount++;
-				}
-			}
-		}
-		if ($this->show_full) print "<br /><br />&nbsp;";
-		print "</td></tr>";
-
-		// children
-		$children = $family->getChildren();
-		print "<tr><td colspan=\"3\" class=\"details1\" >&nbsp;&nbsp;";
-		if (count($children)<1) print $pgv_lang["no_children"];
-		else print $factarray["NCHI"].": ".count($children);
-		print "</td></tr></table>";
-		print "</li>\r\n";
-		if ($depth>0) foreach ($children as $childid => $child) {
-			$personcount++;
-			$this->print_child_descendancy($child, $depth-1);
-		}
-		print "</ul>\r\n";
-		print "</li>\r\n";
-	}
-}
-
-}
-
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/descendancy_ctrl_user.php'))
-{
-	include_once 'includes/controllers/descendancy_ctrl_user.php';
-}
-else
-{
-	class DescendancyController extends DescendancyControllerRoot
-	{
-	}
-}
-
-$controller = new DescendancyController();
-$controller->init();
-?>
+<?php
+/**
+ * Controller for the Descendancy Page
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008	PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Charts
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_DESCENDANCY_PHP', '');
+
+/**
+ * Initialization
+ */
+require_once( '../bit_setup_inc.php' );
+
+// Is package installed and enabled
+$gBitSystem->verifyPackage( 'phpgedview' );
+
+include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );
+
+$gGedcom = new BitGEDCOM();
+
+// leave manual config until we can move it to bitweaver table 
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_charts.php');
+
+loadLangFile("pgv_confighelp");
+
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_person.php');
+
+$indifacts = array();			 // -- array to store the fact records in for sorting and displaying
+$globalfacts = array();
+$otheritems = array();			  //-- notes, sources, media objects
+$FACT_COUNT=0;
+// -- array of GEDCOM elements that will be found but should not be displayed
+$nonfacts[] = "FAMS";
+$nonfacts[] = "FAMC";
+$nonfacts[] = "MAY";
+$nonfacts[] = "BLOB";
+$nonfacts[] = "CHIL";
+$nonfacts[] = "HUSB";
+$nonfacts[] = "WIFE";
+$nonfacts[] = "RFN";
+$nonfacts[] = "";
+$nonfamfacts[] = "UID";
+$nonfamfacts[] = "";
+/**
+ * Main controller class for the individual page.
+ */
+class DescendancyControllerRoot extends BaseController {
+	var $pid = "";
+	var $descPerson = null;
+
+	var $diffindi = null;
+	var $NAME_LINENUM = 1;
+	var $accept_success = false;
+	var $visibility = "visible";
+	var $position = "relative";
+	var $display = "block";
+	var $canedit = false;
+	var $name_count = 0;
+	var $total_names = 0;
+	var $SEX_COUNT = 0;
+	var $show_full;
+	var $chart_style;
+	var $sexarray = array();
+	var $generations;
+	var $personcount;
+	var $box_width;
+	var $Dbwidth;
+	var $Dbheight;
+	var $pbwidth;
+	var $pbheight;
+	// d'Aboville numbering system [ http://www.saintclair.org/numbers/numdob.html ]
+	var $dabo_num=array();
+	var $dabo_sex=array();
+	var $name;
+	var $cellwidth;
+	var $show_cousins;
+
+	/**
+	 * constructor
+	 */
+	function DescendancyRootController() {
+		parent::BaseController();
+	}
+	/**
+	 * Initialization function
+	 */
+	function init() {
+	global $USE_RIN, $MAX_ALIVE_AGE, $bwidth, $bheight, $pbwidth, $pbheight, $GEDCOM, $GEDCOM_DEFAULT_TAB, $pgv_lang, $PEDIGREE_FULL_DETAILS, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS, $show_full;
+
+	$this->sexarray["M"] = $pgv_lang["male"];
+	$this->sexarray["F"] = $pgv_lang["female"];
+	$this->sexarray["U"] = $pgv_lang["unknown"];
+
+	// Extract parameters from form
+	$this->pid        =safe_GET_xref('pid');
+	$this->show_full  =safe_GET('show_full', array('0', '1'), $PEDIGREE_FULL_DETAILS);
+	$this->chart_style=safe_GET_integer('chart_style', 0, 3, 0);
+	$this->generations=safe_GET_integer('generations', 2, $MAX_DESCENDANCY_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS);
+	$this->box_width  =safe_GET_integer('box_width',   50, 300, 100);
+
+	// This is passed as a global.  A parameter would be better...
+	$show_full=$this->show_full;
+
+	if (!isset($this->view)) $this->view="";
+	if (!isset($this->personcount)) $this->personcount = 1;
+
+	$this->Dbwidth*=$this->box_width/100;
+
+	if (!$this->show_full) {
+		$bwidth *= $this->box_width / 150;
+	} else {
+		$bwidth*=$this->box_width/100;
+	}
+
+	if (!$this->show_full) {
+		$bheight = $bheight / 1.5;
+	}
+
+	$pbwidth = $bwidth+12;
+	$pbheight = $bheight+14;
+
+	$this->show_changes=safe_GET('show_changes');
+	$this->action      =safe_GET('action');
+
+	// Validate form variables
+	$this->pid=check_rootid($this->pid);
+
+	if (strlen($this->name)<30) $this->cellwidth="420";
+	else $this->cellwidth=(strlen($this->name)*14);
+
+	$this->descPerson = Person::getInstance($this->pid);
+	$this->name=$this->descPerson->getFullName();
+
+	//-- 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;
+	}
+	*/
+	if (!$this->isPrintPreview()) {
+		$this->visibility = "hidden";
+		$this->position = "absolute";
+		$this->display = "none";
+	}
+	//-- perform the desired action
+	switch($this->action) {
+		case "addfav":
+			$this->addFavorite();
+			break;
+		case "accept":
+			$this->acceptChanges();
+			break;
+		case "undo":
+			$this->desc->undoChange();
+			break;
+	}
+
+	}
+
+	/**
+	 * print a child family
+	 *
+	 * @param string $pid individual Gedcom Id
+	 * @param int $depth the descendancy depth to show
+	 */
+	function print_child_family(&$person, $depth, $label="1.", $gpid="") {
+		global $personcount;
+
+		if (is_null($person)) return;
+		$families = $person->getSpouseFamilies();
+		if ($depth<1) return;
+		foreach($families as $famid => $family) {
+			print_sosa_family($family->getXref(), "", -1, $label, $person->getXref(), $gpid, $personcount);
+			$personcount++;
+			$children = $family->getChildren();
+			$i=1;
+			foreach ($children as $child) {
+				$this->print_child_family($child, $depth-1, $label.($i++).".", $person->getXref());
+			}
+		}
+	}
+
+/**
+ * print a child descendancy
+ *
+ * @param string $pid individual Gedcom Id
+ * @param int $depth the descendancy depth to show
+ */
+function print_child_descendancy(&$person, $depth) {
+	global $pgv_lang;
+	global $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent;
+	global $personcount;
+
+	if (is_null($person)) return;
+	//print_r($person);
+	print "<li>";
+	print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
+	if ($depth==$this->generations) print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"$Dindent\" border=\"0\" alt=\"\" /></td><td>\n";
+	else {
+		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"3\" width=\"3\" border=\"0\" alt=\"\" />";
+		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["hline"]["other"]."\" height=\"3\" width=\"".($Dindent-3)."\" border=\"0\" alt=\"\" /></td><td>\n";
+	}
+	print_pedigree_person($person->getXref(), 1, $this->view!="preview",'',$personcount);
+	print "</td>";
+
+	// check if child has parents and add an arrow
+	print "<td>&nbsp;</td>";
+	print "<td>";
+	$sfamids = $person->getChildFamilies();
+	foreach($sfamids as $famid => $family) {
+		$parents = find_parents($famid);
+		if ($parents) {
+			$parid=$parents["HUSB"];
+			if ($parid=="") $parid=$parents["WIFE"];
+			if ($parid!="") {
+				print_url_arrow($parid.$personcount.$person->getXref(), encode_url("?pid={$parid}&generations={$this->generations}&chart_style={$this->chart_style}&show_full={$this->show_full}&box_width={$this->box_width}"), $pgv_lang["start_at_parents"], 2);
+				$personcount++;
+			}
+		}
+	}
+
+	// d'Aboville child number
+	$level =$this->generations-$depth;
+	if ($this->show_full) print "<br /><br />&nbsp;";
+	print "<span dir=\"ltr\">"; //needed so that RTL languages will display this properly
+	if (!isset($this->dabo_num[$level])) $this->dabo_num[$level]=0;
+	$this->dabo_num[$level]++;
+	$this->dabo_num[$level+1]=0;
+	$this->dabo_sex[$level]=$person->getSex();
+	for ($i=0; $i<=$level;$i++) {
+		$isf=$this->dabo_sex[$i];
+		if ($isf=="M") $isf="";
+		if ($isf=="U") $isf="NN";
+		print "<span class=\"person_box".$isf."\">&nbsp;".$this->dabo_num[$i]."&nbsp;</span>";
+		if ($i<$level) echo ".";
+	}
+	print "</span>";
+	print "</td></tr>";
+	print "</table>";
+	print "</li>\r\n";
+
+	// loop for each spouse
+	$sfam = $person->getSpouseFamilies();
+	foreach ($sfam as $famid => $family) {
+		$personcount++;
+		$this->print_family_descendancy($person, $family, $depth);
+	}
+}
+
+/**
+ * print a family descendancy
+ *
+ * @param string $pid individual Gedcom Id
+ * @param Family $famid family record
+ * @param int $depth the descendancy depth to show
+ */
+function print_family_descendancy(&$person, &$family, $depth) {
+	global $pgv_lang, $factarray;
+	global $GEDCOM, $PGV_IMAGE_DIR, $PGV_IMAGES, $Dindent, $personcount;
+
+	if (is_null($family)) return;
+	if (is_null($person)) return;
+
+	$famrec = $family->getGedcomRecord();
+	$famid = $family->getXref();
+	$parents = find_parents($famid);
+	if ($parents) {
+
+		// spouse id
+		$id = $parents["WIFE"];
+		if ($id==$person->getXref()) $id = $parents["HUSB"];
+
+		// print marriage info
+		print "<li>";
+		print "<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["spacer"]["other"]."\" height=\"2\" width=\"".($Dindent+4)."\" border=\"0\" alt=\"\" />";
+		print "<span class=\"details1\" style=\"white-space: nowrap; \" >";
+		print "<a href=\"#\" onclick=\"expand_layer('".$famid.$personcount."'); return false;\" class=\"top\"><img id=\"".$famid.$personcount."_img\" src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES["minus"]["other"]."\" align=\"middle\" hspace=\"0\" vspace=\"3\" border=\"0\" alt=\"".$pgv_lang["view_family"]."\" /></a> ";
+		echo '<a href="', encode_url("family.php?famid={$famid}&ged={$GEDCOM}"), '" class="details1">';
+		$marriage = $family->getMarriage();
+		if ($marriage->canShow()) $marriage->print_simple_fact();
+		else print $pgv_lang["private"];
+		echo "</a>";
+		print "</span>";
+
+		// print spouse
+		print "<ul style=\"list-style: none; display: block;\" id=\"".$famid.$personcount."\">";
+		print "<li>";
+		print "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
+		print_pedigree_person($id, 1, $this->view!="preview",''.$personcount);
+		print "</td>";
+
+		// check if spouse has parents and add an arrow
+		print "<td>&nbsp;</td>";
+		print "<td>";
+		$sfamids = find_family_ids($id);
+		foreach($sfamids as $indexval => $sfamid) {
+			$parents = find_parents($sfamid);
+			if ($parents) {
+				$parid=$parents["HUSB"];
+				if ($parid=="") $parid=$parents["WIFE"];
+				if ($parid!="") {
+					print_url_arrow($parid.$personcount.$person->getXref(), encode_url("?pid={$parid}&generations={$this->generations}&show_full={$this->show_full}&box_width={$this->box_width}"), $pgv_lang["start_at_parents"], 2);
+					$personcount++;
+				}
+			}
+		}
+		if ($this->show_full) print "<br /><br />&nbsp;";
+		print "</td></tr>";
+
+		// children
+		$children = $family->getChildren();
+		print "<tr><td colspan=\"3\" class=\"details1\" >&nbsp;&nbsp;";
+		if (count($children)<1) print $pgv_lang["no_children"];
+		else print $factarray["NCHI"].": ".count($children);
+		print "</td></tr></table>";
+		print "</li>\r\n";
+		if ($depth>0) foreach ($children as $child) {
+			$personcount++;
+			$this->print_child_descendancy($child, $depth-1);
+		}
+		print "</ul>\r\n";
+		print "</li>\r\n";
+	}
+}
+
+}
+
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/descendancy_ctrl_user.php'))
+{
+	include_once 'includes/controllers/descendancy_ctrl_user.php';
+}
+else
+{
+	class DescendancyController extends DescendancyControllerRoot
+	{
+	}
+}
+
+?>

Index: family_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/family_ctrl.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- family_ctrl.php	7 Jul 2008 17:57:40 -0000	1.4
+++ family_ctrl.php	30 Apr 2009 19:09:48 -0000	1.5
@@ -1,571 +1,511 @@
-<?php
-/**
- * Parses gedcom file and gives access to information about a family.
- *
- * You must supply a $famid value with the identifier for the family.
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
[...1051 lines suppressed...]
+		}
+		if ($this->display && PGV_USER_ID) {
+			// other / add_to_my_favorites
+			$submenu = new Menu($pgv_lang['add_to_my_favorites'], encode_url('family.php?action=addfav&famid='.$this->getFamilyID().'&gid='.$this->getFamilyID()));
+			$submenu->addIcon("{$PGV_IMAGE_DIR}/{$PGV_IMAGES['gedcom']['small']}");
+			$submenu->addClass("submenuitem{$ff}", "submenuitem_hover{$ff}");
+			$menu->addSubmenu($submenu);
+		}
+		return $menu;
+	}
+}
+
+if (file_exists('includes/controllers/family_ctrl_user.php')) {
+	require_once 'includes/controllers/family_ctrl_user.php';
+} else {
+	class FamilyController extends FamilyRoot {
+	}
+}
+
+?>

--- NEW FILE: advancedsearch_ctrl.php ---
<?php

/**
 * Controller for the Advanced Search Page
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2009	PGV Development Team. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 *
 * @package PhpGedView
 * @subpackage Display
 * @version $Id: advancedsearch_ctrl.php,v 1.1 2009/04/30 19:09:48 lsces Exp $
 */

if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
	print "You cannot access an include file directly.";
	exit;
}

/**
 * Initialization
 */
require_once( '../bit_setup_inc.php' );

// Is package installed and enabled
$gBitSystem->verifyPackage( 'phpgedview' );

include_once( PHPGEDVIEW_PKG_PATH.'BitGEDCOM.php' );

$gGedcom = new BitGEDCOM();

// leave manual config until we can move it to bitweaver table 
require_once (PHPGEDVIEW_PKG_PATH."includes/controllers/search_ctrl.php");

/**
 * Main controller class for the search page.
 */
class AdvancedSearchController extends SearchController {

	var $fields = array();
	var $values = array();
	var $plusminus = array();
	var $errors = array();

	/**
	 * constructor
	 */
	function AdvancedSearchController() {
		parent :: SearchController();
	}
	/**
	 * Initialization function
	 */
	function init() {
		global $SEARCH_FACTS_DEFAULT;
		parent :: init();
		if (empty($_REQUEST['action'])) $this->action="advanced";
		if ($this->action=="advanced") {
			if (isset($_REQUEST['fields'])) $this->fields = $_REQUEST['fields'];
			if (isset($_REQUEST['values'])) $this->values = $_REQUEST['values'];
			if (isset($_REQUEST['plusminus'])) $this->plusminus = $_REQUEST['plusminus'];
			$this->reorderFields();
			$this->advancedSearch();
		}
		if (count($this->fields)==0) {
			$this->fields = explode(",",$SEARCH_FACTS_DEFAULT);
			$this->fields[] = "FAMC:HUSB:NAME:GIVN:SDX";
			$this->fields[] = "FAMC:HUSB:NAME:SURN:SDX";
			$this->fields[] = "FAMC:WIFE:NAME:GIVN:SDX";
			$this->fields[] = "FAMC:WIFE:NAME:SURN:SDX";
		}
	}

	function getOtherFields() {
		global $INDI_FACTS_ADD;

		$ofields = array("ADDR","ADDR:CITY","ADDR:STAE","ADDR:CTRY","ADDR:POST",
			"AFN","EMAIL","FAX",
			"CHR:DATE","CHR:PLAC",
			"BURI:DATE","BURI:PLAC",
			"CREM:DATE","CREM:PLAC",
			"ADOP:DATE","ADOP:PLAC",
			"BAPM:DATE","BAPM:PLAC","BARM:DATE","BARM:PLAC","BASM:DATE","BASM:PLAC","BLES:DATE","BLES:PLAC",
			"EVEN","EVEN:DATE","EVEN:PLAC",
			"FCOM:DATE","FCOM:PLAC",
			"_MILI","_MILI:DATE","_MILI:PLAC",
			"ORDN:DATE","ORDN:PLAC",
			"NATU:DATE","NATU:PLAC","EMIG:DATE","EMIG:PLAC","IMMI:DATE","IMMI:PLAC",
			"CENS:DATE","CENS:PLAC",
			"CAST","DSCR",
			"NATI","OCCU","RELI","TITL",
			"RESI","RESI:DATE","RESI:PLAC",
			"NAME:NICK","NAME:_MARNM","NAME:_HEB","NAME:ROMN",
			"FAMS:CENS:DATE","FAMS:CENS:PLAC","FAMS:DIV:DATE","FAMS:DIV:PLAC",
			"NOTE","FAMS:NOTE",
			"BAPL:DATE","BAPL:PLAC","BAPL:TEMP",
			"ENDL:DATE","ENDL:PLAC","ENDL:TEMP",
			"SLGC:DATE","SLGC:PLAC","SLGC:TEMP",
			"FAMS:SLGS:DATE","FAMS:SLGS:PLAC","FAMS:SLGS:TEMP"
		);
		// Allow (some of) the user-specified fields to be selected
		foreach (explode(',', $INDI_FACTS_ADD) as $fact) {
			if (
				$fact!='BIRT' &&
				$fact!='DEAT' &&
				!in_array($fact, $ofields) &&
				!in_array("{$fact}:DATE", $ofields) &&
				!in_array("{$fact}:DATE", $ofields)
			) {
				$ofields[]=$fact;
			}
		}
		return $ofields;
	}

	function getPageTitle() {
		global $pgv_lang;
		if ($this->action=="advanced") return $pgv_lang["advanced_search"];
		else parent :: getPageTitle();
	}

	function getValue($i) {
		$val = "";
		if (isset($this->values[$i])) $val = $this->values[$i];
		return $val;
	}

	function getField($i) {
		$val = "";
		if (isset($this->fields[$i])) $val = htmlentities($this->fields[$i]);
		return $val;
	}

	function getIndex($field) {
		return array_search($field, $this->fields);
	}

	function getLabel($tag) {
		global $factarray, $pgv_lang;
		foreach (array('SDX', 'SDX_DM', 'SDX_STD', 'EXACT', 'BEGINS', 'CONTAINS') as $keyword) {
			$factarray["NAME:GIVN:$keyword"] = $factarray["GIVN"];
			$factarray["NAME:SURN:$keyword"] = $factarray["SURN"];
		}
		if (isset($factarray[$tag])) return $factarray[$tag];
		if (isset($pgv_lang[$tag])) return $pgv_lang[$tag];
		$label = "";
		$parts = preg_split("/:/", $tag);
		foreach($parts as $part) {
			if (isset($factarray[$part])) $label .= $factarray[$part]." ";
			else if (isset($pgv_lang[$part])) $label .= $pgv_lang[$part]." ";
			else $label .= $part." ";
		}
		return $label;
	}

	function reorderFields() {
		$i = 0;
		$newfields = array();
		$newvalues = array();
		$newplus = array();
		$rels = array();
		foreach($this->fields as $j=>$field) {
			if (strpos($this->fields[$j], "FAMC:HUSB:NAME")===0 || strpos($this->fields[$j], "FAMC:WIFE:NAME")===0) {
				$rels[$this->fields[$j]] = $this->values[$j];
				continue;
			}
			$newfields[$i] = $this->fields[$j];
			if (isset($this->values[$j])) $newvalues[$i] = $this->values[$j];
			if (isset($this->plusminus[$j])) $newplus[$i] = $this->plusminus[$j];
			$i++;
		}
		$this->fields = $newfields;
		$this->values = $newvalues;
		$this->plusminus = $newplus;
		foreach($rels as $field=>$value) {
			$this->fields[] = $field;
			$this->values[] = $value;
		}
	}

	function advancedSearch($justSql=false, $table="individuals", $prefix="i") {
		global $TBLPREFIX, $DBCONN, $DBTYPE;
		global $gedcom_record_cache;

		DMsoundex("", "opencache");
		$this->myindilist = array ();
		$fct = count($this->fields);
		if ($fct==0) return;

		$namesTable = false;
		$datesTable = false;
		$placesTable = false;
		$famsTable = false;
		$famcTable = false;

		$sql = '';
		if ($justSql) $sqlfields = "SELECT DISTINCT ".$prefix."_id, ".$prefix."_file";
		else $sqlfields = "SELECT i_id, i_gedcom, i_isdead, i_file, i_sex";
		$sqltables = " FROM ".$TBLPREFIX.$table;
		$sqlwhere = " WHERE ".$prefix."_file=".PGV_GED_ID;
		$keepfields = $this->fields;
		for($i=0; $i<$fct; $i++) {
			$field = $this->fields[$i];
			if (empty($field)) continue;
			$value='';
			if (isset($this->values[$i])) $value = $this->values[$i];
			if (empty($value)) continue;
			$parts = preg_split("/:/", $field);
			//-- handle names seperately
			if ($parts[0]=="NAME") {
				// The pgv_name table contains both names and soundex values
				if (!$namesTable) {
					$sqltables.=" JOIN ".$TBLPREFIX."name ON (i_file=n_file AND i_id=n_id) ";
					$namesTable = true;
				}
				switch (end($parts)) {
				case 'SDX_STD':
					$sdx=explode(':', soundex_std($value));
					foreach ($sdx as $k=>$v) {
						if ($parts[1]=='GIVN') {
							$sdx[$k]='n_soundex_givn_std '.PGV_DB_LIKE." '%{$v}%'";
						} else {
							$sdx[$k]='n_soundex_surn_std '.PGV_DB_LIKE." '%{$v}%'";
						}
					}
					$sqlwhere.=' AND ('.implode(' OR ', $sdx).')';
					break;
				case 'SDX':
					// SDX uses DM by default.
				case 'SDX_DM':
					$sdx=explode(':', soundex_dm($value));
					foreach ($sdx as $k=>$v) {
						if ($parts[1]=='GIVN') {
							$sdx[$k]='n_soundex_givn_dm '.PGV_DB_LIKE." '%{$v}%'";
						} else {
							$sdx[$k]='n_soundex_surn_dm '.PGV_DB_LIKE." '%{$v}%'";
						}
					}
					$sqlwhere.=' AND ('.implode(' OR ', $sdx).')';
					break;
				case 'EXACT':
					// Exact match.
					switch ($parts[1]) {
					case 'GIVN':
						// Allow for exact match on multiple given names.
						$sqlwhere.=' AND (n_givn '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."' OR n_givn ".PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)." %' OR n_givn ".PGV_DB_LIKE." '% ".$DBCONN->escapeSimple($value)."' OR n_givn ".PGV_DB_LIKE." '% ".$DBCONN->escapeSimple($value)." %')";
						break;
					case 'SURN':
						$sqlwhere.=' AND n_surname '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."'";
						break;
					default:
						$sqlwhere.=' AND n_full '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."'";
						break;
					}
					break;
				case 'BEGINS':
					// "Begins with" match.
					switch ($parts[1]) {
					case 'GIVN':
						// Allow for match on start of multiple given names
						$sqlwhere.=' AND (n_givn '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."%' OR n_givn ".PGV_DB_LIKE." '% ".$DBCONN->escapeSimple($value)."%')";
						break;
					case 'SURN':
						$sqlwhere.=' AND n_surname '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."%'";
						break;
					default:
						$sqlwhere.=' AND n_full '.PGV_DB_LIKE." '".$DBCONN->escapeSimple($value)."%'";
						break;
					}
					break;
				case 'CONTAINS':
				default:
					// Partial match.
					switch ($parts[1]) {
					case 'GIVN':
						$sqlwhere.=' AND n_givn '.PGV_DB_LIKE." '%".$DBCONN->escapeSimple($value)."%'";
						break;
					case 'SURN':
						$sqlwhere.=' AND n_surname '.PGV_DB_LIKE." '%".$DBCONN->escapeSimple($value)."%'";
						break;
					default:
						$sqlwhere.=' AND n_full '.PGV_DB_LIKE." '%".$DBCONN->escapeSimple($value)."%'";
						break;
					}
					break;
				}
			}
			//-- handle dates
			else if (isset($parts[1]) && $parts[1]=="DATE") {
				if (!$datesTable) {
					$sqltables.=", ".$TBLPREFIX."dates";
					$sqlwhere .= " AND ".$prefix."_file=d_file AND ".$prefix."_id=d_gid";
					$datesTable = true;
				}
				$sqlwhere .= " AND (d_fact='".$parts[0]."'";
				$date = new GedcomDate($value);
				if ($date->isOK()) {
					$jd1 = $date->date1->minJD;
					if ($date->date2) $jd2 = $date->date2->maxJD;
					else $jd2 = $date->date1->maxJD;
					if (!empty($this->plusminus[$i])) {
						$adjd = $this->plusminus[$i]*365;
						//print $jd1.":".$jd2.":".$adjd;
						$jd1 = $jd1 - $adjd;
						$jd2 = $jd2 + $adjd;
					}
					$sqlwhere .= " AND d_julianday1>=".$jd1." AND d_julianday2<=".$jd2;
				}
				$sqlwhere .= ") ";
			}
			//-- handle places
			else if (isset($parts[1]) && $parts[1]=="PLAC") {
				if (!$placesTable) {
					$sqltables.=", ".$TBLPREFIX."places, ".$TBLPREFIX."placelinks";
					$sqlwhere .= " AND ".$prefix."_file=p_file AND p_file=pl_file AND ".$prefix."_id=pl_gid AND pl_p_id=p_id";
					$placesTable = true;
				}
				//-- soundex search
				//if (end($parts)=="SDX") {
					$places = preg_split("/[, ]+/", $value);
					$parr = array();
					for ($j = 0; $j < count($places); $j ++) {
						$parr[$j] = DMsoundex($places[$j]);
					}
					$sqlwhere .= " AND (";
					$fnc = 0;
					$field = "p_dm_soundex";
					foreach ($parr as $name) {
						foreach ($name as $name1) {
							if ($fnc>0)
								$sqlwhere .= " OR ";
							$fnc++;
							$sqlwhere .= $field." ".PGV_DB_LIKE." '%".$DBCONN->escapeSimple($name1)."%'";
						}
					}
					$sqlwhere .= ") ";
				//}
			}
			//-- handle parent/spouse names
			else if ($parts[0]=='FAMS') {
				if (!$famsTable) {
					$sqltables.=", ".$TBLPREFIX."families as FAMS";
					$sqlwhere .= " AND i_file=FAMS.f_file";
					$famsTable = true;
				}
				//-- alter the fields and recurse to generate a subquery for spouse/parent fields
				$oldfields = $this->fields;
				for($j=0; $j<$fct; $j++) {
					//-- if it doesn't start with FAMS or FAMC then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])==0) {
						$this->fields[$j]='';
					}
					else $this->fields[$j] = preg_replace("/^".$parts[0].":/","", $this->fields[$j]);
				}
				$sqlwhere .= " AND (FAMS.f_husb=i_id OR FAMS.f_wife=i_id)";
				$subsql = $this->advancedSearch(true,"families","f");
				$sqlwhere .= " AND ROW(FAMS.f_id, FAMS.f_file) IN (".$subsql.")";
				$this->fields = $oldfields;
				//-- remove all of the fam fields so they don't show up again
				for($j=0; $j<$fct; $j++) {
					//-- if it does start with FAMS or FAMC then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])>0) {
						$this->fields[$j]='';
					}
				}
			}
			else if ($parts[0]=='FAMC') {
				if (!$famcTable) {
					$sqltables.=", ".$TBLPREFIX."families as FAMC";
					$sqlwhere .= " AND i_file=FAMC.f_file";
					$famcTable = true;
				}
				//-- alter the fields and recurse to generate a subquery for spouse/parent fields
				$oldfields = $this->fields;
				for($j=0; $j<$fct; $j++) {
					//-- if it doesn't start with FAMS or FAMC then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])==0) {
						$this->fields[$j]='';
					}
					else $this->fields[$j] = preg_replace("/^".$parts[0].":/","", $this->fields[$j]);
				}
				$sqlwhere .= " AND (FAMC.f_chil ".PGV_DB_LIKE." CONCAT('%',i_id,';%'))";
				$subsql = $this->advancedSearch(true,"families","f");
				$sqlwhere .= " AND ROW(FAMC.f_id, FAMC.f_file) IN (".$subsql.")";
				$this->fields = $oldfields;
				//-- remove all of the fam fields so they don't show up again
				for($j=0; $j<$fct; $j++) {
					//-- if it does start with FAMS or FAMC then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])>0) {
						$this->fields[$j]='';
					}
				}
			}
			else if ($parts[0]=='HUSB' || $parts[0]=='WIFE') {
				if (!$famsTable) {
					$sqltables.=", ".$TBLPREFIX."individuals";
					$sqlwhere .= " AND i_file=f_file";
					$famsTable = true;
				}
				//-- alter the fields and recurse to generate a subquery for spouse/parent fields
				$oldfields = $this->fields;
				for($j=0; $j<$fct; $j++) {
					//-- if it doesn't start with FAMS or FAMC then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])==0) {
						$this->fields[$j]='';
					}
					else $this->fields[$j] = preg_replace("/^".$parts[0].":/","", $this->fields[$j]);
				}
				$subsql = $this->advancedSearch(true,"individuals","i");
				if ($parts[0]=='HUSB') $sqlwhere .= " AND ROW(f_husb, f_file) IN (".$subsql.")";
				if ($parts[0]=='WIFE') $sqlwhere .= " AND ROW(f_wife, f_file) IN (".$subsql.")";
				$this->fields = $oldfields;
				//-- remove all of the fam fields so they don't show up again
				for($j=0; $j<$fct; $j++) {
					//-- if it does start with HUSB or WIFE then remove that field
					if (preg_match("/^".$parts[0].":/", $this->fields[$j])>0) {
						$this->fields[$j]='';
					}
				}
			}
			//-- handle everything else
			else {
				$sqlwhere .= " AND i_gedcom ".PGV_DB_LIKE." '";

				$ct = count($parts);
				for($j=0; $j<$ct; $j++) {
					 $sqlwhere .= "%".($j+1)." ".$parts[$j]." %";
//					 if ($j<$ct-1) {
//					 	$sqlwhere .= "%";
//					 } else {
					 	$sqlwhere .= "%".$DBCONN->escapeSimple($value)."%";
//					 }
				}
				$sqlwhere .= "'";
			}
		}
		$sql = $sqlfields.$sqltables.$sqlwhere;
//		print $sql;
		if ($justSql) return $sql;
		$res = dbquery($sql);
		if (!DB::isError($res)) {
			while ($row =& $res->fetchRow(DB_FETCHMODE_ASSOC)){
				$row['xref']=$row['i_id'];
				$row['ged_id']=$row['i_file'];
				$row['type'] = 'INDI';
				$row['gedrec'] = $row['i_gedcom'];
				$object = Person::getInstance($row);
				$this->myindilist[$row['i_id']] = $object;
			}
			$res->free();
		}
		$this->fields = $keepfields;
	}

	function PrintResults() {
		global $pgv_lang, $GEDCOMS;

		include_once ("includes/functions/functions_print_lists.php");
		$ret = true;
		if (count($this->myindilist)>0) {
			print "<br />";
			print "\n\t<div class=\"center\">\n";
			uasort($this->myindilist, array("GedcomRecord","Compare"));
			print_indi_table($this->myindilist, $pgv_lang["individuals"]." @ ".PrintReady($GEDCOMS[PGV_GEDCOM]["title"], true));
			print "</div>";
		}
		else {
			$ret = false;
			if ($this->isPostBack) print "<br /><div class=\"warning\" style=\" text-align: center;\"><i>".$pgv_lang["no_results"]."</i><br /></div>\n\t\t";
		}
		return $ret;
	}
}
// -- end of class

//-- load a user extended class if one exists
if (file_exists('includes/controllers/advancedsearch_ctrl_user.php')) {
	include_once 'includes/controllers/advancedsearch_ctrl_user.php';
}
?>

Index: pedigree_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/pedigree_ctrl.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pedigree_ctrl.php	7 Jul 2008 17:57:40 -0000	1.6
+++ pedigree_ctrl.php	30 Apr 2009 19:09:48 -0000	1.7
@@ -1,320 +1,304 @@
-<?php
-/**
- * 
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2005	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Charts
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * Initialization
- */
-require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
-require_once(PHPGEDVIEW_PKG_PATH.'includes/person_class.php');
-
-/**
- * Main controller class for the Ancestry page.
- */
-class PedigreeControllerRoot extends BaseController {
-	var $log2;
-	var $show_famlink = true;
-	var $rootid;
-	var $rootPerson;
-	var $show_full;
-	var $talloffset;
-	var $PEDIGREE_GENERATIONS;
-	var $OLD_PGENS;
-	var $max_generation = false;
-	var $min_generation = false;
-	var $pbwidth;
-	var $pbheight;
-	var $treeid;
-	var $treesize;
-	var $curgen;
-	var $yoffset;
-	var $xoffset;
-	var $prevyoffset;
-	var $offsetarray;
-	var $minyoffset;
-	
-	/**
-	 * constructor
-	 */
-	function PedigreeControllerRoot() {
-		parent::BaseController();
-	}
-	/**
-	 * Initialization function
-	 */
-	function init() {
-		global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT, $MAX_PEDIGREE_GENERATIONS;
-		global $DEFAULT_PEDIGREE_GENERATIONS, $SHOW_EMPTY_BOXES;
-		global $bwidth, $bheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing;
-		global $TEXT_DIRECTION, $BROWSER_TYPE, $show_full, $talloffset;
-		
-		$this->log2 = log(2);
-		if ($this->isPrintPreview()) {
-			$this->show_famlink = false;
-		}
-		
-		if (!isset($_REQUEST['show_full'])) $this->show_full=$PEDIGREE_FULL_DETAILS;
-		else $this->show_full = $_REQUEST['show_full'];
-		if ($this->show_full=="") $this->show_full = 0;
-		$show_full = $this->show_full;
-		
-		if (!isset($_REQUEST['talloffset'])) $this->talloffset = (int)$PEDIGREE_LAYOUT;
-		else $this->talloffset = $_REQUEST['talloffset'];
-		if ($this->talloffset=="") $this->talloffset = 0;
-		$talloffset = $this->talloffset;
-		
-		if (empty($_REQUEST['PEDIGREE_GENERATIONS'])) $this->PEDIGREE_GENERATIONS=$DEFAULT_PEDIGREE_GENERATIONS;
-		else $this->PEDIGREE_GENERATIONS=$_REQUEST['PEDIGREE_GENERATIONS'];
-		
-		if ($this->PEDIGREE_GENERATIONS > $MAX_PEDIGREE_GENERATIONS) {
-			$this->PEDIGREE_GENERATIONS = $MAX_PEDIGREE_GENERATIONS;
-			$this->max_generation = TRUE;
-		}
-		
-		if ($this->PEDIGREE_GENERATIONS < 3) {
-			$this->PEDIGREE_GENERATIONS = 3;
-			$this->min_generation = TRUE;
-		}
-		$this->OLD_PGENS = $this->PEDIGREE_GENERATIONS;
-		
-		if (!isset($_REQUEST['rootid'])) $this->rootid="";
-		else $this->rootid = $_REQUEST['rootid'];
-		$this->rootid = clean_input($this->rootid);
-		$this->rootid = check_rootid($this->rootid);
-		
-		$this->rootPerson = Person::getInstance($this->rootid);
-		if (is_null($this->rootPerson)) $this->rootPerson = new Person('');
-				
-		//-- adjustments for hide details
-		if ($this->show_full==false) {
-			$bheight=30;
-			$bwidth-=30;
-			$baseyoffset+=30;
-		}
-		//-- adjustments for portrait mode
-		if ($this->talloffset==0) {
-			$bxspacing+=12;
-			$bwidth+=20;
-			$baseyoffset -= 20*($this->PEDIGREE_GENERATIONS-1);
-		}
-		//-- adjustments for preview
-		if ($this->isPrintPreview()) {
-			$baseyoffset -= 20;
-		}
-		
-		$this->pbwidth = $bwidth+6;
-		$this->pbheight = $bheight+5;
-		
-		$this->treeid = pedigree_array($this->rootid);
-		$this->treesize = pow(2, (int)($this->PEDIGREE_GENERATIONS))-1;
-		
-		if (($this->PEDIGREE_GENERATIONS < 5)&&($this->show_full==false)) {
-			$baseyoffset+=($this->PEDIGREE_GENERATIONS*$this->pbheight/2)+50;
-			if ($this->isPrintPreview()) $baseyoffset-=120;
-		}
-		
-		if ($this->PEDIGREE_GENERATIONS==3) {
-			$baseyoffset+=$this->pbheight*1.6;
-		}
-		if (($this->max_generation == TRUE)||($this->min_generation == TRUE)) $baseyoffset+=20;
-		
-		// -- this next section will create and position the DIV layers for the pedigree tree
-		$this->curgen = 1;			// -- variable to track which generation the algorithm is currently working on
-		$this->yoffset=0;				// -- used to offset the position of each box as it is generated
-		$this->xoffset=0;
-		$this->prevyoffset=0;		// -- used to track the y position of the previous box
-		$this->offsetarray = array();
-		$this->minyoffset = 0;
-		if ($this->treesize<3) $this->treesize=3;
-		// -- loop through all of id's in the array starting at the last and working to the first
-		//-- calculation the box positions
-		for($i=($this->treesize-1); $i>=0; $i--) {
-			// -- check to see if we have moved to the next generation
-			if ($i < floor($this->treesize / (pow(2, $this->curgen)))) {
-				$this->curgen++;
-			}
-			//-- box position in current generation
-			$boxpos = $i-pow(2, $this->PEDIGREE_GENERATIONS-$this->curgen);
-			//-- offset multiple for current generation
-			$genoffset = pow(2, $this->curgen-$this->talloffset);
-			$boxspacing = $this->pbheight+$byspacing;
-			// -- calculate the yoffset		Position in the generation		Spacing between boxes		put child between parents
-			$this->yoffset = $baseyoffset+($boxpos * ($boxspacing * $genoffset))+(($boxspacing/2)*$genoffset)+($boxspacing * $genoffset);
-			if ($this->talloffset==0) {
-				//-- compact the tree
-				if ($this->curgen<$this->PEDIGREE_GENERATIONS) {
-					$parent = floor(($i-1)/2);
-					if ($i%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * ($this->curgen-1));
-					else $this->yoffset=$this->yoffset + (($boxspacing/2) * ($this->curgen-1));
-		
-					$pgen = $this->curgen;
-					while($parent>0) {
-						if ($parent%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $pgen);
-						else $this->yoffset=$this->yoffset + (($boxspacing/2) * $pgen);
-						$pgen++;
-						if ($pgen>3) {
-							$temp=0;
-							for($j=1; $j<($pgen-2); $j++) $temp += (pow(2, $j)-1);
-							if ($parent%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $temp);
-							else $this->yoffset=$this->yoffset + (($boxspacing/2) * $temp);
-						}
-						$parent = floor(($parent-1)/2);
-					}
-					if ($this->curgen>3) {
-						$temp=0;
-							for($j=1; $j<($this->curgen-2); $j++) $temp += (pow(2, $j)-1);
-						if ($i%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $temp);
-						else $this->yoffset=$this->yoffset + (($boxspacing/2) * $temp);
-					}
-				}
-			}
-			// -- calculate the xoffset
-			if ($this->talloffset) {
-				// -- Landscape
-				$this->xoffset = 10 + $basexoffset + (($this->PEDIGREE_GENERATIONS - $this->curgen) * ($this->pbwidth+$bxspacing));
-				if ($this->curgen == $this->PEDIGREE_GENERATIONS) $this->xoffset += 10;
-			} else {
-				// -- Portrait
-				$this->xoffset = 20 + $basexoffset + (($this->PEDIGREE_GENERATIONS - $this->curgen) * (($this->pbwidth+$bxspacing) / 2));
-			}
-			if ($this->curgen == 1 && $this->talloffset) $this->xoffset += 10;
-			$this->offsetarray[$i]["x"]=$this->xoffset;
-			$this->offsetarray[$i]["y"]=$this->yoffset;
-		}
-		
-		//-- collapse the tree if boxes are missing
-		if (!$SHOW_EMPTY_BOXES) {
-			if ($this->PEDIGREE_GENERATIONS>1) $this->collapse_tree(0, 1, 0);
-		}
-		
-		//-- calculate the smallest yoffset and adjust the tree to that offset
-		$minyoffset = 0;
-		for($i=0; $i<count($this->treeid); $i++) {
-			if ($SHOW_EMPTY_BOXES || !empty($treeid[$i])) {
-				if (!empty($offsetarray[$i])) {
-					if (($minyoffset==0)||($minyoffset>$this->offsetarray[$i]["y"]))  $minyoffset = $this->offsetarray[$i]["y"];
-				}
-			}
-		}
-		
-		$ydiff = $baseyoffset+35-$minyoffset;
-		$this->adjust_subtree(0, $ydiff);
-				
-		//-- if no father keep the tree off of the pedigree form
-		if (($this->isPrintPreview())&&($this->offsetarray[0]["y"]+$baseyoffset<300)) $this->adjust_subtree(0, 300-($this->offsetarray[0]["y"]+$baseyoffset));
-	}
-	
-	/**
-	 * return the title of this page
-	 * @return string	the title of the page to go in the <title> tags
-	 */
-	function getPageTitle() {
-		global $pgv_lang, $GEDCOM;
-		
-		$name = $pgv_lang['unknown'];
-		if (!is_null($this->rootPerson)) $name = $this->rootPerson->getName();
-		return $name." ".$pgv_lang["index_header"];
-	}
-	
-	function getPersonName() {
-		global $pgv_lang;
-		
-		$name = $pgv_lang['unknown'];
-		if (!is_null($this->rootPerson)) $name = $this->rootPerson->getName();
-		return $name;
-	}
-	
-	function adjust_subtree($index, $diff) {
-		global $offsetarray, $treeid, $PEDIGREE_GENERATIONS, $log2, $talloffset,$boxspacing, $mdiff, $SHOW_EMPTY_BOXES;
-		$f = ($index*2)+1; //-- father index
-		$m = $f+1; //-- mother index
-	
-		if (!$SHOW_EMPTY_BOXES && empty($treeid[$index])) return;
-		if (empty($offsetarray[$index])) return;
-		$offsetarray[$index]["y"] += $diff;
-		if ($f<count($treeid)) adjust_subtree($f, $diff);
-		if ($m<count($treeid)) adjust_subtree($m, $diff);
-	}
-	
-	function collapse_tree($index, $curgen, $diff) {
-		global $offsetarray, $treeid, $PEDIGREE_GENERATIONS, $log2, $talloffset,$boxspacing, $mdiff, $minyoffset;
-	
-		//print "$index:$curgen:$diff<br />\n";
-		$f = ($index*2)+1; //-- father index
-		$m = $f+1; //-- mother index
-		if (empty($treeid[$index])) {
-			$pgen=$curgen;
-			$genoffset=0;
-			while($pgen<=$PEDIGREE_GENERATIONS) {
-				$genoffset += pow(2, ($PEDIGREE_GENERATIONS-$pgen));
-				$pgen++;
-			}
-			if ($talloffset==1) $diff+=.5*$genoffset;
-			else $diff+=$genoffset;
-			if (isset($offsetarray[$index]["y"])) $offsetarray[$index]["y"]-=($boxspacing*$diff)/2;
-			return $diff;
-		}
-		if ($curgen==$PEDIGREE_GENERATIONS) {
-			$offsetarray[$index]["y"] -= $boxspacing*$diff;
-			//print "UP $index BY $diff<br />\n";
-			return $diff;
-		}
-		$odiff=$diff;
-		$fdiff = collapse_tree($f, $curgen+1, $diff);
-		if (($curgen<($PEDIGREE_GENERATIONS-1))||($index%2==1)) $diff=$fdiff;
-		if (isset($offsetarray[$index]["y"])) $offsetarray[$index]["y"] -= $boxspacing*$diff;
-		//print "UP $index BY $diff<br />\n";
-		$mdiff = collapse_tree($m, $curgen+1, $diff);
-		$zdiff = $mdiff - $fdiff;
-		if (($zdiff>0)&&($curgen<$PEDIGREE_GENERATIONS-2)) {
-			$offsetarray[$index]["y"] -= $boxspacing*$zdiff/2;
-			//print "UP $index BY ".($zdiff/2)."<br />\n";
-			if ((empty($treeid[$m]))&&(!empty($treeid[$f]))) adjust_subtree($f, -1*($boxspacing*$zdiff/4));
-			$diff+=($zdiff/2);
-		}
-		return $diff;
-	}
-}
-
-// -- end of class
-//-- load a user extended class if one exists
-if (file_exists('includes/controllers/pedigree_ctrl_user.php'))
-{
-	include_once 'includes/controllers/pedigree_ctrl_user.php';
-}
-else
-{
-	class PedigreeController extends PedigreeControllerRoot
-	{
-	}
-}
-
-$controller = new PedigreeController();
-$controller->init();
-?>
+<?php
+/**
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Charts
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_PEDIGREE_CTRL_PHP', '');
+
+/**
+ * Initialization
+ */
+require_once(PHPGEDVIEW_PKG_PATH.'includes/functions/functions_charts.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/controllers/basecontrol.php');
+require_once(PHPGEDVIEW_PKG_PATH.'includes/classes/class_person.php');
+
+/**
+ * Main controller class for the Ancestry page.
+ */
+class PedigreeControllerRoot extends BaseController {
+	var $log2;
+	var $show_famlink = true;
+	var $rootid;
+	var $rootPerson;
+	var $show_full;
+	var $talloffset;
+	var $PEDIGREE_GENERATIONS;
+	var $pbwidth;
+	var $pbheight;
+	var $treeid;
+	var $treesize;
+	var $curgen;
+	var $yoffset;
+	var $xoffset;
+	var $prevyoffset;
+	var $offsetarray;
+	var $minyoffset;
+
+	/**
+	 * Initialization function
+	 */
+	function init() {
+		global $PEDIGREE_FULL_DETAILS, $PEDIGREE_LAYOUT, $MAX_PEDIGREE_GENERATIONS;
+		global $DEFAULT_PEDIGREE_GENERATIONS, $SHOW_EMPTY_BOXES;
+		global $bwidth, $bheight, $baseyoffset, $basexoffset, $byspacing, $bxspacing;
+		global $TEXT_DIRECTION, $BROWSER_TYPE, $show_full, $talloffset;
+
+		$this->log2 = log(2);
+		if ($this->isPrintPreview()) {
+			$this->show_famlink = false;
+		}
+
+		$this->rootid    =safe_GET_xref('rootid');
+		$this->show_full =safe_GET('show_full', array('0', '1'), $PEDIGREE_FULL_DETAILS);
+		$this->talloffset=safe_GET('talloffset', array('0', '1'), $PEDIGREE_LAYOUT);
+		$this->PEDIGREE_GENERATIONS=safe_GET_integer('PEDIGREE_GENERATIONS', 2, $MAX_PEDIGREE_GENERATIONS, $DEFAULT_PEDIGREE_GENERATIONS);
+
+		// TODO: some library functions expect this as a global.
+		// Passing a function parameter would be much better.
+		global $PEDIGREE_GENERATIONS;
+		$PEDIGREE_GENERATIONS=$this->PEDIGREE_GENERATIONS;
+
+		// This is passed as a global.  A parameter would be better...
+		$this->show_full = ($this->show_full) ? 1 : 0;		// Make SURE this is an integer
+		$this->talloffset = ($this->talloffset) ? 1 : 0;
+		$show_full = $this->show_full;
+		$talloffset = $this->talloffset;
+
+		// Validate parameters
+		$this->rootid=check_rootid($this->rootid);
+
+		$this->rootPerson = Person::getInstance($this->rootid);
+		if (is_null($this->rootPerson)) $this->rootPerson = new Person('');
+
+		//-- adjustments for hide details
+		if ($this->show_full==false) {
+			$bheight=30;
+			$bwidth-=30;
+			$baseyoffset+=30;
+		}
+		//-- adjustments for portrait mode
+		if ($this->talloffset==0) {
+			$bxspacing+=12;
+			$bwidth+=20;
+			$baseyoffset -= 20*($this->PEDIGREE_GENERATIONS-1);
+		}
+		//-- adjustments for preview
+		if ($this->isPrintPreview()) {
+			$baseyoffset -= 20;
+		}
+
+		$this->pbwidth = $bwidth+6;
+		$this->pbheight = $bheight+5;
+
+		$this->treeid = ancestry_array($this->rootid);
+		$this->treesize = pow(2, (int)($this->PEDIGREE_GENERATIONS))-1;
+
+		//-- ancestry_array puts everyone at $i+1
+		for($i=0; $i<$this->treesize; $i++) $this->treeid[$i] = $this->treeid[$i+1];
+
+		if (($this->PEDIGREE_GENERATIONS < 5)&&($this->show_full==false)) {
+			$baseyoffset+=($this->PEDIGREE_GENERATIONS*$this->pbheight/2)+50;
+			if ($this->isPrintPreview()) $baseyoffset-=120;
+		}
+
+		if ($this->PEDIGREE_GENERATIONS==3) {
+			$baseyoffset+=$this->pbheight*1.6;
+		}
+
+		// -- this next section will create and position the DIV layers for the pedigree tree
+		$this->curgen = 1;			// -- variable to track which generation the algorithm is currently working on
+		$this->yoffset=0;				// -- used to offset the position of each box as it is generated
+		$this->xoffset=0;
+		$this->prevyoffset=0;		// -- used to track the y position of the previous box
+		$this->offsetarray = array();
+		$this->minyoffset = 0;
+		if ($this->treesize<3) $this->treesize=3;
+		// -- loop through all of id's in the array starting at the last and working to the first
+		//-- calculation the box positions
+		for($i=($this->treesize-1); $i>=0; $i--) {
+			// -- check to see if we have moved to the next generation
+			if ($i < floor($this->treesize / (pow(2, $this->curgen)))) {
+				$this->curgen++;
+			}
+			//-- box position in current generation
+			$boxpos = $i-pow(2, $this->PEDIGREE_GENERATIONS-$this->curgen);
+			//-- offset multiple for current generation
+			$genoffset = pow(2, $this->curgen-$this->talloffset);
+			$boxspacing = $this->pbheight+$byspacing;
+			// -- calculate the yoffset		Position in the generation		Spacing between boxes		put child between parents
+			$this->yoffset = $baseyoffset+($boxpos * ($boxspacing * $genoffset))+(($boxspacing/2)*$genoffset)+($boxspacing * $genoffset);
+			if ($this->talloffset==0) {
+				//-- compact the tree
+				if ($this->curgen<$this->PEDIGREE_GENERATIONS) {
+					$parent = floor(($i-1)/2);
+					if ($i%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * ($this->curgen-1));
+					else $this->yoffset=$this->yoffset + (($boxspacing/2) * ($this->curgen-1));
+
+					$pgen = $this->curgen;
+					while($parent>0) {
+						if ($parent%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $pgen);
+						else $this->yoffset=$this->yoffset + (($boxspacing/2) * $pgen);
+						$pgen++;
+						if ($pgen>3) {
+							$temp=0;
+							for($j=1; $j<($pgen-2); $j++) $temp += (pow(2, $j)-1);
+							if ($parent%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $temp);
+							else $this->yoffset=$this->yoffset + (($boxspacing/2) * $temp);
+						}
+						$parent = floor(($parent-1)/2);
+					}
+					if ($this->curgen>3) {
+						$temp=0;
+							for($j=1; $j<($this->curgen-2); $j++) $temp += (pow(2, $j)-1);
+						if ($i%2 == 0) $this->yoffset=$this->yoffset - (($boxspacing/2) * $temp);
+						else $this->yoffset=$this->yoffset + (($boxspacing/2) * $temp);
+					}
+				}
+			}
+			// -- calculate the xoffset
+			if ($this->talloffset) {
+				// -- Landscape
+				$this->xoffset = 10 + $basexoffset + (($this->PEDIGREE_GENERATIONS - $this->curgen) * ($this->pbwidth+$bxspacing));
+				if ($this->curgen == $this->PEDIGREE_GENERATIONS) $this->xoffset += 10;
+			} else {
+				// -- Portrait
+				$this->xoffset = 20 + $basexoffset + (($this->PEDIGREE_GENERATIONS - $this->curgen) * (($this->pbwidth+$bxspacing) / 2));
+			}
+			if ($this->curgen == 1 && $this->talloffset) $this->xoffset += 10;
+			$this->offsetarray[$i]["x"]=$this->xoffset;
+			$this->offsetarray[$i]["y"]=$this->yoffset;
+		}
+
+		//-- collapse the tree if boxes are missing
+		if (!$SHOW_EMPTY_BOXES) {
+			if ($this->PEDIGREE_GENERATIONS>1) $this->collapse_tree(0, 1, 0);
+		}
+
+		//-- calculate the smallest yoffset and adjust the tree to that offset
+		$minyoffset = 0;
+		for($i=0; $i<count($this->treeid); $i++) {
+			if ($SHOW_EMPTY_BOXES || !empty($treeid[$i])) {
+				if (!empty($offsetarray[$i])) {
+					if (($minyoffset==0)||($minyoffset>$this->offsetarray[$i]["y"]))  $minyoffset = $this->offsetarray[$i]["y"];
+				}
+			}
+		}
+
+		$ydiff = $baseyoffset+35-$minyoffset;
+		$this->adjust_subtree(0, $ydiff);
+
+		//-- if no father keep the tree off of the pedigree form
+		if (($this->isPrintPreview())&&($this->offsetarray[0]["y"]+$baseyoffset<300)) $this->adjust_subtree(0, 300-($this->offsetarray[0]["y"]+$baseyoffset));
+	}
+
+	/**
+	 * return the title of this page
+	 * @return string	the title of the page to go in the <title> tags
+	 */
+	function getPageTitle() {
+		global $pgv_lang, $GEDCOM;
+
+		$name = $pgv_lang['unknown'];
+		if (!is_null($this->rootPerson)) $name = $this->rootPerson->getFullName();
+		return $name." ".$pgv_lang["index_header"];
+	}
+
+	function getPersonName() {
+		global $pgv_lang;
+
+		$name = $pgv_lang['unknown'];
+		if (!is_null($this->rootPerson)) $name = $this->rootPerson->getFullName();
+		return $name;
+	}
+
+	function adjust_subtree($index, $diff) {
+		global $offsetarray, $treeid, $log2, $talloffset,$boxspacing, $mdiff, $SHOW_EMPTY_BOXES;
+		$f = ($index*2)+1; //-- father index
+		$m = $f+1; //-- mother index
+
+		if (!$SHOW_EMPTY_BOXES && empty($treeid[$index])) return;
+		if (empty($offsetarray[$index])) return;
+		$offsetarray[$index]["y"] += $diff;
+		if ($f<count($treeid)) adjust_subtree($f, $diff);
+		if ($m<count($treeid)) adjust_subtree($m, $diff);
+	}
+
+	function collapse_tree($index, $curgen, $diff) {
+		global $offsetarray, $treeid, $log2, $talloffset,$boxspacing, $mdiff, $minyoffset;
+
+		//print "$index:$curgen:$diff<br />\n";
+		$f = ($index*2)+1; //-- father index
+		$m = $f+1; //-- mother index
+		if (empty($treeid[$index])) {
+			$pgen=$curgen;
+			$genoffset=0;
+			while($pgen<=$this->PEDIGREE_GENERATIONS) {
+				$genoffset += pow(2, ($this->PEDIGREE_GENERATIONS-$pgen));
+				$pgen++;
+			}
+			if ($talloffset==1) $diff+=.5*$genoffset;
+			else $diff+=$genoffset;
+			if (isset($offsetarray[$index]["y"])) $offsetarray[$index]["y"]-=($boxspacing*$diff)/2;
+			return $diff;
+		}
+		if ($curgen==$this->PEDIGREE_GENERATIONS) {
+			$offsetarray[$index]["y"] -= $boxspacing*$diff;
+			//print "UP $index BY $diff<br />\n";
+			return $diff;
+		}
+		$odiff=$diff;
+		$fdiff = collapse_tree($f, $curgen+1, $diff);
+		if (($curgen<($this->PEDIGREE_GENERATIONS-1))||($index%2==1)) $diff=$fdiff;
+		if (isset($offsetarray[$index]["y"])) $offsetarray[$index]["y"] -= $boxspacing*$diff;
+		//print "UP $index BY $diff<br />\n";
+		$mdiff = collapse_tree($m, $curgen+1, $diff);
+		$zdiff = $mdiff - $fdiff;
+		if (($zdiff>0)&&($curgen<$this->PEDIGREE_GENERATIONS-2)) {
+			$offsetarray[$index]["y"] -= $boxspacing*$zdiff/2;
+			//print "UP $index BY ".($zdiff/2)."<br />\n";
+			if ((empty($treeid[$m]))&&(!empty($treeid[$f]))) adjust_subtree($f, -1*($boxspacing*$zdiff/4));
+			$diff+=($zdiff/2);
+		}
+		return $diff;
+	}
+}
+
+// -- end of class
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/pedigree_ctrl_user.php'))
+{
+	include_once 'includes/controllers/pedigree_ctrl_user.php';
+}
+else
+{
+	class PedigreeController extends PedigreeControllerRoot
+	{
+	}
+}
+
+?>

Index: clippings_ctrl.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/controllers/clippings_ctrl.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- clippings_ctrl.php	7 Jul 2008 17:57:40 -0000	1.3
+++ clippings_ctrl.php	30 Apr 2009 19:09:48 -0000	1.4
@@ -1,734 +1,730 @@
-<?php
-/**
- * Controller for the Clippings Page
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2006	John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
[...1433 lines suppressed...]
+								$this->add_clipping($clipping);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+// -- end of class
+
+//-- load a user extended class if one exists
+if (file_exists('includes/controllers/clippings_ctrl_user.php')) {
+	include_once 'includes/controllers/clippings_ctrl_user.php';
+} else {
+	class ClippingsController extends ClippingsControllerRoot {
+	}
+}
+
+?>

Update of /cvsroot/bitweaver/_bit_phpgedview/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19010/phpgedview/includes

Modified Files:
	lang_codes_std.php pclzip.lib.php index_cache.php .htaccess 
	reportheader.php specialchars.php authentication.php 
	lang_settings_std.php grampsxml.rng templecodes.php 
	session.php help_text_vars.php sort_tables_utf8.php 
	cssparser.inc.php 
Added Files:
	media_reorder.php media_tab_head.php session_spider.php 
	family_nav.php dmsounds_UTF8.php hitcount.php 
	accesskeyHeaders.php media_reorder_count.php 
Removed Files:
	repository_class.php functions_editlang.php 
	functions_privacy.php functions_name.php date_class.php 
	functions_print_lists.php functions_import.php 
	feedcreator.class.php reportbase.php functions_db.php 
	mutex_class.php serviceclient_class.php localclient_class.php 
	source_class.php functions_mediadb.php reporthtml.php 
	GEClippings.php functions_mail.php functions_tools.php 
	person_class.php functions.php GrampsExport.php 
	class_stats_compat.php functions_print.php 
	functions_print_facts.php gedcomrecord.php menu.php 
	family_class.php class_stats.php functions_lang.php 
	reportpdf.php functions_rss.php functions_export.php 
	GEWebService.php GEDownloadGedcom.php functions_date.php 
	functions_places.php functions_edit.php media_class.php 
	functions_charts.php functions_rtl.php 
Log Message:
Code update for PGV4.2 - sections moved to sub-directories

Index: templecodes.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/templecodes.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- templecodes.php	7 Jul 2008 17:30:13 -0000	1.4
+++ templecodes.php	30 Apr 2009 18:32:43 -0000	1.5
@@ -1,154 +1,156 @@
-<?php
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-# $Id$
-$TEMPLE_CODES = array();
-$TEMPLE_CODES["ABA"]=	"Aba, Nigeria";
-$TEMPLE_CODES["ACCRA"]=	"Accra, Ghana";
-$TEMPLE_CODES["ADELA"]=	"Adelaide, Australia";
-$TEMPLE_CODES["ALBUQ"]=	"Albuquerque, New Mexico";
-$TEMPLE_CODES["ANCHO"]=	"Anchorage, Alaska";
-$TEMPLE_CODES["SAMOA"]=	"Apia, Samoa";
-$TEMPLE_CODES["ASUNC"]=	"Asuncion, Paraguay";
-$TEMPLE_CODES["ATLAN"]=	"Atlanta, Georgia";
-$TEMPLE_CODES["SWISS"]=	"Bern, Switzerland";
-$TEMPLE_CODES["BOGOT"]=	"Bogota, Columbia";
-$TEMPLE_CODES["BILLI"]=	"Billings, Montana";
-$TEMPLE_CODES["BIRMI"]=	"Birmingham, Alabama";
-$TEMPLE_CODES["BISMA"]=	"Bismarck, North Dakota";
-$TEMPLE_CODES["BOGOT"]=	"Bogota, Colombia";
-$TEMPLE_CODES["BOISE"]=	"Boise, Idaho";
-$TEMPLE_CODES["BOSTO"]=	"Boston, Massachusetts";
-$TEMPLE_CODES["BOUNT"]=	"Bountiful, Utah";
-$TEMPLE_CODES["BRISB"]=	"Brisbane, Australia";
-$TEMPLE_CODES["BROUG"]=	"Baton Rouge, Louisiana";
-$TEMPLE_CODES["BAIRE"]=	"Buenos Aires, Argentina";
-$TEMPLE_CODES["CAMPI"]=	"Campinas, Brazil";
-$TEMPLE_CODES["CARAC"]=	"Caracas, Venezuela";
-$TEMPLE_CODES["ALBER"]=	"Cardston, Alberta, Canada";
-$TEMPLE_CODES["CHICA"]=	"Chicago, Illinois";
-$TEMPLE_CODES["CIUJU"]=	"Ciudad Juarez, Mexico";
-$TEMPLE_CODES["COCHA"]=	"Cochabamba, Bolivia";
-$TEMPLE_CODES["COLJU"]=	"Colonia Juarez, Mexico";
-$TEMPLE_CODES["COLSC"]=	"Columbia, South Carolina";
-$TEMPLE_CODES["COLUM"]=	"Columbus, Ohio";
-$TEMPLE_CODES["COPEN"]=	"Copenhagen, Denmark";
-$TEMPLE_CODES["CRIVE"]=	"Columbia River, Washington";
-$TEMPLE_CODES["DALLA"]=	"Dallas, Texas";
-$TEMPLE_CODES["DENVE"]=	"Denver, Colorado";
-$TEMPLE_CODES["DETRO"]=	"Detroit, Michigan";
-$TEMPLE_CODES["EDMON"]=	"Edmonton, Alberta, Canada";
-$TEMPLE_CODES["EHOUS"]=	"ENDOWMENT HOUSE";
-$TEMPLE_CODES["FRANK"]=	"Frankfurt am Main, Germany";  // There's also a Frankfurt an der Oder in Germany
-$TEMPLE_CODES["FREIB"]=	"Freiburg, Germany";
-$TEMPLE_CODES["FRESN"]=	"Fresno, California";
-$TEMPLE_CODES["FUKUO"]=	"Fukuoka, Japan";
-$TEMPLE_CODES["GUADA"]=	"Guadalajara, Mexico";
-$TEMPLE_CODES["GUATE"]=	"Guatemala City, Guatemala";
-$TEMPLE_CODES["GUAYA"]=	"Guayaquil, Ecuador";
-$TEMPLE_CODES["HAGUE"]=	"The Hague, Netherlands";
-$TEMPLE_CODES["HALIF"]=	"Halifax, Nova Scotia, Canada";
-$TEMPLE_CODES["NZEAL"]=	"Hamilton, New Zealand";
-$TEMPLE_CODES["HARTF"]=	"Hartford, Connecticut";
-$TEMPLE_CODES["HELSI"]=	"Helsinki, Finland";
-$TEMPLE_CODES["HERMO"]=	"Hermosillo, Mexico";
-$TEMPLE_CODES["HKONG"]=	"Hong Kong";
-$TEMPLE_CODES["HOUST"]=	"Houston, Texas";
-$TEMPLE_CODES["IFALL"]=	"Idaho Falls, Idaho";
-$TEMPLE_CODES["JOHAN"]=	"Johannesburg, South Africa";
-$TEMPLE_CODES["JRIVE"]=	"Jordan River, Utah";
-$TEMPLE_CODES["KIEV"]=	"Kiev, Ukraine";
-$TEMPLE_CODES["KONA"]=	"Kona, Hawaii";
-$TEMPLE_CODES["HAWAI"]=	"Laie, Hawaii";
-$TEMPLE_CODES["LVEGA"]=	"Las Vegas, Nevada";
-$TEMPLE_CODES["LIMA"]=	"Lima, Peru";
-$TEMPLE_CODES["LOGAN"]=	"Logan, Utah";
-$TEMPLE_CODES["LONDO"]=	"London, England";
-$TEMPLE_CODES["LANGE"]=	"Los Angeles, California";
-$TEMPLE_CODES["LOUIS"]=	"Louisville, Kentucky";
-$TEMPLE_CODES["LUBBO"]=	"Lubbock, Texas";
-$TEMPLE_CODES["MADRI"]=	"Madrid, Spain";
-$TEMPLE_CODES["MANIL"]=	"Manila, Philippines";
-$TEMPLE_CODES["MANTI"]=	"Manti, Utah";
-$TEMPLE_CODES["MEDFO"]=	"Medford, Oregon";
-$TEMPLE_CODES["MELBO"]=	"Melbourne, Australia";
-$TEMPLE_CODES["MEMPH"]=	"Memphis, Tennessee";
-$TEMPLE_CODES["MERID"]=	"Merida, Mexico";
-$TEMPLE_CODES["ARIZO"]=	"Mesa, Arizona";
-$TEMPLE_CODES["MEXIC"]=	"Mexico City, Mexico";
-$TEMPLE_CODES["MONTE"]=	"Monterrey, Mexico";
-$TEMPLE_CODES["MNTVD"]=	"Montevideo, Uruguay";
-$TEMPLE_CODES["MONTI"]=	"Monticello, Utah";
-$TEMPLE_CODES["MONTR"]=	"Montreal, Quebec, Canada";
-$TEMPLE_CODES["MTIMP"]=	"Mt. Timpanogos, Utah";
-$TEMPLE_CODES["NASHV"]=	"Nashville, Tennessee";
-$TEMPLE_CODES["NAUV2"]=	"Nauvoo, Illinois (new)";
-$TEMPLE_CODES["NAUVO"]=	"Nauvoo, Illinois (original)";
-$TEMPLE_CODES["NBEAC"]=	"Newport Beach, California";
-$TEMPLE_CODES["NYORK"]=	"New York, New York";
-$TEMPLE_CODES["NUKUA"]=	"Nuku'Alofa, Tonga";
-$TEMPLE_CODES["OAKLA"]=	"Oakland, California";
-$TEMPLE_CODES["OAXAC"]=	"Oaxaca, Mexico";
-$TEMPLE_CODES["OGDEN"]=	"Ogden, Utah";
-$TEMPLE_CODES["OKLAH"]=	"Oklahoma City, Oklahoma";
-$TEMPLE_CODES["ORLAN"]=	"Orlando, Florida";
-$TEMPLE_CODES["PALEG"]=	"Porto Alegre, Mexico";
-$TEMPLE_CODES["PALMY"]=	"Palmyra, New York";
-$TEMPLE_CODES["PAPEE"]=	"Papeete, Tahiti";
-$TEMPLE_CODES["PERTH"]=	"Perth, Australia";
-$TEMPLE_CODES["PORTL"]=	"Portland, Oregon";
-$TEMPLE_CODES["POFFI"]=	"PRESIDENT'S OFFICE";
-$TEMPLE_CODES["PREST"]=	"Preston, England";
-$TEMPLE_CODES["PROVO"]=	"Provo, Utah";
-$TEMPLE_CODES["RALEI"]=	"Raleigh, North Carolina";
-$TEMPLE_CODES["RECIF"]=	"Recife, Brazil";
-$TEMPLE_CODES["REDLA"]=	"Redlands, California";
-$TEMPLE_CODES["REGIN"]=	"Regina, Saskatchewan, Canada";
-$TEMPLE_CODES["RENO"]=	"Reno, Nevada";
-$TEMPLE_CODES["SACRA"]=	"Sacramento, California";
-$TEMPLE_CODES["SLAKE"]=	"Salt Lake City, Utah";
-$TEMPLE_CODES["SANTO"]=	"San Antonio, Texas";
-$TEMPLE_CODES["SDIEG"]=	"San Diego, California";
-$TEMPLE_CODES["SJOSE"]= "San Jose, Costa Rica";
-$TEMPLE_CODES["SANTI"]=	"Santiago, Chile";
-$TEMPLE_CODES["SDOMI"]=	"Santo Domingo, Dom. Rep.";
-$TEMPLE_CODES["SPAUL"]=	"Sao Paulo, Brazil";
-$TEMPLE_CODES["SEATT"]=	"Seattle, Washington";
-$TEMPLE_CODES["SEOUL"]=	"Seoul, Korea";
-$TEMPLE_CODES["SNOWF"]= "Snowflake, Arizona";
-$TEMPLE_CODES["SPOKA"]= "Spokane, Washington";
-$TEMPLE_CODES["SGEOR"]=	"St. George, Utah";
-$TEMPLE_CODES["SLOUI"]=	"St. Louis, Missouri";
-$TEMPLE_CODES["SPMIN"]= "St. Paul, Minnesota";
-$TEMPLE_CODES["STOCK"]=	"Stockholm, Sweden";
-$TEMPLE_CODES["SUVA"]=	"Suva, Fiji";
-$TEMPLE_CODES["SYDNE"]=	"Sydney, Australia";
-$TEMPLE_CODES["TAIPE"]=	"Taipei, Taiwan";
-$TEMPLE_CODES["TAMPI"]=	"Tampico, Mexico";
-$TEMPLE_CODES["TOKYO"]=	"Tokyo, Japan";
-$TEMPLE_CODES["TORNO"]=	"Toronto, Ontario, Canada";
-$TEMPLE_CODES["TGUTI"]=	"Tuxtla Gutierrez, Mexico";
-$TEMPLE_CODES["VERAC"]=	"Veracruz, Mexico";
-$TEMPLE_CODES["VERNA"]=	"Vernal, Utah";
-$TEMPLE_CODES["VILLA"]=	"Villa Hermosa, Mexico";
-$TEMPLE_CODES["WASHI"]=	"Washington, DC";
-$TEMPLE_CODES["WINTE"]=	"Winter Quarters, Nebraska";
-
-$STATUS_CODES = array();
-$STATUS_CODES["CHILD"]= "Died as a child: exempt";
-$STATUS_CODES["INFANT"] = "Died as an infant: exempt";
-$STATUS_CODES["STILLBORN"] = "Stillborn: exempt";
-$STATUS_CODES["BIC"] = "Born in the covenant";
-$STATUS_CODES["SUBMITTED"] = "Submitted but not yet cleared";
-$STATUS_CODES["UNCLEARED"] = "Uncleared: insufficient data";
-$STATUS_CODES["CLEARED"] = "Cleared but not yet completed";
-$STATUS_CODES["COMPLETED"] = "Completed; date unknown";
-$STATUS_CODES["PRE-1970"] = "Completed before 1970; date not available";
-$STATUS_CODES["CANCELLED"] = "Sealing cancelled (divorce)";
-$STATUS_CODES["DNS"] = "Do Not Seal: unauthorized";
-$STATUS_CODES["DNS/CAN"] = "Do Not Seal, previous sealing cancelled";
-?>
+<?php
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_TEMPLECODES_PHP', '');
+
+# $Id$
+$TEMPLE_CODES = array();
+$TEMPLE_CODES["ABA"]=	"Aba, Nigeria";
+$TEMPLE_CODES["ACCRA"]=	"Accra, Ghana";
+$TEMPLE_CODES["ADELA"]=	"Adelaide, Australia";
+$TEMPLE_CODES["ALBUQ"]=	"Albuquerque, New Mexico";
+$TEMPLE_CODES["ANCHO"]=	"Anchorage, Alaska";
+$TEMPLE_CODES["SAMOA"]=	"Apia, Samoa";
+$TEMPLE_CODES["ASUNC"]=	"Asuncion, Paraguay";
+$TEMPLE_CODES["ATLAN"]=	"Atlanta, Georgia";
+$TEMPLE_CODES["SWISS"]=	"Bern, Switzerland";
+$TEMPLE_CODES["BOGOT"]=	"Bogota, Columbia";
+$TEMPLE_CODES["BILLI"]=	"Billings, Montana";
+$TEMPLE_CODES["BIRMI"]=	"Birmingham, Alabama";
+$TEMPLE_CODES["BISMA"]=	"Bismarck, North Dakota";
+$TEMPLE_CODES["BOGOT"]=	"Bogota, Colombia";
+$TEMPLE_CODES["BOISE"]=	"Boise, Idaho";
+$TEMPLE_CODES["BOSTO"]=	"Boston, Massachusetts";
+$TEMPLE_CODES["BOUNT"]=	"Bountiful, Utah";
+$TEMPLE_CODES["BRISB"]=	"Brisbane, Australia";
+$TEMPLE_CODES["BROUG"]=	"Baton Rouge, Louisiana";
+$TEMPLE_CODES["BAIRE"]=	"Buenos Aires, Argentina";
+$TEMPLE_CODES["CAMPI"]=	"Campinas, Brazil";
+$TEMPLE_CODES["CARAC"]=	"Caracas, Venezuela";
+$TEMPLE_CODES["ALBER"]=	"Cardston, Alberta, Canada";
+$TEMPLE_CODES["CHICA"]=	"Chicago, Illinois";
+$TEMPLE_CODES["CIUJU"]=	"Ciudad Juarez, Mexico";
+$TEMPLE_CODES["COCHA"]=	"Cochabamba, Bolivia";
+$TEMPLE_CODES["COLJU"]=	"Colonia Juarez, Mexico";
+$TEMPLE_CODES["COLSC"]=	"Columbia, South Carolina";
+$TEMPLE_CODES["COLUM"]=	"Columbus, Ohio";
+$TEMPLE_CODES["COPEN"]=	"Copenhagen, Denmark";
+$TEMPLE_CODES["CRIVE"]=	"Columbia River, Washington";
+$TEMPLE_CODES["DALLA"]=	"Dallas, Texas";
+$TEMPLE_CODES["DENVE"]=	"Denver, Colorado";
+$TEMPLE_CODES["DETRO"]=	"Detroit, Michigan";
+$TEMPLE_CODES["EDMON"]=	"Edmonton, Alberta, Canada";
+$TEMPLE_CODES["EHOUS"]=	"ENDOWMENT HOUSE";
+$TEMPLE_CODES["FRANK"]=	"Frankfurt am Main, Germany";  // There's also a Frankfurt an der Oder in Germany
+$TEMPLE_CODES["FREIB"]=	"Freiburg, Germany";
+$TEMPLE_CODES["FRESN"]=	"Fresno, California";
+$TEMPLE_CODES["FUKUO"]=	"Fukuoka, Japan";
+$TEMPLE_CODES["GUADA"]=	"Guadalajara, Mexico";
+$TEMPLE_CODES["GUATE"]=	"Guatemala City, Guatemala";
+$TEMPLE_CODES["GUAYA"]=	"Guayaquil, Ecuador";
+$TEMPLE_CODES["HAGUE"]=	"The Hague, Netherlands";
+$TEMPLE_CODES["HALIF"]=	"Halifax, Nova Scotia, Canada";
+$TEMPLE_CODES["NZEAL"]=	"Hamilton, New Zealand";
+$TEMPLE_CODES["HARTF"]=	"Hartford, Connecticut";
+$TEMPLE_CODES["HELSI"]=	"Helsinki, Finland";
+$TEMPLE_CODES["HERMO"]=	"Hermosillo, Mexico";
+$TEMPLE_CODES["HKONG"]=	"Hong Kong";
+$TEMPLE_CODES["HOUST"]=	"Houston, Texas";
+$TEMPLE_CODES["IFALL"]=	"Idaho Falls, Idaho";
+$TEMPLE_CODES["JOHAN"]=	"Johannesburg, South Africa";
+$TEMPLE_CODES["JRIVE"]=	"Jordan River, Utah";
+$TEMPLE_CODES["KIEV"]=	"Kiev, Ukraine";
+$TEMPLE_CODES["KONA"]=	"Kona, Hawaii";
+$TEMPLE_CODES["HAWAI"]=	"Laie, Hawaii";
+$TEMPLE_CODES["LVEGA"]=	"Las Vegas, Nevada";
+$TEMPLE_CODES["LIMA"]=	"Lima, Peru";
+$TEMPLE_CODES["LOGAN"]=	"Logan, Utah";
+$TEMPLE_CODES["LONDO"]=	"London, England";
+$TEMPLE_CODES["LANGE"]=	"Los Angeles, California";
+$TEMPLE_CODES["LOUIS"]=	"Louisville, Kentucky";
+$TEMPLE_CODES["LUBBO"]=	"Lubbock, Texas";
+$TEMPLE_CODES["MADRI"]=	"Madrid, Spain";
+$TEMPLE_CODES["MANIL"]=	"Manila, Philippines";
+$TEMPLE_CODES["MANTI"]=	"Manti, Utah";
+$TEMPLE_CODES["MEDFO"]=	"Medford, Oregon";
+$TEMPLE_CODES["MELBO"]=	"Melbourne, Australia";
+$TEMPLE_CODES["MEMPH"]=	"Memphis, Tennessee";
+$TEMPLE_CODES["MERID"]=	"Merida, Mexico";
+$TEMPLE_CODES["ARIZO"]=	"Mesa, Arizona";
+$TEMPLE_CODES["MEXIC"]=	"Mexico City, Mexico";
+$TEMPLE_CODES["MONTE"]=	"Monterrey, Mexico";
+$TEMPLE_CODES["MNTVD"]=	"Montevideo, Uruguay";
+$TEMPLE_CODES["MONTI"]=	"Monticello, Utah";
+$TEMPLE_CODES["MONTR"]=	"Montreal, Quebec, Canada";
+$TEMPLE_CODES["MTIMP"]=	"Mt. Timpanogos, Utah";
+$TEMPLE_CODES["NASHV"]=	"Nashville, Tennessee";
+$TEMPLE_CODES["NAUV2"]=	"Nauvoo, Illinois (new)";
+$TEMPLE_CODES["NAUVO"]=	"Nauvoo, Illinois (original)";
+$TEMPLE_CODES["NBEAC"]=	"Newport Beach, California";
+$TEMPLE_CODES["NYORK"]=	"New York, New York";
+$TEMPLE_CODES["NUKUA"]=	"Nuku'Alofa, Tonga";
+$TEMPLE_CODES["OAKLA"]=	"Oakland, California";
+$TEMPLE_CODES["OAXAC"]=	"Oaxaca, Mexico";
+$TEMPLE_CODES["OGDEN"]=	"Ogden, Utah";
+$TEMPLE_CODES["OKLAH"]=	"Oklahoma City, Oklahoma";
+$TEMPLE_CODES["ORLAN"]=	"Orlando, Florida";
+$TEMPLE_CODES["PALEG"]=	"Porto Alegre, Mexico";
+$TEMPLE_CODES["PALMY"]=	"Palmyra, New York";
+$TEMPLE_CODES["PAPEE"]=	"Papeete, Tahiti";
+$TEMPLE_CODES["PERTH"]=	"Perth, Australia";
+$TEMPLE_CODES["PORTL"]=	"Portland, Oregon";
+$TEMPLE_CODES["POFFI"]=	"PRESIDENT'S OFFICE";
+$TEMPLE_CODES["PREST"]=	"Preston, England";
+$TEMPLE_CODES["PROVO"]=	"Provo, Utah";
+$TEMPLE_CODES["RALEI"]=	"Raleigh, North Carolina";
+$TEMPLE_CODES["RECIF"]=	"Recife, Brazil";
+$TEMPLE_CODES["REDLA"]=	"Redlands, California";
+$TEMPLE_CODES["REGIN"]=	"Regina, Saskatchewan, Canada";
+$TEMPLE_CODES["RENO"]=	"Reno, Nevada";
+$TEMPLE_CODES["SACRA"]=	"Sacramento, California";
+$TEMPLE_CODES["SLAKE"]=	"Salt Lake City, Utah";
+$TEMPLE_CODES["SANTO"]=	"San Antonio, Texas";
+$TEMPLE_CODES["SDIEG"]=	"San Diego, California";
+$TEMPLE_CODES["SJOSE"]= "San Jose, Costa Rica";
+$TEMPLE_CODES["SANTI"]=	"Santiago, Chile";
+$TEMPLE_CODES["SDOMI"]=	"Santo Domingo, Dom. Rep.";
+$TEMPLE_CODES["SPAUL"]=	"Sao Paulo, Brazil";
+$TEMPLE_CODES["SEATT"]=	"Seattle, Washington";
+$TEMPLE_CODES["SEOUL"]=	"Seoul, Korea";
+$TEMPLE_CODES["SNOWF"]= "Snowflake, Arizona";
+$TEMPLE_CODES["SPOKA"]= "Spokane, Washington";
+$TEMPLE_CODES["SGEOR"]=	"St. George, Utah";
+$TEMPLE_CODES["SLOUI"]=	"St. Louis, Missouri";
+$TEMPLE_CODES["SPMIN"]= "St. Paul, Minnesota";
+$TEMPLE_CODES["STOCK"]=	"Stockholm, Sweden";
+$TEMPLE_CODES["SUVA"]=	"Suva, Fiji";
+$TEMPLE_CODES["SYDNE"]=	"Sydney, Australia";
+$TEMPLE_CODES["TAIPE"]=	"Taipei, Taiwan";
+$TEMPLE_CODES["TAMPI"]=	"Tampico, Mexico";
+$TEMPLE_CODES["TOKYO"]=	"Tokyo, Japan";
+$TEMPLE_CODES["TORNO"]=	"Toronto, Ontario, Canada";
+$TEMPLE_CODES["TGUTI"]=	"Tuxtla Gutierrez, Mexico";
+$TEMPLE_CODES["VERAC"]=	"Veracruz, Mexico";
+$TEMPLE_CODES["VERNA"]=	"Vernal, Utah";
+$TEMPLE_CODES["VILLA"]=	"Villa Hermosa, Mexico";
+$TEMPLE_CODES["WASHI"]=	"Washington, DC";
+$TEMPLE_CODES["WINTE"]=	"Winter Quarters, Nebraska";
+
+$STATUS_CODES = array();
+$STATUS_CODES["CHILD"]= "Died as a child: exempt";
+$STATUS_CODES["INFANT"] = "Died as an infant: exempt";
+$STATUS_CODES["STILLBORN"] = "Stillborn: exempt";
+$STATUS_CODES["BIC"] = "Born in the covenant";
+$STATUS_CODES["SUBMITTED"] = "Submitted but not yet cleared";
+$STATUS_CODES["UNCLEARED"] = "Uncleared: insufficient data";
+$STATUS_CODES["CLEARED"] = "Cleared but not yet completed";
+$STATUS_CODES["COMPLETED"] = "Completed; date unknown";
+$STATUS_CODES["PRE-1970"] = "Completed before 1970; date not available";
+$STATUS_CODES["CANCELLED"] = "Sealing cancelled (divorce)";
+$STATUS_CODES["DNS"] = "Do Not Seal: unauthorized";
+$STATUS_CODES["DNS/CAN"] = "Do Not Seal, previous sealing cancelled";
+?>

--- reporthtml.php DELETED ---

--- reportpdf.php DELETED ---

--- functions_privacy.php DELETED ---

--- repository_class.php DELETED ---

--- functions_export.php DELETED ---

--- functions_places.php DELETED ---

--- functions_print_facts.php DELETED ---

--- class_stats_compat.php DELETED ---

--- person_class.php DELETED ---

--- functions_import.php DELETED ---

Index: help_text_vars.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/help_text_vars.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- help_text_vars.php	7 Jul 2008 17:30:13 -0000	1.1
+++ help_text_vars.php	30 Apr 2009 18:32:43 -0000	1.2
@@ -1,252 +1,255 @@
-<?php
-/**
- * File contains var's to glue Help_text for PHPGedView together
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008  John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Help
- * @author John Finlay & Jans Luder
- * @version $Id$
- */
-
-// The variables in this file are used to glue together other var's in the help_text.xx.php
-// Do NOT put any var's, that need to be translated, in this file
-if (strstr($_SERVER["SCRIPT_NAME"],"help_text_vars")) {
-	print "Now, why would you want to do that.  You're not hacking are you?";
-	exit;
-}
-loadLangFile("pgv_confighelp");
-
-$pgv_lang["help_manageservers.php"]	= "#pgv_lang[help_managesites]#";
-$pgv_lang["edit_RESN_help"]			= "#pgv_lang[RESN_help]#";
-
-$pgv_lang["help_aliveinyear.php"]	= "#pgv_lang[alive_in_year_help]#";
-
-//General
-$pgv_lang["start_ahelp"]			= "<div class=\"list_value_wrap\"><center class=\"error\">#pgv_lang[start_admin_help]#</center>";
-$pgv_lang["end_ahelp"]				= "<center class=\"error\">#pgv_lang[end_admin_help]#</center></div>";
-$pgv_lang["redast"]				= "<span class=\"error\"<b>*</b></span>";
-
-// Header
-$pgv_lang["header_help_items"]			= "<a name=\"header\">&nbsp;</a>#pgv_lang[header_help]#<br /><a name=\"header_search\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_search_help]#<br /><a name=\"header_lang_select\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_lang_select_help]#<br /><a name=\"header_user_links\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_user_links_help]#<br /><a name=\"header_favorites\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_favorites_help]#<br /><a name=\"header_theme\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_theme_help]#<br />";
-$pgv_lang["menu_help_items"]			= "<a name=\"menu\">&nbsp;</a>#pgv_lang[menu_help]#<a name=\"menu_fam\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_famtree_help]#<br /><a name=\"menu_myged\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_myged_help]#<a name=\"menu_charts\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_charts_help]#<a name=\"menu_lists\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_lists_help]#<a name=\"menu_annical\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_annical_help]#<a name=\"menu_clip\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_clip_help]#<a name=\"menu_search\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_search_help]#<a name=\"menu_rslog\"></a><a name=\"menu_help\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_help_help]#<br />";
-$pgv_lang["index_portal_help_blocks"]		= "<a href=\"#top\">$UpArrow </a><a name=\"index_portal\">&nbsp;</a>#pgv_lang[index_portal_head_help]##pgv_lang[index_portal_help]#<br /><a name=\"index_welcome\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_welcome_help]#<br /><a name=\"index_login\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_login_help]#<br /><a name=\"index_events\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_events_help]#<br /><a name=\"index_onthisday\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_onthisday_help]#<br /><a name=\"index_charts\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_charts_help]#<br /><a name=\"index_favorites\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_favorites_help]#<br /><a name=\"index_stats\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_stats_help]#<br /><a name=\"index_common_surnames\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_common_names_help]#<br /><a name=\"index_media\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_media_help]#<br /><a name=\"index_loggedin\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_loggedin_help]#<br /><a name=\"recent_changes\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[recent_changes_help]#<br />";
-
-//Help
-$pgv_lang["help_help_items"]			= "#pgv_lang[help_help]#<br />#pgv_lang[help_page_help]##pgv_lang[help_content_help]##pgv_lang[help_faq_help]##pgv_lang[help_HS_help]##pgv_lang[help_qm_help]#";
-$pgv_lang["def_help_items"]			= "<a name=\"def\">&nbsp;</a>#pgv_lang[def_help]#<br /><a name=\"def_gedcom\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_gedcom_help]#<br /><a name=\"def_gedcom_date\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_gedcom_date_help]#<br /><a name=\"def_pdf_format\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_pdf_format_help]#<br /><a name=\"def_pgv\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_pgv_help]#<br /><a name=\"def_portal\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_portal_help]#<br /><a name=\"def_theme\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_theme_help]#<br />";
-
-// edit_user.php (My account)
-$pgv_lang["edituser_user_contact_help"]		= "#pgv_lang[edituser_contact_meth_help]#<br /><br /><b>#pgv_lang[messaging]#</b><br />#pgv_lang[mail_option1_help]#<br /><b>#pgv_lang[messaging2]#</b><br />#pgv_lang[mail_option2_help]#<br /><b>#pgv_lang[mailto]#</b><br />#pgv_lang[mail_option3_help]#<br /><b>#pgv_lang[no_messaging]#</b><br />#pgv_lang[mail_option4_help]#<br />";
-$pgv_lang["help_edituser.php"]			= "~#pgv_lang[myuserdata]#~<br /><br />#pgv_lang[edituser_my_account_help]#<br />#pgv_lang[more_help]#";
-
-// user_admin.php
-$pgv_lang["help_useradmin.php"]			= "#pgv_lang[useradmin_help]#<br /><br />#pgv_lang[is_user_help]#<br />#pgv_lang[more_help]#";
-$pgv_lang["useradmin_user_contact_help"]	= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_user_contact_help]#";
-$pgv_lang["useradmin_change_lang_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_change_lang_help]#";
-$pgv_lang["useradmin_email_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_email_help]#";
-$pgv_lang["useradmin_user_theme_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_user_theme_help]#";
-// these need to be checked and maybe moved to the help_text.en.php
-$pgv_lang["useradmin_username_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_username_help]#";
-$pgv_lang["useradmin_firstname_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_firstname_help]#";
-$pgv_lang["useradmin_lastname_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_lastname_help]#";
-$pgv_lang["useradmin_password_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_password_help]#";
-$pgv_lang["useradmin_conf_password_help"]	= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_conf_password_help]#";
-$pgv_lang["edit_useradmin_help"]		= "#pgv_lang[useradmin_edit_user_help]#<br />#pgv_lang[more_help]#";
-
-// general help items used in help welcome page
-$pgv_lang["general_help"]			= "<a name=\"header_general\">&nbsp;</a>#pgv_lang[header_general_help]##pgv_lang[best_display_help]#<br />#pgv_lang[preview_help]#<br />";
-
-// page help for the Welcome page
-$pgv_lang["help_index.php"]			= "#pgv_lang[index_help]#<br />#pgv_lang[index_portal_help_blocks]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[header_help_items]#<br /><br /><a href=\"#top\">$UpArrow </a>#pgv_lang[menu_help_items]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[general_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[def_help_items]#<br />";
-
-// page help for the MyGedView page
-$pgv_lang["mygedview_portal_help_blocks"]	= "<a name=\"mygedview_portal\"></a>#pgv_lang[mygedview_portal_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_welcome\"></a>#pgv_lang[mygedview_welcome_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_customize\"></a>#pgv_lang[mygedview_customize_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_message\"></a>#pgv_lang[mygedview_message_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_events\"></a>#pgv_lang[index_events_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_onthisday\"></a>#pgv_lang[index_onthisday_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_charts\"></a>#pgv_lang[index_charts_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_favorites\"></a>#pgv_lang[mygedview_favorites_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_stats\"></a>#pgv_lang[index_stats_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_myjournal\"></a>#pgv_lang[mygedview_myjournal_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_media\"></a>#pgv_lang[index_media_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_loggedin\"></a>#pgv_lang[index_loggedin_help]#<br /><a name=\"mygedview_recent_changes\"></a><a href=\"#mygedview_portal\">$UpArrow </a>#pgv_lang[recent_changes_help]#<br />";
-$pgv_lang["index_myged_help"]			= "#pgv_lang[mygedview_portal_help_blocks]#<br />";
-
-
-//Login
-$pgv_lang["help_login.php"]			= "#pgv_lang[login_page_help]#<br />#pgv_lang[mygedview_login_help]#";
-$pgv_lang["help_login_register.php"]		= "~#pgv_lang[requestaccount]#~<br /><br />#pgv_lang[register_info_01]#";
-$pgv_lang["help_login_lost_pw.php"]		= "~#pgv_lang[lost_pw_reset]#~<br /><br />#pgv_lang[pls_note11]#";
-$pgv_lang["index_login_register_help"]		= "#pgv_lang[index_login_help]#<br />#pgv_lang[new_user_help]#<br /><br />#pgv_lang[new_password_help]#<br />";
-
-//Add Facts
-$pgv_lang["add_new_facts_help"]			= "#pgv_lang[multiple_help]#<br />#pgv_lang[add_facts_help]#<br />#pgv_lang[add_custom_facts_help]#<br />#pgv_lang[add_from_clipboard_help]#<br />#pgv_lang[def_gedcom_date_help]#<br />#pgv_lang[add_facts_general_help]#";
-
-//Admin Help News Block
-$pgv_lang["index_gedcom_news_ahelp"]		= "#pgv_lang[index_gedcom_news_help]##pgv_lang[start_ahelp]##pgv_lang[index_gedcom_news_adm_help]##pgv_lang[end_ahelp]#";
-
-//Admin Help Advanced HTML Block
-$pgv_lang["index_htmlplus_ahelp"]		= "#pgv_lang[index_htmlplus_help]##pgv_lang[start_ahelp]##pgv_lang[index_htmlplus_content_help]##pgv_lang[end_ahelp]#";
-
-/*
-//Upgrade Utility
-$pgv_lang["help_upgrade.php"]			="#pgv_lang[how_upgrade_help]#<br /><br />#pgv_lang[readme_help]#";
-*/
-
-//-- Admin
-$pgv_lang["help_admin.php"]			="~#pgv_lang[administration]#~</b><br /><br />#pgv_lang[admin_help]#<br /><br />#pgv_lang[readme_help]#";
-
-//-- Language editor and configuration
-$pgv_lang["help_editlang.php"]			="#pgv_lang[lang_edit_help]#<br /><br />#pgv_lang[translation_forum_help]#<br /><br />#pgv_lang[bom_check_help]#<br /><br />#pgv_lang[edit_lang_utility_help]#<br /><br />#pgv_lang[export_lang_utility_help]#<br /><br />#pgv_lang[compare_lang_utility_help]#<br /><br />#pgv_lang[add_new_language_help]#<br /><br />#pgv_lang[more_help]#";
-$pgv_lang["help_changelanguage.php"]			="#pgv_lang[config_lang_utility_help]##pgv_lang[more_help]#";
-
-//-- User Migrate and Backup tool
-$pgv_lang["help_usermigrate.php"]	="#pgv_lang[um_tool_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_sql_index_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_index_sql_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_bu_help]#";
-
-//-- FAQ List editing tool
-$pgv_lang["faq_page_help"]	=	"#pgv_lang[help_faq.php]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[preview_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[restore_faq_edits_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[edit_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[delete_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[moveup_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[movedown_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_header_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_body_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_order_help]#";
-
-//--				G E D C O M
-//-- Gedcom Info
-$pgv_lang["gedcom_info_help"]			= "<div class=\"name_head center\"><b>#pgv_lang[help_contents_gedcom_info]#</b></div><br />#pgv_lang[def_gedcom_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[def_gedcom_date_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[ppp_levels_help]#";
-
-//-- Add Gedcom
-$pgv_lang["help_addgedcom.php"]			="#pgv_lang[add_gedcom_help]#<br /><br />#pgv_lang[add_upload_gedcom_help]#<br />#pgv_lang[readme_help]#";
-//-- Add new Gedcom
-$pgv_lang["help_addnewgedcom.php"]		="#pgv_lang[add_new_gedcom_help]#<br /><br />#pgv_lang[readme_help]#";
-//-- Download Gedcom
-$pgv_lang["help_downloadgedcom.php"]		="#pgv_lang[download_gedcom_help]#";
-//-- Edit Gedcoms
-$pgv_lang["help_editgedcoms.php"]		="#pgv_lang[edit_gedcoms_help]#";
-//-- Edit Config Gedcoms
-$pgv_lang["help_editconfig_gedcom.php"]		="#pgv_lang[edit_config_gedcom_help]##pgv_lang[more_config_hjaelp]#<br /><br />#pgv_lang[readme_help]#";
-//-- Import Gedcom
-$pgv_lang["help_importgedcom.php"]		="#pgv_lang[import_gedcom_help]#";
-//-- Upload Gedcom
-$pgv_lang["help_uploadgedcom.php"]		="#pgv_lang[upload_gedcom_help]#<br /><br />#pgv_lang[add_upload_gedcom_help]#<br />#pgv_lang[readme_help]#";
-//-- Validate Gedcom
-$pgv_lang["help_validategedcom.php"]		="#pgv_lang[validate_gedcom_help]#";
-//-- Edit Privacy
-$pgv_lang["help_edit_privacy.php"]		="~#pgv_lang[edit_privacy_title]#~<br /><br />#pgv_lang[edit_privacy_help]##pgv_lang[more_config_hjaelp]#<br />#pgv_lang[readme_help]#";
-
-//Specials for contents
-$vpos = strpos($pgv_lang["enter_terms"], ":", 0);
-if ($vpos>0) $enter_terms = substr($pgv_lang["enter_terms"], 0, $vpos);
-else $enter_terms = $pgv_lang["enter_terms"];
-$vpos = strpos($pgv_lang["soundex_search"], ":", 0);
-if ($vpos>0) $soundex_search = substr($pgv_lang["soundex_search"], 0, $vpos);
-else $soundex_search = $pgv_lang["soundex_search"];
-
-$pgv_lang["help_used_in_contents"]		= "<div class=\"name_head center\"><b>#pgv_lang[page_help]#</b></div><br />#pgv_lang[help_help_items]#";
-$pgv_lang["search_used_in_contents"]		= "<div class=\"name_head center\"><b>#pgv_lang[search]#</b></div><ul><li><a href=\"#header_search\">#pgv_lang[header]#</a></li><li><a href=\"#menu_search\">#pgv_lang[menu]#</a></li><li><a href=\"#help_search\">#pgv_lang[search]#</li><li><a href=\"#search_enter_terms\">$enter_terms</a></li></ul><br /><br /><a href=\"#top\">$UpArrow </a><a name=\"header_search\"></a>#pgv_lang[header_search_help]#<br /><br /><a href=\"#top\">$UpArrow </a><a name=\"menu_search\"></a>#pgv_lang[menu_search_help]#<br /><a href=\"#top\">$UpArrow </a><a name=\"help_search\"></a>#pgv_lang[help_search.php]#<br /><a href=\"#top\">$UpArrow </a><a name=\"search_enter_terms\"></a>#pgv_lang[search_enter_terms_help]#";
-
-
-/*-- Var's for Menu Item: Help contents
-	The var $pgv_lang["help_contents_help"] contains all the vars below.
-	example: $pgv_lang["h1"] >>> help_index.php will be the var $pgv_lang["help_index.php"],
-	to be displayed if the text of $pgv_lang["welcome_page"] is clicked in the Help Contents
-*/
-$pgv_lang["h1"]		= "help_index.php,welcome_page";
-$pgv_lang["h2"]		= "index_myged_help,mygedview";
-$pgv_lang["h3"]		= "help_calendar.php,anniversary_calendar";
-$pgv_lang["h4"]		= "help_clippings.php,clip_cart";
-$pgv_lang["h5"]		= "help_descendancy.php,descend_chart";
-$pgv_lang["h6"]		= "help_edituser.php,editowndata";
-$pgv_lang["h7"]		= "gedcom_info_help,help_contents_gedcom_info";
-$pgv_lang["h8"]		= "help_family.php,family_info";
-$pgv_lang["h9"]		= "help_famlist.php,family_list";
-$pgv_lang["h10"]	= "header_help_items,header";
-$pgv_lang["h11"]	= "help_individual.php,indi_info";
-$pgv_lang["h12"]	= "help_indilist.php,individual_list";
-$pgv_lang["h13"]	= "help_login.php,login";
-$pgv_lang["h14"]	= "menu_help_items,menu";
-$pgv_lang["h15"]	= "help_medialist.php,media_list";
-$pgv_lang["h16"]	= "help_relationship.php,relationship_chart";
-$pgv_lang["h17"]	= "best_display_help,resolution";
-$pgv_lang["h18"]	= "search_used_in_contents,search";
-$pgv_lang["h19"]	= "help_source.php,source";
-$pgv_lang["h20"]	= "help_sourcelist.php,source_list";
-$pgv_lang["h21"]	= "help_pedigree.php,index_header";
-$pgv_lang["h22"]	= "preview_help,print_preview";
-$pgv_lang["h23"]	= "help_placelist.php,place_list";
-$pgv_lang["h24"]	= "help_timeline.php,timeline_chart";
-$pgv_lang["h25"]	= "help_used_in_contents,page_help";
-$pgv_lang["h26"]	= "edituser_password_help,password";
-$pgv_lang["h27"]	= "edituser_username_help,username";
-$pgv_lang["h28"]	= "add_media_help,add_media_lbl";
-$pgv_lang["h29"]	= "help_login_register.php,requestaccount";
-$pgv_lang["h30"]	= "help_login_lost_pw.php,lost_pw_reset";
-$pgv_lang["h31"]	= "help_ancestry.php,ancestry_chart";
-$pgv_lang["h32"]	= "help_fanchart.php,fan_chart";
-$pgv_lang["h33"]	= "help_reportengine.php,reports";
-$pgv_lang["h34"]	= "def_help_items,definitions";
-$pgv_lang["h35"]	= "accesskey_viewing_advice_help,accesskeys";
-$pgv_lang["h36"]	= "help_faq.php,faq_list";
-$pgv_lang["h37"]	= "hs_title_help,hs_title";
-$pgv_lang["h38"]	= "help_hourglass.php,hourglass_chart";
-$pgv_lang["h39"]	= "help_familybook.php,familybook_chart";
-$pgv_lang["h40"]	= "search_replace_help,search_replace";
-$pgv_lang["h41"]	= "soundex_search_help,search_soundex";
-
-$pgv_lang["help_contents_help"] = "";
-$i=1;
-while (isset($pgv_lang["h$i"])) {
-	$Which = "h".$i;
-	if ($pgv_lang[$Which]!="") $pgv_lang["help_contents_help"] .= "#pgv_lang[h$i]#";
-	$i++;
-}
-
-
-
-
-//-- Help Contents for admin
-
-// $pgv_lang["ah1"]	= "how_upgrade_help,ah1_help";
-$pgv_lang["ah1"]	= "";
-$pgv_lang["ah2"]	= "help_editconfig.php,ah2_help";
-$pgv_lang["ah3"]	= "add_upload_gedcom_help,ah3_help";
-$pgv_lang["ah4"]	= "gedcom_configfile_help,ah4_help";
-$pgv_lang["ah5"]	= "default_gedcom_help,ah5_help";
-$pgv_lang["ah6"]	= "delete_gedcom_help,ah6_help";
-$pgv_lang["ah7"]	= "add_gedcom_help,ah7_help";
-$pgv_lang["ah8"]	= "add_new_gedcom_help,ah8_help";
-$pgv_lang["ah9"]	= "download_gedcom_help,ah9_help";
-$pgv_lang["ah10"]	= "edit_gedcoms_help,ah10_help";
-$pgv_lang["ah11"]	= "edit_config_gedcom_help,ah11_help";
-$pgv_lang["ah12"]	= "import_gedcom_help,ah12_help";
-$pgv_lang["ah13"]	= "upload_gedcom_help,ah13_help";
-$pgv_lang["ah14"]	= "validate_gedcom_help,ah14_help";
-$pgv_lang["ah15"]	= "convert_ansi2utf_help,ah15_help";
-$pgv_lang["ah16"]	= "help_edit_privacy.php,ah16_help";
-$pgv_lang["ah17"]	= "help_useradmin.php,ah17_help";
-$pgv_lang["ah18"]	= "help_admin.php,ah18_help";
-//$pgv_lang["ah19"]	= "addmedia_tool_help,ah19_help";
-$pgv_lang["ah19"]	= "";
-$pgv_lang["ah20"]	= "change_indi2id_help,ah20_help";
-$pgv_lang["ah21"]	= "help_editlang.php,ah21_help";
-$pgv_lang["ah22_help"]	= "_Readme.txt";
-$pgv_lang["ah22"]	= "readme_help,ah22_help";
-$pgv_lang["ah23"]	= "help_changelanguage.php,ah23_help";
-$pgv_lang["ah24"]	= "um_tool_help,ah24_help";
-$pgv_lang["ah25"]	= "um_bu_help,ah25_help";
-$pgv_lang["ah26"]	= "faq_page_help,ah26_help";
-
-$pgv_lang["a_help_contents_help"] = "";
-$i=1;
-while (isset($pgv_lang["ah$i"])) {
-	$Which = "ah".$i;
-	if ($pgv_lang[$Which]!="") $pgv_lang["a_help_contents_help"] .= "#pgv_lang[ah$i]#";
-	$i++;
-}
-
-$pgv_lang["admin_help_contents_help"]		=$pgv_lang["help_contents_help"].$pgv_lang["a_help_contents_help"];
-
-?>
+<?php
+/**
+ * File contains var's to glue Help_text for PHPGedView together
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Help
+ * @author John Finlay & Jans Luder
+ * @version $Id$
+ */
+
+// The variables in this file are used to glue together other var's in the help_text.xx.php
+// Do NOT put any var's, that need to be translated, in this file
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_HELP_TEXT_VARS_PHP', '');
+
+loadLangFile("pgv_confighelp");
+
+$pgv_lang["help_manageservers.php"]	= "#pgv_lang[help_managesites]#";
+$pgv_lang["edit_RESN_help"]			= "#pgv_lang[RESN_help]#";
+
+//General
+$pgv_lang["start_ahelp"]			= "<div class=\"list_value_wrap\"><center class=\"error\">#pgv_lang[start_admin_help]#</center>";
+$pgv_lang["end_ahelp"]				= "<center class=\"error\">#pgv_lang[end_admin_help]#</center></div>";
+$pgv_lang["redast"]				= "<span class=\"error\"<b>*</b></span>";
+
+// Header
+$pgv_lang["header_help_items"]			= "<a name=\"header\">&nbsp;</a>#pgv_lang[header_help]#<br /><a name=\"header_search\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_search_help]#<br /><a name=\"header_lang_select\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_lang_select_help]#<br /><a name=\"header_user_links\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_user_links_help]#<br /><a name=\"header_favorites\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_favorites_help]#<br /><a name=\"header_theme\"></a><a href=\"#header\">$UpArrow </a>#pgv_lang[header_theme_help]#<br />";
+$pgv_lang["menu_help_items"]			= "<a name=\"menu\">&nbsp;</a>#pgv_lang[menu_help]#<a name=\"menu_fam\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_famtree_help]#<br /><a name=\"menu_myged\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_myged_help]#<a name=\"menu_charts\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_charts_help]#<a name=\"menu_lists\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_lists_help]#<a name=\"menu_annical\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_annical_help]#<a name=\"menu_clip\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_clip_help]#<a name=\"menu_search\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_search_help]#<a name=\"menu_rslog\"></a><a name=\"menu_help\"></a><a href=\"#menu\">$UpArrow </a>#pgv_lang[menu_help_help]#<br />";
+$pgv_lang["index_portal_help_blocks"]		= "<a href=\"#top\">$UpArrow </a><a name=\"index_portal\">&nbsp;</a>#pgv_lang[index_portal_head_help]##pgv_lang[index_portal_help]#<br /><a name=\"index_welcome\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_welcome_help]#<br /><a name=\"index_login\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_login_help]#<br /><a name=\"index_events\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_events_help]#<br /><a name=\"index_onthisday\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_onthisday_help]#<br /><a name=\"index_charts\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_charts_help]#<br /><a name=\"index_favorites\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_favorites_help]#<br /><a name=\"index_stats\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_stats_help]#<br /><a name=\"index_common_surnames\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_common_names_help]#<br /><a name=\"index_media\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_media_help]#<br /><a name=\"index_loggedin\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[index_loggedin_help]#<br /><a name=\"recent_changes\"></a><a href=\"#index_portal\">$UpArrow </a>#pgv_lang[recent_changes_help]#<br />";
+
+//Help
+$pgv_lang["help_help_items"]			= "#pgv_lang[help_help]#<br />#pgv_lang[help_page_help]##pgv_lang[help_content_help]##pgv_lang[help_faq_help]##pgv_lang[help_HS_help]##pgv_lang[help_qm_help]#";
+$pgv_lang["def_help_items"]			= "<a name=\"def\">&nbsp;</a>#pgv_lang[def_help]#<br /><a name=\"def_gedcom\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_gedcom_help]#<br /><a name=\"def_gedcom_date\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_gedcom_date_help]#<br /><a name=\"def_pdf_format\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_pdf_format_help]#<br /><a name=\"def_pgv\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_pgv_help]#<br /><a name=\"def_portal\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_portal_help]#<br /><a name=\"def_theme\"></a><a href=\"#def\">$UpArrow </a>#pgv_lang[def_theme_help]#<br />";
+
+// edit_user.php (My account)
+$pgv_lang["edituser_user_contact_help"]		= "#pgv_lang[edituser_contact_meth_help]#<br /><br /><b>#pgv_lang[messaging]#</b><br />#pgv_lang[mail_option1_help]#<br /><b>#pgv_lang[messaging2]#</b><br />#pgv_lang[mail_option2_help]#<br /><b>#pgv_lang[mailto]#</b><br />#pgv_lang[mail_option3_help]#<br /><b>#pgv_lang[no_messaging]#</b><br />#pgv_lang[mail_option4_help]#<br />";
+$pgv_lang["help_edituser.php"]			= "~#pgv_lang[myuserdata]#~<br /><br />#pgv_lang[edituser_my_account_help]#<br />#pgv_lang[more_help]#";
+
+// user_admin.php
+$pgv_lang["help_useradmin.php"]			= "#pgv_lang[useradmin_help]#<br /><br />#pgv_lang[is_user_help]#<br />#pgv_lang[more_help]#";
+$pgv_lang["useradmin_user_contact_help"]	= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_user_contact_help]#";
+$pgv_lang["useradmin_change_lang_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_change_lang_help]#";
+$pgv_lang["useradmin_email_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_email_help]#";
+$pgv_lang["useradmin_user_theme_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_user_theme_help]#";
+// these need to be checked and maybe moved to the help_text.en.php
+$pgv_lang["useradmin_username_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_username_help]#";
+$pgv_lang["useradmin_firstname_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_firstname_help]#";
+$pgv_lang["useradmin_lastname_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_lastname_help]#";
+$pgv_lang["useradmin_password_help"]		= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_password_help]#";
+$pgv_lang["useradmin_conf_password_help"]	= "#pgv_lang[is_user_help]#<br /><br />#pgv_lang[edituser_conf_password_help]#";
+$pgv_lang["edit_useradmin_help"]		= "#pgv_lang[useradmin_edit_user_help]#<br />#pgv_lang[more_help]#";
+
+// general help items used in help welcome page
+$pgv_lang["general_help"]			= "<a name=\"header_general\">&nbsp;</a>#pgv_lang[header_general_help]##pgv_lang[best_display_help]#<br />#pgv_lang[preview_help]#<br />";
+
+// page help for the Welcome page
+$pgv_lang["help_index.php"]			= "#pgv_lang[index_help]#<br />#pgv_lang[index_portal_help_blocks]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[header_help_items]#<br /><br /><a href=\"#top\">$UpArrow </a>#pgv_lang[menu_help_items]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[general_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[def_help_items]#<br />";
+
+// page help for the MyGedView page
+$pgv_lang["mygedview_portal_help_blocks"]	= "<a name=\"mygedview_portal\"></a>#pgv_lang[mygedview_portal_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_welcome\"></a>#pgv_lang[mygedview_welcome_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_customize\"></a>#pgv_lang[mygedview_customize_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_message\"></a>#pgv_lang[mygedview_message_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_events\"></a>#pgv_lang[index_events_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_onthisday\"></a>#pgv_lang[index_onthisday_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_charts\"></a>#pgv_lang[index_charts_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_favorites\"></a>#pgv_lang[mygedview_favorites_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_stats\"></a>#pgv_lang[index_stats_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_myjournal\"></a>#pgv_lang[mygedview_myjournal_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_media\"></a>#pgv_lang[index_media_help]#<br /><a href=\"#mygedview_portal\">$UpArrow </a><a name=\"mygedview_loggedin\"></a>#pgv_lang[index_loggedin_help]#<br /><a name=\"mygedview_recent_changes\"></a><a href=\"#mygedview_portal\">$UpArrow </a>#pgv_lang[recent_changes_help]#<br />";
+$pgv_lang["index_myged_help"]			= "#pgv_lang[mygedview_portal_help_blocks]#<br />";
+
+
+//Login
+$pgv_lang["help_login.php"]			= "#pgv_lang[login_page_help]#<br />#pgv_lang[mygedview_login_help]#";
+$pgv_lang["help_login_register.php"]		= "#pgv_lang[register_info_01]#";
+$pgv_lang["help_login_lost_pw.php"]		= "~#pgv_lang[lost_pw_reset]#~<br /><br />#pgv_lang[pls_note11]#";
+$pgv_lang["index_login_register_help"]		= "#pgv_lang[index_login_help]#<br />#pgv_lang[new_user_help]#<br /><br />#pgv_lang[new_password_help]#<br />";
+
+//Add Facts
+$pgv_lang["add_new_facts_help"]			= "#pgv_lang[multiple_help]#<br />#pgv_lang[add_facts_help]#<br />#pgv_lang[add_custom_facts_help]#<br />#pgv_lang[add_from_clipboard_help]#<br />#pgv_lang[def_gedcom_date_help]#<br />#pgv_lang[add_facts_general_help]#";
+
+//Admin Help News Block
+$pgv_lang["index_gedcom_news_ahelp"]		= "#pgv_lang[index_gedcom_news_help]##pgv_lang[start_ahelp]##pgv_lang[index_gedcom_news_adm_help]##pgv_lang[end_ahelp]#";
+
+//Admin Help Advanced HTML Block
+$pgv_lang["index_htmlplus_ahelp"]		= "#pgv_lang[index_htmlplus_help]##pgv_lang[start_ahelp]##pgv_lang[index_htmlplus_content_help]##pgv_lang[end_ahelp]#";
+
+/*
+//Upgrade Utility
+$pgv_lang["help_upgrade.php"]			="#pgv_lang[how_upgrade_help]#<br /><br />#pgv_lang[readme_help]#";
+*/
+
+//-- Admin
+$pgv_lang["help_admin.php"]			="~#pgv_lang[administration]#~</b><br /><br />#pgv_lang[admin_help]#<br /><br />#pgv_lang[readme_help]#";
+
+//-- Language editor and configuration
+$pgv_lang["help_editlang.php"]			="#pgv_lang[lang_edit_help]#<br /><br />#pgv_lang[translation_forum_help]#<br /><br />#pgv_lang[bom_check_help]#<br /><br />#pgv_lang[edit_lang_utility_help]#<br /><br />#pgv_lang[export_lang_utility_help]#<br /><br />#pgv_lang[compare_lang_utility_help]#<br /><br />#pgv_lang[add_new_language_help]#<br /><br />#pgv_lang[more_help]#";
+$pgv_lang["help_changelanguage.php"]			="#pgv_lang[config_lang_utility_help]##pgv_lang[more_help]#";
+
+//-- User Migrate and Backup tool
+$pgv_lang["help_usermigrate.php"]	="#pgv_lang[um_tool_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_sql_index_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_index_sql_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[um_bu_help]#";
+
+//-- FAQ List editing tool
+$pgv_lang["faq_page_help"]	=	"#pgv_lang[help_faq.php]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[preview_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[restore_faq_edits_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[edit_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[delete_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[moveup_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[movedown_faq_item_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_header_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_body_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[add_faq_order_help]#";
+
+//--				G E D C O M
+//-- Gedcom Info
+$pgv_lang["gedcom_info_help"]			= "<div class=\"name_head center\"><b>#pgv_lang[help_contents_gedcom_info]#</b></div><br />#pgv_lang[def_gedcom_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[def_gedcom_date_help]#<br /><a href=\"#top\">$UpArrow </a>#pgv_lang[ppp_levels_help]#";
+
+//-- Add Gedcom
+$pgv_lang["help_addgedcom.php"]			="#pgv_lang[add_gedcom_help]#<br /><br />#pgv_lang[add_upload_gedcom_help]#<br />#pgv_lang[readme_help]#";
+//-- Add new Gedcom
+$pgv_lang["help_addnewgedcom.php"]		="#pgv_lang[add_new_gedcom_help]#<br /><br />#pgv_lang[readme_help]#";
+//-- Download Gedcom
+$pgv_lang["help_downloadgedcom.php"]		="#pgv_lang[download_gedcom_help]#";
+//-- Edit Gedcoms
+$pgv_lang["help_editgedcoms.php"]		="#pgv_lang[edit_gedcoms_help]#";
+//-- Edit Config Gedcoms
+$pgv_lang["help_editconfig_gedcom.php"]		="#pgv_lang[edit_config_gedcom_help]##pgv_lang[more_help_advice]#<br /><br />#pgv_lang[readme_help]#";
+//-- Import Gedcom
+$pgv_lang["help_importgedcom.php"]		="#pgv_lang[import_gedcom_help]#";
+//-- Upload Gedcom
+$pgv_lang["help_uploadgedcom.php"]		="#pgv_lang[upload_gedcom_help]#<br /><br />#pgv_lang[add_upload_gedcom_help]#<br />#pgv_lang[readme_help]#";
+//-- Validate Gedcom
+$pgv_lang["help_validategedcom.php"]		="#pgv_lang[validate_gedcom_help]#";
+//-- Edit Privacy
+$pgv_lang["help_edit_privacy.php"]		="~#pgv_lang[edit_privacy_title]#~<br /><br />#pgv_lang[edit_privacy_help]##pgv_lang[more_help_advice]#<br />#pgv_lang[readme_help]#";
+
+//Specials for contents
+$vpos = strpos($pgv_lang["enter_terms"], ":", 0);
+if ($vpos>0) $enter_terms = substr($pgv_lang["enter_terms"], 0, $vpos);
+else $enter_terms = $pgv_lang["enter_terms"];
+$vpos = strpos($pgv_lang["soundex_search"], ":", 0);
+if ($vpos>0) $soundex_search = substr($pgv_lang["soundex_search"], 0, $vpos);
+else $soundex_search = $pgv_lang["soundex_search"];
+
+$pgv_lang["help_used_in_contents"]		= "<div class=\"name_head center\"><b>#pgv_lang[page_help]#</b></div><br />#pgv_lang[help_help_items]#";
+$pgv_lang["search_used_in_contents"]		= "<div class=\"name_head center\"><b>#pgv_lang[search]#</b></div><ul><li><a href=\"#header_search\">#pgv_lang[header]#</a></li><li><a href=\"#menu_search\">#pgv_lang[menu]#</a></li><li><a href=\"#help_search\">#pgv_lang[search]#</li><li><a href=\"#search_enter_terms\">$enter_terms</a></li></ul><br /><br /><a href=\"#top\">$UpArrow </a><a name=\"header_search\"></a>#pgv_lang[header_search_help]#<br /><br /><a href=\"#top\">$UpArrow </a><a name=\"menu_search\"></a>#pgv_lang[menu_search_help]#<br /><a href=\"#top\">$UpArrow </a><a name=\"help_search\"></a>#pgv_lang[help_search.php]#<br /><a href=\"#top\">$UpArrow </a><a name=\"search_enter_terms\"></a>#pgv_lang[search_enter_terms_help]#";
+
+
+/*-- Var's for Menu Item: Help contents
+	The var $pgv_lang["help_contents_help"] contains all the vars below.
+	example: $pgv_lang["h1"] >>> help_index.php will be the var $pgv_lang["help_index.php"],
+	to be displayed if the text of $pgv_lang["welcome_page"] is clicked in the Help Contents
+*/
+$pgv_lang["h1"]		= "help_index.php,welcome_page";
+$pgv_lang["h2"]		= "index_myged_help,mygedview";
+$pgv_lang["h3"]		= "help_calendar.php,anniversary_calendar";
+$pgv_lang["h4"]		= "help_clippings.php,clip_cart";
+$pgv_lang["h5"]		= "help_descendancy.php,descend_chart";
+$pgv_lang["h6"]		= "help_edituser.php,editowndata";
+$pgv_lang["h7"]		= "gedcom_info_help,help_contents_gedcom_info";
+$pgv_lang["h8"]		= "help_family.php,family_info";
+$pgv_lang["h9"]		= "help_famlist.php,family_list";
+$pgv_lang["h10"]	= "header_help_items,header";
+$pgv_lang["h11"]	= "help_individual.php,indi_info";
+$pgv_lang["h12"]	= "help_indilist.php,individual_list";
+$pgv_lang["h13"]	= "help_login.php,login";
+$pgv_lang["h14"]	= "menu_help_items,menu";
+$pgv_lang["h15"]	= "help_medialist.php,media_list";
+$pgv_lang["h16"]	= "help_relationship.php,relationship_chart";
+$pgv_lang["h17"]	= "best_display_help,resolution";
+$pgv_lang["h18"]	= "search_used_in_contents,search";
+$pgv_lang["h19"]	= "help_source.php,source";
+$pgv_lang["h20"]	= "help_sourcelist.php,source_list";
+$pgv_lang["h21"]	= "help_pedigree.php,index_header";
+$pgv_lang["h22"]	= "preview_help,print_preview";
+$pgv_lang["h23"]	= "help_placelist.php,place_list";
+$pgv_lang["h24"]	= "help_timeline.php,timeline_chart";
+$pgv_lang["h25"]	= "help_used_in_contents,page_help";
+$pgv_lang["h26"]	= "edituser_password_help,password";
+$pgv_lang["h27"]	= "edituser_username_help,username";
+$pgv_lang["h28"]	= "add_media_help,add_media_lbl";
+$pgv_lang["h29"]	= "help_login_register.php,requestaccount";
+$pgv_lang["h30"]	= "help_login_lost_pw.php,lost_pw_reset";
+$pgv_lang["h31"]	= "help_ancestry.php,ancestry_chart";
+$pgv_lang["h32"]	= "help_fanchart.php,fan_chart";
+$pgv_lang["h33"]	= "help_reportengine.php,reports";
+$pgv_lang["h34"]	= "def_help_items,definitions";
+$pgv_lang["h35"]	= "accesskey_viewing_advice_help,accesskeys";
+$pgv_lang["h36"]	= "help_faq.php,faq_list";
+$pgv_lang["h37"]	= "hs_title_help,hs_title";
+$pgv_lang["h38"]	= "help_hourglass.php,hourglass_chart";
+$pgv_lang["h39"]	= "help_familybook.php,familybook_chart";
+$pgv_lang["h40"]	= "search_replace_help,search_replace";
+$pgv_lang["h41"]	= "soundex_search_help,search_soundex";
+$pgv_lang["h42"]	= "help_treenav.php,interactive_tree";
+
+$pgv_lang["help_contents_help"] = "";
+$i=1;
+while (isset($pgv_lang["h$i"])) {
+	$Which = "h".$i;
+	if ($pgv_lang[$Which]!="") $pgv_lang["help_contents_help"] .= "#pgv_lang[h$i]#";
+	$i++;
+}
+
+
+
+
+//-- Help Contents for admin
+
+// $pgv_lang["ah1"]	= "how_upgrade_help,ah1_help";
+$pgv_lang["ah1"]	= "";
+$pgv_lang["ah2"]	= "help_editconfig.php,ah2_help";
+$pgv_lang["ah3"]	= "add_upload_gedcom_help,ah3_help";
+$pgv_lang["ah4"]	= "gedcom_configfile_help,ah4_help";
+$pgv_lang["ah5"]	= "default_gedcom_help,ah5_help";
+$pgv_lang["ah6"]	= "delete_gedcom_help,ah6_help";
+$pgv_lang["ah7"]	= "add_gedcom_help,ah7_help";
+$pgv_lang["ah8"]	= "add_new_gedcom_help,ah8_help";
+$pgv_lang["ah9"]	= "download_gedcom_help,ah9_help";
+$pgv_lang["ah10"]	= "edit_gedcoms_help,ah10_help";
+$pgv_lang["ah11"]	= "edit_config_gedcom_help,ah11_help";
+$pgv_lang["ah12"]	= "import_gedcom_help,ah12_help";
+$pgv_lang["ah13"]	= "upload_gedcom_help,ah13_help";
+$pgv_lang["ah14"]	= "validate_gedcom_help,ah14_help";
+$pgv_lang["ah15"]	= "convert_ansi2utf_help,ah15_help";
+$pgv_lang["ah16"]	= "help_edit_privacy.php,ah16_help";
+$pgv_lang["ah17"]	= "help_useradmin.php,ah17_help";
+$pgv_lang["ah18"]	= "help_admin.php,ah18_help";
+//$pgv_lang["ah19"]	= "addmedia_tool_help,ah19_help";
+$pgv_lang["ah19"]	= "";
+$pgv_lang["ah20"]	= "change_indi2id_help,ah20_help";
+$pgv_lang["ah21"]	= "help_editlang.php,ah21_help";
+$pgv_lang["ah22_help"]	= "_Readme.txt";
+$pgv_lang["ah22"]	= "readme_help,ah22_help";
+$pgv_lang["ah23"]	= "help_changelanguage.php,ah23_help";
+$pgv_lang["ah24"]	= "um_tool_help,ah24_help";
+$pgv_lang["ah25"]	= "um_bu_help,ah25_help";
+$pgv_lang["ah26"]	= "faq_page_help,ah26_help";
+
+$pgv_lang["a_help_contents_help"] = "";
+$i=1;
+while (isset($pgv_lang["ah$i"])) {
+	$Which = "ah".$i;
+	if ($pgv_lang[$Which]!="") $pgv_lang["a_help_contents_help"] .= "#pgv_lang[ah$i]#";
+	$i++;
+}
+
+$pgv_lang["admin_help_contents_help"]		=$pgv_lang["help_contents_help"].$pgv_lang["a_help_contents_help"];
+
+?>

--- functions_mediadb.php DELETED ---

--- functions.php DELETED ---

--- functions_rss.php DELETED ---

--- functions_lang.php DELETED ---

--- menu.php DELETED ---

--- NEW FILE: media_tab_head.php ---
<?php
/**
 * Provides media tab header for reorder media Items using drag and drop
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2008  PHPGedView Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Module
 * @version $Id: media_tab_head.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 * @author Brian Holland
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_MEDIA_TAB_HEAD_PHP', '');

global $LB_AL_HEAD_LINKS, $gedrec;

require_once("js/prototype.js.htm");
require_once("js/scriptaculous.js.htm");
?>
<script language="javascript" type="text/javascript">
<!--
	function reorder_media() {
	var win02 = window.open("edit_interface.php?action=reorder_media&pid=<?php print $pid; ?>", "win02", "resizable=1, menubar=0, scrollbars=1, top=20, height=840, width=450 ");
	if (window.focus) {win02.focus();}
	}
-->
</script>

<?php
	// Find if indi and family associated media exists and then count them ( $tot_med_ct)
	include ('includes/media_reorder_count.php');

	$gedrec = find_gedcom_record($pid);
	$regexp = "/OBJE @(.*)@/";
	$ct = preg_match_all($regexp, $gedrec, $match, PREG_SET_ORDER);

	// If media exists and is greater than 1 item ---------------------
	if ($tot_med_ct>1) {
		print "<table border=\"0\" width=\"100%\"><tr>";
		// print "<td class=\"width10 center wrap\" valign=\"top\"></td>";
			//Popup Reorder Media
			print "<td class=\"width15 center wrap\" valign=\"top\">";
			print "<button type=\"button\" title=\"". $pgv_lang["reorder_media"]."\" onclick=\"reorder_media();\">". $pgv_lang["reorder_media"] ."</button>";
		print "</td>";
		//print "<td width=\"5%\">&nbsp;</td>";
		print "\n";
		print "</tr></table>";
	}
?>

--- serviceclient_class.php DELETED ---

Index: index_cache.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/index_cache.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index_cache.php	7 Jul 2008 17:30:14 -0000	1.3
+++ index_cache.php	30 Apr 2009 18:32:43 -0000	1.4
@@ -1,136 +1,138 @@
-<?php
-/**
- * Index caching functions
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @subpackage Display
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * load a cached block from a file
- * @param array $block	[0]:name of the block to load, [1]:block's configuration
- * @param int $index	An id for this block in the case of multiple instances of the same block on the page
- * @return boolean  returns false if the block could not be loaded from cache
- */
-function loadCachedBlock($block, $index) {
-	global $PGV_BLOCKS, $INDEX_DIRECTORY, $DEBUG, $lang_short_cut, $LANGUAGE, $GEDCOM;
-	
-	//-- ignore caching when DEBUG is set
-	if (isset($DEBUG) && $DEBUG==true) return false;
-
-	//-- ignore caching for logged in users
-	if (PGV_USER_ID) return false;
-
-	//-- ignore cache when its life is not configured or when its life is zero
-	$cacheLife = 0;
-	if (isset($block[1]['cache'])) $cacheLife = $block[1]['cache'];
-	else {
-		if (isset($PGV_BLOCKS[$block[0]]['config']['cache'])) $cacheLife = $PGV_BLOCKS[$block[0]]['config']['cache'];
-	}
-	if ($cacheLife==0) return false;
-
-	$fname = $INDEX_DIRECTORY."/cache/".$lang_short_cut[$LANGUAGE]."/".$GEDCOM."/".$index."_".$block[0];
-	if (file_exists($fname)) {
-		// Check for expired cache (<0: no expiry), 0: immediate, >0: expires in x days)  Zero already checked
-		if ($cacheLife > 0) {
-			$modtime = filemtime($fname);
-			//-- time should start at the beginning of the day
-			$modtime = $modtime - (date("G",$modtime)*60*60 + date("i",$modtime)*60 + date("s",$modtime));
-			$checktime = ($cacheLife*24*60*60);
-			$modtime = $modtime+$checktime;
-			if ($modtime<time()) return false;
-		}		
-		return @readfile($fname);
-	}
-	return false;
-}
-
-/**
- * Save a block's content to the cache file
- * @param array $block	[0]:name of the block to save, [1]:block's configuration
- * @param int $index	An id for this block in the case of multiple instances of the same block on the page
- * @param string $content	the actual content to save in the cache
- * @return boolean  returns false if the block could not be saved to cache
- */
-function saveCachedBlock($block, $index, $content) {
-	global $PGV_BLOCKS, $INDEX_DIRECTORY, $DEBUG, $lang_short_cut, $LANGUAGE, $GEDCOM;
-	
-	//-- ignore caching when DEBUG is set
-	if (isset($DEBUG) && $DEBUG==true) return false;
-
-	//-- ignore caching for logged in users
-	if (PGV_USER_ID) return false;
-
-	//-- ignore cache when its life is not configured or when its life is zero
-	$cacheLife = 0;
-	if (isset($block[1]['cache'])) $cacheLife = $block[1]['cache'];
-	else if (isset($PGV_BLOCKS[$block[0]]['config']['cache'])) $cacheLife = $PGV_BLOCKS[$block[0]]['config']['cache'];
-	if ($cacheLife==0) return false;
-	
-	$fname = $INDEX_DIRECTORY."/cache";
-	@mkdir($fname);
-	//--many people are not going to like automatically setting the permissions
-	//--777 is considered a security risk, if we can create the directory we should be able to write to it
-	//--do we need a windows specific check here instead?
-	//@chmod($fname, 0777);	// Make SURE this dir. has 0777 perm. (so Admin can delete it without "root" access)
-
-	$fname .= "/".$lang_short_cut[$LANGUAGE];
-	@mkdir($fname);
-	//@chmod($fname, 0777);
-
-	$fname .= "/".$GEDCOM;
-	@mkdir($fname);
-	//@chmod($fname, 0777);
-
-	$fname .= "/".$index."_".$block[0];
-	$fp = @fopen($fname, "wb");
-	if (!$fp) return false;
-	@fwrite($fp, $content);
-	@fclose($fp);
-	return true;
-}
-
-/**
- * clears the cache files
- */
-function clearCache() {
-	global $PGV_BLOCKS, $INDEX_DIRECTORY, $DEBUG, $lang_short_cut, $LANGUAGE, $GEDCOM;
-	
-	foreach($lang_short_cut as $key=>$value) {
-		$fname = $INDEX_DIRECTORY."/cache/".$value."/".$GEDCOM;
-		if (file_exists($fname)) {
-			$dir = dir($fname);
-			while (false !== ($entry = $dir->read())) {
-			   if ($entry!="." && $entry!="..") @unlink($fname."/".$entry);
-			}
-		}
-	}
-	
-	if (file_exists($INDEX_DIRECTORY."/".$GEDCOM."_upcoming.php")) {
-		@unlink($INDEX_DIRECTORY."/".$GEDCOM."_upcoming.php");
-	}
-}
-?>
+<?php
+/**
+ * Index caching functions
+ *
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2002 to 2007  PGV Development Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @subpackage Display
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_INDEX_CACHE_PHP', '');
+
+/**
+ * load a cached block from a file
+ * @param array $block	[0]:name of the block to load, [1]:block's configuration
+ * @param int $index	An id for this block in the case of multiple instances of the same block on the page
+ * @return boolean  returns false if the block could not be loaded from cache
+ */
+function loadCachedBlock($block, $index) {
+	global $PGV_BLOCKS, $INDEX_DIRECTORY, $lang_short_cut, $LANGUAGE, $GEDCOM;
+
+	//-- ignore caching when DEBUG is set
+	//-- ignore caching for logged in users
+	if (PGV_DEBUG || PGV_USER_ID) {
+		return false;
+	}
+
+	//-- ignore cache when its life is not configured or when its life is zero
+	$cacheLife = 0;
+	if (isset($block[1]['cache'])) $cacheLife = $block[1]['cache'];
+	else {
+		if (isset($PGV_BLOCKS[$block[0]]['config']['cache'])) $cacheLife = $PGV_BLOCKS[$block[0]]['config']['cache'];
+	}
+	if ($cacheLife==0) return false;
+
+	$fname = $INDEX_DIRECTORY."/cache/".$lang_short_cut[$LANGUAGE]."/".$GEDCOM."/".$index."_".$block[0];
+	if (file_exists($fname)) {
+		// Check for expired cache (<0: no expiry), 0: immediate, >0: expires in x days)  Zero already checked
+		if ($cacheLife > 0) {
+			$modtime = filemtime($fname);
+			//-- time should start at the beginning of the day
+			$modtime = $modtime - (date("G",$modtime)*60*60 + date("i",$modtime)*60 + date("s",$modtime));
+			$checktime = ($cacheLife*24*60*60);
+			$modtime = $modtime+$checktime;
+			if ($modtime<time()) return false;
+		}
+		return @readfile($fname);
+	}
+	return false;
+}
+
+/**
+ * Save a block's content to the cache file
+ * @param array $block	[0]:name of the block to save, [1]:block's configuration
+ * @param int $index	An id for this block in the case of multiple instances of the same block on the page
+ * @param string $content	the actual content to save in the cache
+ * @return boolean  returns false if the block could not be saved to cache
+ */
+function saveCachedBlock($block, $index, $content) {
+	global $PGV_BLOCKS, $INDEX_DIRECTORY, $lang_short_cut, $LANGUAGE, $GEDCOM;
+
+	//-- ignore caching when DEBUG is set
+	//-- ignore caching for logged in users
+	if (PGV_DEBUG || PGV_USER_ID) {
+		return false;
+	}
+
+	//-- ignore cache when its life is not configured or when its life is zero
+	$cacheLife = 0;
+	if (isset($block[1]['cache'])) $cacheLife = $block[1]['cache'];
+	else if (isset($PGV_BLOCKS[$block[0]]['config']['cache'])) $cacheLife = $PGV_BLOCKS[$block[0]]['config']['cache'];
+	if ($cacheLife==0) return false;
+
+	$fname = $INDEX_DIRECTORY."/cache";
+	@mkdir($fname);
+	//--many people are not going to like automatically setting the permissions
+	//--777 is considered a security risk, if we can create the directory we should be able to write to it
+	//--do we need a windows specific check here instead?
+	//@chmod($fname, 0777);	// Make SURE this dir. has 0777 perm. (so Admin can delete it without "root" access)
+
+	$fname .= "/".$lang_short_cut[$LANGUAGE];
+	@mkdir($fname);
+	//@chmod($fname, 0777);
+
+	$fname .= "/".$GEDCOM;
+	@mkdir($fname);
+	//@chmod($fname, 0777);
+
+	$fname .= "/".$index."_".$block[0];
+	$fp = @fopen($fname, "wb");
+	if (!$fp) return false;
+	@fwrite($fp, $content);
+	@fclose($fp);
+	return true;
+}
+
+/**
+ * clears the cache files
+ */
+function clearCache() {
+	global $PGV_BLOCKS, $INDEX_DIRECTORY, $lang_short_cut, $LANGUAGE, $GEDCOM;
+
+	foreach($lang_short_cut as $key=>$value) {
+		$fname = $INDEX_DIRECTORY."/cache/".$value."/".$GEDCOM;
+		if (file_exists($fname)) {
+			$dir = dir($fname);
+			while (false !== ($entry = $dir->read())) {
+			   if ($entry!="." && $entry!="..") @unlink($fname."/".$entry);
+			}
+		}
+	}
+
+	if (file_exists($INDEX_DIRECTORY."/".$GEDCOM."_upcoming.php")) {
+		@unlink($INDEX_DIRECTORY."/".$GEDCOM."_upcoming.php");
+	}
+}
+?>

--- functions_tools.php DELETED ---

--- NEW FILE: accesskeyHeaders.php ---
<?php
/**
 *  Code for access key codes
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2005  PGV Development Team
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Charts
 * @version $Id: accesskeyHeaders.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

global $SEARCH_SPIDER, $pgv_lang, $SCRIPT_NAME;
if (empty($SEARCH_SPIDER)) {
	?>
	<div class="accesskeys">
	<a class="accesskeys" href="#content" title="<?php print $pgv_lang["accesskey_skip_to_content_desc"]; ?>" tabindex="-1" accesskey="<?php print $pgv_lang["accesskey_skip_to_content"]; ?>"><?php print $pgv_lang["accesskey_skip_to_content_desc"]; ?></a>
	<a class="accesskeys" href="javascript:// accesskey_viewing_advice_help" onfocus="this.onclick" onclick="return helpPopup('accesskey_viewing_advice_help');" title="<?php print $pgv_lang["accesskey_viewing_advice_desc"]; ?>" accesskey="<?php print $pgv_lang["accesskey_viewing_advice"]; ?>"><?php print $pgv_lang["accesskey_viewing_advice_desc"]; ?></a>
	<a href="javascript:// help_<?php print basename($SCRIPT_NAME); ?>" onclick="return helpPopup('help_<?php print basename($SCRIPT_NAME); ?>&amp;action=<?php print $action;?>');" accesskey="<?php print $pgv_lang["accesskey_help_current_page"]; ?>"> </a>
	<a href="javascript:// help_contents_help" onclick="return helpPopup('help_contents_help');" accesskey="<?php print $pgv_lang["accesskey_help_content"]; ?>"> </a>
	</div>
	<?php
}

--- media_class.php DELETED ---

--- localclient_class.php DELETED ---

Index: cssparser.inc.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/cssparser.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cssparser.inc.php	7 Jul 2008 17:30:13 -0000	1.4
+++ cssparser.inc.php	30 Apr 2009 18:32:43 -0000	1.5
@@ -1,251 +1,253 @@
-<?php
-/**
- * Class to parse css information.
- *
- * See the readme file : http://www.phpclasses.org/browse/file/4685.html
- *
- * $Id$
- *
- * @author http://www.phpclasses.org/browse/package/1289.html
- * @package PhpGedView
- * @subpackage Charts
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-class cssparser {
-  var $css;
-  var $html;
-
-  function cssparser($html = true) {
-    // Register "destructor"
-    register_shutdown_function(array(&$this, "finalize"));
-    $this->html = ($html != false);
-    $this->Clear();
-  }
-
-  function finalize() {
-    unset($this->css);
-  }
-
-  function Clear() {
-    unset($this->css);
-    $this->css = array();
-    if($this->html) {
-      $this->Add("ADDRESS", "");
-      $this->Add("APPLET", "");
-      $this->Add("AREA", "");
-      $this->Add("A", "text-decoration : underline; color : Blue;");
-      $this->Add("A:visited", "color : Purple;");
-      $this->Add("BASE", "");
-      $this->Add("BASEFONT", "");
-      $this->Add("BIG", "");
-      $this->Add("BLOCKQUOTE", "");
-      $this->Add("BODY", "");
-      $this->Add("BR", "");
-      $this->Add("B", "font-weight: bold;");
-      $this->Add("CAPTION", "");
-      $this->Add("CENTER", "");
-      $this->Add("CITE", "");
-      $this->Add("CODE", "");
-      $this->Add("DD", "");
-      $this->Add("DFN", "");
-      $this->Add("DIR", "");
-      $this->Add("DIV", "");
-      $this->Add("DL", "");
-      $this->Add("DT", "");
-      $this->Add("EM", "");
-      $this->Add("FONT", "");
-      $this->Add("FORM", "");
-      $this->Add("H1", "");
-      $this->Add("H2", "");
-      $this->Add("H3", "");
-      $this->Add("H4", "");
-      $this->Add("H5", "");
-      $this->Add("H6", "");
-      $this->Add("HEAD", "");
-      $this->Add("HR", "");
-      $this->Add("HTML", "");
-      $this->Add("IMG", "");
-      $this->Add("INPUT", "");
-      $this->Add("ISINDEX", "");
-      $this->Add("I", "font-style: italic;");
-      $this->Add("KBD", "");
-      $this->Add("LINK", "");
-      $this->Add("LI", "");
-      $this->Add("MAP", "");
-      $this->Add("MENU", "");
-      $this->Add("META", "");
-      $this->Add("OL", "");
-      $this->Add("OPTION", "");
-      $this->Add("PARAM", "");
-      $this->Add("PRE", "");
-      $this->Add("P", "");
-      $this->Add("SAMP", "");
-      $this->Add("SCRIPT", "");
-      $this->Add("SELECT", "");
-      $this->Add("SMALL", "");
-      $this->Add("STRIKE", "");
-      $this->Add("STRONG", "");
-      $this->Add("STYLE", "");
-      $this->Add("SUB", "");
-      $this->Add("SUP", "");
-      $this->Add("TABLE", "");
-      $this->Add("TD", "");
-      $this->Add("TEXTAREA", "");
-      $this->Add("TH", "");
-      $this->Add("TITLE", "");
-      $this->Add("TR", "");
-      $this->Add("TT", "");
-      $this->Add("UL", "");
-      $this->Add("U", "text-decoration : underline;");
-      $this->Add("VAR", "");
-    }
-  }
-
-  function SetHTML($html) {
-    $this->html = ($html != false);
-  }
-
-  function Add($key, $codestr) {
-    $key = strtolower($key);
-//    $codestr = strtolower($codestr);
-    if(!isset($this->css[$key])) {
-      $this->css[$key] = array();
-    }
-    $codes = explode(";",$codestr);
-    if(count($codes) > 0) {
-      foreach($codes as $indexval => $code) {
-        $code = trim($code);
-        @list($codekey, $codevalue) = explode(":",$code);
-        if(strlen($codekey) > 0) {
-          $this->css[$key][trim($codekey)] = trim($codevalue);
-        }
-      }
-    }
-  }
-
-  function Get($key, $property) {
-    $key = strtolower($key);
-//    $property = strtolower($property);
-    @list($tag, $subtag) = explode(":",$key);
-    @list($tag, $class) = explode(".",$tag);
-    @list($tag, $id) = explode("#",$tag);
-    $result = "";
-    foreach($this->css as $_tag => $value) {
-      @list($_tag, $_subtag) = explode(":",$_tag);
-      @list($_tag, $_class) = explode(".",$_tag);
-      @list($_tag, $_id) = explode("#",$_tag);
-
-      $tagmatch = (strcmp($tag, $_tag) == 0) | (strlen($_tag) == 0);
-      $subtagmatch = (strcmp($subtag, $_subtag) == 0) | (strlen($_subtag) == 0);
-      $classmatch = (strcmp($class, $_class) == 0) | (strlen($_class) == 0);
-      $idmatch = (strcmp($id, $_id) == 0);
-
-      if($tagmatch & $subtagmatch & $classmatch & $idmatch) {
-        $temp = $_tag;
-        if((strlen($temp) > 0) & (strlen($_class) > 0)) {
-          $temp .= ".".$_class;
-        } elseif(strlen($temp) == 0) {
-          $temp = ".".$_class;
-        }
-        if((strlen($temp) > 0) & (strlen($_subtag) > 0)) {
-          $temp .= ":".$_subtag;
-        } elseif(strlen($temp) == 0) {
-          $temp = ":".$_subtag;
-        }
-        if(isset($this->css[$temp][$property])) {
-          $result = $this->css[$temp][$property];
-        }
-      }
-    }
-    return $result;
-  }
-
-  function GetSection($key) {
-    $key = strtolower($key);
-
-    @list($tag, $subtag) = explode(":",$key);
-    @list($tag, $class) = explode(".",$tag);
-    @list($tag, $id) = explode("#",$tag);
-    $result = array();
-    foreach($this->css as $_tag => $value) {
-      @list($_tag, $_subtag) = explode(":",$_tag);
-      @list($_tag, $_class) = explode(".",$_tag);
-      @list($_tag, $_id) = explode("#",$_tag);
-
-      $tagmatch = (strcmp($tag, $_tag) == 0) | (strlen($_tag) == 0);
-      $subtagmatch = (strcmp($subtag, $_subtag) == 0) | (strlen($_subtag) == 0);
-      $classmatch = (strcmp($class, $_class) == 0) | (strlen($_class) == 0);
-      $idmatch = (strcmp($id, $_id) == 0);
-
-      if($tagmatch & $subtagmatch & $classmatch & $idmatch) {
-        $temp = $_tag;
-        if((strlen($temp) > 0) & (strlen($_class) > 0)) {
-          $temp .= ".".$_class;
-        } elseif(strlen($temp) == 0) {
-          $temp = ".".$_class;
-        }
-        if((strlen($temp) > 0) & (strlen($_subtag) > 0)) {
-          $temp .= ":".$_subtag;
-        } elseif(strlen($temp) == 0) {
-          $temp = ":".$_subtag;
-        }
-        foreach($this->css[$temp] as $property => $value) {
-          $result[$property] = $value;
-        }
-      }
-    }
-    return $result;
-  }
-
-  function ParseStr($str) {
-    $this->Clear();
-    // Remove comments
-    $str = preg_replace("/\/\*(.*)?\*\//Usi", "", $str);
-    // Parse this damn csscode
-    $parts = explode("}",$str);
-    if(count($parts) > 0) {
-      foreach($parts as $indexval => $part) {
-        @list($keystr,$codestr) = explode("{",$part);
-        $keys = explode(",",trim($keystr));
-        if(count($keys) > 0) {
-          foreach($keys as $indexval => $key) {
-            if(strlen($key) > 0) {
-              $key = str_replace("\n", "", $key);
-              $key = str_replace("\\", "", $key);
-              $this->Add($key, trim($codestr));
-            }
-          }
-        }
-      }
-    }
-    //
-    return (count($this->css) > 0);
-  }
-
-  function Parse($filename) {
-    $this->Clear();
-    if(file_exists($filename)) {
-      return $this->ParseStr(file_get_contents($filename));
-    } else {
-      return false;
-    }
-  }
-
-  function GetCSS() {
-    $result = "";
-    foreach($this->css as $key => $values) {
-      $result .= $key." {\n";
-      foreach($values as $key => $value) {
-        $result .= "  $key: $value;\n";
-      }
-      $result .= "}*\n\n";
-    }
-    return $result;
-  }
-}
-?>
+<?php
+/**
+ * Class to parse css information.
+ *
+ * See the readme file : http://www.phpclasses.org/browse/file/4685.html
+ *
+ * $Id$
+ *
+ * @author http://www.phpclasses.org/browse/package/1289.html
+ * @package PhpGedView
+ * @subpackage Charts
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_CSS_PARSER_PHP', '');
+
+class cssparser {
+  var $css;
+  var $html;
+
+  function cssparser($html = true) {
+    // Register "destructor"
+    register_shutdown_function(array(&$this, "finalize"));
+    $this->html = ($html != false);
+    $this->Clear();
+  }
+
+  function finalize() {
+    unset($this->css);
+  }
+
+  function Clear() {
+    unset($this->css);
+    $this->css = array();
+    if($this->html) {
+      $this->Add("ADDRESS", "");
+      $this->Add("APPLET", "");
+      $this->Add("AREA", "");
+      $this->Add("A", "text-decoration : underline; color : Blue;");
+      $this->Add("A:visited", "color : Purple;");
+      $this->Add("BASE", "");
+      $this->Add("BASEFONT", "");
+      $this->Add("BIG", "");
+      $this->Add("BLOCKQUOTE", "");
+      $this->Add("BODY", "");
+      $this->Add("BR", "");
+      $this->Add("B", "font-weight: bold;");
+      $this->Add("CAPTION", "");
+      $this->Add("CENTER", "");
+      $this->Add("CITE", "");
+      $this->Add("CODE", "");
+      $this->Add("DD", "");
+      $this->Add("DFN", "");
+      $this->Add("DIR", "");
+      $this->Add("DIV", "");
+      $this->Add("DL", "");
+      $this->Add("DT", "");
+      $this->Add("EM", "");
+      $this->Add("FONT", "");
+      $this->Add("FORM", "");
+      $this->Add("H1", "");
+      $this->Add("H2", "");
+      $this->Add("H3", "");
+      $this->Add("H4", "");
+      $this->Add("H5", "");
+      $this->Add("H6", "");
+      $this->Add("HEAD", "");
+      $this->Add("HR", "");
+      $this->Add("HTML", "");
+      $this->Add("IMG", "");
+      $this->Add("INPUT", "");
+      $this->Add("ISINDEX", "");
+      $this->Add("I", "font-style: italic;");
+      $this->Add("KBD", "");
+      $this->Add("LINK", "");
+      $this->Add("LI", "");
+      $this->Add("MAP", "");
+      $this->Add("MENU", "");
+      $this->Add("META", "");
+      $this->Add("OL", "");
+      $this->Add("OPTION", "");
+      $this->Add("PARAM", "");
+      $this->Add("PRE", "");
+      $this->Add("P", "");
+      $this->Add("SAMP", "");
+      $this->Add("SCRIPT", "");
+      $this->Add("SELECT", "");
+      $this->Add("SMALL", "");
+      $this->Add("STRIKE", "");
+      $this->Add("STRONG", "");
+      $this->Add("STYLE", "");
+      $this->Add("SUB", "");
+      $this->Add("SUP", "");
+      $this->Add("TABLE", "");
+      $this->Add("TD", "");
+      $this->Add("TEXTAREA", "");
+      $this->Add("TH", "");
+      $this->Add("TITLE", "");
+      $this->Add("TR", "");
+      $this->Add("TT", "");
+      $this->Add("UL", "");
+      $this->Add("U", "text-decoration : underline;");
+      $this->Add("VAR", "");
+    }
+  }
+
+  function SetHTML($html) {
+    $this->html = ($html != false);
+  }
+
+  function Add($key, $codestr) {
+    $key = strtolower($key);
+//    $codestr = strtolower($codestr);
+    if(!isset($this->css[$key])) {
+      $this->css[$key] = array();
+    }
+    $codes = explode(";",$codestr);
+    if(count($codes) > 0) {
+      foreach($codes as $indexval => $code) {
+        $code = trim($code);
+        @list($codekey, $codevalue) = explode(":",$code);
+        if(strlen($codekey) > 0) {
+          $this->css[$key][trim($codekey)] = trim($codevalue);
+        }
+      }
+    }
+  }
+
+  function Get($key, $property) {
+    $key = strtolower($key);
+//    $property = strtolower($property);
+    @list($tag, $subtag) = explode(":",$key);
+    @list($tag, $class) = explode(".",$tag);
+    @list($tag, $id) = explode("#",$tag);
+    $result = "";
+    foreach($this->css as $_tag => $value) {
+      @list($_tag, $_subtag) = explode(":",$_tag);
+      @list($_tag, $_class) = explode(".",$_tag);
+      @list($_tag, $_id) = explode("#",$_tag);
+
+      $tagmatch = (strcmp($tag, $_tag) == 0) | (strlen($_tag) == 0);
+      $subtagmatch = (strcmp($subtag, $_subtag) == 0) | (strlen($_subtag) == 0);
+      $classmatch = (strcmp($class, $_class) == 0) | (strlen($_class) == 0);
+      $idmatch = (strcmp($id, $_id) == 0);
+
+      if($tagmatch & $subtagmatch & $classmatch & $idmatch) {
+        $temp = $_tag;
+        if((strlen($temp) > 0) & (strlen($_class) > 0)) {
+          $temp .= ".".$_class;
+        } elseif(strlen($temp) == 0) {
+          $temp = ".".$_class;
+        }
+        if((strlen($temp) > 0) & (strlen($_subtag) > 0)) {
+          $temp .= ":".$_subtag;
+        } elseif(strlen($temp) == 0) {
+          $temp = ":".$_subtag;
+        }
+        if(isset($this->css[$temp][$property])) {
+          $result = $this->css[$temp][$property];
+        }
+      }
+    }
+    return $result;
+  }
+
+  function GetSection($key) {
+    $key = strtolower($key);
+
+    @list($tag, $subtag) = explode(":",$key);
+    @list($tag, $class) = explode(".",$tag);
+    @list($tag, $id) = explode("#",$tag);
+    $result = array();
+    foreach($this->css as $_tag => $value) {
+      @list($_tag, $_subtag) = explode(":",$_tag);
+      @list($_tag, $_class) = explode(".",$_tag);
+      @list($_tag, $_id) = explode("#",$_tag);
+
+      $tagmatch = (strcmp($tag, $_tag) == 0) | (strlen($_tag) == 0);
+      $subtagmatch = (strcmp($subtag, $_subtag) == 0) | (strlen($_subtag) == 0);
+      $classmatch = (strcmp($class, $_class) == 0) | (strlen($_class) == 0);
+      $idmatch = (strcmp($id, $_id) == 0);
+
+      if($tagmatch & $subtagmatch & $classmatch & $idmatch) {
+        $temp = $_tag;
+        if((strlen($temp) > 0) & (strlen($_class) > 0)) {
+          $temp .= ".".$_class;
+        } elseif(strlen($temp) == 0) {
+          $temp = ".".$_class;
+        }
+        if((strlen($temp) > 0) & (strlen($_subtag) > 0)) {
+          $temp .= ":".$_subtag;
+        } elseif(strlen($temp) == 0) {
+          $temp = ":".$_subtag;
+        }
+        foreach($this->css[$temp] as $property => $value) {
+          $result[$property] = $value;
+        }
+      }
+    }
+    return $result;
+  }
+
+  function ParseStr($str) {
+    $this->Clear();
+    // Remove comments
+    $str = preg_replace("/\/\*(.*)?\*\//Usi", "", $str);
+    // Parse this damn csscode
+    $parts = explode("}",$str);
+    if(count($parts) > 0) {
+      foreach($parts as $indexval => $part) {
+        @list($keystr,$codestr) = explode("{",$part);
+        $keys = explode(",",trim($keystr));
+        if(count($keys) > 0) {
+          foreach($keys as $indexval => $key) {
+            if(strlen($key) > 0) {
+              $key = str_replace("\n", "", $key);
+              $key = str_replace("\\", "", $key);
+              $this->Add($key, trim($codestr));
+            }
+          }
+        }
+      }
+    }
+    //
+    return (count($this->css) > 0);
+  }
+
+  function Parse($filename) {
+    $this->Clear();
+    if(file_exists($filename)) {
+      return $this->ParseStr(file_get_contents($filename));
+    } else {
+      return false;
+    }
+  }
+
+  function GetCSS() {
+    $result = "";
+    foreach($this->css as $key => $values) {
+      $result .= $key." {\n";
+      foreach($values as $key => $value) {
+        $result .= "  $key: $value;\n";
+      }
+      $result .= "}*\n\n";
+    }
+    return $result;
+  }
+}
+?>

Index: pclzip.lib.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/pclzip.lib.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pclzip.lib.php	7 Jul 2008 17:30:15 -0000	1.3
+++ pclzip.lib.php	30 Apr 2009 18:32:43 -0000	1.4
@@ -1,5754 +1,5754 @@
-<?php
-// --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.5
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - March 2006
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-//
-// Presentation :
-//   PclZip is a PHP library that manage ZIP archives.
-//   So far tests show that archives generated by PclZip are readable by
[...11477 lines suppressed...]
+  //   The path translated.
+  // --------------------------------------------------------------------------------
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  {
+    if (stristr(php_uname(), 'windows')) {
+      // ----- Look for potential disk letter
+      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+          $p_path = substr($p_path, $v_position+1);
+      }
+      // ----- Change potential windows directory separator
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+          $p_path = strtr($p_path, '\\', '/');
+      }
+    }
+    return $p_path;
+  }
+  // --------------------------------------------------------------------------------
+
+
+?>

--- NEW FILE: dmsounds_UTF8.php ---
<?php
/**
 * Sound table for Daitch-Mokotoff "Sounds like" algorithm
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @version $Id: dmsounds_UTF8.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_DMSOUNDS_UTF8_PHP', '');

// Hebrew alphabet
define('ALEF', 'א');
define('BET', 'ב');
define('GIMEL', 'ג');
define('DALET', 'ד');
define('HE', 'ה');
define('VAV', 'ו');
define('ZAYIN', 'ז');
define('HET', 'ח');
define('TET', 'ט');
define('YOD', 'י');
define('FINAL_KAF', 'ך');
define('KAF', 'כ');
define('LAMED', 'ל');
define('FINAL_MEM', 'ם');
define('MEM', 'מ');
define('FINAL_NUN', 'ן');
define('NUN', '× ');
define('SAMEKH', 'ס');
define('AYIN', '×¢');
define('FINAL_PE', '×£');
define('PE', 'פ');
define('FINAL_TSADI', '×¥');
define('TSADI', 'צ');
define('QOF', 'ק');
define('RESH', 'ר');
define('SHIN', 'ש');
define('TAV', 'ת');
define('DOUBLE_VAV', '×°');
define('DOUBLE_YOD', 'ײ');
define('VAV_YOD', '×±');

/**
 * Name transformation arrays.
 *
 * Used to transform the Name string to simplify the "sounds like" table.
 * This is especially useful in Hebrew.
 *
 * Each array entry defines the "from" and "to" arguments of an ereg($from, $to, $text)
 * function call to achieve the desired transformations.
 *
 * Note about the use of "\x01":
 *		This code, which can't legitimately occur in the kind of text we're dealing with,
 *		is used as a place-holder so that conditional string replacements can be done.
 */
$transformNameTable = array(
	// Force Yiddish ligatures to be treated as separate letters
	array(DOUBLE_VAV,		VAV.VAV),
	array(DOUBLE_YOD,		YOD.YOD),
	array(VAV_YOD,			VAV.YOD),
	// Feature request 1511090, bullet (a)
	array(BET.VAV,			BET.AYIN),
	array(PE.VAV,			PE.AYIN),
	array(VAV.MEM,			AYIN.MEM),
	array(VAV.FINAL_MEM,	AYIN.FINAL_MEM),
	array(VAV.NUN,			AYIN.NUN),
	array(VAV.FINAL_NUN,	AYIN.FINAL_NUN),
	// Feature request 1511090, bullet (b)
	array(VAV.VAV,			BET),
	// Feature request 1511090, bullet (c)
	array("\x01",			''),
	array(YOD.YOD.HE.'$',	"\x01".HE),
	array(YOD.YOD.AYIN.'$',	"\x01".AYIN),
	array(YOD.YOD,			AYIN),
	array("\x01",			YOD.YOD)
	);

$maxchar = 7;		// Max. table key length (in ASCII bytes -- NOT in UTF-8 characters!)

/**
 * The DM sound coding table is organized this way:
 *		key:	a variable-length string that corresponds to the UTF-8 character sequence
 *				represented by the table entry.  Currently, that string can be up to 7
 *				bytes long.  This maximum length is defined by the value of global variable
 *				$maxchar.
 *		value:	an array as follows:
 *				[0]:  zero if not a vowel
 *				[1]:  sound value when this string is at the beginning of the word
 *				[2]:  sound value when this string is followed by a vowel
 *				[3]:  sound value for other cases
 *				[1],[2],[3] can be repeated several times to create branches in the code
 *				an empty sound value means "ignore in this state"
 */
$dmsounds = array();

// Latin alphabet
$dmsounds["A"] = array('1',   '0','','');
$dmsounds["À"] = array('1',   '0','','');
$dmsounds["Á"] = array('1',   '0','','');
$dmsounds["Â"] = array('1',   '0','','');
$dmsounds["Ã"] = array('1',   '0','','');
$dmsounds["Ä"] = array('1',   '0','1','',   '0','','');
$dmsounds["Å"] = array('1',   '0','','');
$dmsounds["Ă"] = array('1',   '0','','');
$dmsounds["Ą"] = array('1',   '','','',   '','','6');
$dmsounds["Ạ"] = array('1',   '0','','');
$dmsounds["Ả"] = array('1',   '0','','');
$dmsounds["Ấ"] = array('1',   '0','','');
$dmsounds["Ầ"] = array('1',   '0','','');
$dmsounds["Ẩ"] = array('1',   '0','','');
$dmsounds["Ẫ"] = array('1',   '0','','');
$dmsounds["Ậ"] = array('1',   '0','','');
$dmsounds["Ắ"] = array('1',   '0','','');
$dmsounds["Ằ"] = array('1',   '0','','');
$dmsounds["Ẳ"] = array('1',   '0','','');
$dmsounds["Ẵ"] = array('1',   '0','','');
$dmsounds["Ặ"] = array('1',   '0','','');
$dmsounds["AE"] = array('1',   '0','1','');
$dmsounds["Æ"] = array('1',   '0','1','');
$dmsounds["AI"] = array('1',   '0','1','');
$dmsounds["AJ"] = array('1',   '0','1','');
$dmsounds["AU"] = array('1',   '0','7','');
$dmsounds["AV"] = array('1',   '0','7','',   '7','7','7');
$dmsounds["ÄU"] = array('1',   '0','1','');
$dmsounds["AY"] = array('1',   '0','1','');
$dmsounds["B"] = array('0',   '7','7','7');
//$dmsounds["C"] = array('0',   '5','5','5',   '4','4','4');
$dmsounds["C"] = array('0',   '5','5','5',   '34','4','4');
$dmsounds["Ć"] = array('0',   '4','4','4');
$dmsounds["Č"] = array('0',   '4','4','4');
$dmsounds["Ç"] = array('0',   '4','4','4');
//$dmsounds["CH"] = array('0',   '5','5','5',   '4','4','4');
$dmsounds["CH"] = array('0',   '5','5','5',   '34','4','4');
$dmsounds["CHS"] = array('0',   '5','54','54');
$dmsounds["CK"] = array('0',   '5','5','5',   '45','45','45');
$dmsounds["CCS"] = array('0',   '4','4','4');
$dmsounds["CS"] = array('0',   '4','4','4');
$dmsounds["CSZ"] = array('0',   '4','4','4');
$dmsounds["CZ"] = array('0',   '4','4','4');
$dmsounds["CZS"] = array('0',   '4','4','4');
$dmsounds["D"] = array('0',   '3','3','3');
$dmsounds["Ď"] = array('0',   '3','3','3');
$dmsounds["Đ"] = array('0',   '3','3','3');
$dmsounds["DRS"] = array('0',   '4','4','4');
$dmsounds["DRZ"] = array('0',   '4','4','4');
$dmsounds["DS"] = array('0',   '4','4','4');
$dmsounds["DSH"] = array('0',   '4','4','4');
$dmsounds["DSZ"] = array('0',   '4','4','4');
$dmsounds["DT"] = array('0',   '3','3','3');
$dmsounds["DDZ"] = array('0',   '4','4','4');
$dmsounds["DDZS"] = array('0',   '4','4','4');
$dmsounds["DZ"] = array('0',   '4','4','4');
$dmsounds["DŹ"] = array('0',   '4','4','4');
$dmsounds["DÅ»"] = array('0',   '4','4','4');
$dmsounds["DZH"] = array('0',   '4','4','4');
$dmsounds["DZS"] = array('0',   '4','4','4');
$dmsounds["E"] = array('1',   '0','','');
$dmsounds["È"] = array('1',   '0','','');
$dmsounds["É"] = array('1',   '0','','');
$dmsounds["Ê"] = array('1',   '0','','');
$dmsounds["Ë"] = array('1',   '0','','');
$dmsounds["Ĕ"] = array('1',   '0','','');
$dmsounds["Ė"] = array('1',   '0','','');
$dmsounds["Ę"] = array('1',   '','','6',   '','','');
$dmsounds["Ẹ"] = array('1',   '0','','');
$dmsounds["Ẻ"] = array('1',   '0','','');
$dmsounds["Ẽ"] = array('1',   '0','','');
$dmsounds["Ế"] = array('1',   '0','','');
$dmsounds["Ề"] = array('1',   '0','','');
$dmsounds["Ể"] = array('1',   '0','','');
$dmsounds["Ễ"] = array('1',   '0','','');
$dmsounds["Ệ"] = array('1',   '0','','');
$dmsounds["EAU"] = array('1',   '0','','');
$dmsounds["EI"] = array('1',   '0','1','');
$dmsounds["EJ"] = array('1',   '0','1','');
$dmsounds["EU"] = array('1',   '1','1','');
$dmsounds["EY"] = array('1',   '0','1','');
$dmsounds["F"] = array('0',   '7','7','7');
$dmsounds["FB"] = array('0',   '7','7','7');
//$dmsounds["G"] = array('0',   '5','5','5',   '4','4','4');
$dmsounds["G"] = array('0',   '5','5','5',   '34','4','4');
$dmsounds["Ğ"] = array('0',   '','','');
$dmsounds["GGY"] = array('0',   '5','5','5');
$dmsounds["GY"] = array('0',   '5','5','5');
$dmsounds["H"] = array('0',   '5','5','',   '5','5','5');
$dmsounds["I"] = array('1',   '0','','');
$dmsounds["Ì"] = array('1',   '0','','');
$dmsounds["Í"] = array('1',   '0','','');
$dmsounds["Î"] = array('1',   '0','','');
$dmsounds["Ï"] = array('1',   '0','','');
$dmsounds["Ĩ"] = array('1',   '0','','');
$dmsounds["Ä®"] = array('1',   '0','','');
$dmsounds["Ä°"] = array('1',   '0','','');
$dmsounds["Ỉ"] = array('1',   '0','','');
$dmsounds["Ị"] = array('1',   '0','','');
$dmsounds["IA"] = array('1',   '1','','');
$dmsounds["IE"] = array('1',   '1','','');
$dmsounds["IO"] = array('1',   '1','','');
$dmsounds["IU"] = array('1',   '1','','');
$dmsounds["J"] = array('0',   '1','','',   '4','4','4',   '5','5','');
$dmsounds["K"] = array('0',   '5','5','5');
$dmsounds["KH"] = array('0',   '5','5','5');
$dmsounds["KS"] = array('0',   '5','54','54');
$dmsounds["L"] = array('0',   '8','8','8');
$dmsounds["Ľ"] = array('0',   '8','8','8');
$dmsounds["Ĺ"] = array('0',   '8','8','8');
$dmsounds["Ł"] = array('0',   '7','7','7',   '8','8','8');
//$dmsounds["LL"] = array('0',   '8','8','8',   '58','8','8',   '1','','');
$dmsounds["LL"] = array('0',   '8','8','8',   '58','8','8',   '1','8','8');
//$dmsounds["LLY"] = array('0',   '8','8','8',   '1','','');
$dmsounds["LLY"] = array('0',   '8','8','8',   '1','8','8');
//$dmsounds["LY"] = array('0',   '8','8','8',   '1','','');
$dmsounds["LY"] = array('0',   '8','8','8',   '1','8','8');
$dmsounds["M"] = array('0',   '6','6','6');
$dmsounds["MĔ"] = array('0',   '66','66','66');
$dmsounds["MN"] = array('0',   '66','66','66');
$dmsounds["N"] = array('0',   '6','6','6');
$dmsounds["Ń"] = array('0',   '6','6','6');
$dmsounds["Ň"] = array('0',   '6','6','6');
$dmsounds["Ñ"] = array('0',   '6','6','6');
$dmsounds["NM"] = array('0',   '66','66','66');
$dmsounds["O"] = array('1',   '0','','');
$dmsounds["Ò"] = array('1',   '0','','');
$dmsounds["Ó"] = array('1',   '0','','');
$dmsounds["Ô"] = array('1',   '0','','');
$dmsounds["Õ"] = array('1',   '0','','');
$dmsounds["Ö"] = array('1',   '0','','');
$dmsounds["Ø"] = array('1',   '0','','');
$dmsounds["Ő"] = array('1',   '0','','');
$dmsounds["Œ"] = array('1',   '0','','');
$dmsounds["Æ "] = array('1',   '0','','');
$dmsounds["Ọ"] = array('1',   '0','','');
$dmsounds["Ỏ"] = array('1',   '0','','');
$dmsounds["Ố"] = array('1',   '0','','');
$dmsounds["Ồ"] = array('1',   '0','','');
$dmsounds["Ổ"] = array('1',   '0','','');
$dmsounds["Ỗ"] = array('1',   '0','','');
$dmsounds["Ộ"] = array('1',   '0','','');
$dmsounds["Ớ"] = array('1',   '0','','');
$dmsounds["Ờ"] = array('1',   '0','','');
$dmsounds["Ở"] = array('1',   '0','','');
$dmsounds["á» "] = array('1',   '0','','');
$dmsounds["Ợ"] = array('1',   '0','','');
$dmsounds["OE"] = array('1',   '0','','');
$dmsounds["OI"] = array('1',   '0','1','');
$dmsounds["OJ"] = array('1',   '0','1','');
$dmsounds["OU"] = array('1',   '0','','');
$dmsounds["OY"] = array('1',   '0','1','');
$dmsounds["P"] = array('0',   '7','7','7');
$dmsounds["PF"] = array('0',   '7','7','7');
$dmsounds["PH"] = array('0',   '7','7','7');
$dmsounds["Q"] = array('0',   '5','5','5');
$dmsounds["R"] = array('0',   '9','9','9');
$dmsounds["Ř"] = array('0',   '4','4','4');
$dmsounds["RS"] = array('0',   '4','4','4',   '94','94','94');
$dmsounds["RZ"] = array('0',   '4','4','4',   '94','94','94');
$dmsounds["S"] = array('0',   '4','4','4');
$dmsounds["Ś"] = array('0',   '4','4','4');
$dmsounds["Å "] = array('0',   '4','4','4');
$dmsounds["Ş"] = array('0',   '4','4','4');
$dmsounds["SC"] = array('0',   '2','4','4');
$dmsounds["ŠČ"] = array('0',   '2','4','4');
$dmsounds["SCH"] = array('0',   '4','4','4');
$dmsounds["SCHD"] = array('0',   '2','43','43');
$dmsounds["SCHT"] = array('0',   '2','43','43');
$dmsounds["SCHTCH"] = array('0',   '2','4','4');
$dmsounds["SCHTSCH"] = array('0',   '2','4','4');
$dmsounds["SCHTSH"] = array('0',   '2','4','4');
$dmsounds["SD"] = array('0',   '2','43','43');
$dmsounds["SH"] = array('0',   '4','4','4');
$dmsounds["SHCH"] = array('0',   '2','4','4');
$dmsounds["SHD"] = array('0',   '2','43','43');
$dmsounds["SHT"] = array('0',   '2','43','43');
$dmsounds["SHTCH"] = array('0',   '2','4','4');
$dmsounds["SHTSH"] = array('0',   '2','4','4');
$dmsounds["ß"] = array('0',   '','4','4');
$dmsounds["ST"] = array('0',   '2','43','43');
$dmsounds["STCH"] = array('0',   '2','4','4');
$dmsounds["STRS"] = array('0',   '2','4','4');
$dmsounds["STRZ"] = array('0',   '2','4','4');
$dmsounds["STSCH"] = array('0',   '2','4','4');
$dmsounds["STSH"] = array('0',   '2','4','4');
$dmsounds["SSZ"] = array('0',   '4','4','4');
$dmsounds["SZ"] = array('0',   '4','4','4');
$dmsounds["SZCS"] = array('0',   '2','4','4');
$dmsounds["SZCZ"] = array('0',   '2','4','4');
$dmsounds["SZD"] = array('0',   '2','43','43');
$dmsounds["SZT"] = array('0',   '2','43','43');
$dmsounds["T"] = array('0',   '3','3','3');
$dmsounds["Ť"] = array('0',   '3','3','3');
$dmsounds["Å¢"] = array('0',   '3','3','3',   '4','4','4');
$dmsounds["TC"] = array('0',   '4','4','4');
$dmsounds["TCH"] = array('0',   '4','4','4');
$dmsounds["TH"] = array('0',   '3','3','3');
$dmsounds["TRS"] = array('0',   '4','4','4');
$dmsounds["TRZ"] = array('0',   '4','4','4');
$dmsounds["TS"] = array('0',   '4','4','4');
$dmsounds["TSCH"] = array('0',   '4','4','4');
$dmsounds["TSH"] = array('0',   '4','4','4');
$dmsounds["TSZ"] = array('0',   '4','4','4');
$dmsounds["TTCH"] = array('0',   '4','4','4');
$dmsounds["TTS"] = array('0',   '4','4','4');
$dmsounds["TTSCH"] = array('0',   '4','4','4');
$dmsounds["TTSZ"] = array('0',   '4','4','4');
$dmsounds["TTZ"] = array('0',   '4','4','4');
$dmsounds["TZ"] = array('0',   '4','4','4');
$dmsounds["TZS"] = array('0',   '4','4','4');
$dmsounds["U"] = array('1',   '0','','');
$dmsounds["Ù"] = array('1',   '0','','');
$dmsounds["Ú"] = array('1',   '0','','');
$dmsounds["Û"] = array('1',   '0','','');
$dmsounds["Ü"] = array('1',   '0','','');
$dmsounds["Ũ"] = array('1',   '0','','');
$dmsounds["Ū"] = array('1',   '0','','');
$dmsounds["Å®"] = array('1',   '0','','');
$dmsounds["Å°"] = array('1',   '0','','');
$dmsounds["Ų"] = array('1',   '0','','');
$dmsounds["Ư"] = array('1',   '0','','');
$dmsounds["Ụ"] = array('1',   '0','','');
$dmsounds["Ủ"] = array('1',   '0','','');
$dmsounds["Ứ"] = array('1',   '0','','');
$dmsounds["Ừ"] = array('1',   '0','','');
$dmsounds["Ử"] = array('1',   '0','','');
$dmsounds["á»®"] = array('1',   '0','','');
$dmsounds["á»°"] = array('1',   '0','','');
$dmsounds["UE"] = array('1',   '0','','');
$dmsounds["UI"] = array('1',   '0','1','');
$dmsounds["UJ"] = array('1',   '0','1','');
$dmsounds["UY"] = array('1',   '0','1','');
$dmsounds["UW"] = array('1',   '0','1','',   '0','7','7');
$dmsounds["V"] = array('0',   '7','7','7');
//$dmsounds["W"] = array('0',   '7','7','7',   '7','','');
$dmsounds["W"] = array('0',   '7','7','7');
$dmsounds["X"] = array('0',   '5','54','54');
$dmsounds["Y"] = array('1',   '1','','');
$dmsounds["Ý"] = array('1',   '1','','');
$dmsounds["Ỳ"] = array('1',   '1','','');
$dmsounds["á»´"] = array('1',   '1','','');
$dmsounds["Ỷ"] = array('1',   '1','','');
$dmsounds["Ỹ"] = array('1',   '1','','');
$dmsounds["Z"] = array('0',   '4','4','4');
$dmsounds["Ź"] = array('0',   '4','4','4');
$dmsounds["Å»"] = array('0',   '4','4','4');
$dmsounds["Ž"] = array('0',   '4','4','4');
$dmsounds["ZD"] = array('0',   '2','43','43');
$dmsounds["ZDZ"] = array('0',   '2','4','4');
$dmsounds["ZDZH"] = array('0',   '2','4','4');
$dmsounds["ZH"] = array('0',   '4','4','4');
$dmsounds["ZHD"] = array('0',   '2','43','43');
$dmsounds["ZHDZH"] = array('0',   '2','4','4');
$dmsounds["ZS"] = array('0',   '4','4','4');
$dmsounds["ZSCH"] = array('0',   '4','4','4');
$dmsounds["ZSH"] = array('0',   '4','4','4');
$dmsounds["ZZS"] = array('0',   '4','4','4');

// Cyrillic alphabet
$dmsounds["А"] = array('1',   '0','','');
$dmsounds["Б"] = array('0',   '7','7','7');
$dmsounds["В"] = array('0',   '7','7','7');
$dmsounds["Г"] = array('0',   '5','5','5');
$dmsounds["Д"] = array('0',   '3','3','3');
$dmsounds["ДЗ"] = array('0',   '4','4','4');
$dmsounds["Е"] = array('1',   '0','','');
$dmsounds["Ё"] = array('1',   '0','','');
$dmsounds["Ж"] = array('0',   '4','4','4');
$dmsounds["З"] = array('0',   '4','4','4');
$dmsounds["И"] = array('1',   '0','','');
$dmsounds["Й"] = array('1',   '1','','',   '4','4','4');
$dmsounds["К"] = array('0',   '5','5','5');
$dmsounds["Л"] = array('0',   '8','8','8');
$dmsounds["М"] = array('0',   '6','6','6');
$dmsounds["Н"] = array('0',   '6','6','6');
$dmsounds["О"] = array('1',   '0','','');
$dmsounds["П"] = array('0',   '7','7','7');
$dmsounds["Р"] = array('0',   '9','9','9');
$dmsounds["РЖ"] = array('0',   '4','4','4');
$dmsounds["С"] = array('0',   '4','4','4');
$dmsounds["Т"] = array('0',   '3','3','3');
$dmsounds["У"] = array('1',   '0','','');
$dmsounds["Ф"] = array('0',   '7','7','7');
$dmsounds["Ð¥"] = array('0',   '5','5','5');
$dmsounds["Ц"] = array('0',   '4','4','4');
$dmsounds["Ч"] = array('0',   '4','4','4');
$dmsounds["Ш"] = array('0',   '4','4','4');
$dmsounds["Щ"] = array('0',   '2','4','4');
$dmsounds["Ъ"] = array('0',   '','','');
$dmsounds["Ы"] = array('0',   '1','','');
$dmsounds["Ь"] = array('0',   '','','');
$dmsounds["Э"] = array('1',   '0','','');
$dmsounds["Ю"] = array('0',   '1','','');
$dmsounds["Я"] = array('0',   '1','','');

// Greek alphabet
$dmsounds["Α"] = array('1',   '0','','');
$dmsounds["Ά"] = array('1',   '0','','');
$dmsounds["ΑΙ"] = array('1',   '0','1','');
$dmsounds["ΑΥ"] = array('1',   '0','1','');
$dmsounds["Β"] = array('0',   '7','7','7');
$dmsounds["Γ"] = array('0',   '5','5','5');
$dmsounds["Δ"] = array('0',   '3','3','3');
$dmsounds["Ε"] = array('1',   '0','','');
$dmsounds["Έ"] = array('1',   '0','','');
$dmsounds["ΕΙ"] = array('1',   '0','1','');
$dmsounds["ΕΥ"] = array('1',   '1','1','');
$dmsounds["Ζ"] = array('0',   '4','4','4');
$dmsounds["Η"] = array('1',   '0','','');
$dmsounds["Ή"] = array('1',   '0','','');
$dmsounds["Θ"] = array('0',   '3','3','3');
$dmsounds["Ι"] = array('1',   '0','','');
$dmsounds["Ί"] = array('1',   '0','','');
$dmsounds["Ϊ"] = array('1',   '0','','');
$dmsounds["ΐ"] = array('1',   '0','','');
$dmsounds["Κ"] = array('0',   '5','5','5');
$dmsounds["Λ"] = array('0',   '8','8','8');
$dmsounds["Μ"] = array('0',   '6','6','6');
$dmsounds["ΜΠ"] = array('0',   '7','7','7');
$dmsounds["Ν"] = array('0',   '6','6','6');
$dmsounds["ΝΤ"] = array('0',   '3','3','3');
$dmsounds["Ξ"] = array('0',   '5','54','54');
$dmsounds["Ο"] = array('1',   '0','','');
$dmsounds["Ό"] = array('1',   '0','','');
$dmsounds["ΟΙ"] = array('1',   '0','1','');
$dmsounds["ΟΥ"] = array('1',   '0','1','');
$dmsounds["Π"] = array('0',   '7','7','7');
$dmsounds["Ρ"] = array('0',   '9','9','9');
$dmsounds["Σ"] = array('0',   '4','4','4');
$dmsounds["ς"] = array('0',   '','','4');
$dmsounds["Τ"] = array('0',   '3','3','3');
$dmsounds["ΤΖ"] = array('0',   '4','4','4');
$dmsounds["ΤΣ"] = array('0',   '4','4','4');
$dmsounds["Î¥"] = array('1',   '1','','');
$dmsounds["Ύ"] = array('1',   '1','','');
$dmsounds["Ϋ"] = array('1',   '1','','');
$dmsounds["ΰ"] = array('1',   '1','','');
$dmsounds["ΥΚ"] = array('1',   '5','5','5');
$dmsounds["ΥΥ"] = array('1',   '65','65','65');
$dmsounds["Φ"] = array('0',   '7','7','7');
$dmsounds["Χ"] = array('0',   '5','5','5');
$dmsounds["Ψ"] = array('0',   '7','7','7');
$dmsounds["Ω"] = array('1',   '0','','');
$dmsounds["Ώ"] = array('1',   '0','','');

// Hebrew alphabet
$dmsounds[ALEF] = array('1',   '0','','');
$dmsounds[ALEF.VAV] = array('1',   '0','7','');
$dmsounds[ALEF.GIMEL] = array('1',   '4','4','4',   '5','5','5',   '34','34','34');
//$dmsounds[BET.BET] = array('0',   '77','77','77');
$dmsounds[BET.BET] = array('0',   '7','7','7',   '77','77','77');
$dmsounds[BET] = array('0',   '7','7','7');
//$dmsounds[GIMEL.GIMEL] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[GIMEL.GIMEL] = array('0',   '4','4','4',   '5','5','5',   '45','45','45',   '55','55','55',   '54','54','54');
$dmsounds[GIMEL.DALET] = array('0',   '43','43','43',   '53','53','53');
$dmsounds[GIMEL.HE] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[GIMEL.ZAYIN] = array('0',   '44','44','44',   '45','45','45');
$dmsounds[GIMEL.HET] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[GIMEL.KAF] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[GIMEL.FINAL_KAF] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[GIMEL.TSADI] = array('0',   '44','44','44',   '45','45','45');
$dmsounds[GIMEL.FINAL_TSADI] = array('0',   '44','44','44',   '45','45','45');
$dmsounds[GIMEL.QOF] = array('0',   '45','45','45',   '54','54','54');
$dmsounds[GIMEL.SHIN] = array('0',   '44','44','44',   '54','54','54');
$dmsounds[GIMEL.TAV] = array('0',   '43','43','43',   '53','53','53');
$dmsounds[GIMEL] = array('0',   '4','4','4',   '5','5','5');
$dmsounds[DALET.ZAYIN] = array('0',   '4','4','4');
//$dmsounds[DALET.DALET] = array('0',   '33','33','33');
$dmsounds[DALET.DALET] = array('0',   '3','3','3',   '33','33','33');
$dmsounds[DALET.TET] = array('0',   '33','33','33');
$dmsounds[DALET.SHIN] = array('0',   '4','4','4');
$dmsounds[DALET.TSADI] = array('0',   '4','4','4');
$dmsounds[DALET.FINAL_TSADI] = array('0',   '4','4','4');
$dmsounds[DALET] = array('0',   '3','3','3');
$dmsounds[HE.GIMEL] = array('0',   '54','54','54',   '55','55','55');
$dmsounds[HE.KAF] = array('0',   '55','55','55');
$dmsounds[HE.HET] = array('0',   '55','55','55');
$dmsounds[HE.QOF] = array('0',   '55','55','55',   '5','5','5');
$dmsounds[HE.HE] = array('0',   '5','5','',   '55','55','');	// -- added by GK
$dmsounds[HE] = array('0',   '5','5','');
$dmsounds[VAV.YOD] = array('1',   '','','',   '7','7','7');
$dmsounds[VAV] = array('1',   '7','7','7',   '7','','');
$dmsounds[VAV.VAV] = array('1',   '7','7','7',   '7','','');
$dmsounds[VAV.VAV.PE] = array('1',   '7','7','7',   '77','77','77');
$dmsounds[ZAYIN.SHIN] = array('0',   '4','4','4',   '44','44','44');
$dmsounds[ZAYIN.DALET.ZAYIN] = array('0',   '2','4','4');
$dmsounds[ZAYIN] = array('0',   '4','4','4');
$dmsounds[ZAYIN.GIMEL] = array('0',   '44','44','44',   '45','45','45');
//$dmsounds[ZAYIN.ZAYIN] = array('0',   '44','44','44');
$dmsounds[ZAYIN.ZAYIN] = array('0',   '4','4','4',   '44','44','44');
$dmsounds[ZAYIN.SAMEKH] = array('0',   '44','44','44');
$dmsounds[ZAYIN.TSADI] = array('0',   '44','44','44');
$dmsounds[ZAYIN.FINAL_TSADI] = array('0',   '44','44','44');
$dmsounds[HET.GIMEL] = array('0',   '54','54','54',   '53','53','53');
//$dmsounds[HET.HET] = array('0',   '55','55','55');
$dmsounds[HET.HET] = array('0',   '5','5','5',   '55','55','55');
$dmsounds[HET.QOF] = array('0',   '55','55','55',   '5','5','5');
$dmsounds[HET.KAF] = array('0',   '45','45','45',   '55','55','55');
$dmsounds[HET.SAMEKH] = array('0',   '5','54','54');
$dmsounds[HET.SHIN] = array('0',   '5','54','54');
$dmsounds[HET] = array('0',   '5','5','5');
$dmsounds[TET.SHIN] = array('0',   '4','4','4');
$dmsounds[TET.DALET] = array('0',   '33','33','33');
$dmsounds[TET.YOD] = array('0',   '3','3','3',   '4','4','4',   '3','3','34');
$dmsounds[TET.TAV] = array('0',   '33','33','33');
$dmsounds[TET.TET] = array('0',   '3','3','3',   '33','33','33');	// -- added by GK
$dmsounds[TET] = array('0',   '3','3','3');
$dmsounds[YOD] = array('1',   '1','','');
$dmsounds[YOD.ALEF] = array('1',   '1','','',   '1','1','1');
$dmsounds[KAF.GIMEL] = array('0',   '55','55','55',   '54','54','54');
$dmsounds[KAF.SHIN] = array('0',   '5','54','54');
$dmsounds[KAF.SAMEKH] = array('0',   '5','54','54');
$dmsounds[KAF.KAF] = array('0',   '5','5','5',   '55','55','55');	// == added by GK
$dmsounds[KAF.FINAL_KAF] = array('0',   '5','5','5',   '55','55','55');	// == added by GK
$dmsounds[KAF] = array('0',   '5','5','5');
$dmsounds[KAF.HET] = array('0',   '55','55','55',   '5','5','5');
$dmsounds[FINAL_KAF] = array('0',   '','5','5');
$dmsounds[LAMED] = array('0',   '8','8','8');
$dmsounds[LAMED.LAMED] = array('0',   '88','88','88',   '8','8','8');
$dmsounds[MEM.NUN] = array('0',   '66','66','66');
$dmsounds[MEM.FINAL_NUN] = array('0',   '66','66','66');
//$dmsounds[MEM.MEM] = array('0',   '66','66','66');
$dmsounds[MEM.MEM] = array('0',   '6','6','6',   '66','66','66');
$dmsounds[MEM.FINAL_MEM] = array('0',   '6','6','6',   '66','66','66');	// -- added by GK
$dmsounds[MEM] = array('0',   '6','6','6');
$dmsounds[FINAL_MEM] = array('0',   '','6','6');
$dmsounds[NUN.MEM] = array('0',   '66','66','66');
$dmsounds[NUN.FINAL_MEM] = array('0',   '66','66','66');
//$dmsounds[NUN.NUN] = array('0',   '66','66','66');
$dmsounds[NUN.NUN] = array('0',   '6','6','6',   '66','66','66');
$dmsounds[NUN.FINAL_NUN] = array('0',   '6','6','6',   '66','66','66');	// -- added by GK
$dmsounds[NUN] = array('0',   '6','6','6');
$dmsounds[FINAL_NUN] = array('0',   '','6','6');
$dmsounds[SAMEKH.TAV.SHIN] = array('0',   '2','4','4');
$dmsounds[SAMEKH.TAV.ZAYIN] = array('0',   '2','4','4');
$dmsounds[SAMEKH.TET.ZAYIN] = array('0',   '2','4','4');
$dmsounds[SAMEKH.TET.SHIN] = array('0',   '2','4','4');
$dmsounds[SAMEKH.TSADI.DALET] = array('0',   '2','4','4');
$dmsounds[SAMEKH.TET] = array('0',   '2','4','4',   '43','43','43');
$dmsounds[SAMEKH.TAV] = array('0',   '2','4','4',   '43','43','43');
$dmsounds[SAMEKH.GIMEL] = array('0',   '44','44','44',   '4','4','4');
//$dmsounds[SAMEKH.SAMEKH] = array('0',   '44','44','44');
$dmsounds[SAMEKH.SAMEKH] = array('0',   '4','4','4',   '44','44','44');
$dmsounds[SAMEKH.TSADI] = array('0',   '44','44','44');
$dmsounds[SAMEKH.FINAL_TSADI] = array('0',   '44','44','44');
$dmsounds[SAMEKH.ZAYIN] = array('0',   '44','44','44');
$dmsounds[SAMEKH.SHIN] = array('0',   '44','44','44');
$dmsounds[SAMEKH] = array('0',   '4','4','4');
$dmsounds[AYIN] = array('1',   '0','','');
$dmsounds[PE.BET] = array('0',   '7','7','7',   '77','77','77');
$dmsounds[PE.VAV.VAV] = array('0',   '7','7','7',   '77','77','77');
$dmsounds[PE.PE] = array('0',   '7','7','7',   '77','77','77');
$dmsounds[PE.FINAL_PE] = array('0',   '7','7','7',   '77','77','77');	// -- added by GK
$dmsounds[PE] = array('0',   '7','7','7');
$dmsounds[FINAL_PE] = array('0',   '','7','7');
$dmsounds[TSADI.GIMEL] = array('0',   '44','44','44',   '45','45','45');
$dmsounds[TSADI.ZAYIN] = array('0',   '44','44','44');
$dmsounds[TSADI.SAMEKH] = array('0',   '44','44','44');
//$dmsounds[TSADI.TSADI] = array('0',   '44','44','44');
//$dmsounds[TSADI.FINAL_TSADI] = array('0',   '44','44','44');
$dmsounds[TSADI.TSADI] = array('0',   '4','4','4',   '5','5','5',   '44','44','44',   '54','54','54',   '45','45','45');
$dmsounds[TSADI.FINAL_TSADI] = array('0',   '4','4','4',   '5','5','5',   '44','44','44',   '54','54','54');
$dmsounds[TSADI.SHIN] = array('0',   '44','44','44',   '4','4','4',   '5','5','5');
$dmsounds[TSADI] = array('0',   '4','4','4',   '5','5','5');
$dmsounds[FINAL_TSADI] = array('0',   '','4','4');
$dmsounds[QOF.HE] = array('0',   '55','55','5');
$dmsounds[QOF.SAMEKH] = array('0',   '5','54','54');
$dmsounds[QOF.SHIN] = array('0',   '5','54','54');
//$dmsounds[QOF.QOF] = array('0',   '55','55','55');
$dmsounds[QOF.QOF] = array('0',   '5','5','5',   '55','55','55');
$dmsounds[QOF.HET] = array('0',   '55','55','55');
$dmsounds[QOF.KAF] = array('0',   '55','55','55');
$dmsounds[QOF.FINAL_KAF] = array('0',   '55','55','55');
$dmsounds[QOF.GIMEL] = array('0',   '55','55','55',   '54','54','54');
$dmsounds[QOF] = array('0',   '5','5','5');
$dmsounds[RESH.RESH] = array('0',   '99','99','99',   '9','9','9');
$dmsounds[RESH] = array('0',   '9','9','9');
$dmsounds[SHIN.TET.ZAYIN] = array('0',   '2','4','4');
$dmsounds[SHIN.TAV.SHIN] = array('0',   '2','4','4');
$dmsounds[SHIN.TAV.ZAYIN] = array('0',   '2','4','4');
$dmsounds[SHIN.TET.SHIN] = array('0',   '2','4','4');
$dmsounds[SHIN.DALET] = array('0',   '2','43','43');
$dmsounds[SHIN.ZAYIN] = array('0',   '44','44','44');
$dmsounds[SHIN.SAMEKH] = array('0',   '44','44','44');
$dmsounds[SHIN.TAV] = array('0',   '2','43','43');
$dmsounds[SHIN.GIMEL] = array('0',   '4','4','4',   '44','44','44',   '4','43','43');
$dmsounds[SHIN.TET] = array('0',   '2','43','43',   '44','44','44');
$dmsounds[SHIN.TSADI] = array('0',   '44','44','44',   '45','45','45');
$dmsounds[SHIN.FINAL_TSADI] = array('0',   '44','','44',   '45','','45');
$dmsounds[SHIN.SHIN] = array('0',   '4','4','4',   '44','44','44');
$dmsounds[SHIN] = array('0',   '4','4','4');
$dmsounds[TAV.GIMEL] = array('0',   '34','34','34');
$dmsounds[TAV.ZAYIN] = array('0',   '34','34','34');
$dmsounds[TAV.SHIN] = array('0',   '4','4','4');
//$dmsounds[TAV.TAV] = array('0',   '33','33','33',   '4','4','4');
$dmsounds[TAV.TAV] = array('0',   '3','3','3',   '4','4','4',   '33','33','33',   '44','44','44',   '34','34','34',   '43','43','43');
$dmsounds[TAV] = array('0',   '3','3','3',   '4','4','4');

// Arabic alphabet
$dmsounds["ا"] = array('1',   '0','','');
$dmsounds["ب"] = array('0',   '7','7','7');
$dmsounds["ت"] = array('0',   '3','3','3');
$dmsounds["Ø«"] = array('0',   '3','3','3');
$dmsounds["ج"] = array('0',   '4','4','4');
$dmsounds["Ø­"] = array('0',   '5','5','5');
$dmsounds["Ø®"] = array('0',   '5','5','5');
$dmsounds["د"] = array('0',   '3','3','3');
$dmsounds["Ø°"] = array('0',   '3','3','3');
$dmsounds["ر"] = array('0',   '9','9','9');
$dmsounds["ز"] = array('0',   '4','4','4');
$dmsounds["س"] = array('0',   '4','4','4');
$dmsounds["Ø´"] = array('0',   '4','4','4');
$dmsounds["ص"] = array('0',   '4','4','4');
$dmsounds["ض"] = array('0',   '3','3','3');
$dmsounds["Ø·"] = array('0',   '3','3','3');
$dmsounds["ظ"] = array('0',   '4','4','4');
$dmsounds["ع"] = array('1',   '0','','');
$dmsounds["غ"] = array('0',   '0','','');
$dmsounds["ف"] = array('0',   '7','7','7');
$dmsounds["ق"] = array('0',   '5','5','5');
$dmsounds["ك"] = array('0',   '5','5','5');
$dmsounds["ل"] = array('0',   '8','8','8');
$dmsounds["لا"] = array('0',   '8','8','8');
$dmsounds["م"] = array('0',   '6','6','6');
$dmsounds["ن"] = array('0',   '6','6','6');
$dmsounds["هن"] = array('0',   '66','66','66');
$dmsounds["ه"] = array('0',   '5','5','');
$dmsounds["و"] = array('1',   '','','',   '7','','');
$dmsounds["ي"] = array('0',   '1','','');
$dmsounds["Ø¢"] = array('0',   '1','','');
$dmsounds["Ø©"] = array('0',   '','','3');
$dmsounds["ی"] = array('0',   '1','','');
$dmsounds["ى"] = array('1',   '1','','');

?>

Index: grampsxml.rng
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/grampsxml.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- grampsxml.rng	7 Jul 2008 17:30:14 -0000	1.2
+++ grampsxml.rng	30 Apr 2009 18:32:43 -0000	1.3
@@ -1,532 +1,532 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2005-2006  Donald N. Allingham
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
[...1033 lines suppressed...]
+    </element></optional>
+    <optional><element name="place">
+        <attribute name="hlink"><data type="IDREF"/></attribute>
+    </element></optional>
+    <optional><element name="status">
+        <attribute name="val"><text/></attribute>
+    </element></optional>
+    <optional><element name="sealed_to">
+        <attribute name="hlink"><data type="IDREF"/></attribute>
+    </element></optional>
+    <optional><element name="note">
+        <ref name="note-content"/>
+    </element></optional>
+    <optional><ref name="date-content"/></optional>
+    <zeroOrMore><element name="sourceref">
+        <ref name="sourceref-content"/>
+    </element></zeroOrMore>
+  </define>
+
+</grammar>

--- functions_charts.php DELETED ---

--- functions_print.php DELETED ---

--- NEW FILE: media_reorder.php ---
<?php
/**
 * Reorder media Items using drag and drop
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Module
 * @version $Id: media_reorder.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 * @author Brian Holland
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_MEDIA_REORDER_PHP', '');

include_once("includes/functions/functions_print_facts.php");

	print "<br /><b>".$pgv_lang["reorder_media"]."</b>";
//	print_help_link("reorder_children_help", "qm");
	print "&nbsp --- &nbsp;" . $pgv_lang["reorder_media_window_title"];

	global $MULTI_MEDIA, $TBLPREFIX, $SHOW_ID_NUMBERS, $MEDIA_EXTERNAL;
	global $pgv_lang, $pgv_changes, $factarray, $view;
	global $GEDCOMS, $GEDCOM, $MEDIATYPE, $pgv_changes, $DBCONN, $DBTYPE;
	global $WORD_WRAPPED_NOTES, $MEDIA_DIRECTORY, $PGV_IMAGE_DIR, $PGV_IMAGES, $TEXT_DIRECTION;
	global $is_media, $cntm1, $cntm2, $cntm3, $cntm4, $t, $mgedrec;
	global $typ2b, $edit, $tabno ;
	global $ids, $pid, $related, $level, $gedrec, $media_data, $order, $order1, $order2, $j ;

	print "\n";

	?>
	<form name="reorder_form" method="post" action="edit_interface.php">
		<input type="hidden" name="action" value="reorder_media_update" />
		<input type="hidden" name="pid" value="<?php print $pid; ?>" />
<!--		<input type="hidden" name="option" value="bybirth" /> -->

		<center><p>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_save"];?>"><?php print $pgv_lang["save"];?></button>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_reset"];?>" onclick="document.reorder_form.action.value='reset_media_update'; document.reorder_form.submit();"><?php print $pgv_lang["reset"];?></button>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_cancel"];?>" onclick="window.close();"><?php print $pgv_lang["cancel"];?></button>
		</center>

<ul id="reorder_media_list">

	<?php
	  print "\n";

      if (!showFact("OBJE", $pid)) return false;
      if (!isset($pgv_changes[$pid."_".$GEDCOM])) $gedrec = find_gedcom_record($pid);
      else $gedrec = find_updated_record($pid);

	//related=true means show related items
	$related="true";

	//-- find all of the related ids
	$ids = array($pid);
	if ($related) {
		$ct = preg_match_all("/1 FAMS @(.*)@/", $gedrec, $match, PREG_SET_ORDER);
		for($i=0; $i<$ct; $i++) {
			$ids[] = trim($match[$i][1]);
		}
	}

	//-- If  they exist, get a list of the sorted current objects in the indi gedcom record  -  (1 _PGV_OBJS @xxx@ .... etc) ----------
	$sort_current_objes = array();
	if ($level>0) $sort_regexp = "/".$level." _PGV_OBJS @(.*)@/";
	else $sort_regexp = "/_PGV_OBJS @(.*)@/";
	$sort_ct = preg_match_all($sort_regexp, $gedrec, $sort_match, PREG_SET_ORDER);
	for ($i=0; $i<$sort_ct; $i++) {
		if (!isset($sort_current_objes[$sort_match[$i][1]])) $sort_current_objes[$sort_match[$i][1]] = 1;
		else $sort_current_objes[$sort_match[$i][1]]++;
		$sort_obje_links[$sort_match[$i][1]][] = $sort_match[$i][0];
	}
	$sort_media_found = false;
	// -----------------------------------------------------------------------------------------------

	// create ORDER BY list from Gedcom sorted records list  ---------------------------
	$orderbylist = 'ORDER BY '; // initialize
	foreach ($sort_match as $media_id) {
		$orderbylist .= "m_media='$media_id[1]' DESC, ";
	}
	$orderbylist = rtrim($orderbylist, ', ');
	//  print_r($orderbylist);
	// -----------------------------------------------------------------------------------------------

	//-- get a list of the current objects in the record
	$current_objes = array();
	if ($level>0) $regexp = "/".$level." OBJE @(.*)@/";
	else $regexp = "/OBJE @(.*)@/";
	$ct = preg_match_all($regexp, $gedrec, $match, PREG_SET_ORDER);
	for ($i=0; $i<$ct; $i++) {
		if (!isset($current_objes[$match[$i][1]])) $current_objes[$match[$i][1]] = 1;
		else $current_objes[$match[$i][1]]++;
		$obje_links[$match[$i][1]][] = $match[$i][0];
	}

	$media_found = false;

	$sqlmm = "SELECT DISTINCT ";
	// Adding DISTINCT is the fix for: [ 1488550 ] Family/Individual Media Duplications
	// but it may not work for all RDBMS.
	// $sqlmm  = "SELECT ";
	$sqlmm .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM ".$TBLPREFIX."media, ".$TBLPREFIX."media_mapping where ";
	$sqlmm .= "mm_gid IN (";
	$i=0;
	foreach ($ids as $key=>$media_id) {
		if ($i>0) $sqlmm .= ",";
		$sqlmm .= "'".$DBCONN->escapeSimple($media_id)."'";
		$i++;
	}
	$sqlmm .= ") AND mm_gedfile = '".$GEDCOMS[$GEDCOM]["id"]."' AND mm_media=m_media AND mm_gedfile=m_gedfile ";
	//-- for family and source page only show level 1 obje references
	if ($level>0) $sqlmm .= "AND mm_gedrec ".PGV_DB_LIKE." '$level OBJE%'";

	if ($sort_ct>0) {
		$sqlmm .= $orderbylist;
	} else {
		// $sqlmm .= " ORDER BY m_titl ";
		$sqlmm .= " ORDER BY mm_gid DESC ";
	}

	$resmm = dbquery($sqlmm);
	$foundObjs = array();

//      $resmm1 = mysql_query($sqlmm);
//      $numm = mysql_num_rows($resmm1);

			while ($rowm = $resmm->fetchRow(DB_FETCHMODE_ASSOC)) {

				if (isset($foundObjs[$rowm['m_media']])) {
					if (isset($current_objes[$rowm['m_media']])) $current_objes[$rowm['m_media']]--;
					continue;
				}

				// NOTE: Determine the size of the mediafile
				$imgwidth = 300+40;
				$imgheight = 300+150;
				if (preg_match("'://'", $rowm["m_file"])) {
					if (in_array($rowm["m_ext"], $MEDIATYPE)) {
						$imgwidth = 400+40;
						$imgheight = 500+150;
					} else {
						$imgwidth = 800+40;
						$imgheight = 400+150;
					}
				}
				else if (file_exists(filename_decode(check_media_depth($rowm["m_file"], "NOTRUNC")))) {
					$imgsize = findImageSize(check_media_depth($rowm["m_file"], "NOTRUNC"));
					$imgwidth = $imgsize[0]+40;
					$imgheight = $imgsize[1]+150;
				}
				$rows = array();

				$rows['normal'] = $rowm;
				if (isset($current_objes[$rowm['m_media']])) $current_objes[$rowm['m_media']]--;
/*
				if (!isset($j)) {
					$j=0;
				} else {
					$j=$j;
				}
*/
				foreach($rows as $rtype => $rowm) {
					// if  (FactViewRestricted($rowm['m_media'], $rowm['m_gedrec']) == "true")
					$res = media_reorder_row($rtype, $rowm, $pid);
					$media_found = $media_found || $res;
					$foundObjs[$rowm['m_media']] = true;

//					$media_data = $rowm['m_media'];
//					print "<input type=\"hidden\" name=\"order1[$media_data]\" value=\"$j\" />";
					print "\n\n";
						//BH Debug
						// $order2[].=$media_data;
				$j++;
				}
			}

			?>
			</ul>
<?php
// BH Debug ----------------------------------------------------------------------------------
//			print "<br /><br /> No 2 = <br />";
//			print_r($order2);
//			echo "<input type=\"hidden\" name=\"order2\" value=\"$order2\" />";

print "\n";
?>
<script type="text/javascript" language="javascript">
// <![CDATA[
	new Effect.BlindDown('reorder_media_list', {duration: .5});
	Sortable.create('reorder_media_list',
		{
			scroll:window,
			onUpdate : function() {
				inputs = $('reorder_media_list').getElementsByTagName('input');
				for (var i = 0; i < inputs.length; i++) {
					inputs[i].value = i;
				}
			}
		}
	);
// ]]>
</script>

		<center>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_save"];?>"><?php print $pgv_lang["save"];?></button>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_reset"];?>" onclick="document.reorder_form.action.value='reset_media_update'; document.reorder_form.submit();"><?php print $pgv_lang["reset"];?></button>
		<button type="submit" title="<?php print $pgv_lang["reorder_media_cancel"];?>" onclick="window.close();"><?php print $pgv_lang["cancel"];?></button>
		</center><p>

	</form>
	<?php


?>


Index: sort_tables_utf8.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/sort_tables_utf8.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sort_tables_utf8.php	7 Jul 2008 17:30:13 -0000	1.2
+++ sort_tables_utf8.php	30 Apr 2009 18:32:43 -0000	1.3
@@ -1,89 +1,243 @@
-<?php
-/**
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2003  John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package PhpGedView
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**********************************************************************************
- *                                                                                *
- *	To prevent loss of some characters, this file MUST be saved in UTF-8 mode     *
- *                                                                                *
- ********************************************************************************** */
-
- /**
- *		Build the tables required for the Dictionary sort
- *
- *		A Dictionary sort is one where all letters with diacritics are considered to be
- *		identical to the base letter (without the mark).  Diacritics become important
- *		only when the two strings (without marks) are identical.
- *
- *		There are two sets of tables, one for the Upper Case version of a UTF8 character
- *		and the other for the lower-case version.  The two tables are not necessarily 
- *		identical.  For example, the Turkish dotless i doesn't exist in the Upper case
- *		table.
- *
- *		Within each set, there are three lists which MUST have a one-to-one relationship.
- *		The "DiacritStrip" list gives the base letter of the corresponding "DiacritWhole" 
- *		character.  
- *		The "DiacritOrder" list assigns a sort value to the diacritic mark of the 
- *		"DiacritWhole" character.  All letters that don't appear in these lists, including 
- *		the base letter from which the one bearing diacritic marks is formed, are assigned 
- *		a sort value of " ".  By using a single letter from the ASCII code chart, we can
- *		have 52 different UTF8 characters all mapping to the same base character.  This will
- *		handle Vietnamese, which is by far the richest language in terms of diacritic marks.
- */
-
-global $DICTIONARY_SORT, $LANGUAGE;
-global $UCDiacritWhole, $LCDiacritWhole, $unknownNN, $unknownPN, $pgv_lang;
-
-if (!isset($DICTIONARY_SORT[$LANGUAGE])) $DICTIONARY_SORT[$LANGUAGE] = false;
-if ($DICTIONARY_SORT[$LANGUAGE]) {
-	$UCDiacritWhole = "ÁÀÄÂÃÅǺĀĂĄǍÇĆĈĊČĎĐÉÈËÊĒĔĘĖĚĜĞĢĠĤĦÍÌÏÎĨĪĬİĮǏĴĶĹĻĽĿŁÑŃŅŇÓÒÖÔÕŐØǾŌŎƠǑŔŖŘŚŜŞŠŢŤŦÚÙÜÛŨŰŲŪŬŮƯǓǕǗǙǛŴÝŸŶŹŻŽ";
-	$UCDiacritStrip = "AAAAAAAAAAACCCCCDDEEEEEEEEEGGGGHHIIIIIIIIIIJKLLLLLNNNNOOOOOOOOOOOORRRSSSSTTTUUUUUUUUUUUUUUUUWYYYZZZ";
-	$UCDiacritOrder = "ABCDEFGHIJKABCDEABABCDEFGHIJKLMABABCDEFGHIJAAABCDEABCDABCDEFGHIJKLABCABCDABCABCDEFGHIJKLMNOPAABCABC";
-	$LCDiacritWhole = "áàäâãåǻāăąǎçćĉċčďđéèëêēĕęėěƒĝğġģĥħíìïîĩīĭįǐĵķĺļľŀłñńņʼnóòöôõőøǿōŏơǒŕŗřśŝşšţťŧúùüûũűūŭůųūưǔǖǘǚǜŵýÿŷźżž";
-	$LCDiacritStrip = "aaaaaaaaaaacccccddeeeeeeeeefgggghhiiiiiiiiijklllllnnnnoooooooooooorrrsssstttuuuuuuuuuuuuuuuuuwyyyzzz";
-	$LCDiacritOrder = "ABCDEFGHIJKABCDEABABCDEFGHIAABCDABCDEFGHIJLAAABCDEABCDABCDEFGHIJKLABCABCDABCABCDEFGHIJKLMNOPQAABCABC";	
-}
-
-$unknownNN = array();
-$unknownNN["hebrew"]	= "(לא ידוע)";
-$unknownNN["arabic"]	= "(غير معروف)";
-$unknownNN["greek"]		= "(άγνωστος/η)";
-$unknownNN["russian"]	= "(неопределено)";
-$unknownNN["chinese"]	= "(未知)";
-$unknownNN["vietnamese"] = "(vô danh)";
-$unknownNN["other"]		= $pgv_lang["NN"];
-
-$unknownPN = array();	 
-$unknownPN["hebrew"]	= "(לא ידוע)";
-$unknownPN["arabic"]	= "(غير معروف)";
-$unknownPN["greek"]		= "(άγνωστος/η)";
-$unknownPN["russian"]	= "(неопределено)";
-$unknownPN["chinese"]	= "(未知)";
-$unknownPN["vietnamese"] = "(không biết tuổi)";
-$unknownPN["other"]		= $pgv_lang["PN"];
-
-?>
+<?php
+/**
+ * phpGedView: Genealogy Viewer
+ * Copyright (C) 2007 to 2008  PGV Development Team.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package PhpGedView
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_SORT_TABLES_UTF8_PHP', '');
+
+/**********************************************************************************
+ *                                                                                *
+ *	To prevent loss of some characters, this file MUST be saved in UTF-8 mode     *
+ *                                                                                *
+ ********************************************************************************** */
+
+ /**
+ *		Build the tables required for the Dictionary sort
+ *
+ *		A Dictionary sort is one where all letters with diacritics are considered to be
+ *		identical to the base letter (without the mark).  Diacritics become important
+ *		only when the two strings (without marks) are identical.
+ *
+ *		There are two sets of tables, one for the Upper Case version of a UTF8 character
+ *		and the other for the lower-case version.  The two tables are not necessarily
+ *		identical.  For example, the Turkish dotless i doesn't exist in the Upper case
+ *		table.
+ *
+ *		Within each set, there are three lists which MUST have a one-to-one relationship.
+ *		The "DiacritStrip" list gives the base letter of the corresponding "DiacritWhole"
+ *		character.
+ *		The "DiacritOrder" list assigns a sort value to the diacritic mark of the
+ *		"DiacritWhole" character.  All letters that don't appear in these lists, including
+ *		the base letter from which the one bearing diacritic marks is formed, are assigned
+ *		a sort value of " ".  By using a single letter from the ASCII code chart, we can
+ *		have 52 different UTF8 characters all mapping to the same base character.  This will
+ *		handle Vietnamese, which is by far the richest language in terms of diacritic marks.
+ */
+
+global $DICTIONARY_SORT, $LANGUAGE;
+global $UCDiacritWhole, $LCDiacritWhole, $unknownNN, $unknownPN, $pgv_lang;
+global $UTF8_ranges, $UTF8_numbers, $UTF8_brackets, $UTF8_LC_letters;
+
+if (!isset($DICTIONARY_SORT[$LANGUAGE])) $DICTIONARY_SORT[$LANGUAGE] = false;
+if ($DICTIONARY_SORT[$LANGUAGE]) {
+	$UCDiacritWhole = "ÁÀÄÂÃÅǺĀĂĄǍÇĆĈĊČĎĐÉÈËÊĒĔĘĖĚĜĞĢĠĤĦÍÌÏÎĨĪĬİĮǏĴĶĹĻĽĿŁÑŃŅŇÓÒÖÔÕŐØǾŌŎƠǑŔŖŘŚŜŞŠŢŤŦÚÙÜÛŨŰŲŪŬŮƯǓǕǗǙǛŴÝŸŶŹŻŽ";
+	$UCDiacritStrip = "AAAAAAAAAAACCCCCDDEEEEEEEEEGGGGHHIIIIIIIIIIJKLLLLLNNNNOOOOOOOOOOOORRRSSSSTTTUUUUUUUUUUUUUUUUWYYYZZZ";
+	$UCDiacritOrder = "ABCDEFGHIJKABCDEABABCDEFGHIJKLMABABCDEFGHIJAAABCDEABCDABCDEFGHIJKLABCABCDABCABCDEFGHIJKLMNOPAABCABC";
+	$LCDiacritWhole = "áàäâãåǻāăąǎçćĉċčďđéèëêēĕęėěƒĝğġģĥħíìïîĩīĭįǐĵķĺļľŀłñńņʼnóòöôõőøǿōŏơǒŕŗřśŝşšţťŧúùüûũűūŭůųūưǔǖǘǚǜŵýÿŷźżž";
+	$LCDiacritStrip = "aaaaaaaaaaacccccddeeeeeeeeefgggghhiiiiiiiiijklllllnnnnoooooooooooorrrsssstttuuuuuuuuuuuuuuuuuwyyyzzz";
+	$LCDiacritOrder = "ABCDEFGHIJKABCDEABABCDEFGHIAABCDABCDEFGHIJLAAABCDEABCDABCDEFGHIJKLABCABCDABCABCDEFGHIJKLMNOPQAABCABC";
+}
+
+$unknownNN = array(
+	'hebrew'    =>$pgv_lang['NNhebrew'],
+	'arabic'    =>$pgv_lang['NNarabic'],
+	'greek'     =>$pgv_lang['NNgreek'],
+	'russian'   =>$pgv_lang['NNrussian'],
+	'chinese'   =>$pgv_lang['NNchinese'],
+	'vietnamese'=>$pgv_lang['NNvietnamese'],
+	'thai'      =>$pgv_lang['NNthai'],
+	'other'     =>$pgv_lang['NNother'],
+);
+$unknownPN = array(
+	'hebrew'    =>$pgv_lang['PNhebrew'],
+	'arabic'    =>$pgv_lang['PNarabic'],
+	'greek'     =>$pgv_lang['PNgreek'],
+	'russian'   =>$pgv_lang['PNrussian'],
+	'chinese'   =>$pgv_lang['PNchinese'],
+	'vietnamese'=>$pgv_lang['PNvietnamese'],
+	'thai'      =>$pgv_lang['PNthai'],
+	'other'     =>$pgv_lang['PNother'],
+);
+
+// Table of UTF8 code ranges
+// Reference: Unicode Consortium  http://www.unicode.org
+$UTF8_ranges = array();
+$UTF8_ranges[] = array("other",		0x000041, 0x00005A);	// upper-case base letters
+$UTF8_ranges[] = array("other",		0x000061, 0x00007A);	// lower-case base letters
+$UTF8_ranges[] = array("other",		0x0000C0, 0x0000D6);	// Letters with diacritics
+$UTF8_ranges[] = array("other",		0x0000D8, 0x0000F6);	// More letters with diacritics
+$UTF8_ranges[] = array("other",		0x0000F8, 0x00024F);	// More letters with diacritics
+$UTF8_ranges[] = array("greek",		0x000370, 0x0003FF);	// Greek
+$UTF8_ranges[] = array("russian",	0x000400, 0x00052F);	// Cyrillic
+$UTF8_ranges[] = array("hebrew",	0x000590, 0x0005FF);	// Hebrew
+$UTF8_ranges[] = array("arabic",	0x000600, 0x0006FF);	// Arabic
+$UTF8_ranges[] = array("arabic",	0x000750, 0x0007FF);	// Arabic
+$UTF8_ranges[] = array("thai",	  0x000E00, 0x000E7F);	// Thai
+$UTF8_ranges[] = array("vietnamese", 0x001E00, 0x001EFF);	// Vietnamese (assumption!!!)
+$UTF8_ranges[] = array("greek",		0x001F00, 0x001FFF);	// Greek
+$UTF8_ranges[] = array("chinese",	0x002E80, 0x002FDF);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x003190, 0x00319F);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x0031C0, 0x0031EF);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x003400, 0x004DBF);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x004E00, 0x009FBF);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x00F900, 0x00FAFF);	// Chinese
+$UTF8_ranges[] = array("other",		0x00FB00, 0x00FB06);	// Latin ligatures
+$UTF8_ranges[] = array("hebrew",	0x00FB1D, 0x00FB4F);	// Hebrew ligatures
+$UTF8_ranges[] = array("arabic",	0x00FB50, 0x00FDFF);	// Arabic
+$UTF8_ranges[] = array("arabic",	0x00FE70, 0x00FEFF);	// Arabic
+$UTF8_ranges[] = array("chinese",	0x020000, 0x02A6DF);	// Chinese
+$UTF8_ranges[] = array("chinese",	0x02F800, 0x02FA1F);	// Chinese
+
+// Numbers:  These are always rendered in LTR, even when the rest of the text is RTL
+$UTF8_numbers = array(
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	"\xD9\xA0", "\xD9\xA1", "\xD9\xA2", "\xD9\xA3", "\xD9\xA4", "\xD9\xA5", "\xD9\xA6", "\xD9\xA7", "\xD9\xA8", "\xD9\xA9",
+	"\xDB\xB0", "\xDB\xB1", "\xDB\xB2", "\xDB\xB3", "\xDB\xB4", "\xDB\xB5", "\xDB\xB6", "\xDB\xB7", "\xDB\xB8", "\xDB\xB9"
+	);
+
+// Parentheses and other paired characters that need to be reversed for proper appearance within RTL text
+$UTF8_brackets = array(
+	'('=>')', ')'=>'(',
+	'['=>']', ']'=>'[',
+	'{'=>'}', '}'=>'{',
+	'<'=>'>', '>'=>'<',
+	"\xC2\xAB"=>"\xC2\xBB", "\xC2\xBB"=>"\xC2\xAB",
+	"\xEF\xB4\xBF"=>"\xEF\xB4\xBE", "\xEF\xB4\xBE"=>"\xEF\xB4\xBF",
+	"\xE2\x80\xBA"=>"\xE2\x80\xB9", "\xE2\x80\xB9"=>"\xE2\x80\xBA",
+	"\xE2\x80\x9E"=>"\xE2\x80\x9C", "\xE2\x80\x9D"=>"\xE2\x80\x9C", "\xE2\x80\x9C"=>"\xE2\x80\x9D",
+	"\xE2\x80\x9A"=>"\xE2\x80\x98", "\xE2\x80\x99"=>"\xE2\x80\x98", "\xE2\x80\x98"=>"\xE2\x80\x99"
+	);
+
+/*
+ * Array of lower-case UTF8 letters with their upper-case equivalents
+ *		key: lower-case UTF8 letter
+ *		value: equivalent upper-case UTF8 letter
+ */
+$UTF8_LC_letters = array (
+	// basic Latin letters and Latin letters with diacritics
+	'a'=>'A', 'à'=>'À', 'á'=>'Á', 'â'=>'Â', 'ã'=>'Ã', 'ä'=>'Ä', 'å'=>'Å', 'æ'=>'Æ', 'ā'=>'Ā', 'ă'=>'Ă', 'ą'=>'Ą', 'ǎ'=>'Ǎ', 'ǻ'=>'Ǻ', 'ǽ'=>'Ǽ', 'ạ'=>'Ạ', 'ả'=>'Ả', 'ấ'=>'Ấ', 'ầ'=>'Ầ', 'ẩ'=>'Ẩ', 'ẫ'=>'Ẫ', 'ậ'=>'Ậ', 'ắ'=>'Ắ', 'ằ'=>'Ằ', 'ẳ'=>'Ẳ', 'ẵ'=>'Ẵ', 'ặ'=>'Ặ',
+	'b'=>'B',
+	'c'=>'C', 'ç'=>'Ç', 'ć'=>'Ć', 'ĉ'=>'Ĉ', 'ċ'=>'Ċ', 'č'=>'Č',
+	'd'=>'D', 'ď'=>'Ď', 'đ'=>'Đ',
+	'e'=>'E', 'è'=>'È', 'é'=>'É', 'ê'=>'Ê', 'ë'=>'Ë', 'ē'=>'Ē', 'ĕ'=>'Ĕ', 'ė'=>'Ė', 'ę'=>'Ę', 'ě'=>'Ě', 'ẹ'=>'Ẹ', 'ẻ'=>'Ẻ', 'ẽ'=>'Ẽ', 'ế'=>'Ế', 'ề'=>'Ề', 'ể'=>'Ể', 'ễ'=>'Ễ', 'ệ'=>'Ệ',
+	'f'=>'F',
+	'g'=>'G', 'ĝ'=>'Ĝ', 'ğ'=>'Ğ', 'ġ'=>'Ġ', 'ģ'=>'Ģ',
+	'h'=>'H', 'ĥ'=>'Ĥ', 'ħ'=>'Ħ',
+	'i'=>'I', 'ì'=>'Ì', 'í'=>'Í', 'î'=>'Î', 'ï'=>'Ï', 'ĩ'=>'Ĩ', 'ī'=>'Ī', 'ĭ'=>'Ĭ', 'į'=>'Į', 'ı'=>'İ', 'ij'=>'IJ', 'ǐ'=>'Ǐ', 'ỉ'=>'Ỉ', 'ị'=>'Ị',
+	'j'=>'J', 'ĵ'=>'Ĵ',
+	'k'=>'K', 'ķ'=>'Ķ',
+	'l'=>'L', 'ĺ'=>'Ĺ', 'ļ'=>'Ļ', 'ľ'=>'Ľ', 'ŀ'=>'Ŀ', 'ł'=>'Ł',
+	'm'=>'M',
+	'n'=>'N', 'ñ'=>'Ñ', 'ń'=>'Ń', 'ņ'=>'Ņ', 'ň'=>'Ň',
+	'o'=>'O', 'ò'=>'Ò', 'ó'=>'Ó', 'ô'=>'Ô', 'õ'=>'Õ', 'ö'=>'Ö', 'ø'=>'Ø', 'ō'=>'Ō', 'ŏ'=>'Ŏ', 'ő'=>'Ő', 'œ'=>'Œ', 'ơ'=>'Ơ', 'ǒ'=>'Ǒ', 'ǿ'=>'Ǿ', 'ọ'=>'Ọ', 'ỏ'=>'Ỏ', 'ố'=>'Ố', 'ồ'=>'Ồ', 'ổ'=>'Ổ', 'ỗ'=>'Ỗ', 'ộ'=>'Ộ', 'ớ'=>'Ớ', 'ờ'=>'Ờ', 'ở'=>'Ở', 'ỡ'=>'Ỡ', 'ợ'=>'Ợ',
+	'p'=>'P',
+	'q'=>'Q',
+	'r'=>'R', 'ŕ'=>'Ŕ', 'ŗ'=>'Ŗ', 'ř'=>'Ř',
+	's'=>'S', 'ś'=>'Ś',
+	't'=>'T',
+	'u'=>'U', 'ù'=>'Ù', 'ú'=>'Ú', 'û'=>'Û', 'ü'=>'Ü', 'ŭ'=>'Ŭ', 'ů'=>'Ů', 'ű'=>'Ű', 'ų'=>'Ų', 'ư'=>'Ư', 'ǔ'=>'Ǔ', 'ǖ'=>'Ǖ', 'ǘ'=>'Ǘ', 'ǚ'=>'Ǚ', 'ǜ'=>'Ǜ', 'ụ'=>'Ụ', 'ủ'=>'Ủ', 'ứ'=>'Ứ', 'ừ'=>'Ừ', 'ử'=>'Ử', 'ữ'=>'Ữ', 'ự'=>'Ự',
+	'v'=>'V',
+	'w'=>'W', 'ŵ'=>'Ŵ', 'ẁ'=>'Ẁ', 'ẃ'=>'Ẃ', 'ẅ'=>'Ẅ',
+	'x'=>'X',
+	'y'=>'Y', 'ý'=>'Ý', 'ŷ'=>'Ŷ', 'ÿ'=>'Ÿ', 'ỳ'=>'Ỳ', 'ỵ'=>'Ỵ', 'ỷ'=>'Ỷ', 'ỹ'=>'Ỹ',
+	'z'=>'Z', 'ź'=>'Ź', 'ż'=>'Ż', 'ž'=>'Ž',
+	'ð'=>'Ð',
+	'ŋ'=>'Ŋ',
+	'þ'=>'Þ',
+	'ə'=>'Ə',
+	// Greek
+	'α'=>'Α', 'ά'=>'Ά',
+	'β'=>'Β',
+	'γ'=>'Γ',
+	'δ'=>'Δ',
+	'ε'=>'Ε', 'έ'=>'Έ',
+	'ζ'=>'Ζ',
+	'η'=>'Η', 'ή'=>'Ή',
+	'θ'=>'Θ',
+	'ι'=>'Ι', 'ί'=>'Ί', 'ϊ'=>'Ϊ',
+	'κ'=>'Κ',
+	'λ'=>'Λ',
+	'μ'=>'Μ',
+	'ν'=>'Ν',
+	'ξ'=>'Ξ',
+	'ο'=>'Ο', 'ό'=>'Ό',
+	'π'=>'Π',
+	'ρ'=>'Ρ',
+	'ς'=>'Σ',
+	'τ'=>'Τ',
+	'υ'=>'Υ', 'ϋ'=>'Ϋ',
+	'φ'=>'Φ',
+	'χ'=>'Χ',
+	'ψ'=>'Ψ',
+	'ω'=>'Ω', 'ώ'=>'Ώ',
+	// Cyrillic
+	'а'=>'А',
+	'б'=>'Б',
+	'в'=>'В',
+	'г'=>'Г', 'ґ'=>'Ґ', 'ѓ'=>'Ѓ', 'ғ'=>'Ғ',
+	'д'=>'Д',
+	'е'=>'Е', 'ё'=>'Ё',
+	'ж'=>'Ж', 'җ'=>'Җ',
+	'з'=>'З',
+	'и'=>'И', 'й'=>'Й', 'і'=>'І', 'ї'=>'Ї',
+	'ј'=>'Ј',
+	'к'=>'К', 'ќ'=>'Ќ', 'қ'=>'Қ', 'ҝ'=>'Ҝ',
+	'л'=>'Л', 'љ'=>'Љ',
+	'м'=>'М',
+	'н'=>'Н', 'ң'=>'Ң', 'њ'=>'Њ',
+	'о'=>'О',
+	'п'=>'П',
+	'р'=>'Р',
+	'с'=>'С',
+	'т'=>'Т', 'ћ'=>'Ћ',
+	'у'=>'У', 'ў'=>'Ў', 'ү'=>'Ү', 'ұ'=>'Ұ',
+	'ф'=>'Ф',
+	'х'=>'Х', 'ҳ'=>'Ҳ',
+	'ц'=>'Ц', 'џ'=>'Џ',
+	'ч'=>'Ч', 'ҹ'=>'Ҹ',
+	'ш'=>'Ш', 'щ'=>'Щ',
+	'ъ'=>'Ъ', 'ы'=>'Ы', 'ь'=>'Ь',
+	'э'=>'Э',
+	'ю'=>'Ю',
+	'я'=>'Я',
+	'ђ'=>'Ђ',
+	'є'=>'Є',
+	'ѕ'=>'Ѕ',
+	'Ò»'=>'Òº',
+	'ә'=>'Ә',
+	'Ó©'=>'Ó¨'
+	);
+?>

--- date_class.php DELETED ---

Index: specialchars.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/specialchars.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- specialchars.php	7 Jul 2008 17:30:13 -0000	1.3
+++ specialchars.php	30 Apr 2009 18:32:43 -0000	1.4
@@ -1,1247 +1,1300 @@
-<?PHP
-/**
- * Special Character tables, for use by JavaScript to input characters 
- * that aren't on your keyboard
- * 
- * THIS FILE MUST BE SAVED IN UTF-8 ENCODING (or some special characters will be lost)
- * 
- * When updating, be sure to add the language into the array $specialchar_languages, 
- * add a case for that language into the switch, and add any new special characters 
- * into the default case of the switch near the bottom.
- * 
[...2516 lines suppressed...]
+	"&#191;" => "¿",
+	"&#171;" => "«",
+	"&#187;" => "»",
+	"&#8224;" => "†",
+	"&#8225;" => "‡",
+	"&#8734;" => "∞",  // infinity
+	"&#247;" => "÷",
+	"&#215;" => "×",
+	"&#170;" => "ª",  // feminine ordinal (nª)
+	"&#186;" => "º",  // masculine ordinal (nº)
+	"&#8364;" => "€",
+	"&#162;" => "¢",
+	"&#163;" => "£",
+	"&#165;" => "Â¥",
+	"&#167;" => "§",
+	"&#169;" => "©",
+	"&#176;" => "°",  // degree symbol
+	"&#182;" => "¶",
+);
+?>

--- feedcreator.class.php DELETED ---

--- NEW FILE: hitcount.php ---
<?php
/**
 * Counts how many hits.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @version $Id: hitcount.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 * @package PhpGedView
 * @subpackage Charts
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

//only do counter stuff if counters are enabled
if($SHOW_COUNTER)
{
	$PGV_COUNTER_FILENAME = $INDEX_DIRECTORY.$GEDCOM."pgv_counters.txt";
	$PGV_COUNTER_NAME     = $GEDCOM."pgv_counter";
	$PGV_INDI_COUNTER_NAME = $GEDCOM."pgv_indi_counter";

	// if counter file doesn't exist create it
	if(!file_exists($PGV_COUNTER_FILENAME))
	{
			$fp=fopen($PGV_COUNTER_FILENAME,"w");
			fputs($fp,"0");
			fclose($fp);
	}

	if(isset($pid) && find_person_record($pid)) { //individual counter

		// Capitalize ID to make sure we have a correct hitcount on the individual
		$pid = strtoupper($pid);

		//see if already viewed individual this session
		if(isset($_SESSION[$PGV_INDI_COUNTER_NAME][$pid]))
		{
			$hitCount = $_SESSION[$PGV_INDI_COUNTER_NAME][$pid];
		}
		else //haven't viewed individual this session
		{
			$l_fcontents = file_get_contents($PGV_COUNTER_FILENAME);
			$ct = preg_match_all ("/@$pid@...);
			if($ct>0) //found individual increment counter
			{
				$hitCount = $matches[1][0];
				$hitCount = ((int)$hitCount) + 1;
				$l_fcontents = preg_replace("/(@$pid@) (\d+)/","$1 $hitCount",$l_fcontents);
				$fp=fopen($PGV_COUNTER_FILENAME,"r+");
				fputs($fp,$l_fcontents);
				fclose($fp);
			}
			else //first view of individual
			{
				$fp=fopen($PGV_COUNTER_FILENAME,"r+");
				fseek($fp,0,SEEK_END);
				fputs($fp,"\r\n@...."@ 1");
				fclose($fp);
				$hitCount=1;
			}
			$_SESSION[$PGV_INDI_COUNTER_NAME][$pid] = $hitCount;
		}
	}
	else //web site counter
	{
		// has user started a session on site yet
		if(isset($_SESSION[$PGV_COUNTER_NAME]))
		{
			$hitCount = $_SESSION[$PGV_COUNTER_NAME];
		}
		else //new user so increment counter and save
		{
			$l_fcontents = file_get_contents($PGV_COUNTER_FILENAME);
			$ct = preg_match ("/^(\d+)/",$l_fcontents,$matches);
			if($ct)
			{
			$hitCount = $matches[0];
			$hitCount = ((int)$hitCount) + 1;
			$ct = preg_match("/^(\d+)@/",$l_fcontents,$matches);
			if($ct) //found missing return & newline
				$l_fcontents = preg_replace("/^(\d+)/","$hitCount\r\n",$l_fcontents);
			else  //returns & newline exist
				$l_fcontents = preg_replace("/^(\d+)/","$hitCount",$l_fcontents);
				$fp=fopen($PGV_COUNTER_FILENAME,"r+");
				fputs($fp,$l_fcontents);
				fclose($fp);
		}
		else
			$hitCount=0;
			$_SESSION[$PGV_COUNTER_NAME]=$hitCount;
		}
	}

	//replace the numbers with their images
	if (array_key_exists('0', $PGV_IMAGES))
		for($i=0;$i<10;$i++)
			$hitCount = str_replace("$i","<img src=\"".$PGV_IMAGE_DIR."/".$PGV_IMAGES[$i]["digit"]."\" alt=\"pgv_counter\" />","$hitCount");
	else
		$hitCount="<span class=\"hit-counter\">{$hitCount}</span>";

	if ($TEXT_DIRECTION=="rtl") $hitCount = getLRM() . $hitCount . getLRM();
}
?>

--- functions_edit.php DELETED ---

--- functions_print_lists.php DELETED ---

--- functions_name.php DELETED ---

Index: session.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/session.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- session.php	7 Jul 2008 17:30:13 -0000	1.19
+++ session.php	30 Apr 2009 18:32:43 -0000	1.20
@@ -1,1029 +1,707 @@
-<?php
-/**
- * Startup and session logic
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2008  PGV Development Team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
[...1705 lines suppressed...]
+// Make sure that they follow the directionality of the page, not that of the
+// enclosed text.
+if ($TEXT_DIRECTION=='ltr') {
+	define ('PGV_LPARENS', '&lrm;(');
+	define ('PGV_RPARENS', ')&lrm;');
+} else {
+	define ('PGV_LPARENS', '&rlm;(');
+	define ('PGV_RPARENS', ')&rlm;');
+}
+
+// define constants to be used when setting permissions after creating files/directories
+if (substr(PHP_SAPI, 0, 3) == 'cgi') {  // cgi-mode, should only be writable by owner
+	define('PGV_PERM_EXE',  0755);  // to be used on directories, php files and htaccess files
+	define('PGV_PERM_FILE', 0644);  // to be used on images, text files, etc
+} else { // mod_php mode, should be writable by everyone
+	define('PGV_PERM_EXE',  0777);
+	define('PGV_PERM_FILE', 0666);
+}
+
+?>

Index: reportheader.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/reportheader.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reportheader.php	7 Jul 2008 17:30:13 -0000	1.4
+++ reportheader.php	30 Apr 2009 18:32:43 -0000	1.5
@@ -1,170 +1,172 @@
-<?php
-
-/**
- * Report Header Parser
- *
- * used by the SAX parser to generate PDF reports from the XML report file.
- *
- * @package PhpGedView
- * @subpackage Reports
- * @version $Id$
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-/**
- * element handlers array
- *
- * An array of element handler functions
- * @global array $elementHandler
- */
-$elementHandler = array();
-$elementHandler["PGVReport"]["start"]			= "PGVReportSHandler";
-$elementHandler["PGVRvar"]["start"]			= "PGVRvarSHandler";
-$elementHandler["PGVRTitle"]["start"]			= "PGVRTitleSHandler";
-$elementHandler["PGVRTitle"]["end"]			= "PGVRTitleEHandler";
-$elementHandler["PGVRDescription"]["end"]			= "PGVRDescriptionEHandler";
-$elementHandler["PGVRInput"]["start"]			= "PGVRInputSHandler";
-$elementHandler["PGVRInput"]["end"]			= "PGVRInputEHandler";
-
-$text = "";
-$report_array = array();
-
-
-
-/**
- * xml start element handler
- *
- * this function is called whenever a starting element is reached
- * @param resource $parser the resource handler for the xml parser
- * @param string $name the name of the xml element parsed
- * @param array $attrs an array of key value pairs for the attributes
- */
-function startElement($parser, $name, $attrs) {
-	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
-	
-	if (($processIfs==0 || $name=="PGVRif")) {
-		if (isset($elementHandler[$name]["start"])) call_user_func($elementHandler[$name]["start"], $attrs);
-	}
-}
-
-/**
- * xml end element handler
- *
- * this function is called whenever an ending element is reached
- * @param resource $parser the resource handler for the xml parser
- * @param string $name the name of the xml element parsed
- */
-function endElement($parser, $name) {
-	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
-	
-	if (($processIfs==0 || $name=="PGVRif")) {
-		if (isset($elementHandler[$name]["end"])) call_user_func($elementHandler[$name]["end"]);
-	}
-}
-
-/**
- * xml character data handler
- *
- * this function is called whenever raw character data is reached
- * just print it to the screen
- * @param resource $parser the resource handler for the xml parser
- * @param string $data the name of the xml element parsed
- */
-function characterData($parser, $data) {
-	global $text;
-	
-	$text .= $data;
-}
-
-function PGVReportSHandler($attrs) {
-	global $report_array;
-	global $PRIV_PUBLIC, $PRIV_USER, $PRIV_NONE, $PRIV_HIDE;
-	
-	$access = $PRIV_PUBLIC;
-	if (isset($attrs["access"])) {
-		if (isset($$attrs["access"])) $access = $$attrs["access"];
-	}
-	$report_array["access"] = $access;
-
-	if (isset($attrs["icon"])) $report_array["icon"] = $attrs["icon"];
-	else $report_array["icon"] = "";
-}
-
-function PGVRvarSHandler($attrs) {
-	global $text, $vars, $pgv_lang, $factarray, $fact, $desc, $type, $generation;
-	
-	$var = $attrs["var"];
-	if (!empty($var)) {
-		$tfact = $fact;
-		if ($fact=="EVEN") $tfact = $type;
-		$var = preg_replace(array("/\[/","/\]/","/@fact/","/@desc/"), array("['","']",$tfact,$desc), $var);
-		eval("if (!empty(\$$var)) \$var = \$$var;");
-		$ct = preg_match("/factarray\['(.*)'\]/", $var, $match);
-		if ($ct>0) $var = $match[1];
-		$text .= $var;
-	}
-}
-
-function PGVRTitleSHandler() {
-	global $report_array, $text;
-	
-	$text = "";
-}
-
-function PGVRTitleEHandler() {
-	global $report_array, $text;
-	
-	$report_array["title"] = $text;
-	$text = "";
-}
-
-function PGVRDescriptionEHandler() {
-	global $report_array, $text;
-	
-	$report_array["description"] = $text;
-	$text = "";
-}
-
-function PGVRInputSHandler($attrs) {
-	global $input, $text;
-	
-	$text ="";
-	$input = array();
-	$input["name"] = "";
-	$input["type"] = "";
-	$input["lookup"] = "";
-	$input["default"] = "";
-	$input["value"] = "";
-	$input["options"] = "";
-	if (isset($attrs["name"])) $input["name"] = $attrs["name"];
-	if (isset($attrs["type"])) $input["type"] = $attrs["type"];
-	if (isset($attrs["lookup"])) $input["lookup"] = $attrs["lookup"];
-	if (isset($attrs["default"])) {
-		if ($attrs["default"]=="NOW") $input["default"] = date("d M Y"); 
-		else {
-			$ct = preg_match("/NOW\s*([+\-])\s*(\d+)/", $attrs['default'], $match);
-			if ($ct>0) {
-				$plus = 1;
-				if ($match[1]=="-") $plus = -1;
-				$input["default"] = date("d M Y", time()+$plus*60*60*24*$match[2]);
-			}
-			else $input["default"] = $attrs["default"];
-		}
-	}
-	if (isset($attrs["options"])) $input["options"] = $attrs["options"];
-}
-
-function PGVRInputEHandler() {
-	global $report_array, $text, $input;
-	
-	$input["value"] = $text;
-	if (!isset($report_array["inputs"])) $report_array["inputs"] = array();
-	$report_array["inputs"][] = $input;
-	$text = "";
-}
-
-?>
+<?php
+
+/**
+ * Report Header Parser
+ *
+ * used by the SAX parser to generate PDF reports from the XML report file.
+ *
+ * @package PhpGedView
+ * @subpackage Reports
+ * @version $Id$
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_REPORTHEADER_PHP', '');
+
+/**
+ * element handlers array
+ *
+ * An array of element handler functions
+ * @global array $elementHandler
+ */
+$elementHandler = array();
+$elementHandler["PGVReport"]["start"]			= "PGVReportSHandler";
+$elementHandler["PGVRvar"]["start"]			= "PGVRvarSHandler";
+$elementHandler["PGVRTitle"]["start"]			= "PGVRTitleSHandler";
+$elementHandler["PGVRTitle"]["end"]			= "PGVRTitleEHandler";
+$elementHandler["PGVRDescription"]["end"]			= "PGVRDescriptionEHandler";
+$elementHandler["PGVRInput"]["start"]			= "PGVRInputSHandler";
+$elementHandler["PGVRInput"]["end"]			= "PGVRInputEHandler";
+
+$text = "";
+$report_array = array();
+
+
+
+/**
+ * xml start element handler
+ *
+ * this function is called whenever a starting element is reached
+ * @param resource $parser the resource handler for the xml parser
+ * @param string $name the name of the xml element parsed
+ * @param array $attrs an array of key value pairs for the attributes
+ */
+function startElement($parser, $name, $attrs) {
+	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
+
+	if (($processIfs==0 || $name=="PGVRif")) {
+		if (isset($elementHandler[$name]["start"])) call_user_func($elementHandler[$name]["start"], $attrs);
+	}
+}
+
+/**
+ * xml end element handler
+ *
+ * this function is called whenever an ending element is reached
+ * @param resource $parser the resource handler for the xml parser
+ * @param string $name the name of the xml element parsed
+ */
+function endElement($parser, $name) {
+	global $elementHandler, $processIfs, $processGedcoms, $processRepeats;
+
+	if (($processIfs==0 || $name=="PGVRif")) {
+		if (isset($elementHandler[$name]["end"])) call_user_func($elementHandler[$name]["end"]);
+	}
+}
+
+/**
+ * xml character data handler
+ *
+ * this function is called whenever raw character data is reached
+ * just print it to the screen
+ * @param resource $parser the resource handler for the xml parser
+ * @param string $data the name of the xml element parsed
+ */
+function characterData($parser, $data) {
+	global $text;
+
+	$text .= $data;
+}
+
+function PGVReportSHandler($attrs) {
+	global $report_array;
+	global $PRIV_PUBLIC, $PRIV_USER, $PRIV_NONE, $PRIV_HIDE;
+
+	$access = $PRIV_PUBLIC;
+	if (isset($attrs["access"])) {
+		if (isset($$attrs["access"])) $access = $$attrs["access"];
+	}
+	$report_array["access"] = $access;
+
+	if (isset($attrs["icon"])) $report_array["icon"] = $attrs["icon"];
+	else $report_array["icon"] = "";
+}
+
+function PGVRvarSHandler($attrs) {
+	global $text, $vars, $pgv_lang, $factarray, $fact, $desc, $type, $generation;
+
+	$var = $attrs["var"];
+	if (!empty($var)) {
+		$tfact = $fact;
+		if ($fact=="EVEN") $tfact = $type;
+		$var = preg_replace(array("/\[/","/\]/","/@fact/","/@desc/"), array("['","']",$tfact,$desc), $var);
+		eval("if (!empty(\$$var)) \$var = \$$var;");
+		$ct = preg_match("/factarray\['(.*)'\]/", $var, $match);
+		if ($ct>0) $var = $match[1];
+		$text .= $var;
+	}
+}
+
+function PGVRTitleSHandler() {
+	global $report_array, $text;
+
+	$text = "";
+}
+
+function PGVRTitleEHandler() {
+	global $report_array, $text;
+
+	$report_array["title"] = $text;
+	$text = "";
+}
+
+function PGVRDescriptionEHandler() {
+	global $report_array, $text;
+
+	$report_array["description"] = $text;
+	$text = "";
+}
+
+function PGVRInputSHandler($attrs) {
+	global $input, $text;
+
+	$text ="";
+	$input = array();
+	$input["name"] = "";
+	$input["type"] = "";
+	$input["lookup"] = "";
+	$input["default"] = "";
+	$input["value"] = "";
+	$input["options"] = "";
+	if (isset($attrs["name"])) $input["name"] = $attrs["name"];
+	if (isset($attrs["type"])) $input["type"] = $attrs["type"];
+	if (isset($attrs["lookup"])) $input["lookup"] = $attrs["lookup"];
+	if (isset($attrs["default"])) {
+		if ($attrs["default"]=="NOW") $input["default"] = date("d M Y");
+		else {
+			$ct = preg_match("/NOW\s*([+\-])\s*(\d+)/", $attrs['default'], $match);
+			if ($ct>0) {
+				$plus = 1;
+				if ($match[1]=="-") $plus = -1;
+				$input["default"] = date("d M Y", time()+$plus*60*60*24*$match[2]);
+			}
+			else $input["default"] = $attrs["default"];
+		}
+	}
+	if (isset($attrs["options"])) $input["options"] = $attrs["options"];
+}
+
+function PGVRInputEHandler() {
+	global $report_array, $text, $input;
+
+	$input["value"] = $text;
+	if (!isset($report_array["inputs"])) $report_array["inputs"] = array();
+	$report_array["inputs"][] = $input;
+	$text = "";
+}
+
+?>

--- source_class.php DELETED ---

--- NEW FILE: family_nav.php ---
<?php
/**
* Family Navigator for phpGedView
*
* Display immediate family members table for fast navigation
* ( Currently used with Facts and Details tab, and Album Tab pages )
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2007 to 2008  PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @subpackage Includes
* @version $Id: family_nav.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
* @author Brian Holland
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_FAMILY_NAV_PHP', '');

// -----------------------------------------------------------------------------
// Function Family Nav for PHPGedView - called by individual_ctrl.php
// -----------------------------------------------------------------------------
// function family_nav() {
// ------------------------------------------------------------------------------

global $edit, $tabno, $mediacnt, $GEDCOM, $pid;
$edit=$edit;
global $show_full, $tabno;
$show_full="1";

// Gets current clicked tab to set $tabno -----------
if (isset($_COOKIE['lastclick'])) {
	$tabno=$_COOKIE['lastclick']-1;
}else{
	$tabno=0;
}


// Debug only -----------------------------------------
// echo "Lastclick =" . $_COOKIE['lastclick'];
//echo "<br />";
//print "TAB =" . $tabno;

// =====================================================================

//     Start Family Nav Table ----------------------------
	echo "<table class=\"facts_table\" width='230' cellpadding=\"0\">";
		global $pgv_lang, $SHOW_ID_NUMBERS, $PGV_IMAGE_DIR, $PGV_IMAGES;
		global $spouselinks, $parentlinks, $DeathYr, $BirthYr;
		global $TEXT_DIRECTION;

		$personcount=0;
		$families = $this->indi->getChildFamilies();

		//-- parent families -------------------------------------------------------------
		foreach($families as $famid=>$family) {
			$label = $this->indi->getChildFamilyLabel($family);
			$people = $this->buildFamilyList($family, "parents");
			$styleadd = "";
			?>
			<tr>
				<td style="padding-bottom: 4px;" align="center" colspan="2">
				<?php 
				echo "<a href=family.php?famid=".$famid.">";
				//echo "<b>". $pgv_lang["parent_family"] ."&nbsp;&nbsp;(".$famid.")</b>";
				echo "<b>".$pgv_lang["parent_family"]."&nbsp;&nbsp;</b><span class=\"age\">(".$famid.")</span>";
				echo "</a>"; 
				?>
				</td>
			</tr>
			<?php
			if (isset($people["husb"])) {
				$menu = array();
				$menu["label"] = "&nbsp;" . $people["husb"]->getLabel() . "&nbsp;". "\n";
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
				if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
				?>
				<tr>
					<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
						<?php // print $people["husb"]->getLabel(); ?>
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["husb"]); ?>">
						<?php
						print "<a href=\"".encode_url($people["husb"]->getLinkUrl()."&tab={$tabno}")."\">";
						print PrintReady($people["husb"]->getFullName());
						print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						print "</a>";
						?>
					</td>
				</tr>
				<?php
			}

			if (isset($people["wife"])) {
				$menu = array();
				$menu["label"] = "&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n";
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
				if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
				?>
				<tr>
					<td class="facts_label<?php print $styleadd; ?>">
						<?php //print $people["wife"]->getLabel(); ?>
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["wife"]); ?>">
						<?php
						print "<a href=\"".encode_url($people["wife"]->getLinkUrl()."&tab={$tabno}")."\">";
						print PrintReady($people["wife"]->getFullName());
						print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						print "</a>";
						?>
					</td>
				</tr>
				<?php
			}

			if (isset($people["children"])) {
				$elderdate = $family->getMarriageDate();
				foreach($people["children"] as $key=>$child) {
				if ($pid == $child->getXref() ){
				}else{
					$menu = array();
					$menu["label"] = $child->getLabel() . "\n";
					$menu["submenuclass"] = "submenu";
					$menu["items"] =  array();
					$submenu = array();
					$submenu["label"]  = print_pedigree_person_nav($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
					$submenu["label"] .= PrintReady($spouselinks);
					$menu["items"][] = $submenu;
				}
				if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); }
				if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($child->getBirthYear()); }

					?>
					<tr>
						<td class="facts_label<?php print $styleadd; ?>">
						<?php
						if ($pid == $child->getXref() ) {
							print $child->getLabel();
						}else{
							print_menu($menu);
						}
						?>
						</td>
						<td align="center" class="<?php print $this->getPersonStyle($child); ?>">
							<?php
							if ($pid == $child->getXref()) {
								print PrintReady($child->getFullName());
								print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
							}else{
								print "<a href=\"".encode_url($child->getLinkUrl()."&tab={$tabno}")."\">";
								print PrintReady($child->getFullName());
								print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
								print "</a>";
							}
							?>
						</td>
					</tr>
					<?php
					$elderdate = $child->getBirthDate();
				}
			}
		}

		//-- step families ----------------------------------------------------------------
		foreach($this->indi->getStepFamilies() as $famid=>$family) {
			$label = $this->indi->getStepFamilyLabel($family);
			$people = $this->buildFamilyList($family, "step");
			if ($people){
				echo "<tr><td><br /></td><td></td></tr>";
			}
			$styleadd = "";
			$elderdate = "";
			?>
			<tr>
				<td style="padding-bottom: 4px;" align="center" colspan="2">
				<?php 
				echo "<a href=family.php?famid=".$famid.">"; 
				echo "<b>".$pgv_lang["step_parent_family"]."&nbsp;&nbsp;</b><span class=\"age\">(".$famid.")</span>";
				echo "</a>"; 
				?>
				</td>
			</tr>
			<?php
			
			//if (isset($people["husb"]) && $people["husb"]->getLabel() == ".") {
			if (isset($people["husb"]) ) {
				$menu = array();
				if ($people["husb"]->getLabel() == ".") {
					$menu["label"] = "&nbsp;" . $pgv_lang["stepdad"] . "&nbsp;". "\n";
				}else{
					$menu["label"] = "&nbsp;" . $people["husb"]->getLabel() . "&nbsp;". "\n";
				}
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
				if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
				?>

				<tr>
					<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["husb"]); ?>" >
						<?php
						print "<a href=\"".encode_url($people["husb"]->getLinkUrl()."&tab={$tabno}")."\">";
						print PrintReady($people["husb"]->getFullName());
						print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						print "</a>";
						?>
					</td>
				</tr>
				<?php
				$elderdate = $people["husb"]->getBirthDate();
			}

			$styleadd = "";
			//if (isset($people["wife"]) && $people["wife"]->getLabel() == ".") {
			if (isset($people["wife"]) ) {
				$menu = array();
				if ($people["wife"]->getLabel() == ".") {
					$menu["label"] = "&nbsp;" . $pgv_lang["stepmom"] . "&nbsp;". "\n";
				}else{
					$menu["label"] = "&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n";
				}
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
				if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
				?>
				<tr>
					<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["wife"]); ?>">
						<?php
						print "<a href=\"".encode_url($people["wife"]->getLinkUrl()."&tab={$tabno}")."\">";
						print PrintReady($people["wife"]->getFullName());
						print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						print "</a>";
						?>
					</td>
				</tr>
				<?php
			}

			$styleadd = "";
			if (isset($people["children"])) {
				$elderdate = $family->getMarriageDate();
				foreach($people["children"] as $key=>$child) {
					$menu = array();
					$menu["label"] = $child->getLabel() . "\n";
					$menu["submenuclass"] = "submenu";
					$menu["items"] =  array();
					$submenu = array();
					$submenu["label"]  = print_pedigree_person_nav($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
					$submenu["label"] .= PrintReady($spouselinks);
					$menu["items"][] = $submenu;

					if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); }
					if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($child->getBirthYear()); }
					?>
					<tr>
						<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
							<?php //print $child->getLabel(); ?>
							<?php
								print_menu($menu);
							?>
						</td>
						<td align="center" class="<?php print $this->getPersonStyle($child); ?>">
							<?php
							print "<a href=\"".encode_url($child->getLinkUrl()."&tab={$tabno}")."\">";
							print PrintReady($child->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
							print "</a>";
							?>
						</td>
					</tr>
					<?php
					//$elderdate = $child->getBirthDate();
				}
			}
		}

		//-- spouse and children --------------------------------------------------
		$families = $this->indi->getSpouseFamilies();
		foreach($families as $famid=>$family) {
		echo "<tr><td><br /></td><td></td></tr>";
		?>
			<tr>
				<td style="padding-bottom: 4px;" align="center" colspan="2">
				<?php 
				echo "<a href=family.php?famid=".$famid.">"; 
				echo "<b>".$pgv_lang["immediate_family"]."&nbsp;&nbsp;</b><span class=\"age\">(".$famid.")</span>";
				echo "</a>"; 
				?>
				</td>
			</tr>
		<?php

			//$personcount = 0;
			$people = $this->buildFamilyList($family, "spouse");
			if ($this->indi->equals($people["husb"])){
				$spousetag = 'WIFE';
			}else{
				$spousetag = 'HUSB';
			}
			$styleadd = "";
			if ( isset($people["husb"]) && $spousetag == 'HUSB' ) {
				$menu = array();
				$menu["label"] = "&nbsp;" . $people["husb"]->getLabel() . "&nbsp;". "\n";
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["husb"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["husb"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["husb"]->getDeathYear()); }
				if (PrintReady($people["husb"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["husb"]->getBirthYear()); }
				?>
				<tr>
					<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
						<?php // print $people["husb"]->getLabel(); ?>
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["husb"]); ?>">
						<?php
						if ($pid == $people["husb"]->getXref()) {
							print PrintReady($people["husb"]->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						}else{
							print "<a href=\"".encode_url($people["husb"]->getLinkUrl()."&tab={$tabno}")."\">";
							print PrintReady($people["husb"]->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
							print "</a>";
						}
						?>
					</td>
				</tr>
				<?php
			}

			if ( isset($people["wife"]) && $spousetag == 'WIFE') {
				$menu = array();
				$menu["label"] = "&nbsp;" . $people["wife"]->getLabel() . "&nbsp;". "\n";
				$menu["submenuclass"] = "submenu";
				$menu["items"] =  array();
				$submenu = array();
				$submenu["label"]  = print_pedigree_person_nav($people["wife"]->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
				$submenu["label"] .= PrintReady($parentlinks);
				$menu["items"][] = $submenu;

				if (PrintReady($people["wife"]->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($people["wife"]->getDeathYear()); }
				if (PrintReady($people["wife"]->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($people["wife"]->getBirthYear()); }
				?>
				<tr>
					<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
						<?php // print $people["wife"]->getLabel(); ?>
						<?php
							print_menu($menu);
						?>
					</td>
					<td align="center" class="<?php print $this->getPersonStyle($people["wife"]); ?>">
						<?php
						if ($pid == $people["wife"]->getXref()) {
							print PrintReady($people["wife"]->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
						}else{
							print "<a href=\"".encode_url($people["wife"]->getLinkUrl()."&tab={$tabno}")."\">";
							print PrintReady($people["wife"]->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
							print "</a>";
						}
						?>
					</td>
				</tr>
				<?php
			}

			$styleadd = "";
			if (isset($people["children"])) {
				foreach($people["children"] as $key=>$child) {
					$menu = array();
					$menu["label"] = "&nbsp;" . $child->getLabel() . "&nbsp;". "\n";
					$menu["submenuclass"] = "submenu";
					$menu["items"] =  array();
					$submenu = array();
					$submenu["label"]  = print_pedigree_person_nav($child->getXref(), 2, !$this->isPrintPreview(), 0, $personcount++);
					$submenu["label"] .= PrintReady($spouselinks);
					$menu["items"][] = $submenu;

					if (PrintReady($child->getDeathYear()) == 0) { $DeathYr = ""; }else{ $DeathYr = PrintReady($child->getDeathYear()); }
					if (PrintReady($child->getBirthYear()) == 0) { $BirthYr = ""; }else{ $BirthYr = PrintReady($child->getBirthYear()); }
					?>
					<tr>
						<td class="facts_label<?php print $styleadd; ?>" nowrap="nowrap">
							<?php //print $child->getLabel(); ?>
							<?php
								print_menu($menu);
							?>
						</td>
						<td align="center" class="<?php print $this->getPersonStyle($child); ?>">
							<?php
							print "<a href=\"".encode_url($child->getLinkUrl()."&tab={$tabno}")."\">";
							print PrintReady($child->getFullName());
							print "<font size=\"1\"><br />" . $BirthYr . " - " . $DeathYr . "</font>";
							print "</a>";
							?>
						</td>
					</tr>
					<?php
				}
			}

		}
		echo "</table>";


// -----------------------------------------------------------------------------
// }
// -----------------------------------------------------------------------------
// End Family Nav Table
// -----------------------------------------------------------------------------

// ==================================================================
require_once 'includes/functions/functions_charts.php';
/**
* print the information for an individual chart box
*
* find and print a given individuals information for a pedigree chart
* @param string $pid the Gedcom Xref ID of the   to print
* @param int $style the style to print the box in, 1 for smaller boxes, 2 for larger boxes
* @param boolean $show_famlink set to true to show the icons for the popup links and the zoomboxes
* @param int $count on some charts it is important to keep a count of how many boxes were printed
*/
function print_pedigree_person_nav($pid, $style=1, $show_famlink=true, $count=0, $personcount="1") {
	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $PRIV_PUBLIC, $factarray, $ZOOM_BOXES, $LINK_ICONS, $view, $SCRIPT_NAME, $GEDCOM;
	global $pgv_lang, $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_ID_NUMBERS, $SHOW_PEDIGREE_PLACES;
	global $CONTACT_EMAIL, $CONTACT_METHOD, $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
	global $PGV_IMAGE_DIR, $PGV_IMAGES, $ABBREVIATE_CHART_LABELS, $USE_MEDIA_VIEWER;
	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
	global $SEARCH_SPIDER;

	global $spouselinks, $parentlinks, $step_parentlinks, $persons, $person_step, $person_parent, $tabno, $theme_name, $spousetag;
	global $natdad, $natmom;

	if ($style != 2) $style=1;
	if (empty($show_full)) $show_full = 0;
	if (empty($PEDIGREE_FULL_DETAILS)) $PEDIGREE_FULL_DETAILS = 0;

	if (!isset($OLD_PGENS)) $OLD_PGENS = $DEFAULT_PEDIGREE_GENERATIONS;
	if (!isset($talloffset)) $talloffset = $PEDIGREE_LAYOUT;

	$person=Person::getInstance($pid);
	if ($pid==false || empty($person)) {
		$spouselinks  = false;
		$parentlinks  = false;
		$step_parentlinks = false;
	}

	$tmp=array('M'=>'','F'=>'F', 'U'=>'NN');
	$isF=$tmp[$person->getSex()];
	$spouselinks = "";
	$parentlinks = "";
	$step_parentlinks   = "";
	$disp=$person->canDisplayDetails();

	if ($person->canDisplayName()) {
		if ($show_famlink && (empty($SEARCH_SPIDER))) {
			if ($LINK_ICONS!="disabled") {
				//-- draw a box for the family popup
				if ($TEXT_DIRECTION=="rtl") {
				$spouselinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; left: -1px; \"><tr><td align=\"right\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$spouselinks .= "<font size=\"1\"><b>" . $pgv_lang['family'] . "</b><br /></font>";
				$parentlinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; left: -1px; \"><tr><td align=\"right\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$parentlinks .= "<font size=\"1\"><b>" . $pgv_lang['parents'] . "</b><br /></font>";
				$step_parentlinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; left: -1px; \"><tr><td align=\"right\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$step_parentlinks .= "<font size=\"1\"><b>" . $pgv_lang['parents'] . "</b><br /></font>";
				}else{
				$spouselinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; right: -1px; \"><tr><td align=\"left\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$spouselinks .= "<font size=\"1\"><b>" . $pgv_lang['family'] . "</b><br /></font>";
				$parentlinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; right: -1px; \"><tr><td align=\"left\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$parentlinks .= "<font size=\"1\"><b>" . $pgv_lang['parents'] . "</b><br /></font>";
				$step_parentlinks .= "\n\t\t\t<table class=\"person_box$isF\" style=\" position: absolute; top: -19px; right: -1px; \"><tr><td align=\"left\" style=\"font-size:10px;font-weight:normal;\" class=\"name2\" nowrap=\"nowrap\">";
				$step_parentlinks .= "<font size=\"1\"><b>" . $pgv_lang['parents'] . "</b><br /></font>";
				}
				$persons       = "";
				$person_parent = "";
				$person_step   = "";



				//-- parent families --------------------------------------
				$fams = $person->getChildFamilies();
				foreach($fams as $famid=>$family) {

					if (!is_null($family)) {
						$husb = $family->getHusband($person);
						$wife = $family->getWife($person);
						// $spouse = $family->getSpouse($person);
						$children = $family->getChildren();
						$num = count($children);

						// Husband ------------------------------
						if ($husb || $num>0) {
							if ($TEXT_DIRECTION=="ltr") {
								$title = $pgv_lang["familybook_chart"].": ".$famid;
							}else{
								$title = $famid." :".$pgv_lang["familybook_chart"];
							}
							if ($husb) {
								$person_parent="Yes";
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["indi_info"].": ".$husb->getXref();
								}else{
									$title = $husb->getXref()." :".$pgv_lang["indi_info"];
								}
								$parentlinks .= "<a href=\"".encode_url($husb->getLinkUrl()."&amp;tab={$tabno}")."\">";
								$parentlinks .= PrintReady($husb->getFullName());
								$parentlinks .= "</a>";
								$parentlinks .= "<br />";
								$natdad = "yes";
							}
						}

						// Wife ------------------------------
						if ($wife || $num>0) {
							if ($TEXT_DIRECTION=="ltr") {
								$title = $pgv_lang["familybook_chart"].": ".$famid;
							}else{
								$title = $famid." :".$pgv_lang["familybook_chart"];
							}
							if ($wife) {
								$person_parent="Yes";
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["indi_info"].": ".$wife->getXref();
								}else{
									$title = $wife->getXref()." :".$pgv_lang["indi_info"];
								}
								$parentlinks .= "<a href=\"".encode_url($wife->getLinkUrl()."&amp;tab={$tabno}")."\">";
								$parentlinks .= PrintReady($wife->getFullName());
								$parentlinks .= "</a>";
								$parentlinks .= "<br />";
								$natmom = "yes";
							}
						}
					}
				}

				//-- step families -----------------------------------------
				$fams = $person->getStepFamilies();
				foreach($fams as $famid=>$family) {
					if (!is_null($family)) {
						$husb = $family->getHusband($person);
						$wife = $family->getWife($person);
						// $spouse = $family->getSpouse($person);
						$children = $family->getChildren();
						$num = count($children);

						if ($natdad == "yes") {
						}else{
							// Husband -----------------------
							if ( ($husb || $num>0) && $husb->getLabel() != "." ) {
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["familybook_chart"].": ".$famid;
								}else{
									$title = $famid." :".$pgv_lang["familybook_chart"];
								}
								if ($husb) {
									$person_step="Yes";
									if ($TEXT_DIRECTION=="ltr") {
										$title = $pgv_lang["indi_info"].": ".$husb->getXref();
									}else{
										$title = $husb->getXref()." :".$pgv_lang["indi_info"];
									}
									$parentlinks .= "<a href=\"".encode_url($husb->getLinkUrl()."&amp;tab={$tabno}")."\">";
									$parentlinks .= PrintReady($husb->getFullName());
									$parentlinks .= "</a>";
									$parentlinks .= "<br />";
								}
							}
						}

						if ($natmom == "yes") {
						}else{
							// Wife ----------------------------
							if ($wife || $num>0) {
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["familybook_chart"].": ".$famid;
								}else{
									$title = $famid." :".$pgv_lang["familybook_chart"];
								}
								if ($wife) {
									$person_step="Yes";
									if ($TEXT_DIRECTION=="ltr") {
										$title = $pgv_lang["indi_info"].": ".$wife->getXref();
									}else{
										$title = $wife->getXref()." :".$pgv_lang["indi_info"];
									}
									$parentlinks .= "<a href=\"".encode_url($wife->getLinkUrl()."&amp;tab={$tabno}")."\">";
									$parentlinks .= PrintReady($wife->getFullName());
									$parentlinks .= "</a>";
									$parentlinks .= "<br />";
								}
							}
						}
					}
				}

				// Spouse Families -------------------------------------- @var $family Family
				$fams = $person->getSpouseFamilies();
				foreach($fams as $famid=>$family) {
					if (!is_null($family)) {
						$spouse = $family->getSpouse($person);
						$children = $family->getChildren();
						$num = count($children);

						// Spouse ------------------------------
						if ($spouse || $num>0) {
							if ($TEXT_DIRECTION=="ltr") {
								$title = $pgv_lang["familybook_chart"].": ".$famid;
							}else{
								$title = $famid." :".$pgv_lang["familybook_chart"];
							}
							if ($spouse) {
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["indi_info"].": ".$spouse->getXref();
								}else{
									$title = $spouse->getXref()." :".$pgv_lang["indi_info"];
								}
								$spouselinks .= "<a href=\"".encode_url($spouse->getLinkUrl()."&amp;tab={$tabno}")."\">";
								$spouselinks .= PrintReady($spouse->getFullName());
								$spouselinks .= "</a><br />";
								if ($spouse->getFullName() != "") {
									$persons = "Yes";
								}
							}
						}

						// Children ------------------------------   @var $child Person
						foreach($children as $c=>$child) {
							if ($child) {
								$persons="Yes";
								if ($TEXT_DIRECTION=="ltr") {
									$title = $pgv_lang["indi_info"].": ".$child->getXref();
									$spouselinks .= "o&nbsp;&nbsp;";
									$spouselinks .= "<a href=\"".encode_url($child->getLinkUrl()."&amp;tab={$tabno}")."\">";
									$spouselinks .= PrintReady($child->getFullName());
									$spouselinks .= "</a>";
									$spouselinks .= "<br />";
								}else{
									$title = $child->getXref()." :".$pgv_lang["indi_info"];
									$spouselinks .= "<a href=\"".encode_url($child->getLinkUrl()."&amp;tab={$tabno}")."\">";
									$spouselinks .= PrintReady($child->getFullName() );
									$spouselinks .= "</a>";
									$spouselinks .= "&nbsp;&nbsp;o";
									$spouselinks .= "<br />";
								}
							}
						}
					}
				}
				?>

				<?php if ($theme_name=="Xenea" || $theme_name=="Standard" || $theme_name=="Wood" || $theme_name=="Ocean") { ?>
				<style type="text/css" rel="stylesheet">
					a:hover .name2 { color: #222222; }
				</style>
				<?php } ?>

				<?php
				if ($persons != "Yes") {
					$spouselinks  .= "(" . $pgv_lang['none'] . ")</td></tr></table>\n\t\t";
				}else{
					$spouselinks  .= "</td></tr></table>\n\t\t";
				}

				if ($person_parent != "Yes") {
					$parentlinks .= "(" . $pgv_lang['unknown'] . ")</td></tr></table>\n\t\t";
				}else{
					$parentlinks .= "</td></tr></table>\n\t\t";
				}

				if ($person_step != "Yes") {
					$step_parentlinks .= "(" . $pgv_lang['unknown'] . ")</td></tr></table>\n\t\t";
				}else{
					$step_parentlinks .= "</td></tr></table>\n\t\t";
				}
			}
		}
	}
}
// ==============================================================
?>

Index: lang_settings_std.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/lang_settings_std.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lang_settings_std.php	7 Jul 2008 17:30:14 -0000	1.6
+++ lang_settings_std.php	30 Apr 2009 18:32:43 -0000	1.7
@@ -1,67 +1,940 @@
-<?php
-/**
- * Standard file of language_settings.php
- *
- * -> NEVER manually delete or edit this file <-
- *
- * phpGedView: Genealogy Viewer
- * Copyright (C) 2002 to 2007  John Finlay and Others
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
[...976 lines suppressed...]
+'factsfile'=>'languages/facts.ar.php',
+'adminfile'=>'languages/admin.ar.php',
+'editorfile'=>'languages/editor.ar.php',
+'countryfile'=>'languages/countries.ar.php',
+'faqlistfile'=>'languages/faqlist.ar.php',
+'extrafile'=>'languages/extra.ar.php',
+'DATE_FORMAT'=>'D M Y',
+'TIME_FORMAT'=>'h:i:sA',
+'WEEK_START'=>'0',
+'TEXT_DIRECTION'=>'rtl',
+'NAME_REVERSE'=>false,
+'ALPHABET_upper'=>'ابتثجحخدذرزسشصضطظعغفقكلمنهويآةىی',
+'ALPHABET_lower'=>'ابتثجحخدذرزسشصضطظعغفقكلمنهويآةىی',
+'MULTI_LETTER_ALPHABET'=>'',
+'MULTI_LETTER_EQUIV'=>'',
+'DICTIONARY_SORT'=>false,
+'COLLATION'=>'utf8_unicode_ci'
+);
+
+?>

--- GEClippings.php DELETED ---

--- class_stats.php DELETED ---

--- gedcomrecord.php DELETED ---

--- NEW FILE: media_reorder_count.php ---
<?php
/**
 * Provides media count for reorder media Items using drag and drop
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PHPGedView Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Module
 * @version $Id: media_reorder_count.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 * @author Brian Holland
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_MEDIA_REORDER_COUNT_PHP', '');

// Find if indi and family associated media exists and then count them ( $tot_med_ct)  ===================================================
	// Check indi gedcom items
		$gedrec = find_gedcom_record($pid);
		$level=0;
		if ($level>0) $regexp = "/".$level." OBJE @(.*)@/";
		else $regexp = "/OBJE @(.*)@/";
		// $regexp = "/OBJE @(.*)@/";
		$ct_indi = preg_match_all($regexp, $gedrec, $match, PREG_SET_ORDER);
		for($i=0; $i<$ct_indi; $i++) {
			if (!isset($current_objes[$match[$i][1]])) $current_objes[$match[$i][1]] = 1;
			else $current_objes[$match[$i][1]]++;
			$obje_links[$match[$i][1]][] = $match[$i][0];
		}
	//-- Test if indi is related
	$ct = preg_match_all("/1 FAMS @(.*)@/", $gedrec, $match, PREG_SET_ORDER);
	if ($ct>0) {
		// find all the related ids
		$related=true;
		if ($related) {
			$ct = preg_match_all("/1 FAMS @(.*)@/", $gedrec, $match, PREG_SET_ORDER);
			for($i=0; $i<$ct; $i++) {
				$ids[] = trim($match[$i][1]);
			}
		}
		// Use database to get details of indi related items ---------------------------------------------
			$sqlmm = "SELECT DISTINCT ";
			// $sqlmm = "SELECT ";
			$sqlmm .= "m_media, m_ext, m_file, m_titl, m_gedfile, m_gedrec, mm_gid, mm_gedrec FROM ".$TBLPREFIX."media, ".$TBLPREFIX."media_mapping where ";
			$sqlmm .= "mm_gid IN (";
			$i=0;
			foreach($ids as $key=>$id) {
				if ($i>0) $sqlmm .= ",";
				$sqlmm .= "'".$DBCONN->escapeSimple($id)."'";
				$i++;
			}
			$sqlmm .= ") AND mm_gedfile = '".$GEDCOMS[$GEDCOM]["id"]."' AND mm_media=m_media AND mm_gedfile=m_gedfile ";
			//-- for family and source page only show level 1 obje references----------------------------------------
			$level=0;
			if ($level>0) {
				$sqlmm .= "AND mm_gedrec ".PGV_DB_LIKE." '$level OBJE%'";
			}
			// Order by -------------------------------------------------------
			$sqlmm .= " ORDER BY mm_gid DESC ";
			// Perform DB Query -----------------------
			$resmm = dbquery($sqlmm);
			// Get related media item count
			$ct_db = $resmm->numRows();
	//else if indi not related
	}else{
		// Get related media item count
		$ct_db = 0;
	}

	// Gedcom media count --------------------------------
	if (isset($current_objes)) {
		$ct_objs = count($current_objes);
	}else{
		$ct_objs = 0;
	}
//	$foundObjs = array();
	//Total Media count
	$tot_med_ct = ($ct_db + $ct_objs);

// Debug --------------------------------------------
//	echo "<br />";
//	print_r($current_objes);
//	echo "<br />";
//	echo "<br />";
//	echo "Objes count = " . $ct_objs . "<br />";
//	echo "Db count = " . $ct_db . "<br />";
//	echo "Indi count = " . $ct_indi . "<br /><br />";
//	echo "Total Media count = " . $tot_med_ct;
// =====================================================================================

?>

--- GrampsExport.php DELETED ---

--- GEDownloadGedcom.php DELETED ---

--- functions_mail.php DELETED ---

--- family_class.php DELETED ---

--- GEWebService.php DELETED ---

--- mutex_class.php DELETED ---

--- functions_editlang.php DELETED ---

Index: lang_codes_std.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/lang_codes_std.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lang_codes_std.php	7 Jul 2008 17:30:14 -0000	1.5
+++ lang_codes_std.php	30 Apr 2009 18:32:43 -0000	1.6
@@ -1,60 +1,263 @@
-<?php
-/**
- *
- * @package PhpGedView
- * @subpackage Languages
- * @version $Id$
- *
- * RFC1766 (HTML language codes) refers to ISO standard 639, and specifies that the 
- * 2-character language code of the ISO standard should be used, and that an ISO 
- * standard country code can be used as a suffix to the two-character major language
- * code to produce regional variants.  For example, en-us for the English (US) variant.
- *
- * When checking the ISO-639 codes, you should use the Library of Congress site as your
- * authority.  LOC is the current registrar for ISO-639.
- *
- * See Library of Congress http://www.loc.gov/standards/iso639-2/langcodes.html
- *
- */
- 
-/**
- * This table lists various languages and an appropriate flag for that language.
- * The key field is the abbreviation, internal to PhpGedView, for the language.
- *
- * The abbreviations are used when a new language is to be implemented in PhpGedView.
- * For example, the abbreviation for "Croatian" is "hr".  This means that the various 
- * files within PhpGedView that are specific to Croatian would have .hr. as the last
- * part of the file name, and the Croatian flag would be croatia.gif.
- *
- * Note that PhpGedView allows the flag names to be other than as shown above.  For
- * example, the flag for English (abbreviation "en") could be "australia.gif".
- *
- * This table is used to produce the list of languages that can still be added to
- * PhpGedView.
- *
- */
-
-if (stristr($_SERVER["SCRIPT_NAME"], basename(__FILE__))!==false) {
-	print "You cannot access an include file directly.";
-	exit;
-}
-
-$lng_codes["en"]    = array("English", "United Kingdom");
-
-/**
- * This table provides the list of browser languages that are handled by the same
- * basic language code.  Essentially, it's a list of code synonyms.
- *
- * For example, language code "de" (German) also applies to language code "de-at" 
- * (German, Austria), "de-ch" (German, Switzerland), "de-de" (German, Germany) "de-li" 
- * (German, Liechtenstein), and "de-lu" (German, Luxemburg).
- *
- * If a given language code isn't in the list, that language doesn't have any
- * synonym codes.  For example, code "cy" (Welsh) isn't in the list, so there aren't
- * any synonym codes for Welsh.
- *
- */
- 
-$lng_synonyms["en"]	= "en-au;en-bz;en-ca;en-gb;en-ie;en-jm;en-nz;en-tt;en-us;en-za;";
-
-?>
+<?php
+/**
+ *
+ * @package PhpGedView
+ * @subpackage Languages
+ * @version $Id$
+ *
+ * RFC1766 (HTML language codes) refers to ISO standard 639, and specifies that the
+ * 2-character language code of the ISO standard should be used, and that an ISO
+ * standard country code can be used as a suffix to the two-character major language
+ * code to produce regional variants.  For example, en-us for the English (US) variant.
+ *
+ * When checking the ISO-639 codes, you should use the Library of Congress site as your
+ * authority.  LOC is the current registrar for ISO-639.
+ *
+ * See Library of Congress http://www.loc.gov/standards/iso639-2/langcodes.html
+ *
+ */
+
+/**
+ * This table lists various languages and an appropriate flag for that language.
+ * The key field is the abbreviation, internal to PhpGedView, for the language.
+ *
+ * The abbreviations are used when a new language is to be implemented in PhpGedView.
+ * For example, the abbreviation for "Croatian" is "hr".  This means that the various
+ * files within PhpGedView that are specific to Croatian would have .hr. as the last
+ * part of the file name, and the Croatian flag would be croatia.gif.
+ *
+ * Note that PhpGedView allows the flag names to be other than as shown above.  For
+ * example, the flag for English (abbreviation "en") could be "australia.gif".
+ *
+ * This table is used to produce the list of languages that can still be added to
+ * PhpGedView.
+ *
+ */
+
+if (!defined('PGV_PHPGEDVIEW')) {
+	header('HTTP/1.0 403 Forbidden');
+	exit;
+}
+
+define('PGV_LANG_CODES_STD_PHP', '');
+
+$lng_codes["aa"]    = array("Afar", "Ethiopia");
+$lng_codes["ab"]    = array("Abkhazian", "Georgia");
+$lng_codes["af"]    = array("Afrikaans", "South Africa");
+$lng_codes["ak"]    = array("Akan", "Guinea");
+$lng_codes["sq"]    = array("Albanian", "Albania");
+$lng_codes["am"]    = array("Amharic", "Ethiopia");
+$lng_codes["ar"]    = array("Arabic", "Arab League");	// Common alternate: plain green
+$lng_codes["an"]    = array("Aragonese", "Spain");
+$lng_codes["hy"]    = array("Armenian", "Armenia");
+$lng_codes["av"]    = array("Avaric", "Azerbaijan");
+$lng_codes["ay"]    = array("Aymara", "Peru");
+$lng_codes["az"]    = array("Azerbaijani", "Azerbaijan");
+$lng_codes["bm"]    = array("Bambara", "Mali");
+$lng_codes["ba"]    = array("Bashkir", "Russia");
+$lng_codes["eu"]    = array("Basque", "France");
+$lng_codes["be"]    = array("Belarusian", "Belarus");
+$lng_codes["bn"]    = array("Bengali", "Bangladesh");
+$lng_codes["bh"]    = array("Bihari", "India");
+$lng_codes["bi"]    = array("Bislama", "Vanuatu");
+$lng_codes["bs"]    = array("Bosnian", "Bosnia");
+$lng_codes["br"]    = array("Breton", "France");
+$lng_codes["bg"]    = array("Bulgarian", "Bulgaria");
+$lng_codes["my"]    = array("Burmese", "Myanmar");
+$lng_codes["ca"]    = array("Catalan (Valencian)", "Spain");
+$lng_codes["ch"]    = array("Chamorro", "Guam");
+$lng_codes["ce"]    = array("Chechen", "Russia");
+$lng_codes["ny"]    = array("Chichewa", "Malawi");
+$lng_codes["zh"]    = array("Chinese", "China");
+$lng_codes["cv"]    = array("Chuvash", "Russia");
+$lng_codes["kw"]    = array("Cornish", "United Kingdom");
+$lng_codes["co"]    = array("Corsican", "France");
+$lng_codes["cr"]    = array("Cree", "Canada");
+$lng_codes["hr"]    = array("Croatian", "Croatia");
+$lng_codes["cs"]    = array("Czech", "Czech Republic");
+$lng_codes["da"]    = array("Danish", "Denmark");
+$lng_codes["dv"]    = array("Divehi", "Maldives");
+$lng_codes["nl"]    = array("Dutch", "Netherlands");
+$lng_codes["dz"]    = array("Dzongkha", "Bhutan");
+$lng_codes["en"]    = array("English", "USA");
+$lng_codes["eo"]    = array("Esperanto", "United Nations");
+$lng_codes["et"]    = array("Estonian", "Estonia");
+$lng_codes["ee"]    = array("Ewe", "Ghana");
+$lng_codes["fo"]    = array("Faeroese", "Faeroe Islands");
+$lng_codes["fa"]    = array("Persian (Farsi)", "Iran");
+$lng_codes["fj"]    = array("Fijian", "Fiji");
+$lng_codes["fi"]    = array("Finnish", "Finland");
+$lng_codes["fr"]    = array("French", "France");
+$lng_codes["fy"]    = array("Frisian", "Friesland");
+$lng_codes["ff"]    = array("Fulah", "Sierra Leone");
+$lng_codes["gd"]    = array("Gaelic", "Royal Lion Rampant");  // Alternate: Scotland
+$lng_codes["gl"]    = array("Gallegan", "Portugal");
+$lng_codes["lg"]    = array("Ganda", "Uganda");
+$lng_codes["ka"]    = array("Georgian", "Georgia");
+$lng_codes["de"]    = array("German", "Germany");
+$lng_codes["el"]    = array("Greek", "Greece");
+$lng_codes["gn"]    = array("Guarani", "Paraguay");
+$lng_codes["gu"]    = array("Gujarati", "India");
+$lng_codes["ht"]    = array("Haitian", "Haiti");
+$lng_codes["ha"]    = array("Hausa", "Nigeria");
+$lng_codes["he"]    = array("Hebrew", "Israel");
+$lng_codes["hz"]    = array("Herero", "Botswana");
+$lng_codes["hi"]    = array("Hindi", "India");
+$lng_codes["ho"]    = array("Hiri Motu", "Papua New Guinea");
+$lng_codes["hu"]    = array("Hungarian", "Hungary");
+$lng_codes["is"]    = array("Icelandic", "Iceland");
+$lng_codes["io"]    = array("Ido", "United Nations");
+$lng_codes["ig"]    = array("Igbo", "Nigeria");
+$lng_codes["id"]    = array("Indonesian", "Indonesia");
+$lng_codes["ia"]    = array("Interlingua (IALA)", "United Nations");
+$lng_codes["ie"]    = array("Interlingue", "United Nations");
+$lng_codes["iu"]    = array("Inuktitut", "Canada");
+$lng_codes["ik"]    = array("Inupiaq", "USA");
+$lng_codes["ga"]    = array("Irish", "Eire");
+$lng_codes["it"]    = array("Italian", "Italy");
+$lng_codes["ja"]    = array("Japanese", "Japan");
+$lng_codes["jv"]    = array("Javanese", "Indonesia");
+$lng_codes["kl"]    = array("Kalaallisut", "Greenland");
+$lng_codes["kn"]    = array("Kannada", "India");
+$lng_codes["kr"]    = array("Kanuri", "Nigeria");
+$lng_codes["ks"]    = array("Kashmiri", "India");
+$lng_codes["kk"]    = array("Kazakh", "Kazakhstan");
+$lng_codes["km"]    = array("Khmer", "Cambodia");
+$lng_codes["ki"]    = array("Kikuyu", "Kenya");
+$lng_codes["rw"]    = array("Kinyarwanda", "Rwanda");
+$lng_codes["ky"]    = array("Kirghiz", "Kyrgyzstan");
+$lng_codes["kv"]    = array("Komi", "Russia");
+$lng_codes["kg"]    = array("Kongo", "Zaire");
+$lng_codes["ko"]    = array("Korean", "Korea");
+$lng_codes["kj"]    = array("Kuanyama", "Angola");
+$lng_codes["ku"]    = array("Kurdish", "Iraq");
+$lng_codes["lo"]    = array("Lao", "Laos");
+$lng_codes["la"]    = array("Latin", "Vatican");
+$lng_codes["lv"]    = array("Latvian", "Latvia");
+$lng_codes["li"]    = array("Limburgish", "Netherlands");
+$lng_codes["ln"]    = array("Lingala", "Zaire");
+$lng_codes["lt"]    = array("Lithuanian", "Lithuania");
+$lng_codes["lu"]    = array("Luba-Katanga", "Zaire");
+$lng_codes["lb"]    = array("Luxembourgish", "Luxembourg");
+$lng_codes["mk"]    = array("Macedonian", "Macedonia");
+$lng_codes["mg"]    = array("Malagasy", "Madagascar");
+$lng_codes["ml"]    = array("Malayalam", "India");
+$lng_codes["ms"]    = array("Malay", "Malaysia");
+$lng_codes["mt"]    = array("Maltese", "Malta");
+$lng_codes["mi"]    = array("Maori", "New Zealand");
+$lng_codes["mr"]    = array("Marathi", "India");
+$lng_codes["mh"]    = array("Marshallese", "Marshall Islands");
+$lng_codes["mo"]    = array("Moldavian", "Moldova");
+$lng_codes["mn"]    = array("Mongolian", "Mongolia");
+$lng_codes["na"]    = array("Nauru", "Nauru");
+$lng_codes["nv"]    = array("Navajo", "USA");
+$lng_codes["nr"]    = array("Ndebele (South dialect)", "South Africa");
+$lng_codes["nd"]    = array("Ndebele (North dialect)", "South Africa");
+$lng_codes["ng"]    = array("Ndonga", "Namibia");
+$lng_codes["ne"]    = array("Nepali", "Nepal");
+$lng_codes["no"]    = array("Norwegian", "Norway");
+$lng_codes["oj"]    = array("Ojibwa", "Canada");
+$lng_codes["or"]    = array("Oriya", "India");
+$lng_codes["om"]    = array("Oromo", "Ethiopia");
+$lng_codes["os"]    = array("Ossetian", "Iran");
+$lng_codes["pi"]    = array("Pali", "India");
+$lng_codes["pa"]    = array("Panjabi", "Pakistan");
+$lng_codes["pl"]    = array("Polish", "Poland");
+$lng_codes["pt"]    = array("Portuguese", "Portugal");
+$lng_codes["oc"]    = array("Provençal", "France");
+$lng_codes["ps"]    = array("Pushto", "Afghanistan");
+$lng_codes["qu"]    = array("Quechua", "Peru");
+$lng_codes["rm"]    = array("Raeto-Romance", "Switzerland");
+$lng_codes["ro"]    = array("Romanian", "Romania");
+$lng_codes["rn"]    = array("Rundi", "Burundi");
+$lng_codes["ru"]    = array("Russian", "Russia");
+$lng_codes["sz"]    = array("Sami (Lappish dialect)", "Finland");
+$lng_codes["se"]    = array("Sami (Northern dialect)", "Finland");
+$lng_codes["sm"]    = array("Samoan", "Samoa");
+$lng_codes["sg"]    = array("Sango", "Central African Republic");
+$lng_codes["sa"]    = array("Sanskrit", "India");
+$lng_codes["sc"]    = array("Sardinian", "Italy");
+$lng_codes["sr"]    = array("Serbian", "Serbia and Montenegro");
+$lng_codes["sn"]    = array("Shona", "Zimbabwe");
+$lng_codes["sd"]    = array("Sindhi", "Pakistan");
+$lng_codes["si"]    = array("Sinhala", "Sri lanka");
+$lng_codes["cu"]    = array("Slavic (Church Slavic)", "Bulgaria");
+$lng_codes["sk"]    = array("Slovak", "Slovakia");
+$lng_codes["sl"]    = array("Slovenian", "Slovenia");
+$lng_codes["so"]    = array("Somali", "Somalia");
+$lng_codes["sb"]    = array("Sorbian", "Czech Republic");
+$lng_codes["st"]    = array("Sotho (Southern dialect)", "Lesotho");
+$lng_codes["es"]    = array("Spanish", "Spain");
+$lng_codes["su"]    = array("Sundanese", "Indonesia");
+$lng_codes["sx"]    = array("Sutu", "Lesotho");
+$lng_codes["sw"]    = array("Swahili", "Zaire");
+$lng_codes["ss"]    = array("Swati", "Swaziland");
+$lng_codes["sv"]    = array("Swedish", "Sweden");
+$lng_codes["tl"]    = array("Tagalog", "Philippines");
+$lng_codes["ty"]    = array("Tahitian", "Tahiti");
+$lng_codes["tg"]    = array("Tajik", "Tajikistan");
+$lng_codes["ta"]    = array("Tamil", "India");
+$lng_codes["tt"]    = array("Tatar", "Ukraine");
+$lng_codes["te"]    = array("Telugu", "India");
+$lng_codes["th"]    = array("Thai", "Thailand");
+$lng_codes["bo"]    = array("Tibetan", "Tibet");
+$lng_codes["ti"]    = array("Tigrinya", "Ethiopia");
+$lng_codes["to"]    = array("Tonga", "Tonga");
+$lng_codes["ts"]    = array("Tsonga", "Mozambique");
+$lng_codes["tn"]    = array("Tswana", "Botswana");
+$lng_codes["tr"]    = array("Turkish", "Turkey");
+$lng_codes["tk"]    = array("Turkmen", "Turkmenistan");
+$lng_codes["tw"]    = array("Twi", "Cote d'Ivoire");
+$lng_codes["ug"]    = array("Uighur", "China");
+$lng_codes["uk"]    = array("Ukrainian", "Ukraine");
+$lng_codes["ur"]    = array("Urdu", "Pakistan");
+$lng_codes["uz"]    = array("Uzbek", "Uzbekistan");
+$lng_codes["ve"]    = array("Venda", "South Africa");
+$lng_codes["vi"]    = array("Vietnamese", "Vietnam");
+$lng_codes["wa"]    = array("Walloon", "Wallonia");
+$lng_codes["cy"]    = array("Welsh", "Wales");
+$lng_codes["wo"]    = array("Wolof", "Senegal");
+$lng_codes["xh"]    = array("Xhosa", "South Africa");
+$lng_codes["ii"]    = array("Yi (Sichuan dialect)", "China");
+$lng_codes["yi"]    = array("Yiddish", "USA");
+$lng_codes["yo"]    = array("Yoruba", "Nigeria");
+$lng_codes["za"]    = array("Zhuang", "China");
+$lng_codes["zu"]    = array("Zulu", "South Africa");
+
+/**
+ * This table provides the list of browser languages that are handled by the same
+ * basic language code.  Essentially, it's a list of code synonyms.
+ *
+ * For example, language code "de" (German) also applies to language code "de-at"
+ * (German, Austria), "de-ch" (German, Switzerland), "de-de" (German, Germany) "de-li"
+ * (German, Liechtenstein), and "de-lu" (German, Luxemburg).
+ *
+ * If a given language code isn't in the list, that language doesn't have any
+ * synonym codes.  For example, code "cy" (Welsh) isn't in the list, so there aren't
+ * any synonym codes for Welsh.
+ *
+ */
+
+$lng_synonyms["ar"]	= "ar-ae;ar-bh;ar-dz;ar-eg;ar-iq;ar-jo;ar-kw;ar-lb;ar-ly;ar-ma;ar-om;ar-qa;ar-sa;ar-sy;ar-tn;ar-ye;";
+$lng_synonyms["zh"]	= "zh-cn;zh-hk;zh-mo;zh-sg;zh-tw;";
+$lng_synonyms["nl"]	= "nl-be;";
+$lng_synonyms["cs"]	= "cz;";
+$lng_synonyms["en"]	= "en-au;en-bz;en-ca;en-gb;en-ie;en-jm;en-nz;en-tt;en-us;en-za;";
+$lng_synonyms["fr"]	= "fr-be;fr-ca;fr-ch;fr-lu;fr-mc;";
+$lng_synonyms["de"]	= "de-at;de-ch;de-de;de-li;de-lu;";
+$lng_synonyms["it"]	= "it-ch;";
+$lng_synonyms["no"]	= "nb;nn;";
+$lng_synonyms["pt"]	= "pt-br;";
+$lng_synonyms["ro"]	= "ro-mo;";
+$lng_synonyms["ru"]	= "ru-mo;";
+$lng_synonyms["es"]	= "es-ar;es-bo;es-cl;es-co;es-cr;es-do;es-ec;es-gt;es-hn;es-mx;es-ni;es-pa;es-pe;es-pr;es-py;es-sv;es-uy;es-ve;";
+$lng_synonyms["sv"]	= "sv-fi;";
+// The following codes were changed in ISO-639.  The synonym codes should not be used.
+// See Library of Congress: http://www.loc.gov/standards/iso639-2/codechanges.html
+$lng_synonyms["yi"]	= "ji;";
+$lng_synonyms["he"]	= "iw;";
+$lng_synonyms["id"]	= "in;";
+$lng_synonyms["jv"]	= "jw;";
+$lng_synonyms["hr"]	= "sh;";
+
+?>

Index: .htaccess
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/.htaccess,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .htaccess	7 Jul 2008 17:30:15 -0000	1.3
+++ .htaccess	30 Apr 2009 18:32:43 -0000	1.4
@@ -1,3 +1,3 @@
-# $Id$
-order allow,deny
-deny from all
+# $Id$
+order allow,deny
+deny from all

Index: authentication.php
===================================================================
RCS file: /cvsroot/bitweaver/_bit_phpgedview/includes/authentication.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- authentication.php	11 Aug 2008 14:18:49 -0000	1.20
+++ authentication.php	30 Apr 2009 18:32:43 -0000	1.21
@@ -1,455 +1,1232 @@
-<?php
-/**
- * MySQL User and Authentication functions
- *
- * This file contains the MySQL specific functions for working with users and authenticating them.
- * It also handles the internal mail messages, favorites, news/journal, and storage of MyGedView
- * customizations.  Assumes that a database connection has already been established.
- *
- * You can extend PhpGedView to work with other systems by implementing the functions in this file.
- * Other possible options are to use LDAP for authentication.
- *
[...1656 lines suppressed...]
+
+	$news = array();
+	$sql = "SELECT * FROM {$TBLPREFIX}news WHERE n_id='$news_id'";
+	$res = dbquery($sql);
+
+	while ($row =& $res->fetchRow(DB_FETCHMODE_ASSOC)){
+		$row = db_cleanup($row);
+		$n = array();
+		$n["id"] = $row["n_id"];
+		$n["username"] = $row["n_username"];
+		$n["date"] = $row["n_date"];
+		$n["title"] = stripslashes($row["n_title"]);
+		$n["text"] = stripslashes($row["n_text"]);
+		$n["anchor"] = "article".$row["n_id"];
+		$res->free();
+		return $n;
+	}
+}
+
+?>

--- functions_date.php DELETED ---

--- functions_rtl.php DELETED ---

--- NEW FILE: session_spider.php ---
<?php
/**
 * Startup and session logic for handling Bots and Spiders
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2008 to 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage admin
 * @version $Id: session_spider.php,v 1.1 2009/04/30 18:32:43 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_SESSION_SPIDER_PHP', '');

/**
 * Changes the session same for known spiders
 * session names are limited to alphanum upper and lower only.
 * $outname = '__Spider-name-:/alphanum_only__';
 * Example  =  sess_xxGOOGLEBOTfsHTTPcffWWWdGOOGLxx
 * Matchable by "ls sess_xx??????????????????????????xx"
 *
 * @param string $bot_name
 * @param string $bot_language
 * @return string
 */
function gen_spider_session_name($bot_name, $bot_language) {
	$outname = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';

	$bot_limit = strlen($bot_name);
	if($bot_limit > 27)
	$bot_limit = 27;
	for($x=0; $x < $bot_limit; $x++) {
		if(preg_match('/^[a-zA-Z0-9]+$/', $bot_name{$x}))
		$outname{$x+2} = strtoupper($bot_name{$x});
		else if ($bot_name{$x} == '.')
		$outname{$x+2} = 'd';
		else if ($bot_name{$x} == ':')
		$outname{$x+2} = 'c';
		else if ($bot_name{$x} == '/')
		$outname{$x+2} = 'f';
		else if ($bot_name{$x} == ' ')
		$outname{$x+2} = 's';
		else if ($bot_name{$x} == '-')
		$outname{$x+2} = 't';
		else if ($bot_name{$x} == '_')
		$outname{$x+2} = 'u';
		else
		$outname{$x+2} = 'o';
	}
	return($outname);
}


/**
  * Remote IP Address Banning
  */
if (file_exists($INDEX_DIRECTORY."banned.php")) {
	require($INDEX_DIRECTORY."banned.php");
	//loops through each ip in banned.php
	foreach($banned as $key=>$value) {
		//creates a regex foreach ip
		$ipRegEx = '';
		$arrayIP = explode('*', $value);
		$ipRegEx .= $arrayIP[0];
		if (count($arrayIP) > 1) {
			for($i=1; $i < count($arrayIP); $i++) {
				if($i == (count($arrayIP)))
		 			$ipRegEx .= "\d{0,3}";
	 			else
	 				$ipRegEx .= "\d{0,3}".$arrayIP[$i];
			}
		}
		//checks the remote ip address against each ip regex
		if (preg_match('/^'.$ipRegEx.'/', $_SERVER['REMOTE_ADDR'])) {
			//adds a message to the log and exits with an Access Denied header
			AddToLog("genservice.php blocked IP Address: ".$_SERVER['REMOTE_ADDR']." by regex: ".$ipRegEx);
			header("HTTP/1.1 403 Access Denied");
			exit;
		}
	}
}

// Search Engines are treated special, and receive only core data, without the
// pretty bells and whistles.  Recursion is also going to be kept to a minimum.
// Max uncompressed page output has to be under 100k.  Spiders do not index the
// rest of the file.

global $SEARCH_SPIDER;
$SEARCH_SPIDER = false;		// set empty at start

$ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";

$worms = array(
	'XXX',
	'Super_Ale',
	'Wget',
	'DataCha',
	'libwww-perl',
	'LWP::Simple',
	'lwp-trivial',
	'MJ.*bot',
	'ru.*rv',
	'DotBot',
	'HTTrack',
	'AISearchBot',
	'panscient.com',
//	'Mozilla([^\/])|(\/[\D])',	// legitimate Mozilla-based browsers have something like "Mozilla/5.0"
	'(Microsoft)|(Internet)|(Explorer)'		// Internet Explorer self-identifies with "MSIE"
	);

$quitReason = "";

// check for attempt to redirect
if (preg_match("/=.*:\/\//i", rawurldecode($_SERVER["REQUEST_URI"]))) {
	$quitReason = "Embedded URL detected";
}

// check for worms and bad bots
if ($quitReason == "") {
	foreach ($worms as $worm) {
		if (preg_match('/'.$worm.'/i', $ua)) {
			$quitReason = "Blocked crawler detected";
			break;
		}
	}
}

// Do we have a reason to quit now?
if ($quitReason != "") {
	if ((!ini_get('register_globals'))||(strtolower(ini_get('register_globals'))=="off")) {
		//-- load common functions
		require_once("includes/functions/functions.php");
		//-- load db specific functions
		require_once("includes/functions/functions_db.php");
		require_once("includes/authentication.php");      // -- load the authentication system
		AddToLog("MSG>{$quitReason}; script terminated.");
		AddToLog("UA>{$ua}<");
		AddToLog("URI>{$_SERVER["REQUEST_URI"]}<");
	}
	header("HTTP/1.0 403 Forbidden");
	print "Hackers are not welcome here.";
	exit;
}


// The search list has been reversed.  Whitelist all browsers, and
// mark everything else as a spider/bot.
// Java/ Axis/ and PEAR required for GDBI and our own cross site communication.
$real_browsers = array(
	'PHP-SOAP',
	'PGVAgent',
	'MSIE ',
	'Opera',
	'Firefox',
	'Konqueror',
	'Gecko',
	'Safari',
	'http://www.avantbrowser.com',
	'BlackBerry',
	'Lynx',
	'Java/',
	'PEAR',
	'Axis/',
	'MSFrontPage',
	'RssReader',
	'Liferea/',
	'W3C_Validator'
	);

// Here we list the search engines whose accesses we don't need to log.
// This avoids cluttering the log files with useless entries
$known_spiders = array(
	'Googlebot',
	'Yahoo Slurp',
	'msnbot',
	'Ask Jeeves',
	'Mediapartners-Google',
	'Feedfetcher-Google',
	'Twiceler'
);

// We overlay the following name with carefully selected characters.
// This is to avoid XSS problems.  Alpha : . / - _ only.  Yes, the following string is 72 chars.
$spider_name = '                                                                        ';

// If you want to disable spider detection, set real to true here.
$real = false;

if($ua != "") {
	foreach($real_browsers as $browser_check) {
		if (eregi($browser_check, $ua)!==false) {
			$real = true;
			break;
		}
	}
	// check for old Netscapes.
	if (eregi("Mozilla/", $ua)) {
		if (eregi("compatible", $ua)===false) {
			if (eregi("\[..\]", $ua)!==false) {
				$real = true;
			}
			if (eregi("Macintosh", $ua)!==false) {
				$real = true;
			}
		}
	}
}
else {
	// For the people who firewall identifying information
	// Switch real to false if you wish to restrict these connections.
	$ua = "Browser User Agent Empty";
	$real = true;
}

if(!$real) {
	$bot_name = $ua;
	// strip out several common strings that clutter the User Agent.
	$bot_name = eregi_replace("Mozilla\/... \(compatible;", "", $bot_name);
	$bot_name = eregi_replace("Mozilla\/... ", "", $bot_name);
	$bot_name = eregi_replace("Windows NT", "", $bot_name);
	$bot_name = eregi_replace("Windows; U;", "", $bot_name);
	$bot_name = eregi_replace("Windows", "", $bot_name);

	// Copy in characters, stripping out unwanteds until we are full, stopping at 70.
	$y = 0;
	$valid_char = false;
	$bot_limit = strlen($bot_name);
	for($x=0; $x < $bot_limit; $x++) {
		if(preg_match('/^[a-zA-Z]+$/', $bot_name{$x})) {
			$spider_name{$y} = $bot_name{$x};
			$valid_char = true;
			$y++;
			if ($y > 70) break;
		}
		else if ($bot_name{$x} == ' ')	{
			if($valid_char) {
				$spider_name{$y} = ' ';
				$valid_char = false;
				$y++;
				if ($y > 70) break;
			}
		}
		else if ($bot_name{$x} == '.')	{
			if($valid_char) {
				$spider_name{$y} = '.';
				$valid_char = true;
				$y++;
				if ($y > 70) break;
			}
		}
		else if ($bot_name{$x} == ':')	{
			$spider_name{$y} = ':';
			$valid_char = true;
			$y++;
			if ($y > 70) break;
		}
		else if ($bot_name{$x} == '/')	{
			$spider_name{$y} = '/';
			$valid_char = true;
			$y++;
			if ($y > 70) break;
		}
		else if ($bot_name{$x} == '-')	{
			$spider_name{$y} = '-';
			$valid_char = true;
			$y++;
			if ($y > 70) break;
		}
		else if ($bot_name{$x} == '_')	{
			$spider_name{$y} = '_';
			$valid_char = true;
			$y++;
			if ($y > 70) break;
		}
		else { // Compress consecutive invalids down to one space char.
			if($valid_char) {
				$spider_name{$y} = ' ';
				$valid_char = false;
				$y++;
				if ($y > 70) break;
			}
		}
	}
	// The SEARCH_SPIDER is set to 70 vetted chars, the session to 26 chars.
	$SEARCH_SPIDER = $spider_name;
	$bot_session = gen_spider_session_name($spider_name, "");
	session_id($bot_session);
}

// stop spiders from accessing certain parts of the site
$bots_not_allowed = array(
'/reports/',
'/includes/',
'config',
'clippings',
'gedrecord.php'
);
if (!empty($SEARCH_SPIDER)) {
	foreach($bots_not_allowed as $place) {
		if (eregi($place, $_SERVER['PHP_SELF'])) {
			header("HTTP/1.0 403 Forbidden");
			print "Sorry, this page is not available for search engine bots.";
			exit;
		}
	}
}

/**
 * Manual Search Engine IP Address tagging
 *   Allow an admin to mark IP addresses as known search engines even if
 *   they are not automatically detected above.   Setting his own IP address
 *   in this file allows him to see exactly what the search engine receives.
 *   To return to normal, the admin MUST use a different IP to get to admin
 *   mode or edit search_engines.php by hand.
 */
if (file_exists($INDEX_DIRECTORY."search_engines.php")) {
	require($INDEX_DIRECTORY."search_engines.php");
	//loops through each ip in search_engines.php
	foreach($search_engines as $key=>$value) {
		//creates a regex foreach ip
		$ipRegEx = '';
		$arrayIP = explode('*', $value);
		$ipRegEx .= $arrayIP[0];
		if (count($arrayIP) > 1) {
			for($i=1; $i < count($arrayIP); $i++) {
				if($i == (count($arrayIP)))
				$ipRegEx .= "\d{0,3}";
 			else
 			$ipRegEx .= "\d{0,3}".$arrayIP[$i];
			}
		}
		//checks the remote ip address against each ip regex
		if (preg_match('/^'.$ipRegEx.'/', $_SERVER['REMOTE_ADDR'])) {
			if(empty($SEARCH_SPIDER))
			$SEARCH_SPIDER = "Manual Search Engine entry of ".$_SERVER['REMOTE_ADDR'];
			$bot_name = "MAN".$_SERVER['REMOTE_ADDR'];
			$bot_session = gen_spider_session_name($bot_name, "");
			session_id($bot_session);
			break;
		}
	}
}

if((empty($SEARCH_SPIDER)) && (!empty($_SESSION['last_spider_name']))) // user following a search engine listing in,
session_regenerate_id();

if(!empty($SEARCH_SPIDER)) {
	$spidertime = time();
	$spiderdate = date("d.m.Y", $spidertime);
	// Do we need to log this spider access?
	$outstr = preg_replace('/\s+/', ' ', $SEARCH_SPIDER); 	// convert tabs etc. to blanks; trim extra blanks
	$outstr = str_replace(' - ', ' ', $outstr);				// Don't allow ' - ' because that is the log separator
	$logSpider = true;
	foreach ($known_spiders as $spider) {
		if (strpos($outstr, $spider) !== false) {
			$logSpider = false;
			break;
		}
	}
	if(isset($_SESSION['spider_count']))
	$spidercount = $_SESSION['spider_count'] + 1;
	else {
		$spidercount = 1;
		if ($logSpider) {
			//adds a message to the log that a new spider session is starting
			require_once("includes/authentication.php");      // -- Loaded early so AddToLog works
			AddToLog("New search engine encountered: ->".$outstr."<-");
		}
	}
	if(isset($_SESSION['last_spider_date'])) {
		if($spiderdate != $_SESSION['last_spider_date']) {
			//adds a message to the log that a new spider session is starting
			if ($logSpider) {
				require_once("includes/authentication.php");      // -- Loaded early so AddToLog works
				AddToLog("Returning search engine last seen ".$_SESSION['spider_count']." times on ".$_SESSION['last_spider_date']." from ".$_SESSION['last_spider_ip']." ->".$outstr."<-");
			}
			$_SESSION['last_spider_date'] = $spiderdate;
			$spidercount = 1;
		}
	}
	$_SESSION['last_spider_date'] = $spiderdate;
	$_SESSION['spider_count'] = $spidercount;
	if(isset($_SERVER['REMOTE_ADDR']))
	$_SESSION['last_spider_ip'] = $_SERVER['REMOTE_ADDR'];
	$_SESSION['last_spider_name'] = $SEARCH_SPIDER;
	if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
	$_SESSION['last_spider_lang'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];

	$_SESSION['pgv_user'] = "";	// Don't allow search engine into user/admin mode.
	$_SESSION['CLANGUAGE'] = "";	// Force language to gedcom default language.
}

?>

--- functions_db.php DELETED ---

--- reportbase.php DELETED ---

Update of /cvsroot/bitweaver/_bit_phpgedview/includes/classes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18770/phpgedview/includes/classes

Added Files:
	class_serviceclient.php class_treenav.php class_mutex.php 
	class_person.php class_phpmailer.php class_stats.php 
	class_smtp.php class_repository.php class_grampsexport.php 
	class_gewebservice.php class_menubar.php class_family.php 
	class_reportpdf.php class_menu.php class_reporthtml.php 
	class_event.php class_gedcomrecord.php class_stats_ui.php 
	class_localclient.php class_reportbase.php class_date.php 
	class_gedownloadgedcom.php class_feedcreator.php 
	class_source.php class_note.php class_geclippings.php 
	class_stats_compat.php class_media.php 
Log Message:
Classes properly identified in PGV4.2

--- NEW FILE: class_gedownloadgedcom.php ---
<?php
/**
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * @package PhpGedView
 * @subpackage Tools
 * @version $Id: class_gedownloadgedcom.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_GEDOWNLOADGEDCOM_PHP', '');

require_once 'includes/classes/class_grampsexport.php';

class GEDownloadGedcom extends GrampsExport
{
/**
  * Creates the Person element and all of it's child elements, and appends it to the
  * 	People element.  Given the link for certain LDS events to a family, if the Family
  * 	has not been previously created, create_family is called to create the family.
  * 	The family relations in the LDS events and in the person element are only created
  * 	if the family they have a relation with are also included in the clippings cart
  *
  * @param string $personRec - the full INDI GEDCOM record of the person to be created
  * @param string $personID - the ID (I1, I2, I3) of the person the is being created
  */
	function create_person($personRec = "", $personID = "") {
		global $pgv_lang;
		$check = $this->query_dom("./people/person[@id=\"$personID\"]");
		if ($check == null)
		{
			$ePerson = $this->dom->createElement("person");
			$ePerson = $this->ePeople->appendChild($ePerson);
			//$ePerson = $this->ePeople->appendChild($ePerson);

			//set attributes for <person>
			$ePerson->setAttribute("id", $personID);
			$ePerson->setAttribute("handle", $personID);
			$ePerson->setAttribute("change", time());

			$eGender = $this->dom->createElement("gender");
			$eGender = $ePerson->appendChild($eGender);
			if (($gender = get_gedcom_value("SEX", 1, $personRec)) != null)
				$etGender = $this->dom->createTextNode($gender);
			else
				$etGender = $this->dom->createTextNode("U");

			$num = 1;
			$etGender = $eGender->appendChild($etGender);
		if (($nameRec = get_sub_record(1, "1 NAME", $personRec)) != null) {
				//creates name
				$eName = $this->dom->createElement("name");
				$eName->setAttribute("type", "Birth Name");

				$givn = get_gedcom_value("GIVN", 2, $nameRec);
				$surn = get_gedcom_value("SURN", 2, $nameRec);
				//-- if no GIVN/SURN sub records then get the names from the 1 NAME line
				if (empty($surn) || empty($givn)) {
					$name = get_gedcom_value("NAME", 1, $nameRec);
					if (!empty($name)) {
						$nparts = explode('/', $name);
						$givn = trim($nparts[0]);
						if (count($nparts)>1) $surn = trim($nparts[1]);
						if (count($nparts)>2) $nnsfx = trim($nparts[2]);
					}
				}
				if (empty($surn))
					$surn = $pgv_lang["unknown"];
				if (empty($givn))
					$givn = $pgv_lang["unknown"];

				$eFirstName = $this->dom->createElement("first");
				$etFirstName = $this->dom->createTextNode($givn);
				$etFirstName = $eFirstName->appendChild($etFirstName);
				$eFirstName = $eName->appendChild($eFirstName);

				$eLastName = $this->dom->createElement("last");
				$etLastName = $this->dom->createTextNode($surn);
				$etLastName = $eLastName->appendChild($etLastName);
				$eLastName = $eName->appendChild($eLastName);
				$eName = $ePerson->appendChild($eName);

				if (!empty($nnsfx) || (($nsfx = get_gedcom_value("NSFX", 2, $nameRec)) != null)) {
					$eSuffix = $this->dom->createElement("suffix");
					if (empty($nsfx)) $nsfx = $nnsfx;
					$etSuffix = $this->dom->createTextNode($nsfx);
					$etSuffix = $eSuffix->appendChild($etSuffix);
					$eSuffix = $eName->appendChild($eSuffix);
				}

				//retrieves name prefix
				if (($npfx = get_gedcom_value("NPFX", 2, $nameRec)) != null) {
					$eTitle = $this->dom->createElement("title");
					$etTitle = $this->dom->createTextNode($npfx);
					$etTitle = $eTitle->appendChild($etTitle);
					$eTitle = $eName->appendChild($eTitle);
				}

				//retrieves the nickname
				if (($nick = get_gedcom_value("NICK", 2, $nameRec)) != null) {
					$eNick = $this->dom->createElement("nick");
					$etNick = $this->dom->createTextNode($nick);
					$etNick = $eNick->appendChild($etNick);
					$eNick = $ePerson->appendChild($eNick);
				}

				//creates note
				if (($nameNote = get_sub_record(2, "2 NOTE", $nameRec)) != null) {
					$this->create_note($eName, $nameNote, 2);
				}

				//creates SourceRef
				$num = 1;
				while (($nameSource = get_sub_record(2, "2 SOUR", $nameRec, $num)) != null) {
					$this->create_sourceref($eName, $nameSource, 2);
					$num++;
				}

			}

			foreach ($this->eventsArray as $event) {
				$this->create_event_ref($ePerson, $personRec, $event);
			}

			$this->create_lds_event($personRec, "baptism", "BAPL", $ePerson);
			$this->create_lds_event($personRec, "endowment", "ENDL", $ePerson);
			$this->create_lds_event($personRec, "sealed_to_parents", "SLGC", $ePerson);

			while (($nameSource = get_sub_record(1, "1 OBJE", $personRec, $num)) != null) {

				$this->create_mediaref($ePerson, $nameSource, 1,0);
				$num++;
			}

			/* This creates the family relation for a person, to link them to
			 * the family they are a child in and to link them to the family
			 * where they are a spouse. These relations will only be included
			 * if the family is also in the clippings cart. Otherwise, the relations
			 * are simply left out of the XML file.
			 *
			 *
			*create_fam_relation($ePerson,$personRec,"FAMC");
			*create_fam_relation($ePerson,$personRec,"FAMS");
			*/
			if (($note = get_sub_record(1, "1 NOTE", $personRec)) != null) {
				$this->create_note($ePerson, $note, 1);
			}
			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $personRec, $num)) != null) {
				$this->create_sourceref($ePerson, $sourcerefRec, 1);
				$num++;
			}
		}

	}
	/**
	  * Creates the SourceRef element and appends it to the Parent Element.  If the actual Source has not
	  * 	been previously created, this will retrieve the record for that, and create that also.
	  *
	  * @param DOMElement $eParent - the parent DOMElement to which the created Note Element is appended
	  * @param string $sourcerefRec - the record containing the reference to a Source
	  * @param int $level - The GEDCOM line level where the SOUR tag may be found
	  */
	function create_sourceref($eParent, $sourcerefRec, $level) {
		if (($sourceID = get_gedcom_value("SOUR", $level, $sourcerefRec)) != null) {

				$eSourceRef = $this->dom->createElement("sourceref");
				if (($sourceHlink = $this->query_dom("./sources/source[@id = \"$sourceID\"]/@handle")) == null)
				{
					$tempRecord = find_source_record($sourceID);
					if($tempRecord == null || $tempRecord == "")
					return;
					$this->create_source($sourceID, $tempRecord);
				}

				$eSourceRef = $eParent->appendChild($eSourceRef);
				$eSourceRef->setAttribute("hlink", $sourceID);

				if (($page = get_gedcom_value("SOUR:PAGE", $level, $sourcerefRec)) != null) {
					$eSPage = $this->dom->createElement("spage");
					$etSPage = $this->dom->createTextNode($page);
					$etSPage = $eSPage->appendChild($etSPage);
					$eSPage = $eSourceRef->appendChild($eSPage);
				}

				if (($comments = get_gedcom_value("SOUR:NOTE", $level, $sourcerefRec)) != null) {
					$eSComments = $this->dom->createElement("scomments");
					$etSComments = $this->dom->createTextNode($comments);
					$etSComments = $eSComments->appendChild($etSComments);
					$eSComments = $eSourceRef->appendChild($eSComments);
				}

				if (($text = get_gedcom_value("SOUR:TEXT", $level, $sourcerefRec)) != null) {
					$num = 1;
					while (($cont = get_gedcom_value("SOUR:TEXT:CONT", $level, $sourcerefRec, $num)) != null) {
						$text .= $cont;
						$num++;
					}
					$eSText = $this->dom->createElement("stext");
					$etSText = $this->dom->createTextNode($text);
					$etSText = $eSText->appendChild($etSText);
					$eSText = $eSourceRef->appendChild($eSText);
				}

				if (($dateRec = get_sub_record(1, ($level +1) . " DATE", $sourcerefRec)) != null) {
					$this->create_date($eSourceRef, $dateRec, $level +1);
				}
			}

	}

	/**
	 * This function creates a family relation for a person and appends the relation
	 * to the person element.
	 *
	 * It searches through the DOMDocument first to see if the person is created,
	 * if they are not, the person is created and then the DOMDocument is queried
	 * and the persons HLINK is retrieved.
	 *
	 * @param DOMElement $eParent - the parent XML element the date element should be appended to
	 * @param GEDCOM record $personRec - the full INDI GEDCOM record of the person that the relation is being created
	 * @param int $tag -  the name of the GEDCOM tag (FAMC, FAMS). This is used to allow the same function to work with childin and parent_in_family relations
	 */
	function create_fam_relation($eParent, $personRec, $tag) {
		global $pgv_lang;
		$famid = get_gedcom_value($tag, 1, $personRec);
		$handle = $famid;
		$created = false;
		$frec = find_family_record($famid);

		$this->create_family($frec, $famid);

		if ($tag == "FAMC")
			$elementName = "childof";
		else
			$elementName = "parentin";

		$eChildof = $this->dom->createElement($elementName);
		$eChildof->setAttribute("hlink", $handle);
		$eChildof = $eParent->appendChild($eChildof);

	}
	/**
	 * Creates the Family element and all of it's child elements, and appends it to the
	 * Families element.  This function will search through the DOMDocument looking
	 * for people in the family. If they are not created yet and they are in the clippings
	 * cart, they will be created and ther hlink added to the family element.
	 *
	 * @param string $frec - the full FAM GEDCOM record of the family to be created
	 * @param string $fid = the ID (F1, F2, F3) of the family that is being created
	 */
	function create_family($frec, $fid) {
		$check = $this->query_dom("./families/family[@id=\"$fid\"]/@id");
		if (($check == null || $check != $fid)) {
			$famrec = $frec;
			$eFamily = $this->dom->createElement("family");
			$eFamily->setAttribute("id", $fid);
			$eFamily->setAttribute("handle", $fid);
			$eFamily->setAttribute("change", time());
			$eFamily = $this->eFams->appendChild($eFamily);

			// Add the <father> element
			$id = get_gedcom_value("HUSB", 1, $famrec);

			//We shouldn't need this code, but I'm keeping it around in case I'm wrong'
//			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
//			if (!isset ($pers)) {
//				/*
//				 *
//				 * If the person does not exist and their ID is in the clippings cart,
//				 * you must create the person before you can query them in the dom to get
//				 * their hlink. The hlink is generated when the person element is created.
//				 * This causes overhead creating objects that are never added to the XML file
//				 * perhaps there is some other way this can be done reducing the overhead?
//				 *
//				 */
//				$this->create_person(find_person_record($id), $id);
//				$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
//			}
			if (!empty($id)) {
				$eFather = $this->dom->createElement("father");
				$eFather->setAttribute("hlink", $id);
				$eFather = $eFamily->appendChild($eFather);
			}

			// Add the <mother> element
			$id = get_gedcom_value("WIFE", 1, $famrec);

			//We shouldn't need this code, but I'm keeping it around in case I'm wrong'
//			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
//			if (!isset ($pers)) {
//				/*
//				 *
//				 * If the person does not exist and their ID is in the clippings cart,
//				 * you must create the person before you can query them in the dom to get
//				 * their hlink. The hlink is generated when the person element is created.
//				 * This causes overhead creating objects that are never added to the XML file
//				 * perhaps there is some other way this can be done reducing the overhead?
//				 *
//				 */
//				$this->create_person(find_person_record($id), $id);
//				$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
//			}
			if (isset ($id) && trim($id) != "" && $id != null) {
				$eMother = $this->dom->createElement("mother");
				$eMother->setAttribute("hlink", $id);
				$eMother = $eFamily->appendChild($eMother);
			}

			foreach ($this->familyevents as $event) {
				$this->create_event_ref($eFamily, $frec, $event);
			}

			// Add the <child> element
			$childrenIds = find_children_in_record($famrec);
			foreach($childrenIds as $id)
			{
			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");

			if (isset ($id) && isset ($pers)) {
				$eChild = $this->dom->createElement("childref");
				$eChild->setAttribute("hlink", $pers);
				$eChild = $eFamily->appendChild($eChild);
			}
			}


			if (($note = get_sub_record(1, "1 NOTE", $frec)) != null) {
				$this->create_note($eFamily, $note, 1);
			}

			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $frec, $num)) != null) {
				$this->create_sourceref($eFamily, $sourcerefRec, 1);
				$num++;
			}
			$num = 1;
			while (($nameSource = get_sub_record(1, "1 OBJE", $frec, $num)) != null) {

				$this->create_mediaref($eFamily, $nameSource, 1,0);
				$num++;
			}



		}
	}

		/**
	* Creates the lds_ord element and appends the correct information depending
	* on the type of lds_ord (Endowment, Sealing, Baptism). If there is a sealing,
	* the function will search if the family is in the clippings cart and if the
	* family is created or not. If the family is not created yet, it will be created
	* and added to the DOMDocument
	*
	* @param $indirec - The full INDI GEDCOM record of the person the lds_ord is being created
	* @param $eventName - the name of the LDS event (Baptism, Sealing, Endowment, etc...)
	* @param $eventABV - the event abbreviation in the GEDCOM (ie. SLGC, BAPL, ENDL)
	* @param $eParent - The parent element the lds event is attached to
	*/
	function create_lds_event($indirec, $eventName, $eventABV, $eParent) {
		global $ePerson, $TEMPLE_CODES, $clipping;

		if (($hasldsevent = get_sub_record(1, "1 " . $eventABV, $indirec)) != null) {

			// Create <lds_ord> and attaches the type attribute
			$eLdsEvent = $this->dom->createElement("lds_ord");
			$eLdsEvent->setAttribute("type", $eventName);

			if (($dateRec = get_sub_record(1, "2 DATE", $hasldsevent)) != null)
				$this->create_date($eLdsEvent, $dateRec, 2);

			// Create <temple>, this element is common with all lds ords
			if (($temple = get_gedcom_value($eventABV . ":TEMP", 1, $indirec)) != null) {
				$eTemple = $this->dom->createElement("temple");
				$eTemple->setAttribute("val", $temple);
				$eTemple = $eLdsEvent->appendChild($eTemple);
			}

			if (($place = get_gedcom_value($eventABV . ":PLAC", 1, $indirec)) != null) {
				$hlink = $this->query_dom("./places/placeobj[@title=\"$place\"]/@handle");
				if ($hlink == null) {
					$hlink = $this->generateHandle();
					$this->create_placeobj($place, $hlink);
					$this->create_place($eLdsEvent, $hlink);
				} else {
					$this->create_place($eLdsEvent, $hlink);
				}
			}

			// Check to see if the STAT of the ordinance is set and add it to the
			// <lds_ord> element
			if (($stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec)) != null) {
				$eStatus = $this->dom->createElement("status");
				$stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec);
				$eStatus->setAttribute("val", isset ($stat));
				$eStatus = $eLdsEvent->appendChild($eStatus);
			}
			// If the event is a sealing
			if ($eventABV == "SLGC") {
				// Create an instance of person and look for their family record
				$person = Person :: getInstance($clipping["id"]);
				$famId = $person->getChildFamilyIds();
				$famrec = find_family_record($famId[0]);
				$fid = $famId[0];
				$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
				if ($handle == null) {
					/*
					 * If the family does not exist and their ID is in the clippings cart,
					 * you must create the family before you can query them in the dom to get
					 * their hlink. The hlink is generated when the person element is created.
					 * This causes overhead creating objects that are never added to the XML file
					 * perhaps there is some other way this can be done reducing the overhead?
					 *
					 */
					$this->create_family($famrec, $famId[0]);
					$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
					$eFam = $this->dom->createElement("sealed_to");
					$eFam->setAttribute("hlink", $handle);
					$eFam = $eLdsEvent->appendChild($eFam);
					$person = null;
				} else
					if ($handle != null) {
						$eFam = $this->dom->createElement("sealed_to");
						$eFam->setAttribute("hlink", $handle);
						$eFam = $eLdsEvent->appendChild($eFam);
						$person = null;
					}
			}

			if (($note = get_sub_record(1, "2 NOTE", $hasldsevent)) != null)
				$this->create_note($eLdsEvent, $note, 2);

			$num = 1;
			while (($sourcerefRec = get_sub_record(2, "2 SOUR", $hasldsevent, $num)) != null) {
				$this->create_sourceref($eLdsEvent, $sourcerefRec, 2);
				$num++;
			}
			$eLdsEvent = $eParent->appendChild($eLdsEvent);
		}
	}



}
?>

--- NEW FILE: class_family.php ---
<?php
/**
 * Class file for a Family
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage DataModel
 * @version $Id: class_family.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_FAMILY_PHP', '');

require_once 'includes/classes/class_gedcomrecord.php';

class Family extends GedcomRecord {
	private $husb = null;
	private $wife = null;
	private $children = array();
	private $childrenIds = array();
	private $marriage = null;
	private $children_loaded = false;
	private $numChildren = false;
	private $_isDivorced = null;

	// Create a Family object from either raw GEDCOM data or a database row
	function Family($data, $simple=true) {
		if (is_array($data)) {
			// Construct from a row from the database
			if ($data['f_husb']) {
				$this->husb=Person::getInstance($data['f_husb']);
			}
			if ($data['f_wife']) {
				$this->wife=Person::getInstance($data['f_wife']);
			}
			if (strpos($data['f_chil'], ';')) {
				$this->childrenIds=explode(';', trim($data['f_chil'], ';'));
			}
			$this->numChildren=$data['f_numchil'];
			// Check for divorce *before* we privatize the data so we can correctly label spouses/ex-spouses
			$this->_isDivorced=(bool)preg_match('/\n1 ('.PGV_EVENTS_DIV.')( Y|\n)/', $data['gedrec']);
		} else {
			// Construct from raw GEDCOM data
			if (preg_match('/^1 HUSB @(.+)@/m', $data, $match)) {
				$this->husb=Person::getInstance($match[1], $simple);
			}
			if (preg_match('/^1 WIFE @(.+)@/m', $data, $match)) {
				$this->wife=Person::getInstance($match[1], $simple);
			}
			if (preg_match_all('/^1 CHIL @(.+)@/m', $data, $match)) {
				$this->childrenIds=$match[1];
			}
			if (preg_match('/^1 NCHI (\d+)/m', $data, $match)) {
				$this->numChildren=$match[1];
			} else {
				$this->numChildren=count($this->childrenIds);
			}
			// Check for divorce *before* we privatize the data so we can correctly label spouses/ex-spouses
			$this->_isDivorced=(bool)preg_match('/\n1 ('.PGV_EVENTS_DIV.')( Y|\n)/', $data);
		}

		// Make sure husb/wife are the right way round.
		if ($this->husb && $this->husb->getSex()=='F' || $this->wife && $this->wife->getSex()=='M') {
			list($this->husb, $this->wife)=array($this->wife, $this->husb);
		}

		parent::GedcomRecord($data);
	}

	// Get an instance of a Family.  We either specify
	// an XREF (in the current gedcom), or we can provide a row
	// from the database (if we anticipate the record hasn't
	// been fetched previously).
	static function &getInstance($data, $simple=true) {
		global $gedcom_record_cache, $GEDCOM, $pgv_changes;

		if (is_array($data)) {
			$ged_id=$data['ged_id'];
			$pid   =$data['xref'];
		} else {
			$ged_id=get_id_from_gedcom($GEDCOM);
			$pid   =$data;
		}

		// Check the cache first
		if (isset($gedcom_record_cache[$pid][$ged_id])) {
			return $gedcom_record_cache[$pid][$ged_id];
		}

		// Look for the record in the database
		if (!is_array($data)) {
			$data=fetch_family_record($pid, $ged_id);

			// If we didn't find the record in the database, it may be remote
			if (!$data && strpos($pid, ':')) {
				list($servid, $remoteid)=explode(':', $pid);
				$service=ServiceClient::getInstance($servid);
				if ($service) {
					// TYPE will be replaced with the type from the remote record
					$data=$service->mergeGedcomRecord($remoteid, "0 @{$pid}@ TYPE\n1 RFN {$pid}", false);
				}
			}

			// If we didn't find the record in the database, it may be new/pending
			if (!$data && PGV_USER_CAN_EDIT && isset($pgv_changes[$pid.'_'.$GEDCOM])) {
				$data=find_updated_record($pid);
				$fromfile=true;
			}

			// If we still didn't find it, it doesn't exist
			if (!$data) {
				return null;
			}
		}

		// Create the object
		$object=new Family($data, $simple);
		if (!empty($fromfile)) {
			$object->setChanged(true);
		}

		// Store it in the cache
		$gedcom_record_cache[$object->xref][$object->ged_id]=&$object;
		//-- also store it using its reference id (sid:pid and local gedcom for remote links)
		$gedcom_record_cache[$pid][$ged_id]=&$object;
		return $object;
	}

	/**
	 * get the husbands ID
	 * @return string
	 */
	function getHusbId() {
		if (!is_null($this->husb)) return $this->husb->getXref();
		else return "";
	}

	/**
	 * get the wife ID
	 * @return string
	 */
	function getWifeId() {
		if (!is_null($this->wife)) return $this->wife->getXref();
		else return "";
	}

	/**
	 * get the husband's person object
	 * @return Person
	 */
	function &getHusband() {
		return $this->husb;
	}
	/**
	 * get the wife's person object
	 * @return Person
	 */
	function &getWife() {
		return $this->wife;
	}

	/**
	 * return the spouse of the given person
	 * @param Person $person
	 * @return Person
	 */
	function &getSpouse(&$person) {
		if (is_null($this->wife) or is_null($this->husb)) return null;
		if ($this->wife->equals($person)) return $this->husb;
		if ($this->husb->equals($person)) return $this->wife;
		return null;
	}

	/**
	 * return the spouse id of the given person id
	 * @param string $pid
	 * @return string
	 */
	function &getSpouseId($pid) {
		if (is_null($this->wife) or is_null($this->husb)) return null;
		if ($this->wife->getXref()==$pid) return $this->husb->getXref();
		if ($this->husb->getXref()==$pid) return $this->wife->getXref();
		return null;
	}

	/**
	 * get the children
	 * @return array 	array of children Persons
	 */
	function getChildren() {
		if (!$this->children_loaded) $this->loadChildren();
		return $this->children;
	}

	/**
	 * get the children ids
	 * @return array 	array of children ids
	 */
	function getChildrenIds() {
		if (!$this->children_loaded) $this->loadChildren();
		return $this->childrenIds;
	}

	// Static helper function to sort an array of families by marriage date
	static function CompareMarrDate($x, $y) {
		return GedcomDate::Compare($x->getMarriageDate(), $y->getMarriageDate());
	}

	/**
	 * Load the children from the database
	 * We used to load the children when the family was created, but that has performance issues
	 * because we often don't need all the children
	 * now, children are only loaded as needed
	 */
	function loadChildren() {
		if ($this->children_loaded) return;
		$this->childrenIds = array();
		$this->numChildren = preg_match_all("/1\s*CHIL\s*@(.*)@/", $this->gedrec, $smatch, PREG_SET_ORDER);
		for($i=0; $i<$this->numChildren; $i++) {
			//-- get the childs ids
			$chil = trim($smatch[$i][1]);
			$this->childrenIds[] = $chil;
		}
		foreach($this->childrenIds as $t=>$chil) {
			$child=Person::getInstance($chil);
			if (!is_null($child)) $this->children[] = $child;
		}
		$this->children_loaded = true;
	}

	/**
	 * get the number of children in this family
	 * @return int 	the number of children
	 */
	function getNumberOfChildren() {

		if ($this->numChildren!==false) return $this->numChildren;

		$this->numChildren = get_gedcom_value("NCHI", 1, $this->gedrec);
		if ($this->numChildren!="") return $this->numChildren.".";
		$this->numChildren = preg_match_all("/1\s*CHIL\s*@(.*)@/", $this->gedrec, $smatch);
		return $this->numChildren;
	}

	/**
	 * get updated Family
	 * If there is an updated family record in the gedcom file
	 * return a new family object for it
	 */
	function &getUpdatedFamily() {
		global $GEDCOM, $pgv_changes;
		if ($this->getChanged()) {
			return $this;
		}
		if (PGV_USER_CAN_EDIT && $this->canDisplayDetails()) {
			if (isset($pgv_changes[$this->xref."_".$GEDCOM])) {
				$newrec = find_updated_record($this->xref);
				if (!empty($newrec)) {
					$newfamily = new Family($newrec);
					$newfamily->setChanged(true);
					return $newfamily;
				}
			}
		}
		return null;
	}
	/**
	 * check if this family has the given person
	 * as a parent in the family
	 * @param Person $person
	 */
	function hasParent(&$person) {
		if (is_null($person)) return false;
		if ($person->equals($this->husb)) return true;
		if ($person->equals($this->wife)) return true;
		return false;
	}
	/**
	 * check if this family has the given person
	 * as a child in the family
	 * @param Person $person
	 */
	function hasChild(&$person) {
		if (is_null($person)) return false;
		$this->loadChildren();
		foreach($this->children as $key=>$child) {
			if ($person->equals($child)) return true;
		}
		return false;
	}

	/**
	 * parse marriage record
	 */
	function _parseMarriageRecord() {
		$this->marriage = new Event(trim(get_sub_record(1, "1 MARR", $this->gedrec)), -1);
		$this->marriage->setParentObject($this);
	}

	/**
	 * get the marriage event
	 *
	 * @return Event
	 */
	function getMarriage() {
		if (is_null($this->marriage)) $this->_parseMarriageRecord();
		return $this->marriage;
	}

	/**
	 * get marriage record
	 * @return string
	 */
	function getMarriageRecord() {
		if (is_null($this->marriage)) $this->_parseMarriageRecord();
		return $this->marriage->getGedcomRecord();
	}

	// Return whether or not this family ended in a divorce.
	// Note that this is calculated prior to privatizing the data, so we can
	// always distinguish spouses from ex-spouses.  This apparant leaking of
	// private data was discussed and agreed on the pgv forum.
	function isDivorced() {
		return $this->_isDivorced;
	}

	/**
	 * get marriage date
	 * @return string
	 */
	function getMarriageDate() {
		global $pgv_lang;
		if (!$this->canDisplayDetails()) {
			return new GedcomDate('');
		}
		if (is_null($this->marriage)) {
			$this->_parseMarriageRecord();
		}
		return $this->marriage->getDate();
	}

	/**
	 * get the marriage year
	 * @return string
	 */
	function getMarriageYear($est = true, $cal = ""){
		// TODO - change the design to use julian days, not gregorian years.
		$mdate = $this->getMarriageDate();
		$mdate = $mdate->MinDate();
		if ($cal) $mdate = $mdate->convert_to_cal($cal);
		return $mdate->y;
	}

	/**
	 * get the marriage month
	 * @return string
	 */
	function getMarriageMonth($est = true, $cal = ""){
		// TODO - change the design to use julian days, not gregorian years.
		$mdate = $this->getMarriageDate();
		$mdate=$mdate->MinDate();
		if ($cal) $mdate = $mdate->convert_to_cal($cal);
		return $mdate->m;
	}

	/**
	 * get the type for this marriage
	 * @return string
	 */
	function getMarriageType() {
		if (is_null($this->marriage)) $this->_parseMarriageRecord();
		return $this->marriage->getType();
	}

	/**
	 * get the marriage place
	 * @return string
	 */
	function getMarriagePlace() {
		$marriage = $this->getMarriage();
		return $marriage->getPlace();
	}

	// Get all the dates/places for marriages - for the FAM lists
	function getAllMarriageDates() {
		if ($this->canDisplayDetails()) {
			foreach (explode('|', PGV_EVENTS_MARR) as $event) {
				if ($array=$this->getAllEventDates($event)) {
					return $array;
				}
			}
		}
		return array();
	}
	function getAllMarriagePlaces() {
		if ($this->canDisplayDetails()) {
			foreach (explode('|', PGV_EVENTS_MARR) as $event) {
				if ($array=$this->getAllEventPlaces($event)) {
					return $array;
				}
			}
		}
		return array();
	}

	/**
	 * get the URL to link to this family
	 * @string a url that can be used to link to this family
	 */
	public function getLinkUrl() {
		return parent::_getLinkUrl('family.php?famid=');
	}

	// Get an array of structures containing all the names in the record
	function getAllNames() {
		if (is_null($this->_getAllNames)) {
			$husb=$this->husb ? $this->husb : new Person('1 SEX M');
			$wife=$this->wife ? $this->wife : new Person('1 SEX F');
			foreach ($husb->getAllNames() as $husb_name) {
				foreach ($wife->getAllNames() as $wife_name) {
					if ($husb_name['type']!='_MARNM' && $wife_name['type']!='_MARNM') {
						$this->_getAllNames[]=array(
							'type'=>$husb_name['type'],
							'full'=>$husb_name['full'].' + '.$wife_name['full'],
							'list'=>$husb_name['list'].$husb->getSexImage().'<br />'.$wife_name['list'].$wife->getSexImage(),
							'sort'=>$husb_name['sort'].' + '.$wife_name['sort'],
						);
					}
				}
			}
		}
		return $this->_getAllNames;
	}

	// Extra info to display when displaying this record in a list of
	// selection items or favourites.
	function format_list_details() {
		return
		  $this->format_first_major_fact(PGV_EVENTS_MARR, 1).
		  $this->format_first_major_fact(PGV_EVENTS_DIV, 1);
	}

}
?>

--- NEW FILE: class_person.php ---
<?php
/**
* Class file for a person
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
[...1760 lines suppressed...]

	// Extra info to display when displaying this record in a list of
	// selection items or favourites.
	function format_list_details() {
		return
		$this->format_first_major_fact(PGV_EVENTS_BIRT, 1).
		$this->format_first_major_fact(PGV_EVENTS_DEAT, 1);
	}
}

// Localise a date differences.  This is a default function, and may be overridden in includes/extras/functions.xx.php
function DefaultGetLabel(&$label, &$gap) {
	global $pgv_lang;

	if (($gap==12)||($gap==-12)) $label .= round($gap/12)." ".$pgv_lang["year1"]; // 1 year
	else if ($gap>20 or $gap<-20) $label .= round($gap/12)." ".$pgv_lang["years"]; // x years
	else if (($gap==1)||($gap==-1)) $label .= $gap." ".$pgv_lang["month1"]; // 1 month
	else if ($gap!=0) $label .= $gap." ".$pgv_lang["months"]; // x months
}
?>

--- NEW FILE: class_repository.php ---
<?php
/**
 * Class file for a Repository (REPO) object
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage DataModel
 * @version $Id: class_repository.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_REPOSITORY_PHP', '');

require_once 'includes/classes/class_gedcomrecord.php';
require_once 'includes/classes/class_serviceclient.php';

class Repository extends GedcomRecord {
	// Get an instance of a Repository.  We either specify
	// an XREF (in the current gedcom), or we can provide a row
	// from the database (if we anticipate the record hasn't
	// been fetched previously).
	static function &getInstance($data, $simple=true) {
		global $gedcom_record_cache, $GEDCOM, $pgv_changes;

		if (is_array($data)) {
			$ged_id=$data['ged_id'];
			$pid   =$data['xref'];
		} else {
			$ged_id=get_id_from_gedcom($GEDCOM);
			$pid   =$data;
		}

		// Check the cache first
		if (isset($gedcom_record_cache[$pid][$ged_id])) {
			return $gedcom_record_cache[$pid][$ged_id];
		}

		// Look for the record in the database
		if (!is_array($data)) {
			$data=fetch_other_record($pid, $ged_id);

			// If we didn't find the record in the database, it may be remote
			if (!$data && strpos($pid, ':')) {
				list($servid, $remoteid)=explode(':', $pid);
				$service=ServiceClient::getInstance($servid);
				if ($service) {
					// TYPE will be replaced with the type from the remote record
					$data=$service->mergeGedcomRecord($remoteid, "0 @{$pid}@ TYPE\n1 RFN {$pid}", false);
				}
			}

			// If we didn't find the record in the database, it may be new/pending
			if (!$data && PGV_USER_CAN_EDIT && isset($pgv_changes[$pid.'_'.$GEDCOM])) {
				$data=find_updated_record($pid);
				$fromfile=true;
			}

			// If we still didn't find it, it doesn't exist
			if (!$data) {
				return null;
			}
		}

		// Create the object
		$object=new Repository($data, $simple);
		if (!empty($fromfile)) {
			$object->setChanged(true);
		}

		// Store it in the cache
		$gedcom_record_cache[$object->xref][$object->ged_id]=&$object;
		//-- also store it using its reference id (sid:pid and local gedcom for remote links)
		$gedcom_record_cache[$pid][$ged_id]=&$object;
		return $object;
	}

	/**
	 * get the URL to link to this repository
	 * @string a url that can be used to link to this repository
	 */
	public function getLinkUrl() {
		return parent::_getLinkUrl('repo.php?rid=');
	}

	// Get an array of structures containing all the names in the record
	function getAllNames() {
		return parent::getAllNames('NAME');
	}
}
?>

--- NEW FILE: class_source.php ---
<?php
/**
 * Class file for a Source (SOUR) object
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage DataModel
 * @version $Id: class_source.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_SOURCE_PHP', '');

require_once 'includes/classes/class_gedcomrecord.php';
require_once 'includes/classes/class_serviceclient.php';

class Source extends GedcomRecord {
	// Get an instance of a Source.  We either specify
	// an XREF (in the current gedcom), or we can provide a row
	// from the database (if we anticipate the record hasn't
	// been fetched previously).
	static function &getInstance($data, $simple=true) {
		global $gedcom_record_cache, $GEDCOM, $pgv_changes;

		if (is_array($data)) {
			$ged_id=$data['ged_id'];
			$pid   =$data['xref'];
		} else {
			$ged_id=get_id_from_gedcom($GEDCOM);
			$pid   =$data;
		}

		// Check the cache first
		if (isset($gedcom_record_cache[$pid][$ged_id])) {
			return $gedcom_record_cache[$pid][$ged_id];
		}

		// Look for the record in the database
		if (!is_array($data)) {
			$data=fetch_source_record($pid, $ged_id);

			// If we didn't find the record in the database, it may be remote
			if (!$data && strpos($pid, ':')) {
				list($servid, $remoteid)=explode(':', $pid);
				$service=ServiceClient::getInstance($servid);
				if ($service) {
					// TYPE will be replaced with the type from the remote record
					$data=$service->mergeGedcomRecord($remoteid, "0 @{$pid}@ TYPE\n1 RFN {$pid}", false);
				}
			}

			// If we didn't find the record in the database, it may be new/pending
			if (!$data && PGV_USER_CAN_EDIT && isset($pgv_changes[$pid.'_'.$GEDCOM])) {
				$data=find_updated_record($pid);
				$fromfile=true;
			}

			// If we still didn't find it, it doesn't exist
			if (!$data) {
				return null;
			}
		}

		// Create the object
		$object=new Source($data, $simple);
		if (!empty($fromfile)) {
			$object->setChanged(true);
		}

		// Store it in the cache
		$gedcom_record_cache[$object->xref][$object->ged_id]=&$object;
		//-- also store it using its reference id (sid:pid and local gedcom for remote links)
		$gedcom_record_cache[$pid][$ged_id]=&$object;
		return $object;
	}

	/**
	 * get the author of this source record
	 * @return string
	 */
	function getAuth() {
		return get_gedcom_value('AUTH', 1, $this->gedrec, '', false);
	}

	/**
	 * get the URL to link to this source
	 * @string a url that can be used to link to this source
	 */
	public function getLinkUrl() {
		return parent::_getLinkUrl('source.php?sid=');
	}

	// Get an array of structures containing all the names in the record
	function getAllNames() {
		return parent::getAllNames('TITL');
	}
}
?>

--- NEW FILE: class_treenav.php ---
<?php
/**
* Class file for the tree navigator
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @version $Id: class_treenav.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_TREENAV_PHP', '');

require_once('includes/classes/class_person.php');
require_once('includes/functions/functions_charts.php');

class TreeNav {
	var $rootPerson = null;
	var $bwidth = 170;
	var $zoomLevel = 0;
	var $name = 'nav';
	var $generations = 4;
	var $allSpouses = true;
	var $images = true;

	/**
	* Tree Navigator Constructor
	* @param string $rootid the rootid of the person
	* @param int $zoom The starting zoom level
	*/
	function TreeNav($rootid='', $name='nav', $zoom=0) {
		global $SHOW_PRIVATE_RELATIONSHIPS;

		$SHOW_PRIVATE_RELATIONSHIPS = true;		// Interactive Tree doesn't work if this is "false"

		if ($rootid!='none') {
			$rootid = check_rootid($rootid);
			$this->zoomLevel = $zoom;
			$this->rootPerson = Person::getInstance($rootid);
			if (is_null($this->rootPerson)) $this->rootPerson = new Person('');
		}

		$this->name = $name;
		//-- handle AJAX requests
		if (!empty($_REQUEST['navAjax'])) {
			//-- embedded tree for mashups
			if ($_REQUEST['navAjax']=='embed') {
				global $SERVER_URL;
				global $stylesheet;
				?>
				document.writeln('<link rel="stylesheet" href="<?php print $SERVER_URL.$stylesheet; ?>" type="text/css" media="all" />');
				document.writeln('<script type="text/javascript" src="<?php print $SERVER_URL; ?>/phpgedview.js"></script>');
				<?php
				ob_start();
				$w = safe_GET('width', PGV_REGEX_INTEGER, '');
				$h = safe_GET('height', PGV_REGEX_INTEGER, '');
				if (!empty($w)) $w.="px";
				if (!empty($h)) $h.="px";
				$this->drawViewport($rootid, $w, $h);
				$output = ob_get_clean();
				$lines = preg_split("/\r?\n/", $output);
				foreach($lines as $line)
					print "document.writeln('".preg_replace("/'/", "\\'", $line)."');\n";
				exit;
			}
			if (isset($_REQUEST['allSpouses'])) {
				if ($_REQUEST['allSpouses']=='false' || $_REQUEST['allSpouses']==false) $this->allSpouses = false;
				else $this->allSpouses = true;
			}
			if (!empty($_REQUEST['details'])) {
				$this->getDetails($this->rootPerson);
			}
			else if (!empty($_REQUEST['newroot'])) {
				if (!empty($_REQUEST['drawport'])) $this->drawViewport('', "", "150px");
				else {
					$fam = null;
					if ($this->allSpouses) $this->drawPersonAllSpouses($this->rootPerson, 4, 0);
					else $this->drawPerson($this->rootPerson, 4, 0, $fam);
				}
			}
			else if (!empty($_REQUEST['parent'])) {
				$person = $this->rootPerson;
				if ($_REQUEST['parent']=='f') {
					$cfamily = $person->getPrimaryChildFamily();
					if (!empty($cfamily)) {
						$father = $cfamily->getHusband();
						if (!empty($father)) {
							$fam = null;
							$this->drawPerson($father, 2, 1, $fam);
						}
						else print "<br />\n";
					}
					else print "<br />\n";
				}
				else {
					$spouse = $person->getCurrentSpouse();
					if (!empty($spouse)) {
						$cfamily = $spouse->getPrimaryChildFamily();
						if (!empty($cfamily)) {
							$mother = $cfamily->getHusband();
							if (!empty($mother)) {
								$fam = null;
								$this->drawPerson($mother, 2, 1, $fam);
							}
							else print "<br />\n";
						}
						else print "<br />\n";
					}
					else print "<br />\n";
				}
			}
			else {
				$fams = $this->rootPerson->getSpouseFamilies();
				$family = end($fams);
				if (!$this->allSpouses) $this->drawChildren($family, 2);
				else $this->drawAllChildren($this->rootPerson, 2);
			}
			exit;
		}
	}

	/**
	* Draw the view port which creates the draggable/zoomable framework
	* @param string $id an id to use for the starting HTML elements
	* @param string $width the width parameter for the outer style
	* @param string $height the height parameter for the outer style
	*/
	function drawViewport($id='', $width='', $height='') {
		global $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $pgv_lang, $CONTACT_EMAIL, $SERVER_URL;
		if (empty($id)) $id = $this->rootPerson->getXref();
		$widthS = "";
		$heightS = "";
		if (!empty($width)) $widthS = "width: $width; ";
		if (!empty($height)) $heightS = "height: $height; ";
		?>
		<?php $this->setupJS(); ?>

		<div id="out_<?php print $this->name; ?>" dir="ltr" style="position: relative; <?php print $widthS.$heightS; ?>text-align: center; overflow: hidden;">
			<div id="in_<?php print $this->name; ?>" style="position: relative; left: -20px; width: auto; cursor: move;" onmousedown="dragStart(event, 'in_<?php print $this->name; ?>', <?php print $this->name; ?>);" onmouseup="dragStop(event);">
			<?php $parent=null;
			//if ($this->rootPerson!=null && !$this->rootPerson->canDisplayDetails()) print_privacy_error($CONTACT_EMAIL);
			if (!$this->allSpouses) $this->drawPerson($this->rootPerson, $this->generations, 0, $parent);
			else $this->drawPersonAllSpouses($this->rootPerson, $this->generations, 0);?>
			</div>
			<div id="controls" style="position: absolute; left: 0px; top: 0px; z-index: 100; background-color: #EEEEEE">
			<table>
				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomIn(); return false;"><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomin']['other'];?>" border="0" alt="zoomin" /></a></td></tr>
				<tr><td><a href="#" onclick="<?php print $this->name; ?>.zoomOut(); return false;"><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['zoomout']['other'];?>" border="0" alt="zoomout" /></a></td></tr>
				<tr><td <?php if (is_null($this->rootPerson) || preg_match("/treenav.php$/", $_SERVER['PHP_SELF'])>0) print "style=\"display: none;\"";?>><a id="biglink" href="#" onclick="<?php print $this->name; ?>.loadBigTree('<?php if (!is_null($this->rootPerson)) print $this->rootPerson->getXref();?>','<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8');?>'); return false;" title="<?php print $pgv_lang["load_full_tree"]; ?>"><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['gedcom']['small'];?>" border="0" alt="" /></a></td></tr>
				<tr><td><a href="#" onclick="<?php print $this->name; ?>.toggleSpouses('<?php if ($this->rootPerson!=null) print $this->rootPerson->getXref(); ?>'); return false;" title="<?php print $pgv_lang["hide_show_spouses"]; ?>"><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['sfamily']['small']; ?>" border="0" alt="" /></a></td></tr>
				<tr><td><?php print_help_link('help_treenav.php','qm'); ?></td></tr>
				<tr><td><img id="<?php print $this->name; ?>_loading" src="<?php print $SERVER_URL; ?>images/loading.gif" style="display: none;" alt="Loading..." /></td></tr>
			</table>
			</div>
		</div>
		<script type="text/javascript">
		<!--
		var <?php print $this->name; ?> = new NavTree("out_<?php print $this->name; ?>","in_<?php print $this->name; ?>", '<?php print $this->name; ?>', '<?php print $id; ?>');
		<?php print $this->name; ?>.zoom = <?php print $this->zoomLevel; ?>;
		<?php print $this->name; ?>.center();
		//-->
		</script>
		<?php
	}

	/**
	* Setup the JavaScript for the tree navigator
	*/
	function setupJS() {
		global $SERVER_URL;
		require_once("js/prototype.js.htm");
		require_once("js/behaviour.js.htm");
		require_once("js/overlib.js.htm");
		require_once("js/scriptaculous.js.htm");
		?>
	<script type="text/javascript" src="<?php print $SERVER_URL; ?>js/treenav.js"></script>
	<script type="text/javascript">
	<!--
		var myrules = {
		'#out_<?php print $this->name; ?> .person_box' : function(element) {
			element.onmouseout = function() {
				if (<?php print $this->name; ?>.zoom>=-2) return false;
				return nd(); // hide helptext
			}
			element.onmouseover = function() { // show helptext
				if (<?php print $this->name; ?>.zoom>=-2) return false;
				bid = element.id.split("_");
				if (<?php print $this->name; ?>.opennedBox[bid[1]]) return false;
				helptext = this.title;
				if (helptext=='') helptext = this.value;
				if (helptext=='' || helptext==undefined) helptext = element.innerHTML;
				this.title = helptext; if (document.all) return; // IE = title
				this.value = helptext; this.title = ''; // Firefox = value
				// show images
				helptext=helptext.replace(/display: none;/gi, "display: inline;");
				return overlib(helptext, BGCOLOR, "#000000", FGCOLOR, "#FFFFE0");
			}
		},
		'.draggable' : function(element) {
			new Draggable(element.id, {revert:true});
		}
		}
		Behaviour.register(myrules);
		/* not used yet
		function dragObserver() {
			this.parent = null;
			this.onEnd = function(eventName, draggable, event) {
				this.parent.appendChild(draggable.element);
				<?php print $this->name; ?>.collapseBox = false;
			}
			this.onStart = function(eventName, draggable, event) {
				this.parent = draggable.element.parentNode;
				document.body.appendChild(draggable.element);
			}
		}
		Draggables.addObserver(new dragObserver());
		*/
	//-->
	</script>
		<?php
	}

	/**
	* Get the details for a person and their spouse
	* @param Person $person the person to print the details for
	*/
	function getDetails(&$person) {
		global $pgv_lang, $factarray, $factAbbrev, $SHOW_ID_NUMBERS, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $SERVER_URL;

		if (empty($person)) $person = $this->rootPerson;
		//if (!$person->canDisplayDetails()) return;

		$families = array();
		if (!empty($_REQUEST['famid'])) {
			$famid = $_REQUEST['famid'];
			if ($famid!='all') {
				$family = Family::getInstance($_REQUEST['famid']);
				if (!empty($family)) $families[] = $family;
			}
			else {
				$fams = $person->getSpouseFamilies();
				foreach($fams as $fam) {
					$families[] = $fam;
				}
			}
		}
		else {
			if ($this->allSpouses) {
				$fams = $person->getSpouseFamilies();
				foreach($fams as $fam) {
					$families[] = $fam;
				}
			}
			else {
				$fams = $person->getSpouseFamilies();
				$families[] = end($fams);
			}
		}

		$name = $person->getFullName();
		if ($SHOW_ID_NUMBERS)
		$name.=" (".$person->getXref().")";

		?>
		<span class="name1">
		<?php print $this->getThumbnail($person); ?>
		<a href="<?php print $person->getLinkUrl(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;"><?php print $person->getSexImage().PrintReady($name); ?></a>
		<img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $person->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
		</span><br />
		<div class="details1 indent">
			<b><?php
				if (isset ($factAbbrev["BIRT"])) print $factAbbrev["BIRT"];
				else print get_first_letter($factarray['BIRT']);
				?>:</b>
				<?php
				echo $person->getBirthDate()->Display(), ' ', PrintReady($person->getBirthPlace());
				?>
			<br />
			<b><?php
			if ($person->isDead()) {
				if (isset ($factAbbrev["DEAT"])) print $factAbbrev["DEAT"];
				else print get_first_letter($factarray['DEAT']);
				?>:</b>
				<?php
				echo $person->getDeathDate()->Display(), ' ', PrintReady($person->getDeathPlace());
			} ?>
		</div>
		<br />
		<span class="name1"><?php
		foreach($families as $family) {
			if (!empty($family)) $spouse = $family->getSpouse($person);
			if (!empty($spouse)) {
				$name = $spouse->getFullName();
				if ($SHOW_ID_NUMBERS)
				$name.=" (".$spouse->getXref().")";
				?>
				<?php print $this->getThumbnail($spouse); ?>
				<a href="<?php print $spouse->getLinkUrl(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;">
				<?php print $spouse->getSexImage().PrintReady($name); ?></a>
				<img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES["gedcom"]["small"];?>" border="0" width="15" onclick="<?php print $this->name;?>.newRoot('<?php print $spouse->getXref();?>', <?php print $this->name;?>.innerPort, '<?php print htmlentities($GEDCOM,ENT_COMPAT,'UTF-8'); ?>');" />
				<br />
				<div class="details1 indent">
				<b><?php
					if (isset ($factAbbrev["BIRT"])) print $factAbbrev["BIRT"];
					else print get_first_letter($factarray['BIRT']);
					?>:</b>
				<?php
				echo $spouse->getBirthDate()->Display(), ' ', PrintReady($spouse->getBirthPlace());
				?>
				<br />
				<b><?php
					if (isset ($factAbbrev["MARR"])) print $factAbbrev["MARR"];
					else print get_first_letter($factarray['MARR']);
					?>:</b>
				<?php
					$mdate = $family->getMarriageDate();
					if (!is_null($mdate)) print $mdate->Display()." ";
					$place='';
					$place = $family->getMarriagePlace();
					if (!empty($place)) print PrintReady($place); ?>
					<a href="family.php?famid=<?php print $family->getXref(); ?>" onclick="if (!<?php print $this->name;?>.collapseBox) return false;"><img id="d_<?php print $family->getXref(); ?>" alt="<?php print $family->getXref(); ?>" class="draggable" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['family']['button']; ?>" border="0" /></a>
				<br />
				<b><?php
				if ($spouse->isDead()) {
					if (isset ($factAbbrev["DEAT"])) {
						echo $factAbbrev["DEAT"];
					} else {
						echo get_first_letter($factarray['DEAT']);
					}
					?>:</b>
					<?php
					echo $spouse->getDeathDate()->Display(), ' ', PrintReady($spouse->getDeathPlace());
				} ?>
				</div>
				<?php
			} else print "<br />\n";
		}
		?>
		</span>
		<?php
	}

	/**
	* Draw the children for a family
	* @param Family $family The family to draw the children for
	* @param int $gen The number of generations of descendents to draw
	*/
	function drawChildren(&$family, $gen=2) {
		if (!empty($family) && $gen>0) {
			$children = $family->getChildren();
			foreach($children as $ci=>$child) {
				$fam = null;
				$this->drawPerson($child, $gen-1, -1, $fam);
			}
		}
	}

	/**
	* Draw all of the children for a person
	* @param Person $person The person to draw the children for
	* @param int $gen The number of generations of descendents to draw
	*/
	function drawAllChildren(&$person, $gen=2) {
		if (!empty($person) && $gen>0) {
			$fams = $person->getSpouseFamilies();
			foreach($fams as $famid=>$family) {
				$children = $family->getChildren();
				foreach($children as $ci=>$child) {
					$fam = null;
					$this->drawPersonAllSpouses($child, $gen-1, -1);
				}
			}
		}
	}

	/**
	* Get the thumbnail image for the given person
	*
	* @param Person $person
	* @return string
	*/
	function getThumbnail(&$person) {
		global $MULTI_MEDIA, $SHOW_HIGHLIGHT_IMAGES, $TEXT_DIRECTION, $USE_MEDIA_VIEWER, $SERVER_URL;
		$thumbnail = "";
		if ($MULTI_MEDIA && $SHOW_HIGHLIGHT_IMAGES && showFact("OBJE", $person->getXref())) {
			$object = $person->findHighlightedMedia();
			if (!empty($object)) {
				$whichFile = thumb_or_main($object);	// Do we send the main image or a thumbnail?
				$size = findImageSize($whichFile);
				$class = "pedigree_image_portrait";
				if ($size[0]>$size[1]) $class = "pedigree_image_landscape";
				if ($TEXT_DIRECTION == "rtl") $class .= "_rtl";
				// NOTE: IMG ID
				$imgsize = findImageSize($object["file"]);
				$imgwidth = $imgsize[0]+50;
				$imgheight = $imgsize[1]+150;

				if (!empty($object['mid']) && $USE_MEDIA_VIEWER) {
					$thumbnail .= "<a href=\"".encode_url("mediaviewer.php?mid=".$object['mid'])."\" >";
				} else {
					$thumbnail .= "<a href=\"javascript:;\" onclick=\"return openImage('".rawurlencode($object["file"])."',$imgwidth, $imgheight);\">";
				}
				$thumbnail .= "<img src=\"".$SERVER_URL.$whichFile."\" vspace=\"0\" hspace=\"0\" class=\"$class\" alt=\"\" title=\"\"";
				if ($imgsize) $thumbnail .= " /></a>";
				else $thumbnail .= " />";
			}
		}
		return $thumbnail;
	}

	/**
	* Draw a person for the chart but include all of their spouses instead of just one
	* @param Person $person The Person object to draw the box for
	* @param int $gen The number of generations up or down to print
	* @param int $state Whether we are going up or down the tree, -1 for descendents +1 for ancestors
	*/
	function drawPersonAllSpouses(&$person, $gen, $state) {
		global $SHOW_ID_NUMBERS, $PGV_IMAGE_DIR, $PGV_IMAGES, $TEXT_DIRECTION, $SERVER_URL;

		if ($gen<0) {
			return;
		}
		if ($this->zoomLevel < -2) $style = "display: none;";
		else $style = "width: ".(10+$this->zoomLevel)."; height: ".(10+$this->zoomLevel).";";
		if (empty($person)) $person = $this->rootPerson;
		if (empty($person)) return;
		$mother = null;
		$father = null;

		if ($state>=0) {
			$cfamily = $person->getPrimaryChildFamily();
			if (!empty($cfamily)) {
				$father = $cfamily->getHusband();
				if (empty($father)) $father = $cfamily->getWife();
			}
			$fams = $person->getSpouseFamilies();
			$fams = array_reverse($fams);
			//-- find the last spouse family that has a known spouse
			foreach($fams as $family) {
				if (!empty($family)) $spouse = $family->getSpouse($person);
				if (!empty($spouse)) {
					$mcfamily = $spouse->getPrimaryChildFamily();
					if (!empty($mcfamily)) {
						$mother = $mcfamily->getHusband();
						//-- a mother's father was found so break out
						break;
					}
				}
			}
		}
		?>
		<table border="0" cellpadding="0" cellspacing="0" style="margin-top: 0px; margin-bottom: 1px;">
			<tbody>
				<tr>
					<?php /* print the children */
					if ($state<=0) {
						$hasChildren = false;
						if ($person->getNumberOfChildren()>0) $hasChildren = true;
					?>
					<td id="ch_<?php print $person->getXref();?>" align="right" <?php if ($gen==0 && $hasChildren) print 'id="'.$this->name.'_cload" name="'.$this->name.'_cload" onclick="'.$this->name.'.loadChild(this, \''.$person->getXref().'\');"'; ?>>
						<?php
							$this->drawAllChildren($person, $gen);
						?>
					</td>
					<?php
					if ($hasChildren && $person->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['vline']['other']; ?>" width="3" /></td><?php }
					else if ($hasChildren) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['hline']['other']; ?>" width="3" /></td><?php }
					}
					if ($state>0) {
						?><td><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['hline']['other']; ?>" width="8" height="3" /></td><?php
					}
					/* print the person */ ?>
					<td>
						<div class="person_box" dir="<?php print $TEXT_DIRECTION; ?>" id="box_<?php print $person->getXref();?>" style="text-align: <?php echo $TEXT_DIRECTION=="rtl" ? "right":"left"; ?>; cursor: pointer; font-size: <?php print 10 + $this->zoomLevel;?>px; width: <?php print ($this->bwidth+($this->zoomLevel*18));?>px; margin-left: 3px; direction: <?php print $TEXT_DIRECTION; ?>" onclick="<?php print $this->name; ?>.expandBox(this, '<?php print $person->getXref(); ?>', 'all');">
						<?php
							$name = $person->getFullName();

							print PrintReady($person->getSexImage('small', $style)." ".$name);
						?><br />
						<?php
						$fams = $person->getSpouseFamilies();
						foreach($fams as $famid=>$family) {
							$spouse = $family->getSpouse($person);
							if (!is_null($spouse)) {
								$name = $spouse->getFullName();
								print PrintReady($spouse->getSexImage('small', $style)." ".$name);
								print "<br />\n";
							} else print "<br />\n";
						}
						?>
						</div>
					</td>
					<?php
					if ($state<0) {
						?><td><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['hline']['other']; ?>" width="8" height="3" /></td><?php
					}
					/* print the father */
					if ($state>=0 && (!empty($father) || !empty($mother))) {
						$lineid = "pline_";
						if (!empty($father)) $lineid.=$father->getXref();
						$lineid.="_";
						if (!empty($mother)) $lineid.=$mother->getXref();
						?>
					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['vline']['other']; ?>" width="3" /></td><?php } ?>
					<td align="left">
						<table cellpadding="0" cellspacing="0" border="0">
							<tbody>
								<tr>
									<?php /* there is a IE JavaScript bug where the "id" has to be the same as the "name" in order to use the document.getElementsByName() function */ ?>
									<td <?php if ($gen==0 && !empty($father)) print 'id="'.$this->name.'_pload" name="'.$this->name.'_pload" onclick="'.$this->name.'.loadParent(this, \''.$person->getXref().'\', \'f\');"'; ?>>
										<?php if (!empty($father)) $this->drawPerson($father, $gen-1, 1, $cfamily); else print "<br />\n";?>
									</td>
								</tr>
								<?php
								$fams = $person->getSpouseFamilies();
								foreach($fams as $famid=>$family) {
									$spouse = $family->getSpouse($person);
									$mother = null;
									if ($spouse!=null) {
										$mcfamily = $spouse->getPrimaryChildFamily();
										if (!empty($mcfamily)) {
											$mother = $mcfamily->getHusband();
										}
									}
									if (!is_null($mother)) {
								?>
								<tr>
									<td <?php if ($gen==0 && !empty($mother)) print 'id="'.$this->name.'_pload" name="'.$this->name.'_pload" onclick="'.$this->name.'.loadParent(this, \''.$person->getXref().'\', \'m\');"'; ?>>
										<?php if (!empty($mother)) $this->drawPerson($mother, $gen-1, 1, $mcfamily); else print"<br />\n";?>
									</td>
								</tr>
								<?php } } ?>
							</tbody>
						</table>
					</td>
					<?php } ?>
				</tr>
			</tbody>
		</table>
		<?php
	}

	/**
	* Draw a person for the chart
	* @param Person $person The Person object to draw the box for
	* @param int $gen The number of generations up or down to print
	* @param int $state Whether we are going up or down the tree, -1 for descendents +1 for ancestors
	* @param Family $pfamily
	*/
	function drawPerson(&$person, $gen, $state, &$pfamily) {
		global $SHOW_ID_NUMBERS, $PGV_IMAGE_DIR, $PGV_IMAGES, $TEXT_DIRECTION, $SERVER_URL;

		if ($gen<0) {
			return;
		}
		if ($this->zoomLevel < -2) $style = "display: none;";
		else $style = "width: ".(10+$this->zoomLevel)."; height: ".(10+$this->zoomLevel).";";
		if (empty($person)) $person = $this->rootPerson;
		if (empty($person)) return;
		$mother = null;
		$father = null;
		if (!empty($pfamily)) $spouse = $pfamily->getSpouse($person);
		else {
			$spouse = $person->getCurrentSpouse();
			$fams = $person->getSpouseFamilies();
			$pfamily = end($fams);
		}
		if ($state<=0) {
			$fams = $person->getSpouseFamilies();
			$family = end($fams);
		}
		if ($state>=0) {
			$cfamily = $person->getPrimaryChildFamily();
			if (!empty($cfamily)) {
				$father = $cfamily->getHusband();
			}
			if (!empty($spouse)) {
				$mcfamily = $spouse->getPrimaryChildFamily();
				if (!empty($mcfamily)) {
					$mother = $mcfamily->getHusband();
				}
			}
		}
		?>
		<table border="0" cellpadding="0" cellspacing="0" style="margin-top: 0px; margin-bottom: 1px;">
			<tbody>
				<tr>
					<?php /* print the children */
					if ($state<=0) {
						$hasChildren = false;
						if (!empty($family) && $family->getNumberOfChildren()>0) $hasChildren = true;
					?>
					<td id="ch_<?php print $person->getXref();?>" align="right" <?php if ($gen==0 && $hasChildren) print 'id="'.$this->name.'_cload" name="'.$this->name.'_cload" onclick="'.$this->name.'.loadChild(this, \''.$person->getXref().'\');"'; ?>>
						<?php
							$this->drawChildren($family, $gen);
						?>
					</td>
					<?php
					if ($hasChildren && $family->getNumberOfChildren()>1) { ?><td valign="top"><img style="position: absolute;" id="cline_<?php print $person->getXref();?>" name="vertline" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['vline']['other']; ?>" width="3" /></td><?php }
					}
					if ($state>0) {
						?><td><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['hline']['other']; ?>" width="8" height="3" /></td><?php
					}
					/* print the person */ ?>
					<td>
						<div class="person_box" dir="<?php print $TEXT_DIRECTION; ?>" id="box_<?php print $person->getXref();?>" style="text-align: <?php echo $TEXT_DIRECTION=="rtl" ? "right":"left"; ?>; cursor: pointer; font-size: <?php print 10 + $this->zoomLevel;?>px; width: <?php print ($this->bwidth+($this->zoomLevel*18));?>px; direction: <?php print $TEXT_DIRECTION; ?>" onclick="<?php print $this->name; ?>.expandBox(this, '<?php print $person->getXref(); ?>', '<?php if (!empty($pfamily)) print $pfamily->getXref(); ?>');">
						<?php
							$name = $person->getFullName();
							print PrintReady($person->getSexImage('small', $style)." ".$name);
						?><br />
						<?php if (!is_null($spouse)) {$name = $spouse->getFullName();
						print PrintReady($spouse->getSexImage('small', $style)." ".$name);
						} else print "<br />\n"; ?>

						</div>
					</td>
					<?php
					if ($state<0) {
						?><td><img src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['hline']['other']; ?>" width="8" height="3" /></td><?php
					}
					/* print the father */
					if ($state>=0 && (!empty($father) || !empty($mother))) {
						$lineid = "pline_";
						if (!empty($father)) $lineid.=$father->getXref();
						$lineid.="_";
						if (!empty($mother)) $lineid.=$mother->getXref();
						?>
					<?php if (!empty($father) && (!empty($mother))) { ?><td><img style="position: absolute;" id="<?php print $lineid;?>" name="pvertline" src="<?php print $SERVER_URL.$PGV_IMAGE_DIR."/".$PGV_IMAGES['vline']['other']; ?>" width="3" /></td><?php } ?>
					<td align="left">
						<table cellpadding="0" cellspacing="0" border="0">
							<tbody>
								<tr>
									<?php /* there is a IE JavaScript bug where the "id" has to be the same as the "name" in order to use the document.getElementsByName() function */ ?>
									<td <?php if ($gen==0 && !empty($father)) print 'id="'.$this->name.'_pload" name="'.$this->name.'_pload" onclick="'.$this->name.'.loadParent(this, \''.$person->getXref().'\', \'f\');"'; ?>>
										<?php if (!empty($father)) $this->drawPerson($father, $gen-1, 1, $cfamily); else print "<br />\n";?>
									</td>
								</tr>
								<tr>
								<?php /* print the mother */ ?>
									<td <?php if ($gen==0 && !empty($mother)) print 'id="'.$this->name.'_pload" name="'.$this->name.'_pload" onclick="'.$this->name.'.loadParent(this, \''.$person->getXref().'\', \'m\');"'; ?>>
										<?php if (!empty($mother)) $this->drawPerson($mother, $gen-1, 1, $mcfamily); else print"<br />\n";?>
									</td>
								</tr>
							</tbody>
						</table>
					</td>
					<?php } ?>
				</tr>
			</tbody>
		</table>
		<?php
	}
}
?>

--- NEW FILE: class_reportbase.php ---
<?php
/**
 * Base Report Generator
 *
 * used by the SAX parser to generate reports from the XML report file.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
[...2247 lines suppressed...]
	$currentElement = $pgvreport;
	$pgvreport = array_pop($pgvreportStack);
//	print "{".get_class($pgvreport)."} ";
	if (!is_null($pgvreport)) $pgvreport->addElement($currentElement);
	else $pgvreport = $currentElement;
}

function PGVRTitleSHandler($attrs) {
	global $reportTitle, $printData, $printDataStack;

	$reportTitle = true;
}

function PGVRTitleEHandler() {
	global $reportTitle, $printData, $printDataStack;

	$reportTitle = false;

}
?>

--- NEW FILE: class_gewebservice.php ---
<?php
/**
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * @package PhpGedView
 * @subpackage Tools
 * @version $Id: class_gewebservice.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_GEWEBSERVICE_PHP', '');

require_once 'includes/classes/class_grampsexport.php';

class GEWebService extends GrampsExport
{
	var $eRoot;
/**
 * Creates a GrampsXML for a person, if that person exists in the given GEDCOM record
 * @param $personRec - The GEDCOM record where the person can be found
 * @param $personID - The id of the person record
 * @return GrampsXML for the person
 */
function create_person($personRec = "", $personID = "") {
		global $pgv_lang, $eRoot;
		if (!isset($this->dom))
		{
	     $this->dom = new DomDocument("1.0", "UTF-8");
		 $this->dom->formatOutput = true;

		 $eRoot = $this->dom->createElementNS("http://gramps-project.org/xml/1.1.0/", "database");
		 $eRoot = $this->dom->appendChild($eRoot);
		 $this->eEvents = $this->dom->createElement("events");
		 $this->eEvents = $eRoot->appendChild($this->eEvents);
		 $this->ePlaces = $this->dom->createElement("places");
		 $this->ePlaces = $eRoot->appendChild($this->ePlaces);

		}
			$ePerson_new = $this->dom->createElement("person");

			$ePerson=$eRoot->appendChild($ePerson_new);

			$ePerson->setAttribute("id", $personID);
			$ePerson->setAttribute("handle",$personID);
			$ePerson->setAttribute("change", time());

			$eGender = $this->dom->createElement("gender");
			$eGender = $ePerson->appendChild($eGender);
			if (($gender = get_gedcom_value("SEX", 1, $personRec)) != null)
				$etGender = $this->dom->createTextNode($gender);
			else
				$etGender = $this->dom->createTextNode("U");

			$num = 1;
			$etGender = $eGender->appendChild($etGender);

if (($nameRec = get_sub_record(1, "1 NAME", $personRec)) != null) {
				//creates name
				$eName = $this->dom->createElement("name");
				$eName->setAttribute("type", "Birth Name");

				$givn = get_gedcom_value("GIVN", 2, $nameRec);
				$surn = get_gedcom_value("SURN", 2, $nameRec);
				//-- if no GIVN/SURN sub records then get the names from the 1 NAME line
				if (empty($surn) || empty($givn)) {
					$name = get_gedcom_value("NAME", 1, $nameRec);
					if (!empty($name)) {
						$nparts = explode('/', $name);
						$givn = trim($nparts[0]);
						if (count($nparts)>1) $surn = trim($nparts[1]);
						if (count($nparts)>2) $nnsfx = trim($nparts[2]);
					}
				}
				if (empty($surn))
					$surn = $pgv_lang["unknown"];
				if (empty($givn))
					$givn = $pgv_lang["unknown"];

				$eFirstName = $this->dom->createElement("first");
				$etFirstName = $this->dom->createTextNode($givn);
				$etFirstName = $eFirstName->appendChild($etFirstName);
				$eFirstName = $eName->appendChild($eFirstName);

				$eLastName = $this->dom->createElement("last");
				$etLastName = $this->dom->createTextNode($surn);
				$etLastName = $eLastName->appendChild($etLastName);
				$eLastName = $eName->appendChild($eLastName);
				$eName = $ePerson->appendChild($eName);

				if (!empty($nnsfx) || (($nsfx = get_gedcom_value("NSFX", 2, $nameRec)) != null)) {
					$eSuffix = $this->dom->createElement("suffix");
					if (empty($nsfx)) $nsfx = $nnsfx;
					$etSuffix = $this->dom->createTextNode($nsfx);
					$etSuffix = $eSuffix->appendChild($etSuffix);
					$eSuffix = $eName->appendChild($eSuffix);
				}

				//retrieves name prefix
				if (($npfx = get_gedcom_value("NPFX", 2, $nameRec)) != null) {
					$eTitle = $this->dom->createElement("title");
					$etTitle = $this->dom->createTextNode($npfx);
					$etTitle = $eTitle->appendChild($etTitle);
					$eTitle = $eName->appendChild($eTitle);
				}

				//retrieves the nickname
				if (($nick = get_gedcom_value("NICK", 2, $nameRec)) != null) {
					$eNick = $this->dom->createElement("nick");
					$etNick = $this->dom->createTextNode($nick);
					$etNick = $eNick->appendChild($etNick);
					$eNick = $ePerson->appendChild($eNick);
				}

				//creates note
				if (($nameNote = get_sub_record(2, "2 NOTE", $nameRec)) != null) {
					$this->create_note($eName, $nameNote, 2);
				}

				//creates SourceRef
				$num = 1;
				while (($nameSource = get_sub_record(2, "2 SOUR", $nameRec, $num)) != null) {
					$this->create_sourceref($eName, $nameSource, 2);
					$num++;
				}

			}

			foreach ($this->eventsArray as $event) {
				$this->create_event_ref($ePerson, $personRec, $event);
			}

			$this->create_lds_event($personRec, "baptism", "BAPL", $ePerson);
			$this->create_lds_event($personRec, "endowment", "ENDL", $ePerson);
			$this->create_lds_event($personRec, "sealed_to_parents", "SLGC", $ePerson);

			while (($nameSource = get_sub_record(1, "1 OBJE", $personRec, $num)) != null) {

				$this->create_mediaref($ePerson, $nameSource, 1,0);
				$num++;
			}

			/* This creates the family relation for a person, to link them to
			 * the family they are a child in and to link them to the family
			 * where they are a spouse. These relations will only be included
			 * if the family is also in the clippings cart. Otherwise, the relations
			 * are simply left out of the XML file.
			 *
			 *
			*create_fam_relation($ePerson,$personRec,"FAMC");
			*create_fam_relation($ePerson,$personRec,"FAMS");
			*/
			if (($note = get_sub_record(1, "1 NOTE", $personRec)) != null) {
				$this->create_note($ePerson, $note, 1);
			}
			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $personRec, $num)) != null) {
				$this->create_sourceref($ePerson, $sourcerefRec, 1,0);
				$num++;
			}
			return $this->dom->saveXML();
		}

	/**
	* Creates the lds_ord element and appends the correct information depending
	* on the type of lds_ord (Endowment, Sealing, Baptism). If there is a sealing,
	* the function will search if the family is in the clippings cart and if the
	* family is created or not. If the family is not created yet, it will be created
	* and added to the DOMDocument
	*
	* @param $indirec - The full INDI GEDCOM record of the person the lds_ord is being created
	* @param $eventName - the name of the LDS event (Baptism, Sealing, Endowment, etc...)
	* @param $eventABV - the event abbreviation in the GEDCOM (ie. SLGC, BAPL, ENDL)
	* @param $eParent - The parent element the lds event is attached to
	*/
	function create_lds_event($indirec, $eventName, $eventABV, $eParent) {
		global $ePerson, $TEMPLE_CODES, $clipping, $eRoot;
		require_once("includes/classes/class_person.php");
		if (($hasldsevent = get_sub_record(1, "1 " . $eventABV, $indirec)) != null) {

			// Create <lds_ord> and attaches the type attribute
			$eLdsEvent = $this->dom->createElement("lds_ord");
			$eLdsEvent->setAttribute("type", $eventName);

			if (($dateRec = get_sub_record(1, "2 DATE", $hasldsevent)) != null)
				$this->create_date($eLdsEvent, $dateRec, 2);

			// Create <temple>, this element is common with all lds ords
			if (($temple = get_gedcom_value($eventABV . ":TEMP", 1, $indirec)) != null) {
				$eTemple = $this->dom->createElement("temple");
				$eTemple->setAttribute("val", $temple);
				$eTemple = $eLdsEvent->appendChild($eTemple);
			}

			if (($place = get_gedcom_value($eventABV . ":PLAC", 1, $indirec)) != null) {
				$hlink = $this->query_dom("./places/placeobj[@title=\"$place\"]/@handle");
				if ($hlink == null) {
					$hlink = $this->generateHandle();
					$this->create_placeobj($place, $hlink);
					$this->create_place($eLdsEvent, $hlink);
				} else {
					$this->create_place($eLdsEvent, $hlink);
				}
			}

			// Check to see if the STAT of the ordinance is set and add it to the
			// <lds_ord> element
			if (($stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec)) != null) {
				$eStatus = $this->dom->createElement("status");
				$stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec);
				$eStatus->setAttribute("val", isset ($stat));
				$eStatus = $eLdsEvent->appendChild($eStatus);
			}
			// If the event is a sealing
			if ($eventABV == "SLGC") {
				// Create an instance of person and look for their family record
				$person = Person :: getInstance($clipping["id"]);
				$famId = $person->getChildFamilyIds();
				$famrec = find_family_record($famId[0]);
				$fid = $famId[0];
				$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
				if ($handle == null && id_in_cart($fid)) {
					/*
					 * If the family does not exist and their ID is in the clippings cart,
					 * you must create the family before you can query them in the dom to get
					 * their hlink. The hlink is generated when the person element is created.
					 * This causes overhead creating objects that are never added to the XML file
					 * perhaps there is some other way this can be done reducing the overhead?
					 *
					 */
					$this->create_family($famrec, $famId[0]);
					$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
					$eFam = $this->dom->createElement("sealed_to");
					$eFam->setAttribute("hlink", $handle);
					$eFam = $eLdsEvent->appendChild($eFam);
					$person = null;
				} else
					if ($handle != null && id_in_cart($fid)) {
						$eFam = $this->dom->createElement("sealed_to");
						$eFam->setAttribute("hlink", $handle);
						$eFam = $eLdsEvent->appendChild($eFam);
						$person = null;
					}
			}

			if (($note = get_sub_record(1, "2 NOTE", $hasldsevent)) != null)
				$this->create_note($eLdsEvent, $note, 2);

			$num = 1;
			while (($sourcerefRec = get_sub_record(2, "2 SOUR", $hasldsevent, $num)) != null) {
				$this->create_sourceref($eLdsEvent, $sourcerefRec, 2,0);
				$num++;
			}
			$eLdsEvent = $eParent->appendChild($eLdsEvent);
		}
	}

/**
 * Creates a GrampsXML for a source, if that source exists in the given GEDCOM record
 * @param $sourceRec - The GEDCOM record where the source is found
 * @param $sourceID - The ID of the source
 * @param $level - the level the source is on, the default is one
 * @return GrampsXML for source
 */
function create_source($sourceRec, $sourceID, $level = 1,$done=1) {
	global $eRoot;
			if (!isset($this->dom))
		{
	     $this->dom = new DomDocument("1.0", "UTF-8");
		 $this->dom->formatOutput = true;

		 $eRoot = $this->dom->createElementNS("http://gramps-project.org/xml/1.1.0/", "database");
		 $eRoot = $this->dom->appendChild($eRoot);

//		 $this->ePlaces = $this->dom->createElement("places");
//		 $this->ePlaces = $eRoot->appendChild($this->ePlaces);
		}
		$eSource = $this->dom->createElement("source");
		$eSource = $eRoot->appendChild($eSource);
		$eSource->setAttribute("id", $sourceID);
		$eSource->setAttribute("handle", $this->generateHandle());
		$eSource->setAttribute("change", time());
		if (($title = get_gedcom_value("TITL", $level, $sourceRec)) != null) {
			$eSTitle = $this->dom->createElement("stitle");
			$etSTitle = $this->dom->createTextNode($title);
			$etSTitle = $eSTitle->appendChild($etSTitle);
			$eSTitle = $eSource->appendChild($eSTitle);
		}
		if (($author = get_gedcom_value("AUTH", $level, $sourceRec)) != null) {
			$eSAuthor = $this->dom->createElement("sauthor");
			$etSAuthor = $this->dom->createTextNode($author);
			$etSAuthor = $eSAuthor->appendChild($etSAuthor);
			$eSAuthor = $eSource->appendChild($eSAuthor);
		}
		if (($pubInfo = get_gedcom_value("PUBL", $level, $sourceRec)) != null) {
			$eSPubInfo = $this->dom->createElement("spubinfo");
			$etSPubInfo = $this->dom->createTextNode($pubInfo);
			$etSPubInfo = $eSPubInfo->appendChild($etSPubInfo);
			$eSPubInfo = $eSource->appendChild($eSPubInfo);
		}
		if (($abbrev = get_gedcom_value("ABBR", $level, $sourceRec)) != null) {
			$eSAbbrev = $this->dom->createElement("sabbrev");
			$etSAbbrev = $this->dom->createTextNode($abbrev);
			$etSAbbrev = $eSAbbrev->appendChild($etSAbbrev);
			$eSAbbrev = $eSource->appendChild($eSAbbrev);
		}
		if (($note = get_sub_record($level, $level . " NOTE", $sourceRec)) != null) {
			$this->create_note($eSource, $note, $level);
		}
		$num = 1;
		while (($nameSource = get_sub_record(1, "1 OBJE", $sourceRec, $num)) != null) {
			$this->create_mediaref($this->eSources, $nameSource, 1,0);
			$num++;
		}
		return $this->dom->saveXML();
	}


/**
 * Creates a GrampsXML for a family, if that family exists in the given GEDCOM record
 * @param $frec - The GEDCOM record where the family can be found
 * @param $fid - The id of the family record
 * @return GrampsXML for family
 */
function create_family($frec, $fid) {
	global $eRoot;
			if (!isset($this->dom))
		{
	     $this->dom = new DomDocument("1.0", "UTF-8");
		 $this->dom->formatOutput = true;

		 $eRoot = $this->dom->createElementNS("http://gramps-project.org/xml/1.1.0/", "database");
		 $eRoot = $this->dom->appendChild($eRoot);
		 $this->eEvents = $this->dom->createElement("events");
		 $this->eEvents = $eRoot->appendChild($this->eEvents);
		 $this->ePlaces = $this->dom->createElement("places");
		 $this->ePlaces = $eRoot->appendChild($this->ePlaces);
		}
			$famrec = $frec;
			$eFamily_new = $this->dom->createElement("family");
			$eFamily = $eRoot->appendChild($eFamily_new);
			$eFamily->setAttribute("id", $fid);
			$eFamily->setAttribute("handle", $fid);
			$eFamily->setAttribute("change", time());

			// Add the <father> element
			$id = get_gedcom_value("HUSB", 1, $famrec);
			if (isset($id))
			{
		    $eFather = $this->dom->createElement("father");
		    $eFather->setAttribute("hlink", $id);
			$eFather = $eFamily->appendChild($eFather);
			}

			// Add the <mother> element
			$id = get_gedcom_value("WIFE", 1, $famrec);
			if (isset($id))
			{
				$eMother = $this->dom->createElement("mother");
				$eMother->setAttribute("hlink", $id);
				$eMother = $eFamily->appendChild($eMother);
			}

			foreach ($this->familyevents as $event) {
				$this->create_event_ref($eFamily, $frec, $event);
			}

			// Add the <child> element
			$id = get_gedcom_value("CHIL", 1, $famrec);
			if (isset ($id)) {
				$eChild = $this->dom->createElement("child");
				$eChild->setAttribute("hlink", $id);
				$eChild = $eFamily->appendChild($eChild);
			}
			if (($note = get_sub_record(1, "1 NOTE", $frec)) != null) {
				$this->create_note($eFamily, $note, 1);
			}

			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $frec, $num)) != null) {
				$this->create_sourceref($eFamily, $sourcerefRec, 1, 0);
				$num++;
			}
			$num = 1;
			while (($nameSource = get_sub_record(1, "1 OBJE", $frec, $num)) != null) {

				$this->create_mediaref($eFamily, $nameSource, 1, 0);
				$num++;
			}
		return $this->dom->saveXML();
	}

/**
 * Creates a GrampsXML for a record, if that record exists in the given GEDCOM record
 * @param $fid - The id of the record
 * @return GrampsXML for the recrord
 */
function create_record($fid)
{
	$gedrec = find_gedcom_record($fid);
	//0 @I1@ INDI - person
	//0 @F1@ FAM - family
	//0 @S1@ SOUR - source
	//0 @O1@ OBJE - object
	//0 @R1@ REPO - reposotory
	//return $gedrec;
	$ct = preg_match("/0 @.*@ (.*)/", $gedrec, $match);
	if ($ct>0) {
		$type = trim($match[1]);
		// $type;
		if ($type == 'INDI') return $this->create_person($gedrec, $fid);
		if ($type == 'FAM')  return $this->create_family($gedrec, $fid);
		if ($type == 'SOUR') return $this->create_source($gedrec, $fid);
		if ($type == 'OBJE') return $this->create_media($gedrec, $fid);
	}
}

/**
 * Creates a GrampsXML for a media, if that media exists in the given GEDCOM record
 * @param $mediaRec - The GEDCOM record of the media
 * @param $mediaID - The id of the media
 * @param $level - The level on which the media can be found, the default is 1
 * @return GrampsXML for the recrord
 */
function create_media($mediaRec, $mediaID, $level = 1)
{
		global $file, $eRoot;
		if (!isset($this->dom))
		{
	     $this->dom = new DomDocument("1.0", "UTF-8");
		 $this->dom->formatOutput = true;

		 $eRoot = $this->dom->createElementNS("http://gramps-project.org/xml/1.1.0/", "database");
		 $eRoot = $this->dom->appendChild($eRoot);
		}

		$object = $this->dom->createElement("object");
		/*primary object elements and attributes*/
		$object->setAttribute("id", $mediaID);
		$object->setAttribute("handle", $mediaID);
		$object->setAttribute("change", time());
		/*elements and attributes of the object element*/
		/*File elements*/
		$file_ = get_gedcom_value("FILE", 1, $mediaRec);
		$fileNode = $this->dom->createElement("file");

		/*Source*/
		$src = $this->dom->createAttribute("src");
		$srcData = $this->dom->createTextNode($file_);
		$srcData = $src->appendChild($srcData);
		$src = $fileNode->appendChild($src);
		/*MIME*/
		$mime_ = get_gedcom_value("FORM", 1, $mediaRec);
		$mime = $this->dom->createAttribute("mime");
		if (empty ($mime_)) {
			$path = pathinfo($file_);
			if(!isset($path["extension"]))
				$mime_ = "unknown_file_extension";
			else
				$mime_ = $path["extension"];
		}
		$mimeData = $this->dom->createTextNode($mime_);
		$mimeData = $mime->appendChild($mimeData);
		$mime = $fileNode->appendChild($mime);
		/*DESCRIPTION*/
		$description_ = get_gedcom_value("TITL", 1, $mediaRec);
		$description = $this->dom->createAttribute("description");
		$descriptionData = $this->dom->createTextNode($description_);
		$descriptionData = $description->appendChild($descriptionData);
		$description = $fileNode->appendChild($description);
		/*fileNode elements*/
		$fileNode = $object->appendChild($fileNode);

		$fileNode = $this->dom->createElement("file");
		if (($note = get_sub_record(1, "1 NOTE", $mediaRec)) != null) {
			$this->create_note($object, $note, 1);
		}
		$num = 1;
		while (($nameSource = get_sub_record($level, $level . " SOUR", $mediaRec, $num)) != null) {
			$this->create_sourceref($object, $nameSource, 1);
			$num++;
		}
		$eRoot->appendChild($object);
		return $this->dom->saveXML();
}
	function create_mediaref($eParent, $sourcerefRec, $level,$done=1) {
		$mediaId = get_gedcom_value("OBJE", $level, $sourcerefRec);
		//print "Media ID ************ $mediaId";
		$eMediaRef = $this->dom->createElement("objref");
		$eMediaRef = $eParent->appendChild($eMediaRef);
		$eMediaRef->setAttribute("hlink", $mediaId);
		$eParent->appendChild($eMediaRef);
		//		 $mediaRecord = find_gedcom_record($mediaId);
		//               $this->create_media($mediaId,$mediaRecord);
	}

function create_sourceref($eParent, $sourcerefRec, $level,$done=1)
	{
		if (($sourceID = get_gedcom_value("SOUR", $level, $sourcerefRec)) != null) {
				$eSourceRef = $this->dom->createElement("sourceref");
				$eSourceRef = $eParent->appendChild($eSourceRef);
				$eSourceRef->setAttribute("hlink", $sourceID);
		}
	}
}
?>

--- NEW FILE: class_event.php ---
<?php
/**
 * Class that defines an event details object
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @author Joel A. Bruce
 * @version $Id: class_event.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 *
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_EVENT_PHP', '');

require_once("includes/classes/class_date.php");

/**
 * Event
 *
 */
class Event {
//	These objects need further refinement in their implementations and parsing
//	var $address = null;
//	var $notes = array(); //[0..*]: string
//	var $sourceCitations = array(); //[0..*]: SourceCitation
//	var $multimediaLinks = array(); //[0..*]: MultimediaLink

	var $lineNumber = null;
	var $canShow = null;
	var $canShowDetails = null;
	var $canEdit = null;
	var $state = "";
	var $type = NULL;
	var $tag = NULL;
	var $date = NULL;
	var $place = null;
	var $gedcomRecord = null;
	var $resn = null;
	var $dest = false;
	var $label = null;
	var $parentObject = null;
	var $detail = NULL;
	var $values = NULL;
	var $sortOrder = 0;
	var $sortDate = NULL;
	//-- temporary state variable that can be used by other scripts
	var $temp = NULL;

	/**
	 * Get the value for the first given GEDCOM tag
	 *
	 * @param string $code
	 * @return string
	 */
	function getValue($code) {
		if (is_null($this->values)) {
			$this->values=array();
			preg_match_all('/\n2 ('.PGV_REGEX_TAG.') (.+)/', $this->gedcomRecord, $matches, PREG_SET_ORDER);
			foreach ($matches as $match) {
				// If this is a link, remove the "@"
				if (preg_match('/^@'.PGV_REGEX_XREF.'@$/', $match[2])) {
					$this->values[$match[1]]=trim($match[2], "@");
				} else {
					$this->values[$match[1]]=$match[2];
				}
			}
		}
		if (array_key_exists($code, $this->values)) {
			return $this->values[$code];
		}
		return null;
	}

	/**
	 * Parses supplied subrecord to fill in the properties of the class.
	 * Assumes the level of the subrecord is 1, and that all its associated sub records are provided.
	 *
	 * @param string $subrecord
	 * @param int $lineNumber
	 * @return Event
	 */
	function Event($subrecord, $lineNumber=-1) {
		global $factarray;
		if (preg_match('/^1 ('.PGV_REGEX_TAG.') *(.*)/', $subrecord, $match)) {
			$this->tag=$match[1];
			$this->detail=$match[2];
			$this->lineNumber=$lineNumber;
			$this->gedcomRecord=$subrecord;
			// Store 1 EVEN/2 TYPE XXXX as a XXXX event.  Makes subsequent processing easier.
			if (($this->tag=='EVEN' || $this->tag=='FACT') && preg_match('/2 TYPE (\w+)/', $subrecord, $match) && array_key_exists($match[1], $factarray))
				$this->tag=$match[1];
		}
	}

	function setState($s) {
		$this->state = $s;
	}

	function getState() {
		return $this->state;
	}

	/**
	 * Check whether or not this event can be shown
	 *
	 * @return boolean
	 */
	function canShow() {
		if (is_null($this->canShow)) {
			if (empty($this->gedcomRecord)) $this->canShow = false;
			else if (!is_null($this->parentObject)) {
				$this->canShow = showFact($this->tag, $this->parentObject->getXref()) && !FactViewRestricted($this->parentObject->getXref(), $this->gedcomRecord);
			}
			else $this->canShow = true;
		}
		return $this->canShow;
	}

	/**
	 * Check whether or not the details of this event can be shown
	 *
	 * @return boolean
	 */
	function canShowDetails() {
		if (!$this->canShow()) return false;
		if (is_null($this->canShowDetails)) {
			if (!is_null($this->parentObject)) {
				$this->canShowDetails = showFactDetails($this->tag, $this->parentObject->getXref());
			}
			else $this->canShowDetails = true;
		}
		return $this->canShowDetails;
	}

	/**
	 * check whether or not this fact can be edited
	 *
	 * @return boolean
	 */
	function canEdit() {
		if (!$this->canShowDetails()) return false;
		if (is_null($this->canEdit)) {
			if (!is_null($this->parentObject)) {
				$this->canEdit = !FactEditRestricted($this->parentObject->getXref(), $this->gedcomRecord);
			}
			else $this->canEdit = true;
		}
		return $this->canEdit;
	}

	/**
	 * The 4 character event type specified by GEDCom.
	 *
	 * @return string
	 */
	function getType() {
		if (is_null($this->type))
			$this->type=$this->getValue('TYPE');
		return $this->type;
	}

	/**
	 * The place where the event occured.
	 *
	 * @return string
	 */
	function getPlace() {
		if (is_null($this->place)) {
			$this->place=$this->getValue('PLAC');
		}
		return $this->place;
	}

	function getFamilyId() {
		return $this->getValue("_PGVFS");
	}

	function getSpouseId() {
		return $this->getValue("_PGVS");
	}

	/**
	 * Get the date object for this event
	 *
	 * @return GedcomDate
	 */
	function getDate($estimate = true) {
		if (is_null($this->date))
			$this->date=new GedcomDate($this->getValue('DATE'));

		if (!$estimate && $this->dest) return null;
		return $this->date;
	}

	/**
	 * Set the date of this event.  This method should only be used to force a date.
	 *
	 * @param GedcomDate $date
	 */
	function setDate(&$date) {
		$this->date = $date;
		$this->dest = true;
	}

	/**
	 * The remaining unparsed GEDCom record
	 *
	 * @return string
	 */
	function getGedcomRecord() {
		return $this->gedcomRecord;
	}

	/**
	 * The line number, or line of occurrence in the GEDCom record.
	 *
	 * @return unknown
	 */
	function getLineNumber() {
		return $this->lineNumber;
	}

	/**
	 *
	 */
	function getTag() {
		return $this->tag;
	}

	/**
	 * The Person/Family record where this Event came from
	 *
	 * @return GedcomRecord
	 */
	function getParentObject() {
		return $this->parentObject;
	}

	/**
	 *
	 */
	function setParentObject(&$parent) {
		$this->parentObject = $parent;
	}

	/**
	 *
	 */
	function getDetail() {
		return $this->detail;
	}

	/**
	 * Check whether this fact has information to display
	 * Checks for a date or a place
	 *
	 * @return boolean
	 */
	function hasDatePlace() {
		return ($this->getDate() || $this->getPlace());
	}

	function getLabel($abbreviate=false) {
		global $factarray, $factAbbrev;

		if (is_null($this->label))
			if (array_key_exists($this->tag, $factarray))
				$this->label=$factarray[$this->tag];
			else
				$this->label=$this->tag;
			// MARR_XXXX
			if ($this->GetType()) {
				$key = $this->tag."_".strtoupper($this->type);
				if (array_key_exists($key, $factarray))
					$this->label=$factarray[$key];
			}

		if ($abbreviate)
			if (isset ($factAbbrev[$this->tag])) return $factAbbrev[$this->tag];
			else return get_first_letter($this->label);
		else
			return $this->label;
	}

	/**
	 * Print a simple fact version of this event
	 *
	 * @param boolean $return	whether to print or return
	 * @param boolean $anchor	whether to add anchor to date and place
	 */
	function print_simple_fact($return=false, $anchor=false) {
		global $pgv_lang, $SHOW_PEDIGREE_PLACES, $factarray, $ABBREVIATE_CHART_LABELS;

		if (!$this->canShow()) return "";
		$data = "";
		if ($this->gedcomRecord != "1 DEAT"){
		   $data .= "<span class=\"details_label\">".$this->getLabel($ABBREVIATE_CHART_LABELS)."</span> ";
		}
		if ($this->canShowDetails()) {
			$emptyfacts = array("BIRT","CHR","DEAT","BURI","CREM","ADOP","BAPM","BARM","BASM","BLES","CHRA","CONF","FCOM","ORDN","NATU","EMIG","IMMI","CENS","PROB","WILL","GRAD","RETI","BAPL","CONL","ENDL","SLGC","EVEN","MARR","SLGS","MARL","ANUL","CENS","DIV","DIVF","ENGA","MARB","MARC","MARS","OBJE","CHAN","_SEPR","RESI", "DATA", "MAP");
			if (!in_array($this->tag, $emptyfacts))
				$data .= PrintReady($this->detail);
			if (!$this->dest)
				$data .= format_fact_date($this, $anchor, false, true);
			$data .= format_fact_place($this, $anchor, false, false);
		}
		$data .= "<br />\n";
		if (!$return) print $data;
		else return $data;
	}

/* Print a fact icon that varies by the decade, century, and subtype
 *
 * Many facts change over time.  Military uniforms, marriage dress, census forms.
 * This is a cutesy way to show the changes over time.  More icons need to be added
 * to the themes/?????/images/facts/ directory with a form of nn00_TYPE.gif or nnn0_TYPE.gif.
 * A special case of nn00_OCCU_FARM.gif has been added to celebrate farmers and farm hands.
 * A special case of nn00_OCCU_HOUS.gif has been added for KEEPing HOUSe or HOUSe KEEPers.
 * Generic subtyping is done by storing the first four characters of the value of the
 * record in a filename.  "1 RELI Methodist" is RELI_METH.gif or 1900_RELI_METH.gif.
 * 1960__MILI_CONF.gif would be Confederate soldier, and 1860__MILI_UNIO.gif would be
 * the counterpart Union soldier.  The most specific match wins.
 * Examples: 1900_CENS.gif 1910_CENS.gif 1900_OCCU_FARM.gif 1800_OCCU_FARM.gif
 */
 function Icon() {
		global $PGV_IMAGE_DIR;

		// Need the gregorian century/decade
		$date=$this->getDate();

		// If no year, use birth date as fallback
		if ($date->date1->y==0 && is_object($this->parentObject) && $this->parentObject->getType()=='INDI')
			$date=$this->parentObject->getEstimatedBirthDate();

		$gdate=new GregorianDate($date->MinDate());
		$century=floor($gdate->y/100).'00';
		$decade=floor($gdate->y/10).'0';

		$tag=$this->getTag();
		$dir="{$PGV_IMAGE_DIR}/facts";

		// Which era (century/decade)
		$eras=array("{$decade}_", "{$century}_", '');

		// Extra details, such as 1 OCCU Shoemaker or 1 RELI Catholic
		$detail=trim(strtoupper(substr($this->getDetail(),0,4)));
		if ($detail=='KEEP') // Keeping House => House Keeper
			$detail='HOUS';
		$details=array('_'.$detail, '');

		// Variations for different sexes
		if (is_object($this->parentObject) && $this->parentObject->getType()=='INDI')
			$sexes=array('_'.$this->parentObject->getSex(), '');
		else
			$sexes=array('');

		// Image naming structure is [era]tag[detail][sex].gif
		// e.g. 1860_OCCU_FARM_M.gif for a male farm-worker in the 1860s
		$image='';
		foreach ($eras as $era)
			foreach ($details as $detail)
				foreach ($sexes as $sex)
					if (file_exists("{$dir}/{$era}{$tag}{$detail}{$sex}.gif")) {
						$label=$this->getLabel();
						return "<img src=\"{$dir}/{$era}{$tag}{$detail}{$sex}.gif\" alt=\"{$label}\" title=\"{$label}\" align=\"middle\" />";
					}

		return '';
	}

	/**
	 * Static Helper functions to sort events
	 *
	 * @param Event $a
	 * @param Event $b
	 * @return int
	 */
	static function CompareDate(&$a, &$b) {
		$adate = $a->getDate();
		$bdate = $b->getDate();
		//-- non-dated events should sort according to the preferred sort order
		if (is_null($adate) && !is_null($a->sortDate)) $ret = $a->sortOrder - $b->sortOrder;
		else if (is_null($bdate) && !is_null($b->sortDate)) $ret = $a->sortOrder - $b->sortOrder;
		else $ret = GedcomDate::Compare($adate, $bdate);
		if ($ret==0) {
			$ret = $a->sortOrder - $b->sortOrder;
			//-- if dates are the same they should be ordered by their fact type
			if ($ret==0) $ret = Event::CompareType($a, $b);
		}
//		print "[".$a->getTag().":".$adate->isOK().":".$adate->MinJD()."-".$adate->MaxJD()." ".$b->getTag().":".$bdate->isOK().":".$bdate->MinJD()."-".$bdate->MaxJD()." ".$ret."] ";
		return $ret;
	}

	/**
	 * Static method to Compare two events by their type
	 *
	 * @param Event $a
	 * @param Event $b
	 * @return int
	 */
	static function CompareType(&$a, &$b) {
		global $factsort;

		if (empty($factsort))
			$factsort=array_flip(array(
				"BIRT",
				"_HNM",
				"ALIA", "_AKA", "_AKAN",
				"ADOP", "_ADPF", "_ADPF",
				"_BRTM",
				"CHR", "BAPM",
				"FCOM",
				"CONF",
				"BARM", "BASM",
				"EDUC",
				"GRAD",
				"_DEG",
				"EMIG", "IMMI",
				"NATU",
				"_MILI", "_MILT",
				"ENGA",
				"MARB", "MARC", "MARL", "_MARI", "_MBON",
				"MARR", "MARR_CIVIL", "MARR_RELIGIOUS", "MARR_PARTNERS", "MARR_UNKNOWN", "_COML",
				"_STAT",
				"_SEPR",
				"DIVF",
				"MARS",
				"_BIRT_CHIL",
				"DIV", "ANUL",
				"_BIRT_", "_MARR_", "_DEAT_","_BURI_", // other events of close relatives
				"CENS",
				"OCCU",
				"RESI",
				"PROP",
				"CHRA",
				"RETI",
				"FACT", "EVEN",
				"_NMR", "_NMAR", "NMR",
				"NCHI",
				"WILL",
				"_HOL",
				"_????_",
				"DEAT", "CAUS",
				"_FNRL", "BURI", "CREM", "_INTE", "CEME",
				"_YART",
				"_NLIV",
				"PROB",
				"TITL",
				"COMM",
				"NATI",
				"CITN",
				"CAST",
				"RELI",
				"SSN", "IDNO",
				"TEMP",
				"SLGC", "BAPL", "CONL", "ENDL", "SLGS",
				"AFN", "REFN", "_PRMN", "REF", "RIN",
				"ADDR", "PHON", "EMAIL", "_EMAIL", "EMAL", "FAX", "WWW", "URL", "_URL",
				"CHAN", "_TODO"
			));

		// Facts from same families stay grouped together
		// Keep MARR and DIV from the same families from mixing with events from other FAMs
		// Use the original order in which the facts were added
		if ($a->getFamilyId() && $b->getFamilyId() && $a->getFamilyId()!=$b->getFamilyId()) {
			return $a->sortOrder - $b->sortOrder;
		}

		$atag = $a->getTag();
		$btag = $b->getTag();

		// Events not in the above list get mapped onto one that is.
		if (!array_key_exists($atag, $factsort))
			if (preg_match('/^(_(BIRT|MARR|DEAT|BURI)_)/', $atag, $match))
				$atag=$match[1];
			else
				$atag="_????_";
		if (!array_key_exists($btag, $factsort))
			if (preg_match('/^(_(BIRT|MARR|DEAT|BURI)_)/', $btag, $match))
				$btag=$match[1];
			else
				$btag="_????_";

		//-- don't let dated after DEAT/BURI facts sort non-dated facts before DEAT/BURI
		//-- treat dated after BURI facts as BURI instead
		if ($a->getValue('DATE')!=NULL && $factsort[$atag]>$factsort['BURI'] && $factsort[$atag]<$factsort['CHAN']) $atag='BURI';
		$ret = $factsort[$atag]-$factsort[$btag];
		//-- if no sorting preference, then keep original ordering
		if ($ret==0) $ret = $a->sortOrder - $b->sortOrder;
		return $ret;
	}
}
?>

--- NEW FILE: class_menubar.php ---
<?php
/**
* System for generating menus.
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
[...1077 lines suppressed...]
					case 'OBJE':
						if (displayDetailsById($fav['gid'], $fav['type'])) {
							$obj=GedcomRecord::getInstance($fav['gid']);
							if ($obj) {
								$submenu=new Menu(PrintReady($obj->getFullName()), encode_url($obj->getLinkUrl()));
								$submenu->addClass('favsubmenuitem', 'favsubmenuitem_hover');
								$menu->addSubMenu($submenu);
							}
						}
						break;
					}
					$GEDCOM=$OLD_GEDCOM;
				}
			}
		}
		return $menu;
	}
}

?>

--- NEW FILE: class_phpmailer.php ---
<?php
/*~ class.phpmailer.php
.---------------------------------------------------------------------------.
|  Software: PHPMailer - PHP email class                                    |
|   Version: 2.2.1                                                          |
|   Contact: via sourceforge.net support pages (also http://www.codeworxtech.com)  |
|      Info: http://phpmailer.sourceforge.net                               |
|   Support: http://sourceforge.net/projects/phpmailer/                     |
| ------------------------------------------------------------------------- |
|    Author: Andy Prevost (project admininistrator)                         |
|    Author: Brent R. Matzelle (original founder)                           |
| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
| Copyright (c) 2001-2003, Brent R. Matzelle                                |
| ------------------------------------------------------------------------- |
|   License: Distributed under the Lesser General Public License (LGPL)     |
|            http://www.gnu.org/copyleft/lesser.html                        |
| This program is distributed in the hope that it will be useful - WITHOUT  |
| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
| FITNESS FOR A PARTICULAR PURPOSE.                                         |
[...1886 lines suppressed...]
		$str = str_replace("\r", "", $str);
		$str = str_replace("\n", "", $str);
		return $str;
	}

	/**
	* Set the private key file and password to sign the message.
	*
	* @access public
	* @param string $key_filename Parameter File Name
	* @param string $key_pass Password for private key
	*/
	public function Sign($cert_filename, $key_filename, $key_pass) {
		$this->sign_cert_file = $cert_filename;
		$this->sign_key_file = $key_filename;
		$this->sign_key_pass = $key_pass;
	}
}

?>

--- NEW FILE: class_smtp.php ---
<?php
/*~ class.smtp.php
.---------------------------------------------------------------------------.
|  Software: PHPMailer - PHP email class                                    |
|   Version: 2.2.1                                                          |
|   Contact: via sourceforge.net support pages (also http://www.codeworxtech.com)  |
|      Info: http://phpmailer.sourceforge.net                               |
|   Support: http://sourceforge.net/projects/phpmailer/                     |
| ------------------------------------------------------------------------- |
|    Author: Andy Prevost (project admininistrator)                         |
|    Author: Brent R. Matzelle (original founder)                           |
| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
| Copyright (c) 2001-2003, Brent R. Matzelle                                |
| ------------------------------------------------------------------------- |
|   License: Distributed under the Lesser General Public License (LGPL)     |
|            http://www.gnu.org/copyleft/lesser.html                        |
| This program is distributed in the hope that it will be useful - WITHOUT  |
| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
| FITNESS FOR A PARTICULAR PURPOSE.                                         |
[...1074 lines suppressed...]
			if($this->do_debug >= 4) {
				echo "SMTP -> get_lines(): \$data was \"$data\"" .
								$this->CRLF;
				echo "SMTP -> get_lines(): \$str is \"$str\"" .
								$this->CRLF;
			}
			$data .= $str;
			if($this->do_debug >= 4) {
				echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
			}
			// if the 4th character is a space then we are done reading
			// so just break the loop
			if(substr($str,3,1) == " ") { break; }
		}
		return $data;
	}

}

?>

--- NEW FILE: class_reporthtml.php ---
<?php
/**
 * HTML Report Generator
 *
 * used by the SAX parser to generate HTML reports from the XML report file.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Reports
 * @version $Id: class_reporthtml.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_REPORTHTML_PHP', '');

require_once 'includes/classes/class_reportbase.php';

/**
 * main PGV Report Class
 * @package PhpGedView
 * @subpackage Reports
 */
class PGVReport extends PGVReportBase {
	var $headerElements;
	var $pageHeaderElements;
	var $footerElements;
	var $bodyElements;
	var $X=0;
	var $Y=0;
	var $maxY = 0;
	var $currentStyle='';
	var $pageN = 1;
	var $printedfootnotes = array();

	function setup($pw, $ph, $pageSize, $o, $m, $showGenText=true) {
		global $pgv_lang;
		parent::setup($pw, $ph, $pageSize, $o, $m, $showGenText);

		$this->headerElements = array();
		$this->pageHeaderElements = array();
		$this->footerElements = array();
		$this->bodyElements = array();

		if ($showGenText) {
			$element = new PGVRCellHTML(0,10, "C", "");
			$element->addText("$pgv_lang[generated_by] ".PGV_PHPGEDVIEW." ".PGV_VERSION_TEXT);
			$element->setUrl(PGV_PHPGEDVIEW_URL);
			$this->footerElements[] = $element;
		}
	}

	function addPageHeader(&$element) {
		$this->pageHeaderElements[] = $element;
		return count($this->headerElements)-1;
	}

	function addElement(&$element) {
		if ($this->processing=="H") return $this->headerElements[] = $element;
		if ($this->processing=="PH") return $this->pageHeaderElements[] = $element;
		if ($this->processing=="F") return $this->footerElements[] = $element;
		if ($this->processing=="B") return $this->bodyElements[] = $element;
	}

	function runPageHeader() {
		foreach($this->pageHeaderElements as $indexval => $element) {
			if (is_string($element) && $element=="footnotetexts") $this->Footnotes();
			else if (is_string($element) && $element=="addpage") $this->AddPage();
			else if (is_object($element)) $element->render($this);
		}
	}

	function Footnotes() {
		$this->currentStyle = "";
		if(!empty($this->printedfootnotes)){
			print "<br/>";
			foreach($this->printedfootnotes as $indexval => $element) {
				$element->renderFootnote($this);
			}
		}
	}

	function run() {
		global $download, $embed_fonts, $CHARACTER_SET, $TEXT_DIRECTION, $rtl_stylesheet;
		global $waitTitle;

		header("Content-Type: text/html; charset=$CHARACTER_SET");
		print "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
		print "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\t<head>\n\t\t";
		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=$CHARACTER_SET\" />\n";

		// Delay all output until we've seen a page header
		ob_start();
		$waitTitle = true;

		print "<style type=\"text/css\">\n";
		$this->PGVRStyles['footer'] = array('name'=>'footer', 'font'=>'Arial', 'size'=>'10', 'style'=>'');
		foreach($this->PGVRStyles as $class=>$style) {
			$styleAdd = "";
			if (strstr($style['style'], 'B')!==false) $styleAdd .= " font-weight: bold;";
			if (strstr($style['style'], 'U')!==false) $styleAdd .= " text-decoration: underline;";
			if ($style['font']=='') $style['font'] = 'Arial';
			else if ($style['font']=='dejavusans') $style['font'] = 'Arial';
			print ".".$class." {\n";
			print "font-size: ".($style['size'])."pt;\n";
			print "font-family: ".$style['font'].";\n";
			print $styleAdd."\n";
			print "}\n";
		}
		//-- testing setting text direction
		if ($TEXT_DIRECTION=="rtl") {
?>
body {
	direction: rtl;
	text-align: right;
}
html {
	direction: rtl;
	white-space: normal;
}
<?php
		}
		print "</style>\n";
		// print "</head>\n<body direction>\n";
		print "</head>\n<body>\n";
		if (!isset($this->currentStyle)) $this->currentStyle = "";
		$temp = $this->currentStyle;
		//-- header
		print "<div id=\"headerdiv\" style=\"position: relative; top: auto; width: 100%;\">\n";
		foreach($this->headerElements as $indexval => $element) {
			if (is_string($element) && $element=="footnotetexts") $this->Footnotes();
			else if (is_string($element) && $element=="addpage") $this->AddPage();
			else $element->render($this);
		}
		print "</div>\n";
		print "<script type=\"text/javascript\">\ndocument.getElementById('headerdiv').style.height='".($this->Y)."pt';\n</script>\n";
		//-- body

		$oldy = $this->Y;
		$this->Y=0;
		$this->maxY=0;
		$this->runPageHeader();
		print "<div id=\"bodydiv\" style=\"position: relative; top: auto; width: 100%; height: 100%;\">\n";
		$this->currentStyle = "";
		foreach($this->bodyElements as $indexval => $element) {
			if (is_string($element) && $element=="footnotetexts") $this->Footnotes();
			else if (is_string($element) && $element=="addpage") $this->AddPage();
			else if (is_object($element)) $element->render($this);
		}
		print "</div>\n";
		print "<script type=\"text/javascript\">\ndocument.getElementById('bodydiv').style.height='".($this->maxY+2)."pt';\n</script>\n";

		if (isset($waitTitle) && $waitTitle) {
			// We haven't found a page title: take default action
			$contents = ob_get_clean();
			echo "<title>Unknown title</title>\n";
			echo $contents;
			$waitTitle = false;
			unset ($contents);
		}
		//-- footer
//		$this->SetY(-36);
		$oldy = $this->Y;
		$this->Y=0;
		$this->X=0;
		$this->maxY=0;
		print "<div id=\"footerdiv\" style=\"position: relative; top: auto; width: 100%; height: auto;\">\n";
		$this->currentStyle = "footer";
		foreach($this->footerElements as $indexval => $element) {
			if (is_string($element) && $element=="footnotetexts") $this->Footnotes();
			else if (is_string($element) && $element=="addpage") $this->AddPage();
			else if (is_object($element)) $element->render($this);
		}
		$this->currentStyle = $temp;
		print "</div>\n";

		print "<script type=\"text/javascript\">\ndocument.getElementById('footerdiv').style.height='".($this->maxY+2)."pt';\n</script>\n";
		print "</body>\n</html>\n";
	}

	function getStyle($s) {
		if (!isset($this->PGVRStyles[$s]) || $s=='') {
			$s = $this->currentStyle;
			if (empty($s)) {
				$s = 'footer';
			}
			$this->PGVRStyles[$s] = $s;
		}
		return $this->PGVRStyles[$s];
	}

	function getCurrentStyle() {
		return $this->currentStyle;
	}

	function setCurrentStyle($s) {
		$this->currentStyle = $s;
		//$style = $this->getStyle($s);
		//print_r($style);
		//$this->SetFont($style["font"], $style["style"], $style["size"]);
	}

	function GetX() {
		return $this->X;
	}

	function GetY() {
		return $this->Y;
	}

	function SetXY($x, $y) {
		$this->X = $x;
		$this->Y = $y;
		if ($this->maxY<$y) $this->maxY=$y;
	}

	function SetY($y) {
		$this->Y = $y;
		if ($this->maxY<$y) $this->maxY=$y;
	}

	function SetX($x) {
		$this->X = $x;
	}

	function AddPage() {
		$this->pageN++;
	}

	function PageNo() {
		return $this->pageN;
	}

	function getMaxWidth() {
		$w = (($this->pagew * 72) - ($this->margin)) - $this->X;
		return $w;
	}

	function getPageHeight() {
		return ($this->pageh*72)-$this->margin;
	}

	function clearPageHeader() {
		$this->pageHeaderElements = array();
	}

	function createCell($width, $height, $align, $style, $top=".", $left=".") {
		return new PGVRCellHTML($width, $height, $align, $style, $top, $left);
	}

	function createTextBox($width, $height, $border, $fill, $newline, $left=".", $top=".", $pagecheck="true") {
		return new PGVRTextBoxHTML($width, $height, $border, $fill, $newline, $left, $top, $pagecheck);
	}

	function createText($style, $color) {
		return new PGVRTextHTML($style, $color);
	}

	function createFootnote($style="") {
		return new PGVRFootnoteHTML($style);
	}

	function createPageHeader() {
		return new PGVRPageHeaderHTML();
	}

	function createImage($file, $x, $y, $w, $h) {
		return new PGVRImageHTML($file, $x, $y, $w, $h);
	}

	function createLine($x1, $y1, $x2, $y2) {
		return new PGVRLineHTML($x1, $y1, $x2, $y2);
	}

	function checkFootnote(&$footnote) {
		for($i=0; $i<count($this->printedfootnotes); $i++) {
			if ($this->printedfootnotes[$i]->getValue() == $footnote->getValue()) {
				return $this->printedfootnotes[$i];
			}
		}
		$footnote->setNum(count($this->printedfootnotes)+1);
		//$link = $this->AddLink();
		//$footnote->setAddlink($link);
		$this->printedfootnotes[] = $footnote;
		return false;
	}

	function getFootnotesHeight() {
		$h=0;
		foreach($this->printedfootnotes as $indexval => $element) {
			$h+=$element->getFootnoteHeight($this);
		}
		return $h;
	}

	function write($text, $color='') {
		global $waitTitle;
		$style = $this->getStyle($this->getCurrentStyle());

		// Look for first occurrence of a page header,
		// and use this to complete the HTML <title> tag
		if (isset($waitTitle) && $waitTitle && $style['name']=='header') {
			$contents = ob_get_clean();
			echo '<title>', PrintReady(strip_tags($text)), "</title>\n";
			echo $contents;
			$waitTitle = false;		// We're no longer waiting for a page header
			unset ($contents);
		}
		$styleAdd = "";
		if (!empty($color)) $styleAdd .= "color: ".$color.";";
		if ($style['font']=='') $style['font'] = 'Arial';
		print "<span class=\"".$style['name']."\"";
		if (!empty($styleAdd)) print " style=\"".$styleAdd."\"";
		print ">";
		print nl2br(PrintReady($text, false, false));
		print "</span>";
	}

	function getStringWidth($text) {
		$style = $this->getStyle($this->currentStyle);
		return strlen($text)*($style['size']/2);
	}

	function getCurrentStyleHeight() {
		if (empty($this->currentStyle)) return 12;
		$style = $this->getStyle($this->currentStyle);
		return $style["size"];
	}
} //-- end PGVReport

$pgvreport = new PGVReport();
$PGVReportRoot = $pgvreport;

/**
 * Cell element
 */
class PGVRCellHTML extends PGVRCell {

	function PGVRCellHTML($width, $height, $align, $style, $top=".", $left=".") {
		parent::PGVRCell($width, $height, $align, $style, $top, $left);
	}

	function render(&$pdf) {
		global $TEXT_DIRECTION, $embed_fonts;
		if (strstr($this->text, "{{nb}}")!==false) return;
		/* -- commenting out because it causes too many problems
		if ($TEXT_DIRECTION=='rtl') {
			if ($this->align=='L') $this->align='R';
			else if ($this->align=='R') $this->align='L';
		}*/
		if ($pdf->getCurrentStyle()!=$this->styleName)
			$pdf->setCurrentStyle($this->styleName);
		$temptext = preg_replace("/#PAGENUM#/", $pdf->PageNo(), $this->text);
		//$temptext = preg_replace("/#PAGENUM#/", 1, $this->text);
		$curx = $pdf->GetX();
		$cury = $pdf->GetY();
		if (($this->top!=".")||($this->left!=".")) {
			if ($this->top==".") $this->top = $cury;
			if ($this->left==".") $this->left = $curx;
			$pdf->SetXY($this->left, $this->top);
		}
		switch($this->align) {
			case 'R':
				$align = "right";
				break;
			case 'C':
				$align = "center";
				break;
			default:
				$align = "left";
				break;
		}
		if ($this->top==".") $this->top = $pdf->GetY();
		$this->top .= "pt";
		if ($this->left==".") $this->left = $pdf->GetX();
		$this->left .= "pt";
		print "<div style=\"position: absolute; top: ".$this->top."; left: ".$this->left."; ";
		if ($this->width>0) print "width: ".$this->width."pt; ";
		else print "width: ".$pdf->getMaxWidth()."pt; ";
		if ($this->height>0) {
			print "height: ".$this->height."pt; ";
			$pdf->SetY($pdf->GetY()+$this->height);
		}
		print "text-align: ".$align.";\">\n";

		if (!empty($url)) print "<a href=\"$url\">";
		//print $temptext;
		$pdf->write($temptext);
		if (!empty($url)) print "</a>";
		print "</div>\n";

	}
}

class PGVRHtmlPDF extends PGVRHtml {

	function PGVRHtmlPDF($tag, $attrs) {
		parent::PGVRHtml($tag, $attrs);
	}

	function render(&$pdf, $sub = false) {
		global $TEXT_DIRECTION, $embed_fonts;
		//print "[".$this->text."] ";

		if (!empty($this->attrs['pgvrstyle'])) $pdf->setCurrentStyle($this->attrs['pgvrstyle']);

		$this->text = $this->getStart().$this->text;
		foreach($this->elements as $k=>$element) {
			if (is_string($element) && $element=="footnotetexts") $pdf->Footnotes();
			else if (is_string($element) && $element=="addpage") $pdf->AddPage();
			else if ($element->get_type()=='PGVRHtml') {
//				$this->text .= $element->getStart();
				$this->text .= $element->render($pdf, true);
			}
			else $element->render($pdf);
		}
		$this->text .= $this->getEnd();
		if ($sub) return $this->text;
//		print "[".htmlentities($this->text,ENT_COMPAT,'UTF-8')."] ";
		print $this->text;
	}

}

/**
 * TextBox element
 */
class PGVRTextBoxHTML extends PGVRTextBox {

	function PGVRTextBoxHTML($width, $height, $border, $fill, $newline, $left=".", $top=".", $pagecheck="true") {
		parent::PGVRTextBox($width, $height, $border, $fill, $newline, $left, $top, $pagecheck);
	}

	function render(&$pdf) {
		global $lastheight;

		if (!empty($lastheight)) {
			if ($this->height < $lastheight) $this->height = $lastheight;
		}

		$startX = $pdf->GetX();
		$startY = $pdf->GetY();
//		if (!empty($this->fill)) {
//			$ct = preg_match("/#?(..)(..)(..)/", $this->fill, $match);
//			if ($ct>0) {
//				$this->style .= "F";
////				$r = hexdec($match[1]);
////				$g = hexdec($match[2]);
////				$b = hexdec($match[3]);
//				//$pdf->SetFillColor($r, $g, $b);
//			}
//		}
		if ($this->width==0) {
			$this->width = $pdf->getMaxWidth();
		}

		$newelements = array();
		$lastelement = "";
		//-- collapse duplicate elements
		for($i=0; $i<count($this->elements); $i++) {
			$element = $this->elements[$i];
			if (is_object($element)) {
				if ($element->get_type()=="PGVRText") {
					if (empty($lastelement)) $lastelement = $element;
					else {
						if ($element->getStyleName()==$lastelement->getStyleName()) {
							$lastelement->addText(preg_replace("/\n/", "<br />", $element->getValue()));
						}
						else {
							if (!empty($lastelement)) {
								$newelements[] = $lastelement;
								$lastelement = $element;
							}
						}
					}
				}
				//-- do not keep empty footnotes
				else if (($element->get_type()!="PGVRFootnote")||(trim($element->getValue())!="")) {
					if (!empty($lastelement)) {
						$newelements[] = $lastelement;
						$lastelement = "";
					}
					$newelements[] = $element;
				}
			}
			else {
				if (!empty($lastelement)) {
					$newelements[] = $lastelement;
					$lastelement = "";
				}
				$newelements[] = $element;
			}
		}
		if (!empty($lastelement)) $newelements[] = $lastelement;
		$this->elements = $newelements;

		//-- calculate the text box height
		$h = 0;
		$w = 0;
		for($i=0; $i<count($this->elements); $i++) {
			if (is_object($this->elements[$i])) {
				$ew = $this->elements[$i]->setWrapWidth($this->width-$w, $this->width);
				if ($ew==$this->width) $w=0;
				//-- $lw is an array 0=>last line width, 1=1 if text was wrapped, 0 if text did not wrap
				$lw = $this->elements[$i]->getWidth($pdf);
				if ($lw[1]==1) $w = $lw[0];
				else if ($lw[1]==2) $w=0;
				else $w += $lw[0];
				if ($w>$this->width) $w = $lw[0];
				$eh = $this->elements[$i]->getHeight($pdf);
				//if ($eh>$h) $h = $eh;
				//else if ($lw[1]) $h+=$eh;
				$h+=abs($eh);
			}
			else {
				$h += abs($pdf->getFootnotesHeight());
			}
		}
		if ($h>$this->height) $this->height=$h;
		//if (($this->width>0)&&($this->width<$w)) $this->width=$w;

		$curx = $pdf->GetX();
		$cury = $pdf->GetY();
		$curn = $pdf->PageNo();
		if (($this->top!=".")||($this->left!=".")) {
			if ($this->top==".") $this->top = $cury;
			if ($this->left==".") $this->left = $curx;
			$pdf->SetXY($this->left, $this->top);
			$startY = $this->top;
			$startX = $this->left;
			$cury = $startY;
			$curx = $startX;
		}

		$newpage = false;
		if ($this->pagecheck) {
			$ph = $pdf->getPageHeight();
			if ($pdf->GetY()+$this->height > $ph) {
				if ($this->border==1) {
					//print "HERE2";
					$pdf->AddPage();
					$newpage = true;
					$startX = $pdf->GetX();
					$startY = $pdf->GetY();
				}
				else if ($pdf->GetY()>$ph-36) {
					//print "HERE1";
					$pdf->AddPage();
					$startX = $pdf->GetX();
					$startY = $pdf->GetY();
				}
				else {
					//print "HERE3";
					$th = $this->height;
					$this->height = ($ph - $pdf->GetY())+36;
					$newpage = true;
				}
			}
		}

		print "<div style=\"position: absolute; padding-left: 1pt; left: ".$pdf->GetX()."pt; top: ".$pdf->GetY()."pt; width: ".($this->width-1)."pt; height: ".$this->height."pt;";
		if (!empty($this->fill)) {
			print " background-color: ".$this->fill.";";
		}
		if ($this->border>0) {
			print " border: solid black ".$this->border."px;";
		}
		print "\">\n";
		$pdf->SetXY($pdf->GetX(), $pdf->GetY()+1);
		$curx = $pdf->GetX();
		foreach($this->elements as $indexval => $element) {
			if (is_string($element) && $element=="footnotetexts") $pdf->Footnotes();
			else if (is_string($element) && $element=="addpage") $pdf->AddPage();
			else $element->render($pdf, $curx);
		}
		print "</div>\n";
		if ($curn != $pdf->PageNo()) $cury = $pdf->GetY();
		if ($this->newline) {
			$lastheight = 0;
			$ty = $pdf->GetY();
			//if ($curn != $pdf->PageNo()) $ny = $cury+$pdf->getCurrentStyleHeight();
			//else
			$ny = $cury+$this->height;
			if ($ty > $ny) $ny = $ty;
			$pdf->SetY($ny+1);
			$pdf->SetX(0);
			//print "<br />\n";
			//Here1 ty:71 ny:185 cury:169
			//print "Here1 ty:$ty ny:$ny cury:$cury ";
		}
		else {
			//print "Here2 ";
			$ty = $pdf->GetY()-1;
			if (($ty > $startY) && ($ty < $startY + $this->height)) $ty = $startY;
			$pdf->SetXY($curx+$this->width, $ty);
			$lastheight = $this->height;
		}
	}
}

/**
 * Text element
 */
class PGVRTextHTML extends PGVRText {

	function PGVRTextHTML($style, $color) {
		parent::PGVRText($style, $color);
	}

	function render(&$pdf, $curx=0) {
		global $embed_fonts;
		$pdf->setCurrentStyle($this->styleName);
		$temptext = preg_replace("/#PAGENUM#/", $pdf->PageNo(), $this->text);
		//print $this->text;
		$x = $pdf->GetX();
		$cury = $pdf->GetY();

		$pdf->write($temptext, $this->color);

	}

	function getHeight(&$pdf) {
		$ct = substr_count($this->text, "\n");
		if ($ct>0) $ct+=1;
		$style = $pdf->getStyle($this->styleName);
		$h = (($style["size"]+2)*$ct);
		//print "[".$this->text." $ct $h]";
		return $h;
	}

	function getWidth(&$pdf) {
		$pdf->setCurrentStyle($this->styleName);
		if (!isset($this->text)) $this->text = "";
		$lw = $pdf->GetStringWidth($this->text);
		if ($this->wrapWidth > 0) {
			if ($lw > $this->wrapWidth) {
				$lines = explode("\n", $this->text);
				$newtext = "";
				$wrapwidth = $this->wrapWidth;
				$i=0;
				foreach($lines as $indexval => $line) {
					$w = $pdf->GetStringWidth($line)+10;
					if ($w>$wrapwidth) {
						$words = explode(' ', $line);
						$lw = 0;
						foreach($words as $indexval => $word) {
							$lw += $pdf->GetStringWidth($word." ");
							if ($lw <= $wrapwidth) $newtext.=$word." ";
							else {
								//print "NEWLNE $word\n";
								$lw = $pdf->GetStringWidth($word." ");
								$newtext .= "\n$word ";
								$wrapwidth = $this->wrapWidth2;
							}
						}
						$newtext .= "\n";
					}
					else {
						if ($i>0) $newtext .= "\n";
						$newtext .= $line;
					}
					$i++;
				}
				$this->text = $newtext;
				//$this->text = preg_replace("/\n/", "\n~", $this->text);
				//print $this->wrapWidth." $lw [".$this->text."]1 ";
				return array($lw, 1);
			}
		}
		$l = 0;
		if (preg_match("/\n$/", $this->text)>0) $l=2;
		//print $this->wrapWidth." $lw [".$this->text."]$l ";
		return array($lw, $l);
	}
}

/**
 * Footnote element
 */
class PGVRFootnoteHTML extends PGVRFootnote {
	var $styleName;
	var $addlink;
	var $num;

	function PGVRFootnoteHTML($style="") {
		parent::PGVRFootnote($style);
	}

	function render(&$pdf) {
		global $footnote_count, $embed_fonts;

		$fn = $pdf->checkFootnote($this);
		if ($fn===false) {
			$pdf->setCurrentStyle("footnotenum");
//			$pdf->Write($pdf->getCurrentStyleHeight(),$this->num." ", $this->addlink);
			print "<sup><a href=\"#footnote".$this->num."\">";
			$pdf->write($this->num." ");
			print "</a></sup>\n";
		}
		else {
			$fn->rerender($pdf);
		}
	}

	function rerender(&$pdf) {
		global $footnote_count;
		if (empty($this->num)) {
			if (empty($footnote_count)) $footnote_count = 1;
			else $footnote_count++;

			$this->num = $footnote_count;
		}
		$pdf->setCurrentStyle("footnotenum");
		print "<a href=\"#footnote".$this->num."\">";
		$pdf->write($this->num." ");
		print "</a>";
	}

	function renderFootnote(&$pdf) {
		global $embed_fonts;
		if ($pdf->getCurrentStyle()!=$this->styleName)
			$pdf->setCurrentStyle($this->styleName);
		$temptext = preg_replace("/#PAGENUM#/", $pdf->PageNo(), $this->text);

		print "<a name=\"footnote".$this->num."\">".$this->num.". ";
		$pdf->write($temptext);
		print "</a><br/>\n<br />\n";
		$pdf->SetXY(0,$pdf->GetY()+$this->getFootnoteHeight($pdf));
	}

	function getFootnoteHeight(&$pdf) {
		$ct = substr_count($this->text, "\n");
		$ct+=3;
		$style = $pdf->getStyle($this->styleName);
		$h = round(($style["size"]+3.2)*$ct);
		return $h;
	}
}

/**
 * PageHeader element
 */
class PGVRPageHeaderHTML extends PGVRPageHeader {
	function PGVRPageHeaderHTML() {
		parent::PGVRPageHeader();
	}

	function render(&$pdf) {
		$pdf->clearPageHeader();
		foreach($this->elements as $indexval => $element) {
			$pdf->addPageHeader($element);
		}
	}
}

/**
 * image element
 */
class PGVRImageHTML extends PGVRImage {

	function PGVRImageHTML($file, $x, $y, $w, $h) {
		parent::PGVRImage($file, $x, $y, $w, $h);
	}

	function render(&$pdf) {
		global $lastpicbottom, $lastpicpage, $lastpicleft, $lastpicright;;
		if ($this->x==0) $this->x=$pdf->GetX();
		if ($this->y==0) {
			//-- first check for a collision with the last picture
			if (isset($lastpicbottom)) {
				if (($pdf->PageNo()==$lastpicpage)&&($lastpicbottom >= $pdf->GetY())&&($this->x>=$lastpicleft)&&($this->x<=$lastpicright))
					$pdf->SetY($lastpicbottom+5);
			}
			$this->y=$pdf->GetY();
		}
		//$pdf->Image($this->file, $this->x, $this->y, $this->width, $this->height);
		print "<img src=\"$this->file\" style=\"position: absolute; left: ".$this->x."pt; top: ".$this->y."pt; width: ".$this->width."pt; height: ".$this->height."pt;\" alt=\"\" />\n";
		$lastpicbottom = $this->y + $this->height;
		$lastpicpage = $pdf->PageNo();
		$lastpicleft=$this->x;
		$lastpicright=$this->x+$this->width;
	}


	function getHeight(&$pdf) {
		return $this->height;
	}

	function getWidth(&$pdf) {
		return $this->width;
	}
} //-- END PGVRImage

/**
 * line element
 */
class PGVRLineHTML extends PGVRLine {
	function PGVRLineHTML($x1, $y1, $x2, $y2) {
		parent::PGVRLine($x1, $y1, $x2, $y2);
	}
	function render(&$pdf) {
		if ($this->x1==".") $this->x1=$pdf->GetX();
		if ($this->y1==".") $this->y1=$pdf->GetY();
		if ($this->x2==".") $this->x2=$pdf->GetX();
		if ($this->y2==".") $this->y2=$pdf->GetY();
		// TODO Non verticle or horizontal lines can use a series of divs absolutely positioned
		if ($this->x1 == $this->x2) {
			print "<div style=\"position: absolute; overflow: hidden; border-left: solid black 1px; left: ".($this->x1-3)."pt; top: ".($this->y1+1)."pt; width: 1pt; height: ".($this->y2-$this->y1)."pt;\"> </div>";
		}
		if ($this->y1==$this->y2) {
			print "<div style=\"position: absolute; overflow: hidden; border-top: solid black 1px; left: ".($this->x1-3)."pt; top: ".($this->y1+1)."pt; width: ".($this->x2-$this->x1)."pt; height: 1pt;\"> </div>";
		}
	}
} //-- END PGVRLine

?>

--- NEW FILE: class_mutex.php ---
<?php
/**
 * Mutex Class
 *
 * This class provides a simple mutex lock
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @version $Id: class_mutex.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 * @author John Finlay
 * @package PhpGedView
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_MUTEX_PHP', '');

class Mutex {
	var $name; 	//-- the name of the mutex
	var $waitCount;	//-- the number of cycles it we waited while trying to acquire the mutex

	function checkDBCONN() {
		global $DBCONN, $CONFIGURED;

		if (!isset($DBCONN) || DB::isError($DBCONN)) {
			if ($CONFIGURED) {
				//-- fix bad configuration prevents edit config page from loading
				//die("Cannot use mutex without database");
				$CONFIGURED = false;
			}
			return false;
		}
		return true;
	}
	/**
	 * Create a mutex for enforcing mutual exclusion
	 *
	 * @param string $name	the system wide name of the mutex
	 * @param boolane $acquire	whether or not to acquire the mutex after it is created
	 * @return Mutex
	 */
	function Mutex($name, $acquire=false) {
		global $DBCONN, $TBLPREFIX;

		if (!Mutex::checkDBCONN()) return false;
		$this->name = $name;
		//-- check if this mutex already exists
		$sql="SELECT 1 FROM {$TBLPREFIX}mutex WHERE mx_name='".$DBCONN->escapeSimple($name)."'";
		$res=dbquery($sql);
		if (DB::isError($res)) return false;
		$num_rows=$res->numRows();
		$res->free();
		//-- mutex doesn't exist so create it
		if ($num_rows==0) {
			$sql = "INSERT INTO {$TBLPREFIX}mutex (mx_id, mx_name, mx_thread) VALUES (".get_next_id("mutex", "mx_id").", '".$DBCONN->escapeSimple($this->name)."', '0')";
			$res = dbquery($sql);
		}
		$this->waitCount = 0;
		if ($acquire) $this->Wait();
	}

	/**
	 * Try to acquire the mutex.  Block the thread if it cannot obtain it.
	 *
	 * @param int $time		[optional] parameter to only wait for $time secs before giving up
	 * @return boolean		true if successful, false if failed
	 */
	function Wait($time=-1) {
		global $DBCONN, $TBLPREFIX;

		if (!Mutex::checkDBCONN()) return false;
		//-- check if mutex is available
		$available = false;
		while(!$available) {
			//-- do not allow a thread to hold the mutex for more than 5 minutes (300 secs), should not be a problem with PHP
			//--- this will allow another thread to access the mutex if another thread that held it crashed
			//-- allow the same session to get the mutex more than once
			$sql = "SELECT 1 FROM {$TBLPREFIX}mutex WHERE mx_name='".$DBCONN->escapeSimple($this->name)."' AND (mx_thread='0' OR mx_thread='".session_id()."' OR mx_time < ".(time()-300).")";
			$res = dbquery($sql);
			if (DB::isError($res)) return false;
			if ($res->numRows() > 0) {
				$available = true;
			}
			//-- sleep for 1 second between checks
			else {
				if ($time==0) return false;
				else $time--;
				$this->waitCount++;
				sleep(1);
			}
			$res->free();
		}

		$sql = "UPDATE {$TBLPREFIX}mutex SET mx_time=".time().", mx_thread='".session_id()."' WHERE mx_name='".$DBCONN->escapeSimple($this->name)."'";
		$res = dbquery($sql);
		return true;
	}

	/**
	 * Release the mutex previously acquired
	 *
	 */
	function Release() {
		global $DBCONN, $TBLPREFIX;

		if (!Mutex::checkDBCONN()) return false;

		$sql = "UPDATE {$TBLPREFIX}mutex SET mx_time=0, mx_thread='0' WHERE mx_name='".$DBCONN->escapeSimple($this->name)."' AND mx_thread='".session_id()."'";
		$res = dbquery($sql);
		$this->waitCount = 0;
//		print "releasing mutex ".$this->name;
	}

	/**
	 * Get the number of times thread waited to acquire mutex
	 *
	 * @return int
	 */
	function getWaitCount() {
		return $this->waitCount;
	}

	/**
	 * Get the name of this mutex
	 *
	 * @return string
	 */
	function getName() {
		return $this->name;
	}
}
?>

--- NEW FILE: class_grampsexport.php ---
<?php

/**
 * Gramps Export
 * An abstract class that has the basic methods for exporting GRAMPS XML implemented.
 * The class is not tied to any particlular web page(or GUI) and needs to be inherited for proper use
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,b-
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 *
 *
 * @package PhpGedView
 *
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_GRAMPSEXPORT_PHP', '');

 /*
  * This is an abstract class and should only be used through its subclasses, all
  * of which are prefixed by GE.
  */

class GrampsExport {

	var $mediaFiles = array(),$i;
	var $dom, $ePeople, $eFams, $eSources, $ePlaces, $eObject, $eEvents;
	var $familyevents = array (
	"ANUL",
	"CENS",
	"DIV",
	"DIVF",
	"ENGA",
	"MARR",
	"MARB",
	"MARC",
	"MARL",
	"MARS"
);
	var $eventsArray = array (
	"ADOP",
	"BIRT",
	"BAPM",
	"BARM",
	"BASM",
	"BLES",
	"BURI",
	"CENS",
	"CHR",
	"CHRA",
	"CONF",
	"CREM",
	"DEAT",
	"EMIG",
	"FCOM",
	"GRAD",
	"IMMI",
	"NATU",
	"ORDN",
	"RETI",
	"PROB",
	"WILL",
	"EVEN"
);
/**
 * Creates the root elements for the GRAMPS XML file.
 *
 * The methods adds all the root elements and appends them to a DOMDocument.
 */
	function begin_xml() {
		global $pgv_lang, $factarray;//, $eventsArray, $dom, $ePeople, $this->eFams, $eSources, $ePlaces, $eObject;
		$user = PGV_USER_NAME;

		$this->dom = new DomDocument("1.0", "UTF-8");
		$this->dom->formatOutput = true;

		$eRoot = $this->dom->createElementNS("http://gramps-project.org/xml/1.1.0/", "database");
		$eRoot = $this->dom->appendChild($eRoot);

		$eHeader = $this->dom->createElement("header");
		$eHeader = $eRoot->appendChild($eHeader);

		$eCreated = $this->dom->createElement("created");
		$eCreated = $eHeader->appendChild($eCreated);
		$eCreated->setAttribute("date", date("Y-m-d"));
		$eCreated->setAttribute("version", "1.1.2.6");

		$eResearcher = $this->dom->createElement("researcher");
		$eResname = $this->dom->createElement("resname");
		$etResname = $this->dom->createTextNode(getUserFullName($user));
		$etResname = $eResname->appendChild($etResname);
		$eResname = $eResearcher->appendChild($eResname);
		$eResemail = $this->dom->createElement("resemail");
		$etResemail = $this->dom->createTextNode(get_user_setting($user, 'email'));
		$etResemail = $eResemail->appendChild($etResemail);
		$eResemail = $eResearcher->appendChild($eResemail);
		$eResearcher = $eHeader->appendChild($eResearcher);

		$this->eEvents = $this->dom->createElement("events");
		$this->eEvents = $eRoot->appendChild($this->eEvents);

		$this->ePeople = $this->dom->createElement("people");
		$this->ePeople = $eRoot->appendChild($this->ePeople);

		$this->eFams = $this->dom->createElement("families");
		$this->eFams = $eRoot->appendChild($this->eFams);

		$this->eSources = $this->dom->createElement("sources");
		$this->eSources = $eRoot->appendChild($this->eSources);

		$this->ePlaces = $this->dom->createElement("places");
		$this->ePlaces = $eRoot->appendChild($this->ePlaces);

		$this->eObject = $this->dom->createElement("objects");
		$this->eObject = $eRoot->appendChild($this->eObject);
	}

	/**
	 * Creates the date elements used throughout the GRAMPS XML file.
	 * The function will parse the date record and determine the type of date
	 * (regular, range).
	 *
	 * @param DOMObject $eParent - The parent element the date should be attached to
	 * @param string $dateRec - the entire GEDCOM date record to be parsed
	 * @param int $level - the level the date record was found on in the GEDCOM
	 * @param int $done - whether the method is called from the GrampsExport($done=1) or a sub-class
	 */
	function create_date($eParent, $dateRec, $level) {
		if (empty($dateRec)) return;
		$date = new GedcomDate(get_gedcom_value("DATE", $level, $dateRec, '', false));

		//checks to see if there's is a 2nd date value and creates the daterange element
		if (!empty($date->qual2)) {
			$eDateRange = $this->dom->createElement("daterange");
			$eDateRange = $eParent->appendChild($eDateRange);

			//sets the start date
			$eDateRange->setAttribute("start", $this->create_date_value($date->MinDate()));

			//sets the stop date
			$eDateRange->setAttribute("stop", $this->create_date_value($date->MaxDate()));
		} else {
			//if there's no dateRange, this creates the normal dateval Element
			$eDateVal = $this->dom->createElement("dateval");
			$eDateVal = $eParent->appendChild($eDateVal);

			//checks for the Type attribute values
			switch ($date->qual1) {
			case 'bef':
				$eDateVal->setAttribute("type", "before");
				break;
			case 'aft':
				$eDateVal->setAttribute("type", "after");
				break;
			case 'abt':
				$eDateVal->setAttribute("type", "about");
				break;
			}

			//sets the date value
			$eDateVal->setAttribute("val", $this->create_date_value($date->MinDate()));
		}
	}

	/**
	 * Returns all the path to all media files that were used in the family, people, source in the created GRAMPS XML
	 */
	function get_all_media() {
		return $this->mediaFiles;
	}

	/**
	 * Convert a date to the GRAMPS date format
	 * @param CalendarDate $date - a date to convert
	 */
	function create_date_value($date) {
		// Since no calendar is specified, should we always convert to gregorian?
		$date=$date->convert_to_cal('gregorian');
		return
			($date->y==0 ? '????' : $date->Format('Y')) .'-'.
			($date->m==0 ? '??'   : $date->Format('m')) .'-'.
			($date->d==0 ? '??'   : $date->Format('d'));
	}

	/**
	 * Creates a reference(handle) for xml element to element in the events element of the root element
	 * If such an element does not exists it is created using create_event method.
	 * @param DOMElement $eParent - the parent you want to apend the elemnt to
	 * @param GEDCOM record $personrec - the record use to get more information about the event(used when the event is being created)
	 * @param int $event - the $event record
	 */
	function create_event_ref($eParent, $personrec, $event)
	{
		if (($eventRec = get_sub_record(1, "1 " . $event, $personrec)) != null) {
		$eEventRef = $this->dom->createElement("eventref");
		$eEventRef = $eParent->appendChild($eEventRef);
		$eventID = $this->create_event($personrec,$event,$eventRec);
		$eEventRef->setAttribute("hlink", $this->query_dom("./events/event[@id = \"$eventID\"]/@handle"));
		$eParent->appendChild($eEventRef);
		}
	}

	/**
	  * Creates the Event Element given the record passed and the event abbreviation which is then
	  * 	appended to the parent element passed into the method. When the Event element is created
	  * 	all it's child elements are created and appended to it accordingly.  If the Place for the
	  * 	given event has not been created, this method calls create_placeobj thus creating the
	  * 	place and then links them together accordingly, otherwise the method just searches for
	  * 	the place and creates the link.
	  *
	  * @param DOMElement $personrec - the person(or top element) that contains the event
	  * @param string $event - the abbreviation of the event to be created; BIRT, DEAT, ADOP.....
	  * @param DOMElement $eventRec - the parent DOMElement to which the created Event Element is appended
	  * @param int $done - whether the method is called from the GrampsExport($done=1) or a sub-class
	  */
		function create_event($personrec, $event, $eventRec,$done=1) {
		global $factarray;
			$eventID = $this->generateHandle();
			$eventHandle = $eventID;
			$eEvent = $this->dom->createElement("event");
			$eType = $this->dom->createElement("type");
			$eTypeText = $this->dom->createTextNode($event);
			$eTypeText = $eType->appendChild($eTypeText);
			$eEvent->appendChild($eType);//$factarray[$event])
		//	$eEvent->setAttribute("type", $factarray[$event]);
		$eEvent->setAttribute("id", $eventID);
		$eEvent->setAttribute("handle", $eventHandle);
		$eEvent->setAttribute("change", time());

			if (($dateRec = get_sub_record(1, "2 DATE", $eventRec)) != null) {
				$this->create_date($eEvent, $dateRec, 2);
			}

			if (($place = get_gedcom_value($event . ":PLAC", 1, $personrec)) != null) {
				$hlink = $this->query_dom("./places/placeobj[@title=\"".preg_replace("~\"~", '&quot;', $place)."\"]/@handle");
				if ($hlink == null) {
					$hlink = $this->generateHandle();
					$this->create_placeobj($place, $hlink);
					$this->create_place($eEvent, $hlink);
				} else {
					$this->create_place($eEvent, $hlink);
				}
			}

			if (($cause = get_gedcom_value($event . ":CAUS", 1, $personrec)) != null) {
				$eCause = $this->dom->createElement("cause");
				$etCause = $this->dom->createTextNode($cause);
				$etCause = $eCause->appendChild($etCause);
				$eCause = $eEvent->appendChild($eCause);
			}

			if (($description = get_gedcom_value($event . ":TYPE", 1, $personrec)) != null) {
				$eDescription = $this->dom->createElement("description");
				$etDescription = $this->dom->createTextNode($description);
				$etDescription = $eDescription->appendChild($etDescription);
				$eDescription = $eEvent->appendChild($eDescription);
			}

			if (($note = get_sub_record(1, "2 NOTE", $eventRec)) != null) {
				$this->create_note($eEvent, $note, 2);
			}

			$num = 1;
			while (($sourcerefRec = get_sub_record(2, "2 SOUR", $personrec, $num)) != null) {
				$this->create_sourceref($eEvent, $sourcerefRec, 2);
				$num++;
			}
			$num = 1;
			while (($nameSource = get_sub_record(1, "1 OBJE", $personrec, $num)) != null) {

				$this->create_mediaref($eEvent, $nameSource, 1,$done);

				$num++;
			}
			$eEvent = $this->eEvents->appendChild($eEvent);
			return $eventID;

	}


	/**
	 * This function creates a family relation for a person and appends the relation
	 * to the person element.
	 *
	 * It searches through the DOMDocument first to see if the person is created,
	 * if they are not, the person is created and then the DOMDocument is queried
	 * and the persons HLINK is retrieved.
	 *
	 * @param DOMElement $eParent - the parent XML element the date element should be appended to
	 * @param GEDCOM record $personRec - the full INDI GEDCOM record of the person that the relation is being created
	 * @param int $tag -  the name of the GEDCOM tag (FAMC, FAMS). This is used to allow the same function to work with childin and parent_in_family relations
	 */
	function create_fam_relation($eParent, $personRec, $tag)
	{
		//throw new exception("create fam rel - this function is not implemented");
	}

	/**
	 * Creates the Family element and all of it's child elements, and appends it to the
	 * Families element.  This function will search through the DOMDocument looking
	 * for people in the family. If they are not created yet and they are in the clippings
	 * cart, they will be created and ther hlink added to the family element.
	 *
	 * @param string $frec - the full FAM GEDCOM record of the family to be created
	 * @param string $fid = the ID (F1, F2, F3) of the family that is being created
	 */
	function create_family($frec, $fid)
	{
		//throw new exception("create_family - this function is not implemented");
	}

	/**
	* Creates the lds_ord element and appends the correct information depending
	* on the type of lds_ord (Endowment, Sealing, Baptism). If there is a sealing,
	* the function will search if the family is in the clippings cart and if the
	* family is created or not. If the family is not created yet, it will be created
	* and added to the DOMDocument
	*
	* @param $indirec - The full INDI GEDCOM record of the person the lds_ord is being created
	* @param $eventName - the name of the LDS event (Baptism, Sealing, Endowment, etc...)
	* @param $eventABV - the event abbreviation in the GEDCOM (ie. SLGC, BAPL, ENDL)
	* @param $eParent - The parent element the lds event is attached to
	*/
	function create_lds_event($indirec, $eventName, $eventABV, $eParent)
	{
		//throw new exception("create_lds_event - this function is not implemented");
	}

	/**
	  * Creates the Note element and appends it to the parent element
	  *
	  * @param DOMElement $eParent - the parent DOMElement to which the created Note Element is appended
	  * @param string $noteRec - the entire Family, Individual, etc. record in which the event may be found
	  * @param int $level - The GEDCOM line level where the NOTE tag may be found
	  */
	function create_note($eParent, $noteRec, $level) {
		$note = get_gedcom_value("NOTE", $level, $noteRec);
		$note .= get_cont($level+1, $noteRec, false);
//		$num = 1;
//		while (($cont = get_gedcom_value("NOTE:CONT", $level, $noteRec, $num)) != null) {
//			$note .= $cont;
//			$num++;
//		}
		$eNote = $this->dom->createElement("note");
		$etNote = $this->dom->createTextNode(htmlentities($note,ENT_COMPAT,'UTF-8'));
		$etNote = $eNote->appendChild($etNote);
		$eNote = $eParent->appendChild($eNote);
	}

	/**
	  * Creates the Person element and all of it's child elements, and appends it to the
	  * 	People element.  Given the link for certain LDS events to a family, if the Family
	  * 	has not been previously created, create_family is called to create the family.
	  * 	The family relations in the LDS events and in the person element are only created
	  * 	if the family they have a relation with are also included in the clippings cart
	  *
	  * @param string $personRec - the full INDI GEDCOM record of the person to be created
	  * @param string $personID - the ID (I1, I2, I3) of the person the is being created
	  */
	function create_person($personRec = "", $personID = "")
	{
		//throw new exception("create_person - this function is not implemented");

	}
	/**
	  * Creates the Place Element and appends it to the Parent element given
	  *
	  * @param DOMElement $eParent - the parent DOMElement to which the created Place Element is appended
	  * @param string $hlink - the value to which the 'hlink' attribute is set
	  */
	function create_place($eParent, $hlink) {
		$ePlace = $this->dom->createElement("place");
		$ePlace->setAttribute("hlink", $hlink);
		$ePlace = $eParent->appendChild($ePlace);
	}

	/**
	  * Creates the PlaceObj element and appends it to the Places element
	  *
	  * @param string $place - the string containing the value for the placeobj to be created
	  * @param string $hlink - the value to which the 'hlink' attribute is set \
	  * @param int $done - whether the method is called from the GrampsExport($done=1) or a sub-class
	  */
	function create_placeobj($place, $hlink,$done=1) {
		$ePlaceObj = $this->dom->createElement("placeobj");
		$ePlaceObj->setAttribute("handle", $hlink);
		$ePlaceObj->setAttribute("id", $hlink);
		$ePlaceObj->setAttribute("change", time());

		$ePTitle = $this->dom->createElement("ptitle");
		$ePTitle = $ePlaceObj->appendChild($ePTitle);
		$ePlaceObj = $this->ePlaces->appendChild($ePlaceObj);
		$ePlaceText = $this->dom->createTextNode($place);
		$ePTitle->appendChild($ePlaceText);
		$num = 1;
		while (($nameSource = get_sub_record(1, "1 OBJE", $place, $num)) != null) {
			$this->create_mediaref($this->ePlaces, $nameSource, 1,$done);
			$num++;
		}
	}
 /**
  * Creates a reference(handle) for xml element to element in the objects element of the root element
  * If such an element does not exists it is created using create_media method.
  * @param DOMElement $eParent - the parent you want to apend the elemnt to
  * @param GEDCOM record $sourcerefRec - the record use to get more information about the event(used when the event is being created)
  * @param int $level - the level the media could be found
  */
	function create_mediaref($eParent, $sourcerefRec, $level,$done=1) {
		$mediaId = get_gedcom_value("OBJE", $level, $sourcerefRec);
		$eMediaRef = $this->dom->createElement("objref");
		$eMediaRef = $eParent->appendChild($eMediaRef);

		if (($sourceHlink = $this->query_dom("./objects/object[@id = \"$mediaId\"]/@handle")) == null)
			$this->create_media($mediaId, find_media_record($mediaId));
		$eMediaRef->setAttribute("hlink", $this->query_dom("./objects/object[@id = \"$mediaId\"]/@handle"));

		$eParent->appendChild($eMediaRef);
		//		 $mediaRecord = find_gedcom_record($mediaId);
		//               $this->create_media($mediaId,$mediaRecord);
	}
	/**
	 * Creates an object element(for the media) and puts it unde the objects element of the root
	 * @param string $mediaID - the id of the media you want to create
	 * @param string $mediaRec - the GEDCOM record that contains the media
	 * @param int $level - the level the media is in the GEDCOM method
	 */
	function create_media($mediaID, $mediaRec, $level = 1) {
		global $file;
		$object = $this->dom->createElement("object");
		/*primary object elements and attributes*/
		$object->setAttribute("id", $mediaID);
		$object->setAttribute("handle", $this->generateHandle());
		$object->setAttribute("change", time());
		/*elements and attributes of the object element*/
		/*File elements*/
		$file_ = get_gedcom_value("FILE", 1, $mediaRec);
		$this->mediaFiles[] = $file_;
		$fileNode = $this->dom->createElement("file");

		/*Source*/
		$src = $this->dom->createAttribute("src");
		$srcData = $this->dom->createTextNode($file_);
		$srcData = $src->appendChild($srcData);
		$src = $fileNode->appendChild($src);
		/*MIME*/
		$mime_ = get_gedcom_value("FORM", 1, $mediaRec);
		$mime = $this->dom->createAttribute("mime");
		if (empty ($mime_)) {
			$path = pathinfo($file_);
			if(!isset($path["extension"]))
				$mime_ = "unknown_file_extension";
			else
				$mime_ = $path["extension"];
		}
		$mimeData = $this->dom->createTextNode($mime_);
		$mimeData = $mime->appendChild($mimeData);
		$mime = $fileNode->appendChild($mime);
		/*DESCRIPTION*/
		$description_ = get_gedcom_value("TITL", 1, $mediaRec);
		$description = $this->dom->createAttribute("description");
		$descriptionData = $this->dom->createTextNode($description_);
		$descriptionData = $description->appendChild($descriptionData);
		$description = $fileNode->appendChild($description);
		/*fileNode elements*/
		$fileNode = $object->appendChild($fileNode);

		$fileNode = $this->dom->createElement("file");
		if (($note = get_sub_record(1, "1 NOTE", $mediaRec)) != null) {
			$this->create_note($object, $note, 1);
		}
		$num = 1;
		while (($nameSource = get_sub_record($level, $level . " SOUR", $mediaRec, $num)) != null) {
			$this->create_sourceref($object, $nameSource, 1);
			$num++;
		}
		$object = $this->eObject->appendChild($object);
		//find_highlighted_media();//find the primary picture for the gedcom record

	}
	/**
	  * Creates the SourceRef element and appends it to the Parent Element.  If the actual Source has not
	  * 	been previously created, this will retrieve the record for that, and create that also.
	  *
	  * @param DOMElement $eParent - the parent DOMElement to which the created Note Element is appended
	  * @param string $sourcerefRec - the record containing the reference to a Source
	  * @param int $level - The GEDCOM line level where the SOUR tag may be found
	  */
	function create_sourceref($eParent, $sourcerefRec, $level)
	{
		// throw new exception("create_sourceref - this function is not implemented");
	}

	/**
	  * Creates the Source and appends it to the Sources Element
	  *
	  * @param string $sourceID - the ID of the source to be created
	  * @param string $sourceRec - the entire GEDCOM record containing the Source
	  * @param int $level - the level the source is on in the GEDCOM record
	  * @param int $done - whether the method is called from the GrampsExport($done=1) or a sub-class
	  */
function create_source($sourceID, $sourceRec, $level = 1, $done=1) {
		$eSource = $this->dom->createElement("source");
		$eSource->setAttribute("id", $sourceID);
		$eSource->setAttribute("handle", $this->generateHandle());
		$eSource->setAttribute("change", time());
		if (($title = get_gedcom_value("TITL", $level, $sourceRec)) != null) {
			$eSTitle = $this->dom->createElement("stitle");
			$etSTitle = $this->dom->createTextNode($title);
			$etSTitle = $eSTitle->appendChild($etSTitle);
			$eSTitle = $eSource->appendChild($eSTitle);
		}
		if (($author = get_gedcom_value("AUTH", $level, $sourceRec)) != null) {
			$eSAuthor = $this->dom->createElement("sauthor");
			$etSAuthor = $this->dom->createTextNode($author);
			$etSAuthor = $eSAuthor->appendChild($etSAuthor);
			$eSAuthor = $eSource->appendChild($eSAuthor);
		}
		if (($pubInfo = get_gedcom_value("PUBL", $level, $sourceRec)) != null) {
			$eSPubInfo = $this->dom->createElement("spubinfo");
			$etSPubInfo = $this->dom->createTextNode($pubInfo);
			$etSPubInfo = $eSPubInfo->appendChild($etSPubInfo);
			$eSPubInfo = $eSource->appendChild($eSPubInfo);
		}
		if (($abbrev = get_gedcom_value("ABBR", $level, $sourceRec)) != null) {
			$eSAbbrev = $this->dom->createElement("sabbrev");
			$etSAbbrev = $this->dom->createTextNode($abbrev);
			$etSAbbrev = $eSAbbrev->appendChild($etSAbbrev);
			$eSAbbrev = $eSource->appendChild($eSAbbrev);
		}
		if (($note = get_sub_record($level, $level . " NOTE", $sourceRec)) != null) {
			$this->create_note($eSource, $note, $level);
		}
		$num = 1;
		while (($nameSource = get_sub_record(1, "1 OBJE", $sourceRec, $num)) != null) {
			$this->create_mediaref($this->eSources, $nameSource, 1,$done);
			$num++;
		}
		$eSource = $this->eSources->appendChild($eSource);
	}

	/**
	* Generates a unique identifier for linking elements in the DOMDocument
	* This function was created to conform to how GRAMPS formats their XML
	* documents. The handle only has to be unique among the file, but this
	* allows for a creation of a huge XML file with little chance of overlap
	*/
	function generateHandle() {
		return strtoupper("_" . dechex(rand() * (time() * 877)) . dechex(time() * rand(1, 4)));
	}


	/**
	* Reads in an xpath expression and returns the value searched for by the expression
	*
	* @param string $query - XPath expression to be executed on the DOMDocument
	*
	* @return string - The result of the XPath expression (null if no record is found)
	*/
	function query_dom($query) {
		$xpath = new DOMXpath($this->dom);
		$id = $xpath->query($query);
		if ($id->length == 0)
			$id = null;
		if (isset ($id)) {
			foreach ($id as $handle) {
				$id = $handle->nodeValue;
			}
		}
		return $id;
	}

	/**
	* This function takes the dom document and validates it against the
	* GRAMPS RNG schema. It then prints out the results of the validation
	* to the screen.
	*
	* Validating against the DTD could be easily added
	* if that is deemed useful.
	*
	* @param DOMDocument $domObj - this is the dom document to be validated
	* @param boolean $printXML - set to true, this parameter will make validate print out the DOMDocuments XML to the screen
	*
	*/
	function validate($domObj, $printXML = true) {
		if ($printXML) {
			print "<br /><br /><br />" . nl2br(htmlentities($domObj->saveXML(),ENT_COMPAT,'UTF-8'));
		}
		print "Loading GRAMPS file... <br />";
		$domObj->loadXML($domObj->saveXML());
		$res = $domObj->relaxNGValidate('includes/grampsxml.rng');
		if ($res)
			print "Validation: <em style=\"color:green;\"><h1> PASSED against the .RNG</h1></em>";
		else
			print "Validation: <em style=\"color:red;\"><h1> FAILED against the .RNG</h1></em>";
	}
}
?>

--- NEW FILE: class_serviceclient.php ---
<?php
/**
* Class used to access records and data on a remote server
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @subpackage DataModel
* @version $Id: class_serviceclient.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_SERVICECLIENT_PHP', '');

require_once 'includes/classes/class_gedcomrecord.php';
require_once 'includes/classes/class_family.php';
require_once 'includes/functions/functions_import.php';

class ServiceClient extends GedcomRecord {
	var $url = "";
	var $soapClient = null;
	var $SID = "";
	var $gedfile = "";
	var $title = "";
	var $username = "";
	var $password = "";
	var $type = "";
	var $data_type = "";
	var $client_type = "SOAP"; // whether to use SOAP or PEAR:SOAP by default

	/**
	* contstructor to create a new ServiceClient object
	* @param string $gedrec the SERV gedcom record
	*/
	function ServiceClient($gedrec) {
		//parse url
		//crate soap client class
		//authenticate/get/set sid
		parent::GedcomRecord($gedrec);
		//print "creating new service client ".$this->xref;
		//get the url from the gedcom
		$this->url = get_gedcom_value("URL",1,$gedrec);
		$this->gedfile = get_gedcom_value("_DBID", 1, $gedrec);
		$this->title = get_gedcom_value("TITL", 1, $gedrec);
		$this->username = get_gedcom_value("_USER", 2, $gedrec);
		$this->password = get_gedcom_value("_PASS", 2, $gedrec);
		$this->type = "remote";
		$this->data_type = "GEDCOM";
		if (empty($this->url) && empty($this->gedfile))
			return null;
	}

	/**
	* check if the service returned an error
	*/
	static function isError(&$result) {
		if (PEAR::isError($result) || isset($result->faultcode) || isset($result->message) || get_class($result)=='SOAP_Fault') {
			return true;
		}
		return false;
	}

	/**
	* get the title of this source record
	* @return string
	*/
	function getTitle() {
		global $pgv_lang;

		if (empty($this->title)) return $pgv_lang["unknown"];
		return $this->title;
	}

	function getURL() {
		return $this->url;
	}

	/**
	* get the gedcom file
	*/
	function getGedfile() {
		return $this->gedfile;
	}

	/**
	* authenticate the client
	*/
	function authenticate() {
		if (!empty($this->SID)) return $this->SID;
		if (is_null($this->soapClient)) {
			if (!class_exists('SoapClient') || $this->client_type=='PEAR:SOAP') {
				include_once('SOAP/Client.php');
				//AddToLog('Using PEAR:SOAP library');
				// get the wsdl and cache it
				$wsdl = new SOAP_WSDL($this->url);
				//change the encoding style
				$this->__change_encoding($wsdl);
				$this->soapClient = $wsdl->getProxy();
			} else {
				//AddtoLog("Using SOAP Extension");
				//-- don't use exceptions in PHP 4
				$this->soapClient = new SoapClient($this->url, array('exceptions' => 0));
			}
		}
		if ($this->soapClient!=null && !$this->isError($this->soapClient)) {
			$res = $this->soapClient->Authenticate($this->username, $this->password, $this->gedfile, "",$this->data_type);
			if (!is_object($res)) {
				return false;
			}
			if (!isset($res->SID)) {
				return false;
			}
			$this->SID = $res->SID;
			return $this->SID;
		} else {
			addToLog("Unable to generate web service proxy from WSDL. ".print_r($this->soapClient, true));
			return false;
		}
	}

	/**
	* Get a record from the remote site
	* @param string $remoteid the id of the record to get
	*/
	function getRemoteRecord($remoteid) {
		if (!is_object($this->soapClient)) $this->authenticate();
		if (!is_object($this->soapClient)||$this->isError($this->soapClient)) return false;
		$rec = $this->soapClient->getGedcomRecord($this->SID, $remoteid);
		if (is_string($rec)) {
			$rec = preg_replace("/@([^#@\s]+)@/", "@".$this->xref.":$1@", $rec);
			return $rec;
		} else {
			return "";
		}
	}

	/**
	* get the title for this service
	* @return string
	*/
	function getServiceTitle() {
		if (!empty($this->title)) return $this->title;

		$this->authenticate();
		$info = $this->soapClient->ServiceInfo();
		//print_r($info);
		foreach($info->gedcoms as $ind=>$gedobj) {
			if ($gedobj->ID==$this->gedfile) break;
		}
		$this->title = $gedobj->title;
		return $this->title;
	}

	/**
	* Merge people together.
	*/
	function _merge($record1, $record2) {
		// Returns second record if first is empty, no merge needed
		if (empty($record1)) return $record2;
		// Returns first record if second is empty, no merge needed
		if (empty($record2)) return $record1;

		$remoterecs = get_all_subrecords($record2, "", false, false);
		$localrecs = get_all_subrecords($record1, "", false, false);

		$newrecs = array();
		//-- make sure we don't get circular links
		foreach($remoterecs as $ind2=>$subrec2) {
			if (preg_match("/1 RFN/", $subrec2)==0) {
				$newrecs[] = $subrec2;
			}
		}

		foreach($localrecs as $ind=>$subrec) {
			$found = false;
			if (preg_match("/1 CHAN/", $subrec)==0) {
				$subrec = trim($subrec);
				$orig_subrec = $subrec;
				$subrec = preg_replace("/\s+/", " ", $subrec);

				foreach($remoterecs as $ind2=>$subrec2) {
					$subrec2 = trim($subrec2);
					$subrec2 = preg_replace("/\s+/", " ", $subrec2);

					if ($subrec2 == $subrec) {
						$found = true;
						break;
					}
				}
			} else {
				$found = true;
			}
			if (!$found) {
				$newrecs[] = $orig_subrec;
			}
		}

		//-- start with the first line from the local record
		$pos1 = strpos($record1, "\n1");
		if ($pos1!==false) $localrec = substr($record1, 0, $pos1+1);
		else $localrec = $record1;

		//-- update the type of the remote record
		$ct = preg_match("/0 @(.*)@ (\w*)/", $record2, $match);
		if ($ct>0) $localrec = preg_replace("/0 @(.*)@ (\w*)/", "0 @$1@ ".trim($match[2]), $localrec);
		//-- add all of the new records
		foreach($newrecs as $ind=>$subrec) {
			$localrec .= trim($subrec)."\n";
		}
		$localrec = trim($localrec);
//print "[<pre>$localrec</pre>]";
		// Update the last change time
		$pos1 = strpos($localrec, "1 CHAN");
		if ($pos1!==false) {
			$pos2 = strpos($localrec, "\n1", $pos1+4);
			if ($pos2===false) $pos2 = strlen($localrec);
			$newgedrec = substr($localrec, 0, $pos1);
			$newgedrec .= "1 CHAN\n2 DATE ".date("d M Y")."\n";
			$newgedrec .= "3 TIME ".date("H:i:s")."\n";
			$newgedrec .= "2 _PGVU @".$this->xref."@\n";
			$newgedrec .= trim(substr($localrec, $pos2+1));
			$localrec = $newgedrec;
		} else {
			$newgedrec = "\n1 CHAN\n2 DATE ".date("d M Y")."\n";
			$newgedrec .= "3 TIME ".date("H:i:s")."\n";
			$newgedrec .= "2 _PGVU @".$this->xref."@";
			$localrec .= $newgedrec;
		}

		//print "merged record is ".$localrec;
		return $localrec;
	}

	/**
	* Updates Family Records such as children, spouse, and parents
	*/
	function UpdateFamily($record1,$record2){
		// This makes sure there is a record in both the server and client else it returns the record that
		// exist if any
		if (empty($record1)) {
			return $record2;
		} elseif (empty($record2)) {
			return $record1;
		}

		$this->authenticate();
		//this makes sure that the person is the one that was clicked so that this methade is not called more then ti needs to be
		$ct = preg_match("/0 @(.*)@ (.*)/", $record1, $match);
		$personId1=null;
		if ($ct>0) {
			$personId1 = $match[1];
			$type1 = trim($match[2]);
			if ($type1!="INDI"){
				return $record1;
			}
		}
		$ct = preg_match("/0 @(.*)@ (.*)/", $record2, $match);
		if ($ct>0) {
			$personId2 = $match[1];
			$type2 = trim($match[2]);
			if ($type2!="INDI"){
				return $record1;
			}
		}

		//-- remove all remote family links added in _merge() so that we can add them back in if we need to
		$record1 = preg_replace("/\d FAM[SC] @".$this->xref.":[\w\d]+@\r?\n/", "", $record1);

		//debug_print_backtrace();
		// holds the arrays of the current individual Familys
		$List1FamilyChildID = find_families_in_record($record1, "FAMC");
		$List2FamilyChildID = find_families_in_record($record2, "FAMC");
		$List1FamilySpouseID = find_families_in_record($record1, "FAMS");
		$List2FamilySpouseID = find_families_in_record($record2, "FAMS");
		$FamilyListSpouse = array();
		$FamilyListChild = array();

		// bools used to make sure the same children and/or familys are not counted more then twice
		$firstTimeFamily=true;

		// starting the comparisons for family as child
		if(empty($List1FamilyChildID)){
			//-- add all remote ids
			foreach($List2FamilyChildID as $famc=>$famCild2){
				$FamilyListChild[] = $famCild2;
			}
		} elseif(empty($List2FamilyChildID)){
			//-- nothing to do if there are no remote families
		} else {
			// Creating the first family
			foreach($List1FamilyChildID as $famc=>$famCild1){
				if(!empty($famCild1)){
					// Creating the Secound Family
					foreach($List2FamilyChildID as $famc=>$famCild2){
						if(!empty($famCild2)){
							if(!$this->CompairForUpdateFamily($famCild1,$famCild2)){
								if($firstTimeFamily){
									$FamilyListChild[] = $famCild2;
								}
							} else {
								$this->MergeForUpdateFamily($famCild1,$famCild2,$FamilyListChild,$FamilyListChild);
							}
						}
					}
				}
			}
		}
		// starting the comparisons for family as spouse
		if(empty($List1FamilySpouseID)){
			//-- add all remote ids
			foreach($List2FamilySpouseID as $fams=>$famSpouse2){
				if(!empty($famSpouse2)){
					$FamilyListSpouse[] = $famSpouse2;
				}
			}
		} elseif(empty($List2FamilySpouseID)){
			//-- don't do anything if there are no remote families
		} else {
			// Creating the first family
			foreach($List1FamilySpouseID as $fams=>$famSpouse1){
				if(!empty($famSpouse1)){
					// Creating the Secound Family
					foreach($List2FamilySpouseID as $fams=>$famSpouse2){
						if(!empty($famSpouse2)){
							if(!$this->CompairForUpdateFamily($famSpouse1,$famSpouse2)){
								if($firstTimeFamily){
									$FamilyListSpouse[] = $famSpouse2;
								}
							} else {
								$this->MergeForUpdateFamily($famSpouse1,$famSpouse2,$FamilyListSpouse,$FamilyListSpouse);
							}
						}
					}
				}
			}
		}
		// This Adds any new familys to the person.
		if (count($FamilyListChild)>0){
			for ($i=0;$i<count($FamilyListChild);$i++){
				$record1.="\n1 FAMC @";
				if (strpos($FamilyListChild[$i], $this->xref)!==0) $record1 .= $this->xref.":";
				$record1 .= $FamilyListChild[$i]."@";
			}
		}
		if(count($FamilyListSpouse)>0){
			for($i=0;$i<count($FamilyListSpouse);$i++){
				$record1.="\n1 FAMS @";
				if (strpos($FamilyListSpouse[$i], $this->xref)!==0) $record1 .= $this->xref.":";
				$record1 .= $FamilyListSpouse[$i]."@";
			}
		}
		return $record1;
	}

	/**
	* This mergest the the two familys together
	*/
	function MergeForUpdateFamily($Family1,$Family2,$Familylist,&$FamilyListReturn){
		global $pgv_changes, $GEDCOM;
		include_once('includes/functions/functions_edit.php');

		//print "<br />In MergeForUpdateFamily ".$Family1." ".$Family2;
		//print_r($Familylist);
		$FamilyListReturn=$Familylist;

		if (isset($pgv_changes[$Family1."_".$GEDCOM])) $famrec1 = find_updated_record($Family1);
		else $famrec1 = find_family_record($Family1);

		$ct = preg_match("/(\w+):(.+)/", $Family2, $match);
		if ($ct>0) {
			$servid = trim($match[1]);
			$remoteid = trim($match[2]);
			$famrec2 = $this->getRemoteRecord($remoteid);
		} else {
			return $famrec1;
		}

		// Creating the familys from the xref
		$family1 = Family::getInstance($Family1);
		$family2 = new Family($famrec2);

		// Creat the fathers if their is some
		$father1 = $family1->getHusband();
		$father2 = $family2->getHusband();

		// Creat the mothers if their is some
		$mother1=$family1->getWife();
		$mother2=$family2->getWife();

		// Creat an array of Children
		$children1=$family1->getChildren();
		$children2=$family2->getChildren();

		if(count($FamilyListReturn)>0){ // removes the updated family from the list so it does not get added later.
			$index=null;
			for($i=0; $i<count($FamilyListReturn); $i++){
				if($FamilyListReturn[$i]==$Family2){
					$ndex=$i;
					break;
				}
			}
			if($index!=null){
					unset($FamilyListReturn[$index]);
			}
		}

		$famupdated = false;
		// Merging starts here, the merging of children.
		if(empty($children1)) {
			$children1=$children2;
		} elseif(empty($children2)) {
		} else {
			// Children are looped to see if they need to be added or merged to an esisting child
			foreach($children2 as $childID2=>$Child2){
				if(!empty($Child2)) {
					//print "<br/>child 2 Xref ".$Child2->getXref()."-".$childID2;

					$found = false;
					//-- compare to children in local family
					foreach($children1 as $childID1=>$Child1){
						if(!empty($Child1)){
							//print "<br/>child 2 Xref ".$Child2->getXref()." == ".$Child1->getXref();
							$found=$this->ComparePeople($Child1,$Child2);
							if ($found) break;
						}
					}
					if($found){
						$childrec = $Child1->getGedcomRecord();
						if (preg_match("/1 RFN ".$this->xref.":/", $childrec)==0) {
							$childrec .= "\n1 RFN ".$Child2->getXref();
							//print "<br/> repalcing for child ".$Child1->getXref();
							replace_gedrec($Child1->getXref(), $childrec);
							$this->setSameId($Child1->getXref(), $Child2->getXref());
						}
					} else {
						$famupdated = true;
						$famrec1 .="\n1 CHIL @".$Child2->getXref()."@";
						//print "<br/> adding for child ".$Child2->getXref();
					}
				}
			}
		}

		//-- update the family record
		if (preg_match("/1 RFN ".$this->xref.":/", $famrec1)==0) {
			$famrec1 .= "\n1 RFN ".$family2->getXref();
			$famupdated = true;
		}
		if ($famupdated) {
			//print "<br /> updating family record ".$family1->getXref();
			replace_gedrec($family1->getXref(), $famrec1);
		}

		// Merge Father basicly they just add the rfn numer and let the merge handle it latter
		if(empty($father1)){
			if(!empty($father2)){
				$father1=$father2;
				$famrec1 .="\n1 HUSB @".$father1->getXref()."@";
				//print "<br/> adding for fahter ".$father1->getXref();
				replace_gedrec($family1->getXref(), $famrec1);
			}
		} elseif(!empty($father2)){
			if($this->ComparePeople($father1,$father2)){
				$fatherrec = $father1->getGedcomRecord();
				if (preg_match("/1 RFN ".$this->xref.":/", $fatherrec)==0) {
					$fatherrec .= "\n1 RFN ".$father2->getXref();
					//print "<br/> repalcing for father ".$father1->getXref();
					replace_gedrec($father1->getXref(), $fatherrec);
					$this->setSameId($father1->getXref(), $father2->getXref());
				}
			}
		}
		// Merge Mother
		if(empty($mother1)){
			if(!empty($mother2)){
				$mother1=$mother2;
				$famrec1 .="\n1 WIFE @".$mother1->getXref()."@";
				//print "<br/> adding for mother ".$mother1->getXref();
				replace_gedrec($family1->getXref(), $famrec1);
			}
		} else if(!empty($mother2)){
			if($this->ComparePeople($mother1,$mother2)){
				$motherrec = $mother1->getGedcomRecord();
				if (preg_match("/1 RFN ".$this->xref.":/", $motherrec)==0) {
					$motherrec .= "\n1 RFN ".$mother2->getXref();
					//print "<br/> repalcing for mother ".$mother1->getXref();
					replace_gedrec($mother1->getXref(), $motherrec);
					$this->setSameId($mother1->getXref(), $mother2->getXref());
				}
			}
		}
		$this->setSameId($Family1, $Family2);
	}

	/**
	* Compairs familys and then returns true if the have 50% or more chance of being the same family.
	* Other wise it returns false.
	*/
	function CompairForUpdateFamily($family1,$family2) {
		// Values used to calculate the Percent of likley hood that the family is the same.
		$ChanceSameFamily=0.0;
		$CountFamily1=0.0;
		$CountFamily2=0.0;
		$ChanceSame=0.0;

		$firstTimeChildren=true;

		$famrec1 = find_family_record($family1);
		$ct = preg_match("/(\w+):(.+)/", $family2, $match);
		if ($ct>0) {
			$servid = trim($match[1]);
			$remoteid = trim($match[2]);
			$famrec2 = $this->getRemoteRecord($remoteid);
		} else return false;
		$family1 = Family::getInstance($family1);
		if (is_null($family1)) return false;
		$family2 = new Family($famrec2);

		if (!is_null($family1)) {
			// Creat the fathers if their is some
			$father1 = $family1->getHusband();
			$CountFamily1+=1.0;
			$mother1=$family1->getWife();
			$CountFamily1+=1.0;
		}
		$father2 = $family2->getHusband();
		$CountFamily2+=1.0;
		if(empty($father1)){
			unset($father1);
			$CountFamily1-=1.0;
		}
		if(empty($father2)){
			unset($father2);
			$CountFamily2-=1.0;
		}

		// Creat the mothers if their is some
		$mother2=$family2->getWife();
		$CountFamily2+=1.0;
		if(empty($mother1)){
			unset($mother1);
			$CountFamily1-=1.0;
		}
		if(empty($mother2)){
			unset($mother2);
			$CountFamily2-=1.0;
		}

		// Creat an array of Children
		$children1=$family1->getChildren();
		$children2=$family2->getChildren();

		// finds the probablity that they are the same family Bassed of both sites information
		$CountFamily1 += count($children1);
		$CountFamily2 += count($children2);
		foreach($children1 as $childID1=>$Person1){
			if (!empty($Person1)) {
				foreach($children2 as $childID2=>$Person2){
					if(!empty($Person2)){
						if($this->ComparePeople($Person1,$Person2)){
							$ChanceSameFamily+=1.0;
							//print "<br />".$Person1->getXref()." equals ".$Person2->getXref();
							break;
						}
					}
				}
			}
		}

		if(empty($father1)) {
		} elseif(empty($father2)){
		} else {
			if($this->ComparePeople($father1,$father2)){
				$ChanceSameFamily+=1.0;
			}
		}
		if(empty($mother1)) {
		} elseif(empty($mother2)) {
		} else {
			if($this->ComparePeople($mother1,$mother2)){
				$ChanceSameFamily+=1.0;
			}
		}
		if($CountFamily1!=0&&$CountFamily2!=0){
			$ChanceSame=(($ChanceSameFamily/$CountFamily1)+($ChanceSameFamily/$CountFamily2))/2;
			//print "<br />chancesame=".$ChanceSameFamily." count1=".$CountFamily1." count2=".$CountFamily2." ".$family1->getXref()." compared to ".$family2->getXref()." is ".$ChanceSame;
		} else
			return false;

		if($ChanceSame<0.5){ // If the probabilty is less then 0.5 or 50% then the current family is stored here to be added later
			return false;
		} else { return true; }
	}

	/**
	* set two ids in the same person
	* @param string $local The local id
	* @param string $remote the remote id that matches the $local id
	*/
	static function setSameId($local, $remote) {
		global $TBLPREFIX, $DBCONN, $GEDCOMS, $GEDCOM;

		if ($local == $remote) {
			debug_print_backtrace();
			return;
		}
		//-- check if the link already exists
		$gid = get_remote_id($remote);
		if (empty($gid)) {
			$sql = "INSERT INTO ".$TBLPREFIX."remotelinks VALUES ('".$DBCONN->escapeSimple($local)."','".$DBCONN->escapeSimple($remote)."','".$DBCONN->escapeSimple($GEDCOMS[$GEDCOM]["id"])."')";
			$res = dbquery($sql);
		}
	}

	/**
	* Compares to see if two people are the same, and it returns true if they are, but
	* false if they are not. It only compares the name, sex birthdate, and deathdate
	* of the person
	*/
	static function ComparePeople(&$Person1,&$Person2){
		$PersonName1=$Person1->getFullName();
		$PersonSex1=$Person1->getSex();
		$PersonBirth1=$Person1->getEstimatedBirthDate();
		$PersonDeath1=$Person1->getEstimatedDeathDate();

		$PersonName2=$Person2->getFullName();
		$PersonSex2=$Person2->getSex();
		$PersonBirth2=$Person2->getEstimatedBirthDate();
		$PersonDeath2=$Person2->getEstimatedDeathDate();

		$count=0;
		$Probability=0;
		if (!empty($PersonName1)&&!empty($PersonName2)){
			$lev = levenshtein(UTF8_strtolower($PersonName1), UTF8_strtolower($PersonName2));
			if($lev<4){
				$Probability+=2;
			} else
				$Probability-=2;
			$count+=2;
		}
		$sex_prob=array('UU'=>0, 'UF'=>0, 'UM'=>0, 'MU'=>0, 'FU'=>0, 'MM'=>1, 'FF'=>1,'MF'=>-2, 'FM'=>-2);
		$Probability+=$sex_prob[$PersonSex1.$PersonSex2];
		$count++;

		if ($PersonBirth1->isOK() && $PersonBirth2->isOK()) {
			$diff=abs($PersonBirth1->JD() - $PersonBirth2->JD());
			if ($diff==0) {
				$Probability+=2;
			} elseif ($diff<366) {
				$Probability+=1;
			} else {
				$Probability-=1;
			}
			$count++;
		}

		if ($PersonDeath1->isOK() && $PersonDeath2->isOK()) {
			$diff=abs($PersonDeath1->JD() - $PersonDeath2->JD());
			if ($diff==0) {
				$Probability+=2;
			} elseif ($diff<366) {
				$Probability+=1;
			} else {
				$Probability-=1;
			}
			$count++;
		}

		$prob=$Probability/$count;
		if($prob<0.5){
			return false;
		} else {
			return true;
		}
	}

	/**
	* check if any there are any stub records with RFN tags that match the
	* ids in the gedcom record
	* @param string $gedrec
	* @return string
	*/
	function checkIds($gedrec) {
		$ids_checked = array();
		$ct = preg_match_all("/@(".$this->xref.":.*)@/", $gedrec, $match, PREG_SET_ORDER);
		for($i=0; $i<$ct; $i++) {
			$id = trim($match[$i][1]);
			if (isset($ids_checked[$id])) continue;
			$ids_checked[$id]=true;
			$gid = get_remote_id($id);
			if ($gid!==false)
				$gedrec = preg_replace("/@".$id."@/", "@".$gid."@", $gedrec);
			}
			return $gedrec;
		}

	/**
	* merge a local gedcom record with the information from the remote site
	* @param string $xref the remote ID to merge with
	* @param string $localrec the local gedcom record to merge the remote record with
	* @param boolean $isStub whether or not this is a stub record
	* @param boolean $firstLink is this the first time this record is being linked
	*/
	function mergeGedcomRecord($xref, $localrec, $isStub=false, $firstLink=false) {
		global $FILE, $GEDCOM, $sourcelist, $otherlist;
		global $TBLPREFIX, $pgv_changes;
		$FILE = $GEDCOM;
		if (!$isStub) {
			$gedrec = find_gedcom_record($this->xref.":".$xref);
			if (!empty($gedrec)) $localrec = $gedrec;
		}
		//-- used to force an update on the first time linking a person
		if ($firstLink) {
			$this->authenticate();
			$result = $this->soapClient->getGedcomRecord($this->SID, $xref);
			if (PEAR::isError($result) || isset($result->faultcode) || get_class($result)=='SOAP_Fault' || is_object($result)) {
				if (isset($result->faultstring)) {
					AddToLog($result->faultstring);
					print $result->faultstring;
				}
				return $localrec;
			}
			$gedrec = $result;
			$gedrec = preg_replace("/@([^#@\s]+)@/", "@".$this->xref.":$1@", $gedrec);
			$gedrec = $this->checkIds($gedrec);
			$localrec = $this->_merge($localrec, $gedrec);
			include_once("includes/functions/functions_edit.php");
			$localrec = $this->UpdateFamily($localrec,$gedrec);
			$ct=preg_match("/0 @(.*)@/", $localrec, $match);
			if ($ct>0) {
				$pid = trim($match[1]);
				replace_gedrec($pid,$localrec);
			}
		}

		//-- get the last change date of the record
		$change_date = get_gedcom_value("CHAN:DATE", 1, $localrec, '', false);
		if (empty($change_date)) {
			$this->authenticate();
			if (!is_object($this->soapClient) || $this->isError($this->soapClient)) return false;
			$result = $this->soapClient->getGedcomRecord($this->SID, $xref);
			if (PEAR::isError($result) || isset($result->faultcode) || get_class($result)=='SOAP_Fault' || is_object($result)) {
				if (isset($result->faultstring)) {
					AddToLog($result->faultstring);
					print $result->faultstring;
				}
				return $localrec;
			}
			$gedrec = $result;
			$gedrec = preg_replace("/@([^#@\s]+)@/", "@".$this->xref.":$1@", $gedrec);
			$gedrec = $this->checkIds($gedrec);

			$localrec = $this->_merge($localrec, $gedrec);
			$ct=preg_match("/0 @(.*)@/", $localrec, $match);
			if ($ct>0) {
				$pid = trim($match[1]);
				if ($isStub) {
					include_once("includes/functions/functions_edit.php");
					$localrec = $this->UpdateFamily($localrec,$gedrec);
					replace_gedrec($pid,$localrec);
				} else {
					update_record($localrec);
				}
			}
		} else {
			$chan_date = new GedcomDate($change_date);
			$chan_time_str = get_gedcom_value("CHAN:DATE:TIME", 1, $localrec, '', false);
			$chan_time = parse_time($chan_time_str);
			$change_time = mktime($chan_time[0], $chan_time[1], $chan_time[2], $chan_date->date1->m, $chan_date->date1->d, $chan_date->date1->y);
			/**
			* @todo make the timeout a config option
			*/
			// Time Clock (determines how often a record is checked)
			if ($change_time < time()-(60*60*24*14)) // if the last update (to the remote individual) was made more than 14 days ago
			{
				//$change_date= "1 JAN 2000";
				$this->authenticate();
				if (!is_object($this->soapClient) || $this->isError($this->soapClient)) return false;
				$person = $this->soapClient->checkUpdatesByID($this->SID, $xref, $change_date);
				// If there are no changes between the local and remote copies
				if (PEAR::isError($person) || isset($person->faultcode) || get_class($person)=='SOAP_Fault' || isset($person->error_message_prefix)) {

					if (isset($person->faultstring)) AddToLog($person->faultstring);
					else AddToLog($person->message);
					//-- update the last change time
					$pos1 = strpos($localrec, "1 CHAN");
					if ($pos1!==false) {
						$pos2 = strpos($localrec, "\n1", $pos1+4);
						if ($pos2===false) $pos2 = strlen($localrec);
						$newgedrec = substr($localrec, 0, $pos1);
						$newgedrec .= "1 CHAN\n2 DATE ".date("d M Y")."\n";
						$newgedrec .= "3 TIME ".date("H:i:s")."\n";
						$newgedrec .= "2 _PGVU @".$this->xref."@\n";
						$newgedrec .= substr($localrec, $pos2);
						$localrec = $newgedrec;
					} else {
						$newgedrec = "\n1 CHAN\n2 DATE ".date("d M Y")."\n";
						$newgedrec .= "3 TIME ".date("H:i:s")."\n";
						$newgedrec .= "2 _PGVU @".$this->xref."@";
						$localrec .= $newgedrec;
					}
					update_record($localrec);
				}
				// If changes have been made to the remote record
				else {
					$gedrec = $person->gedcom;
					$gedrec = preg_replace("/@([^#@\s]+)@/", "@".$this->xref.":$1@", $gedrec);
					$gedrec = $this->checkIds($gedrec);
					$ct=preg_match("/0 @(.*)@/", $localrec, $match);
					if ($ct>0) {
						$pid = trim($match[1]);
						if (isset($pgv_changes[$pid."_".$GEDCOM])) $localrec = find_updated_record($pid);
						$localrec = $this->_merge($localrec, $gedrec);
						if ($isStub) {
							include_once("includes/functions/functions_edit.php");
							$localrec = $this->UpdateFamily($localrec,$gedrec);
							replace_gedrec($pid,$localrec);
						} else {
							update_record($localrec);
						}
					}
				}
			}
		}

		return $localrec;
	}

		/**
	* get a singleton instance of the results
	* returned by the soapClient search method
	*
	* @param string $query - the query to search on
	* @param integer $start - the start index of the results to return
	* @param integer $max - the maximum number of results to return
	*/
	function &search($query, $start=0, $max=100) {
		$this->authenticate();
		$result = $this->soapClient->search($this->SID, $query, $start, $max);
		return $result;
	}

	/***
	* Change encoding style to literal
	* used when calling a java service
	*
	* @param object $wsdl SOAP_WSDL object
	* @returns object modified wsdl object
	*/
	function __change_encoding(&$wsdl) {
		$namespace = array_keys($wsdl->bindings);
		if (isset($namespace[0]) && isset($wsdl->bindings[$namespace[0]]['operations'])) {
			$operations = array_keys($wsdl->bindings[$namespace[0]]['operations']);

			for($i = 0; $i<count($operations); $i++) {
				$wsdl->bindings[$namespace[0]]['operations'][$operations[$i]]['input']['use'] = 'literal';
				$wsdl->bindings[$namespace[0]]['operations'][$operations[$i]]['output']['use'] = 'literal';
			}
		}
	}

	/**
	* get a singleton instance of this client
	* @return ServiceClient
	*/
	static function &getInstance($id) {
		global $PGV_SERVERS, $SERVER_URL, $GEDCOM;

		if (isset($PGV_SERVERS[$id])) return $PGV_SERVERS[$id];
		$gedrec = find_gedcom_record($id);
		if (empty($gedrec)) $gedrec = find_updated_record($id);
		if (!empty($gedrec)) {
			$url = get_gedcom_value("URL",1,$gedrec);
			$gedfile = get_gedcom_value("_DBID", 1, $gedrec);
			if (empty($url) && empty($gedfile))
				return null;
			if (!empty($url) && (strtolower($url)!=strtolower($SERVER_URL))) {
				$server = new ServiceClient($gedrec);
			} else {
				include_once('includes/classes/class_localclient.php');
				$server = new LocalClient($gedrec);
			}
			$PGV_SERVERS[$id] = $server;
			return $server;
		}
		return null;
	}
}
?>

--- NEW FILE: class_note.php ---
<?php
/**
 * Class file for a Shared Note (NOTE) object
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2009  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage DataModel
 * @version $Id: class_note.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_NOTE_PHP', '');

require_once 'includes/classes/class_gedcomrecord.php';
require_once 'includes/classes/class_serviceclient.php';

class Note extends GedcomRecord {
	// Get an instance of a Shared note.  We either specify
	// an XREF (in the current gedcom), or we can provide a row
	// from the database (if we anticipate the record hasn't
	// been fetched previously).
	static function &getInstance($data, $simple=true) {
		global $gedcom_record_cache, $GEDCOM, $pgv_changes;

		if (is_array($data)) {
			$ged_id=$data['ged_id'];
			$pid   =$data['xref'];
		} else {
			$ged_id=get_id_from_gedcom($GEDCOM);
			$pid   =$data;
		}

		// Check the cache first
		if (isset($gedcom_record_cache[$pid][$ged_id])) {
			return $gedcom_record_cache[$pid][$ged_id];
		}

		// Look for the record in the database
		if (!is_array($data)) {
			$data=fetch_other_record($pid, $ged_id);

			// If we didn't find the record in the database, it may be remote
			if (!$data && strpos($pid, ':')) {
				list($servid, $remoteid)=explode(':', $pid);
				$service=ServiceClient::getInstance($servid);
				if ($service) {
					// TYPE will be replaced with the type from the remote record
					$data=$service->mergeGedcomRecord($remoteid, "0 @{$pid}@ TYPE\n1 RFN {$pid}", false);
				}
			}

			// If we didn't find the record in the database, it may be new/pending
			if (!$data && PGV_USER_CAN_EDIT && isset($pgv_changes[$pid.'_'.$GEDCOM])) {
				$data=find_updated_record($pid);
				$fromfile=true;
			}

			// If we still didn't find it, it doesn't exist
			if (!$data) {
				return null;
			}
		}

		// Create the object
		$object=new Note($data, $simple);
		if (!empty($fromfile)) {
			$object->setChanged(true);
		}

		// Store it in the cache
		$gedcom_record_cache[$object->xref][$object->ged_id]=&$object;
		return $object;
	}

	/**
	 * get the URL to link to this shared note
	 * @string a url that can be used to link to this shared note
	 */
	public function getLinkUrl() {
		return parent::_getLinkUrl('note.php?nid=');
	}

	
	// The "name" of a note record is the first line.  This can be
	// somewhat unwieldy if lots of CONC records are used.  Limit to 100 chars
	function _addName($type, $value, $gedrec) {
		global $pgv_lang;
		if (UTF8_strlen($value)<100) parent::_addName($type, $value, $gedrec);
		else parent::_addName($type, UTF8_substr($value, 0, 100).$pgv_lang["ellipsis"], $gedrec);
	}

	// Get an array of structures containing all the names in the record
	function getAllNames() {
		// Uniquely, the NOTE objects have data in their level 0 record.
		// Hence the REGEX passed in the second parameter
		return parent::getAllNames('NOTE', "0 @".PGV_REGEX_XREF."@");
	}
}
?>

--- NEW FILE: class_media.php ---
<?php
/**
 * Class that defines a media object
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage Charts
 * @version $Id: class_media.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_class_MEDIA_PHP', '');

require_once('includes/classes/class_gedcomrecord.php');

class Media extends GedcomRecord {
	var $title         =null;
	var $file          =null;
	var $ext           ='';
	var $mime          ='';
	var $note          =null;
	var $filesizeraw   =-1;
	var $width         =0;
	var $height        =0;
	var $serverfilename='';
	var $fileexists    =false;
	var $filepropset   =false;

	// Create a Media object from either raw GEDCOM data or a database row
	function Media($data) {
		if (is_array($data)) {
			// Construct from a row from the database
			$this->title=$data['m_titl'];
			$this->file =$data['m_file'];
		} else {
			// Construct from raw GEDCOM data
			$this->title = get_gedcom_value('TITL', 1, $data);
			if (empty($this->title)) {
				$this->title = get_gedcom_value('TITL', 2, $data);
			}
			$this->file = get_gedcom_value('FILE', 1, $data);
		}
		if (empty($this->title)) $this->title = $this->file;

		parent::GedcomRecord($data);
	}

	// Get an instance of a Media object  We either specify
	// an XREF (in the current gedcom), or we can provide a row
	// from the database (if we anticipate the record hasn't
	// been fetched previously).
	static function &getInstance($data, $simple=true) {
		global $gedcom_record_cache, $GEDCOM, $pgv_changes;

		if (is_array($data)) {
			$ged_id=$data['ged_id'];
			$pid   =$data['xref'];
		} else {
			$ged_id=get_id_from_gedcom($GEDCOM);
			$pid   =$data;
		}

		// Check the cache first
		if (isset($gedcom_record_cache[$pid][$ged_id])) {
			return $gedcom_record_cache[$pid][$ged_id];
		}

		// Look for the record in the database
		if (!is_array($data)) {
			$data=fetch_media_record($pid, $ged_id);

			// If we didn't find the record in the database, it may be remote
			if (!$data && strpos($pid, ':')) {
				list($servid, $remoteid)=explode(':', $pid);
				$service=ServiceClient::getInstance($servid);
				if ($service) {
					// TYPE will be replaced with the type from the remote record
					$data=$service->mergeGedcomRecord($remoteid, "0 @{$pid}@ TYPE\n1 RFN {$pid}", false);
				}
			}

			// If we didn't find the record in the database, it may be new/pending
			if (!$data && PGV_USER_CAN_EDIT && isset($pgv_changes[$pid.'_'.$GEDCOM])) {
				$data=find_updated_record($pid);
				$fromfile=true;
			}

			// If we still didn't find it, it doesn't exist
			if (!$data) {
				return null;
			}
		}

		// Create the object
		$object=new Media($data, $simple);
		if (!empty($fromfile)) {
			$object->setChanged(true);
		}

		// Store it in the cache
		$gedcom_record_cache[$object->xref][$object->ged_id]=&$object;
		//-- also store it using its reference id (sid:pid and local gedcom for remote links)
		$gedcom_record_cache[$pid][$ged_id]=&$object;
		return $object;
	}

	/**
	 *
	 * get the title of the media item
	 */
	function getFullName() {
		return $this->title;
	}

	/**
	 * get the media note
	 * @return string
	 */
	function getNote(){
		if (is_null($this->note)) {
			$this->note=get_gedcom_value('NOTE', 1, $this->getGedcomRecord());
		}
		return $this->note;
	}

	/**
	 * get the thumbnail filename
	 * @return string
	 */
	function getThumbnail($generateThumb = true) {
		return thumbnail_file($this->file,$generateThumb);
	}

	/**
	 * get the media file name
	 * @return string
	 */
	function getFilename() {
		return $this->file;
	}

	/**
	 * get the relative file path of the image on the server
	 * @return string
	 */
	function getLocalFilename() {
		return check_media_depth($this->file);
	}

	/**
	 * get the file name on the server
	 * @return string
	 */
	function getServerFilename() {
		global $USE_MEDIA_FIREWALL;
		if ($this->serverfilename) return $this->serverfilename;
		$localfilename = $this->getLocalFilename();
		if (!empty($localfilename)) {
			if (file_exists($localfilename)){
				// found image in unprotected directory
				$this->fileexists = 2;
				$this->serverfilename = $localfilename;
				return $this->serverfilename;
			}
			if ($USE_MEDIA_FIREWALL) {
				$protectedfilename = get_media_firewall_path($localfilename);
				if (file_exists($protectedfilename)){
					// found image in protected directory
					$this->fileexists = 3;
					$this->serverfilename = $protectedfilename;
					return $this->serverfilename;
				}
			}
		}
		// file doesn't exist, return the standard localfilename for backwards compatibility
		$this->fileexists = false;
		$this->serverfilename = $localfilename;
		return $this->serverfilename;
	}

	/**
	 * check if the file exists on this server
	 * @return boolean
	 */
	function fileExists() {
		if (!$this->serverfilename) $this->getServerFilename();
		return $this->fileexists;
	}

	/**
	 * get the media file size
	 * @return string
	 */
	function getFilesize() {
		if (!$this->filepropset) $this->setFileProperties();
		return(sprintf("%.2f", @$this->filesizeraw/1024));
	}

	/**
	 * get the media file size, unformatted
	 * @return number
	 */
	function getFilesizeraw() {
		if (!$this->filepropset) $this->setFileProperties();
		return $this->filesizeraw;
	}

	/**
	 * get the media type
	 * @return string
	 */
	function getMediatype() {
		$mediaType = strtolower(get_gedcom_value("FORM:TYPE", 2, $this->gedrec));
		return $mediaType;
	}

	/**
	 * get the media file type
	 * @return string
	 */
	function getFiletype() {
		if (!$this->filepropset) $this->setFileProperties();
		return $this->ext;
	}

	/**
	 * get the media mime type
	 * @return string
	 */
	function getMimetype() {
		if (!$this->filepropset) $this->setFileProperties();
		return $this->mime;
	}

	/**
	 * get the width of the image
	 * @return number (0 if not an image)
	 */
	function getWidth() {
		if (!$this->filepropset) $this->setFileProperties();
		return $this->width;
	}

	/**
	 * get the height of the image
	 * @return number (0 if not an image)
	 */
	function getHeight() {
		if (!$this->filepropset) $this->setFileProperties();
		return $this->height;
	}

	/**
	 * internal function, sets a number of properties
	 * no need to call directly
	 * @return nothing
	 */
	function setFileProperties() {
		global $pgv_lang;

		if ($this->fileExists()) {
			$this->filesizeraw = @filesize($this->getServerFilename());
			$imgsize=@getimagesize($this->getServerFilename()); // [0]=width [1]=height [2]=filetype ['mime']=mimetype
			if (is_array($imgsize)) {
				// this is an image
				$this->width =0+$imgsize[0];
				$this->height=0+$imgsize[1];
				$imageTypes  =array("","GIF","JPG","PNG","SWF","PSD","BMP","TIFF","TIFF","JPC","JP2","JPX","JB2","SWC","IFF","WBMP","XBM");
				$this->ext   =$imageTypes[0+$imgsize[2]];
				$this->mime  =$imgsize['mime'];
			}
		}
		if (!$this->mime) {
			// this is not an image, OR the file doesn't exist OR it is a url
			// set file type equal to the file extension - can't use parse_url because this may not be a full url
			$exp = explode("?", $this->file);
			$pathinfo = pathinfo($exp[0]);
			$this->ext = @strtoupper($pathinfo['extension']);
			// all mimetypes we wish to serve with the media firewall must be added to this array.
			$mime=array('DOC'=>'application/msword', 'MOV'=>'video/quicktime', 'MP3'=>'audio/mpeg', 'PDF'=>'application/pdf',
			'PPT'=>'application/vnd.ms-powerpoint', 'RTF'=>'text/rtf', 'SID'=>'image/x-mrsid', 'TXT'=>'text/plain', 'XLS'=>'application/vnd.ms-excel');
			if (empty($mime[$this->ext])) {
				// if we don't know what the mimetype is, use something ambiguous
				$this->mime='application/octet-stream';
				if ($this->fileExists()) {
					// alert the admin if we cannot determine the mime type of an existing file
					// as the media firewall will be unable to serve this file properly
					AddToLog($pgv_lang["unknown_mime"].' >'.$this->file.'<');
				}
			} else {
				$this->mime=$mime[$this->ext];
			}
		}
		$this->filepropset = true;
	}

	/**
	 * get the URL to link to this object
	 * @string a url that can be used to link to this object
	 */
	public function getLinkUrl() {
		return parent::_getLinkUrl('mediaviewer.php?mid=');
	}

	/**
	 * check if the given Media object is in the objectlist
	 * @param Media $obje
	 * @return mixed  returns the ID for the for the matching media or false if not found
	 */
	static function in_obje_list(&$obje) {
		global $TBLPREFIX, $GEDCOMS, $GEDCOM, $FILE, $DBCONN;

		if (is_null($obje)) return false;
		if (empty($FILE)) $FILE = $GEDCOM;
		$sql = "SELECT m_media FROM ".$TBLPREFIX."media WHERE m_file='".$DBCONN->escapeSimple($obje->file)."' AND m_titl ".PGV_DB_LIKE." '".$DBCONN->escapeSimple($obje->title)."' AND m_gedfile=".$GEDCOMS[$FILE]['id'];
		$res = dbquery($sql);

		if ($res->numRows()>0) {
			$row = $res->fetchRow();
			return $row[0];
		}

		return false;
	}

	/**
	 * check if this object is equal to the given object
	 * basically just checks if the IDs are the same
	 * @param GedcomRecord $obj
	 */
	function equals(&$obj) {
		if (is_null($obj)) return false;
		if ($this->xref==$obj->getXref()) return true;
		if ($this->title==$obj->title && $this->file==$obj->file) return true;
		return false;
	}

	// If this object has no name, what do we call it?
	function getFallBackName() {
		if ($this->canDisplayDetails()) {
			return UTF8_strtoupper(basename($this->file));
		} else {
			return $this->getXref();
		}
	}

	// Get an array of structures containing all the names in the record
	function getAllNames() {
		return parent::getAllNames('TITL', 2);
	}

	// Extra info to display when displaying this record in a list of
	// selection items or favourites.
	function format_list_details() {
		ob_start();
		print_media_links('1 OBJE @'.$this->getXref().'@', 1, $this->getXref());
		return ob_get_clean();
	}

}
?>

--- NEW FILE: class_localclient.php ---
<?php
/**
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @package PhpGedView
 * @subpackage DataModel
 * @version $Id: class_localclient.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_LOCALCLIENT_PHP', '');

require_once 'includes/classes/class_serviceclient.php';

class LocalClient extends ServiceClient {
	/**
	 * constructor
	 * @param string $gedrec	the gedcom record
	 */
	function LocalClient($gedrec) {
		parent::ServiceClient($gedrec);
		$this->type = "local";
	}

	/**
	 * authenticate the client
	 */
	function authenticate() {
		//-- nothing to do in a local client
	}

	/**
	 * Get a record from the remote site
	 * @param string $remoteid	the id of the record to get
	 */
	function getRemoteRecord($remoteid) {
		$rec = find_gedcom_record($remoteid, $this->gedfile);
		$rec = preg_replace("/@(.*)@/", "@".$this->xref.":$1@", $rec);
		return $rec;
	}

	/**
	 * merge a local gedcom record with the information from the remote site
	 * @param string $xref		the remote ID to merge with
	 * @param string $localrec	the local gedcom record to merge the remote record with
	 * @param boolean $isStub	whether or not this is a stub record
	 * @param boolean $firstLink	is this the first time this record is being linked
	 */
	function mergeGedcomRecord($xref, $localrec, $isStub=false, $firstLink=false) {
		//-- get the record from the database
		$gedrec = find_gedcom_record($xref, $this->gedfile);
		$gedrec = preg_replace("/@(.*)@/", "@".$this->xref.":$1@", $gedrec);
		$gedrec = $this->checkIds($gedrec);
		if (empty($localrec)) return $gedrec;
		$localrec = $this->_merge($localrec, $gedrec);

		//-- used to force an update on the first time linking a person
		if ($firstLink) {
			include_once("includes/functions/functions_edit.php");
			$ct=preg_match("/0 @(.*)@/", $localrec, $match);
			if ($ct>0)
			{
				$pid = trim($match[1]);
				$localrec = $this->UpdateFamily($localrec,$gedrec);
				//-- restore the correct id since it may have been changed by the UpdateFamily method
				$localrec = preg_replace("/0 @(.*)@/", "0 @$pid@", $localrec);
				replace_gedrec($pid,$localrec);
			}
		}
		return $localrec;
	}

	/**
	 * get a singleton instance of the results
	 * returned by the soapClient search method
	 *
	 * @param string $query - the query to search on
	 * @param integer $start - the start index of the results to return
	 * @param integer $max - the maximum number of results to return
	 */
	function &search($query, $start=0, $max=100) {
		//$this->authenticate();
		//$result = $this->soapClient->search($this->SID, $query, $start, $max);
		$search_results = search_indis(array($query), array($this->gedfile), 'AND', true);

		// loop thru the returned result of the method call
		foreach($search_results as $gid=>$indi)
		{
			// privatize the gedcoms returned
			$gedrec = privatize_gedcom($indi["gedcom"]);
			//AddToLog(substr($gedrec,0,50));
			// set the fields that exist and return all the results that are not private
			if(preg_match("~".$query."~i",$gedrec)>0)
			{
				$person = new SOAP_Value('person', 'person', "");
				$person->PID = $gid;
				$person->gedcomName = get_gedcom_value("NAME", 1, $gedrec, '', false);
				$person->birthDate = get_gedcom_value("BIRT:DATE", 1, $gedrec, '', false);
				$person->birthPlace = get_gedcom_value("BIRT:PLAC", 1, $gedrec, '', false);
				$person->deathDate = get_gedcom_value("DEAT:DATE", 1, $gedrec, '', false);
				$person->deathPlace = get_gedcom_value("DEAT:PLAC", 1, $gedrec, '', false);
				$person->gender = get_gedcom_value("SEX", 1, $gedrec, '', false);
				//$search_result_element['gedcom'] = $gedrec;
				$results_array[] = $person;
			}
		}
//			AddToLog('Found '.count($results_array).' after privatizing');
		// set the number of possible results
		//$results[0]['totalResults'] = count($results_array);
		$results_array = array_slice($results_array,$start,$max);
		//$results[0]['persons'] = $results_array;
		$return = new SOAP_Value('searchResult', 'searchResult', "");
		$return->totalResults = count($results_array);
		$return->persons = $results_array;
		return $return;
	}
}
?>

--- NEW FILE: class_stats_ui.php ---
<?php
/**
 * GEDCOM Statistics Feature Add-On Class
 *
 * This class provides access to additional non-stats features of PGV
 * for use in the Advanced HTML block.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @version $Id: class_stats_ui.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 * @author Patrick Kellum
 * @package PhpGedView
 * @subpackage Lists
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_STATS_UI_PHP', '');

require_once 'includes/classes/class_stats.php';
class stats_ui extends stats
{
///////////////////////////////////////////////////////////////////////////////
// Favorites                                                                 //
///////////////////////////////////////////////////////////////////////////////

	static function _getFavorites($isged=true)
	{
		global $GEDCOM, $pgv_lang;
		global $pgv_lang, $factarray, $PGV_IMAGE_DIR, $PGV_IMAGES, $GEDCOM, $ctype, $TEXT_DIRECTION, $INDEX_DIRECTORY;
		global $show_full, $PEDIGREE_FULL_DETAILS, $BROWSERTYPE;

		// Override GEDCOM configuration temporarily
		if(isset($show_full)){$saveShowFull = $show_full;}
		$savePedigreeFullDetails = $PEDIGREE_FULL_DETAILS;
		$show_full = 1;
		$PEDIGREE_FULL_DETAILS = 1;

		if($isged)
		{
			$userfavs = getUserFavorites($GEDCOM);
		}
		else
		{
			$userfavs = getUserFavorites(PGV_USER_ID);
		}
		$content = '';
		if(!count($userfavs))
		{
			if($isged)
			{
				if(PGV_USER_GEDCOM_ADMIN){$content .= print_text('no_favorites', 0, 1);}
				else{$content .= print_text('no_gedcom_favorites', 0, 1);}
			}
			else
			{
				print_text('no_favorites', 0, 1);
			}
		}
		else
		{
			if(!$isged)
			{
				$mygedcom = $GEDCOM;
				$current_gedcom = $GEDCOM;
			}
			$content .= "<table width=\"99%\" style=\"border:none\" cellspacing=\"3px\" class=\"center {$TEXT_DIRECTION}\">";
			foreach($userfavs as $k=>$favorite)
			{
				if(isset($favorite['id'])){$k = $favorite['id'];}
				$removeFavourite = "<a class=\"font9\" href=\"".encode_url("index.php?ctype={$ctype}&action=deletefav&fv_id={$k}")."\" onclick=\"return confirm('{$pgv_lang['confirm_fav_remove']}');\">{$pgv_lang['remove']}</a><br />\n";
				if(!$isged)
				{
					$current_gedcom = $GEDCOM;
					$GEDCOM = $favorite['file'];
				}
				$content .= '<tr><td>';
				if($favorite['type'] == 'URL')
				{
					$content .= "<div id=\"boxurl{$k}.0\" class=\"person_box\">\n";
					if($ctype == 'user' || PGV_USER_GEDCOM_ADMIN){$content .= $removeFavourite;}
					$content .= "<a href=\"{$favorite['url']}\"><b>".PrintReady($favorite['title']).'</b></a>';
					$content .= "<br />\n".PrintReady($favorite['note'], false, true);
					$content .= "</div>\n";
				}
				else
				{
					if(displayDetailsById($favorite['gid'], $favorite['type']))
					{
						require "{$INDEX_DIRECTORY}{$GEDCOM}_conf.php";

						switch($favorite['type'])
						{
							case 'INDI':
							{
								$indirec = find_person_record($favorite['gid']);
								$content .= "<div id=\"box{$favorite['gid']}.0\" class=\"person_box";
								if(preg_match("/1 SEX F/", $indirec) > 0){$content .= 'F';}
								elseif(preg_match("/1 SEX M/", $indirec) > 0){$content .= '';}
								else{$content .= 'NN';}
								$content .= "\">\n";
								if($ctype == 'user' || PGV_USER_GEDCOM_ADMIN){$content .= $removeFavourite;}
								ob_start();
								print_pedigree_person($favorite['gid'], 2, 1, $k);
								$content .= ob_get_clean();
								$content .= PrintReady($favorite['note'], false, true);
								$content .= "</div>\n";
								break;
							}
							default:
							{
								$record=GedcomRecord::getInstance($favorite['gid']);
								$content .= "<div id=\"box{$favorite['gid']}.0\" class=\"person_box\">\n";
								if($ctype == 'user' || PGV_USER_GEDCOM_ADMIN){$content .= $removeFavourite;}
								$content .= $record->format_list('span');
								$content .= "<br />\n".PrintReady($favorite['note'], false, true);
								$content .= "</div>\n";
								break;
							}
						}
						if(!$isged)
						{
							$GEDCOM = $mygedcom;
							require "{$INDEX_DIRECTORY}{$GEDCOM}_conf.php";
						}
					}
				}
				$content .= "</div>\n"
					."</td></tr>\n"
				;
			}
			$content .= "</table>\n";
		}
		if(($isged && PGV_USER_GEDCOM_ADMIN) || !$isged)
		{
			$content .= '
				<script language="JavaScript" type="text/javascript">
				var pastefield;
				function paste_id(value) {
					pastefield.value=value;
				}
				</script>
				<br />
				';
			$uniqueID = floor(microtime() * 1000000);
			if($isged)
			{
				$content .= print_help_link('index_add_favorites_help', 'qm', '', false, true)
					."<b><a href=\"javascript:// {$pgv_lang['add_favorite']} \" onclick=\"expand_layer('add_ged_fav'); return false;\"><img id=\"add_ged_fav_img\" src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['plus']['other']}\" border=\"0\" alt=\"\" />&nbsp;{$pgv_lang['add_favorite']}</a></b>"
					."<br />\n<div id=\"add_ged_fav\" style=\"display: none;\">\n"
					."<form name=\"addgfavform\" method=\"post\" action=\"index.php\">\n"
					."<input type=\"hidden\" name=\"favtype\" value=\"gedcom\" />\n"
				;

			}
			else
			{
				$content .= print_help_link('index_add_favorites_help', 'qm', '', false, true)
					."<b><a href=\"javascript:// {$pgv_lang['add_favorite']} \" onclick=\"expand_layer('add_user_fav'); return false;\"><img id=\"add_user_fav_img\" src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['plus']['other']}\" border=\"0\" alt=\"\" />&nbsp;{$pgv_lang['add_favorite']}</a></b>"
					."<br />\n<div id=\"add_user_fav\" style=\"display: none;\">\n"
					."<form name=\"addufavform\" method=\"post\" action=\"index.php\">\n"
					."<input type=\"hidden\" name=\"favtype\" value=\"user\" />\n"
				;
			}
			$content .= "<input type=\"hidden\" name=\"action\" value=\"addfav\" />\n"
				."<input type=\"hidden\" name=\"ctype\" value=\"{$ctype}\" />\n"
				."<input type=\"hidden\" name=\"ged\" value=\"{$GEDCOM}\" />\n"
				."<table width=\"99%\" style=\"border:none\" cellspacing=\"3px\" class=\"center {$TEXT_DIRECTION}\">"
				."<tr><td>{$pgv_lang['add_fav_enter_id']}<br />\n"
				."<input class=\"pedigree_form\" type=\"text\" name=\"gid\" id=\"gid{$uniqueID}\" size=\"5\" value=\"\" />"
				.print_findindi_link("gid{$uniqueID}", '', true)
				.print_findfamily_link("gid{$uniqueID}", '', true)
				.print_findsource_link("gid{$uniqueID}", '', true)
				."<br />\n{$pgv_lang['add_fav_or_enter_url']}"
				."<br />\n{$pgv_lang['url']}<input type=\"text\" name=\"url\" size=\"40\" value=\"\" />"
				."<br />\n{$pgv_lang['title']} <input type=\"text\" name=\"favtitle\" size=\"40\" value=\"\" />"
				."\n</td><td>"
				."\n{$pgv_lang['add_fav_enter_note']}"
				."<br />\n<textarea name=\"favnote\" rows=\"6\" cols=\"50\"></textarea>"
				."</td></tr></table>\n"
				."<br />\n<input type=\"submit\" value=\"{$pgv_lang['add']}\" style=\"font-size: 8pt; \" />"
				."\n</form></div>\n"
			;
		}

		// Restore GEDCOM configuration
		unset($show_full);
		if(isset($saveShowFull)){$show_full = $saveShowFull;}
		$PEDIGREE_FULL_DETAILS = $savePedigreeFullDetails;

		return $content;
	}

	static function gedcomFavorites(){return self::_getFavorites(true);}
	static function userFavorites(){return self::_getFavorites(false);}

	static function totalGedcomFavorites(){return count(getUserFavorites($GLOBALS['GEDCOM']));}
	static function totalUserFavorites(){return count(getUserFavorites(PGV_USER_ID));}

///////////////////////////////////////////////////////////////////////////////
// Messages                                                                  //
///////////////////////////////////////////////////////////////////////////////

	static function userMessages()
	{
		global $pgv_lang, $PGV_IMAGE_DIR, $TEXT_DIRECTION, $PGV_STORE_MESSAGES, $PGV_IMAGES;

		$usermessages = getUserMessages(PGV_USER_NAME);

		$content = "<form name=\"messageform\" action=\"\" onsubmit=\"return confirm('{$pgv_lang['confirm_message_delete']}');\">";
		if(count($usermessages) == 0)
		{
			$content .= "{$pgv_lang['no_messages']}<br />\n";
		}
		else
		{
			$content .= '
				<script language="JavaScript" type="text/javascript">
				<!--
					function select_all() {
			';
			foreach($usermessages as $k=>$message)
			{
				if(isset($message['id'])){$k = $message['id'];}
				$content .= '
					var cb = document.getElementById("cb_message'.$k.'");
					if (cb) {
						if (!cb.checked) cb.checked = true;
						else cb.checked = false;
					}
				';
			}
			$content .= '
					return false;
				}
				//-->
				</script>
			';
			$content .= '<input type="hidden" name="action" value="deletemessage" />'
				.'<table class="list_table"><tr>'
				."<td class=\"list_label\">{$pgv_lang['delete']}<br />\n<a href=\"javascript:;\" onclick=\"return select_all();\">{$pgv_lang['all']}</a></td>\n"
				."<td class=\"list_label\">{$pgv_lang['message_subject']}</td>\n"
				."<td class=\"list_label\">{$pgv_lang['date_created']}</td>\n"
				."<td class=\"list_label\">{$pgv_lang['message_from']}</td>\n"
				."</tr>\n"
			;
			foreach($usermessages as $k=>$message)
			{
				if(isset($message['id'])){$k = $message['id'];}
				$content .= "<tr>\n<td class=\"list_value_wrap\"><input type=\"checkbox\" id=\"cb_message{$k}\" name=\"message_id[]\" value=\"{$k}\" /></td>\n";
				$showmsg = preg_replace("/(\w)\/(\w)/","\$1/<span style=\"font-size:1px;\"> </span>\$2", PrintReady($message['subject']));
				$showmsg = preg_replace("/@/","@<span style=\"font-size:1px;\"> </span>", $showmsg);
				$content .= "<td class=\"list_value_wrap\"><a href=\"javascript:;\" onclick=\"expand_layer('message{$k}'); return false;\"><b>{$showmsg}</b> <img id=\"message{$k}_img\" src=\"{$PGV_IMAGE_DIR}/{$PGV_IMAGES['plus']['other']}\" border=\"0\" alt=\"\" title=\"\" /></a></td>\n";
				if(!empty($message['created'])){$t = strtotime($message['created']);}else{$t = time();}
				$content .= '<td class="list_value_wrap">'.format_timestamp($t)."</td>\n"
					.'<td class="list_value_wrap">'
				;
				$user_id = get_user_id($message['from']);
				if($user_id)
				{
					$content .= PrintReady(getUserFullName($user_id));
					if($TEXT_DIRECTION == 'ltr')
					{
						$content .= ' '.getLRM().' - '.htmlspecialchars($user_id,ENT_COMPAT,'UTF-8').getLRM();
					}
					else
					{
						$content .= ' '.getRLM().' - '.htmlspecialchars($user_id,ENT_COMPAT,'UTF-8').getRLM();
					}
				}
				else
				{
					$content .= "<a href=\"mailto:{$user_id}\">".preg_replace("/@/","@<span style=\"font-size:1px;\"> </span>", $user_id).'</a>';
				}
				$content .= "</td>\n"
					."</tr>\n"
					."<tr>\n<td class=\"list_value_wrap\" colspan=\"5\"><div id=\"message{$k}\" style=\"display: none;\">"
				;
				$message['body'] = expand_urls(nl2br(htmlspecialchars($message['body'],ENT_COMPAT,'UTF-8')));
				$content .= PrintReady($message['body'])."<br />\n<br />\n";
				if(preg_match("/RE:/", $message["subject"]) == 0)
				{
					$message['subject'] = "RE:{$message['subject']}";
				}
				if($user_id)
				{
					$content .= "<a href=\"javascript:;\" onclick=\"reply('{$user_id}', '{$message['subject']}'); return false;\">{$pgv_lang['reply']}</a> | ";
				}
				$content .= "<a href=\"".encode_url("index.php?action=deletemessage&message_id={$k}")."\" onclick=\"return confirm('{$pgv_lang['confirm_message_delete']}');\">{$pgv_lang['delete']}</a></div></td>\n</tr>\n";
			}
			$content .= "</table>\n"
				."<input type=\"submit\" value=\"{$pgv_lang['delete_selected_messages']}\" /><br />\n<br />\n"
			;
		}
		if(get_user_count() > 1)
		{
			$content .= "{$pgv_lang['message']} <select name=\"touser\">";
			if(PGV_USER_IS_ADMIN)
			{
				$content .= "<option value=\"all\">{$pgv_lang['broadcast_all']}</option>\n"
					."<option value=\"never_logged\">{$pgv_lang['broadcast_never_logged_in']}</option>\n"
					."<option value=\"last_6mo\">{$pgv_lang['broadcast_not_logged_6mo']}</option>\n"
				;
			}
			foreach(get_all_users() as $user_id=>$user_name)
			{
				if($user_id != PGV_USER_ID && get_user_setting($user_id, 'verified_by_admin') == 'yes')
				{
					$content .= "<option value=\"{$user_id}\">".PrintReady(getUserFullName($user_id)).' ';
					if($TEXT_DIRECTION == 'ltr')
					{
						$content .= getLRM()." - {$user_id}".getLRM();
					}
					else
					{
						$content .= getRLM()." - {$user_id}".getRLM();
					}
					$content .= "</option>\n";
				}
			}
			$content .= "</select>\n<input type=\"button\" value=\"{$pgv_lang['send']}\" onclick=\"message(document.messageform.touser.options[document.messageform.touser.selectedIndex].value, 'messaging2', ''); return false;\" />\n";
		}
		$content .= "</form>\n";
		return $content;
	}

	function totalUserMessages(){return count(getUserMessages(PGV_USER_NAME));}

///////////////////////////////////////////////////////////////////////////////
// Journal                                                                //
///////////////////////////////////////////////////////////////////////////////

	static function userJournal()
	{
		global $pgv_lang, $PGV_IMAGE_DIR, $PGV_IMAGES, $TEXT_DIRECTION, $ctype;

		$usernews = getUserNews(PGV_USER_ID);
		$content = '';
		if(count($usernews) == 0)
		{
			$content .= "{$pgv_lang['no_journal']} ";
		}
		foreach($usernews as $k=>$news)
		{
			$day = date('j', $news['date']);
			$mon = date('M', $news['date']);
			$year = date('Y', $news['date']);
			$content .= "<div class=\"person_box\">";
			$ct = preg_match("/#(.+)#/", $news['title'], $match);
			if($ct > 0)
			{
				if(isset($pgv_lang[$match[1]]))
				{
					$news['title'] = preg_replace("/$match[0]/", $pgv_lang[$match[1]], $news['title']);
				}
			}
			$content .= '<span class="news_title">'.PrintReady($news['title'])."</span><br />\n"
				.'<span class="news_date">'.format_timestamp($news['date'])."</span><br />\n<br />\n"
			;
			if(preg_match("/#(.+)#/", $news['text'], $match))
			{
				if(isset($pgv_lang[$match[1]]))
				{
					$news['text'] = preg_replace("/$match[0]/", $pgv_lang[$match[1]], $news['text']);
				}
			}
			if(preg_match("/#(.+)#/", $news['text'], $match))
			{
				if(isset($pgv_lang[$match[1]]))
				{
					$news['text'] = preg_replace("/$match[0]/", $pgv_lang[$match[1]], $news['text']);
				}
				if(isset($$match[1]))
				{
					$news['text'] = preg_replace("/$match[0]/", $$match[1], $news['text']);
				}
			}
			$trans = array_flip(get_html_translation_table(HTML_SPECIALCHARS));
			$news['text'] = strtr($news['text'], $trans);
			$content .= PrintReady($news['text'])."<br />\n<br />\n"
				."<a href=\"javascript:;\" onclick=\"editnews('{$k}'); return false;\">{$pgv_lang['edit']}</a> | "
				."<a href=\"".encode_url("index.php?action=deletenews&news_id={$k}&ctype={$ctype}")."\" onclick=\"return confirm('{$pgv_lang['confirm_journal_delete']}');\">{$pgv_lang['delete']}</a><br />\n"
				."</div><br />\n"
			;
		}
		if(PGV_USER_ID)
		{
			$content .= "<br />\n<a href=\"javascript:;\" onclick=\"addnews('".PGV_USER_ID."'); return false;\">{$pgv_lang['add_journal']}</a>";
		}
		return $content;
	}

	function totalUserJournal(){ return count(getUserNews(PGV_USER_ID));}

///////////////////////////////////////////////////////////////////////////////
// News                                                                      //
///////////////////////////////////////////////////////////////////////////////

	static function gedcomNews($params=null)
	{
		global $pgv_lang, $PGV_IMAGE_DIR, $PGV_IMAGES, $TEXT_DIRECTION, $GEDCOM, $ctype, $PGV_BLOCKS;

		if($params === null){$params = array();}
		if(isset($params[0]) && $params[0] != ''){$limit = strtolower($params[0]);}else{$limit = 'count';}
		if(isset($params[1]) && $params[1] != ''){$flag = strtolower($params[0]);}else{$flag = 5;} // News postings

		if($flag == 0){$limit = 'nolimit';}
		if(isset($_REQUEST['gedcom_news_archive']))
		{
			$limit = 'nolimit';
			$flag = 0;
		}

		$usernews = getUserNews($GEDCOM);

		$content = '';
		if(count($usernews) == 0)
		{
			$content .= "{$pgv_lang['no_news']}<br />\n";
		}
		$c = 0;
		$td = time();
		foreach($usernews as $k=>$news)
		{
			if($limit == 'count')
			{
				if($c >= $flag){break;}
				$c++;
			}
			if($limit == 'date')
			{
				if(floor(($td - $news['date']) / 86400) > $flag){break;}
			}
			$content .= "<div class=\"news_box\" id=\"{$news['anchor']}\">\n";

			// Look for $pgv_lang, $factarray, and $GLOBALS substitutions in the News title
			$newsTitle = print_text($news['title'], 0, 2);
			$ct = preg_match("/#(.+)#/", $newsTitle, $match);
			if($ct > 0)
			{
				if(isset($pgv_lang[$match[1]]))
				{
					$newsTitle = preg_replace("/$match[0]/", $pgv_lang[$match[1]], $newsTitle);
				}
			}
			$content .= "<span class=\"news_title\">".PrintReady($newsTitle)."</span><br />\n";
			$content .= "<span class=\"news_date\">".format_timestamp($news['date'])."</span><br /><br />\n";

			// Look for $pgv_lang, $factarray, and $GLOBALS substitutions in the News text
			$newsText = print_text($news['text'], 0, 2);
			$ct = preg_match("/#(.+)#/", $newsText, $match);
			if($ct > 0)
			{
				if(isset($pgv_lang[$match[1]]))
				{
					$newsText = preg_replace("/{$match[0]}/", $pgv_lang[$match[1]], $newsText);
				}
			}
			$ct = preg_match("/#(.+)#/", $newsText, $match);
			if($ct > 0)
			{
				$varname = $match[1];
				if(isset($pgv_lang[$varname]))
				{
					$newsText = preg_replace("/{$match[0]}/", $pgv_lang[$varname], $newsText);
				}
				else
				{
					if(defined('PGV_'.$varname))
					{
						// e.g. global $VERSION is now constant PGV_VERSION
						$varname='PGV_'.$varname;
					}
					if(defined($varname))
					{
						$newsText = preg_replace("/{$match[0]}/", constant($varname), $newsText);
					}
					else
					{
						if(isset($$varname))
						{
							$newsText = preg_replace("/{$match[0]}/", $$varname, $newsText);
						}
					}
				}
			}
			$trans = get_html_translation_table(HTML_SPECIALCHARS);
			$trans = array_flip($trans);
			$newsText = strtr($newsText, $trans);
			//$newsText = nl2br($newsText);
			$content .= PrintReady($newsText)."<br />\n";

			// Print Admin options for this News item
			if(PGV_USER_GEDCOM_ADMIN)
			{
				$content .= "<hr size=\"1\" />"
					."<a href=\"javascript:;\" onclick=\"editnews('{$k}'); return false;\">{$pgv_lang['edit']}</a> | "
					."<a href=\"".encode_url("index.php?action=deletenews&news_id={$k}&ctype={$ctype}")."\" onclick=\"return confirm('{$pgv_lang['confirm_news_delete']}');\">{$pgv_lang['delete']}</a><br />"
				;
			}
			$content .= "</div>\n";
		}
		$printedAddLink = false;
		if(PGV_USER_GEDCOM_ADMIN)
		{
			$content .= "<a href=\"javascript:;\" onclick=\"addnews('".preg_replace("/'/", "\'", $GEDCOM)."'); return false;\">{$pgv_lang['add_news']}</a>";
			$printedAddLink = true;
		}
		if($limit == 'date' || $limit == 'count')
		{
			if($printedAddLink){$content .= '&nbsp;&nbsp;|&nbsp;&nbsp;';}
			$content .= print_help_link('gedcom_news_archive_help', 'qm', '', false, true);
			$content .= "<a href=\"".encode_url("index.php?gedcom_news_archive=yes&ctype={$ctype}")."\">{$pgv_lang['gedcom_news_archive']}</a><br />\n";
		}
		return $content;
	}

	function totalGedcomNews(){return count(getUserNews($GLOBALS['GEDCOM']));}

///////////////////////////////////////////////////////////////////////////////
// Block                                                                     //
///////////////////////////////////////////////////////////////////////////////

	static function callBlock($params=null)
	{
		if($params === null){return '';}
		if(isset($params[0]) && $params[0] != ''){$block = strtolower($params[0]);}else{return '';}

		$func = "print_{$block}";
		if(!function_exists("print_{$block}")){return '';}

		// Build the config array
		array_shift($params);
		$cfg = array();
		foreach($params as $config)
		{
			$bits = explode('=', $config);
			if(count($bits) < 2){continue;}
			$v = array_shift($bits);
			$cfg[$v] = join('=', $bits);
		}

		// Run the block and retrive its contents
		ob_start();
		$func(false, $cfg, 'main', 9999);
		$out = ob_get_clean();
		// Rip out the content of the block
		return trim(substr(trim(stristr($out, 'blockcontent')), 14, -12));
	}

///////////////////////////////////////////////////////////////////////////////
// System                                                                    //
// Only allowed in GEDCOM Welcome page, not user portals for security.       //
///////////////////////////////////////////////////////////////////////////////

	static function includeFile($params=null)
	{
		if(!isset($_GET['ctype']) || $_GET['ctype'] != 'gedcom'){return '';}
		if($params === null){$params = array();}
		if(isset($params[0]) && $params[0] != ''){$fn = $params[0];}else{return '';}

		if(!file_exists($fn) || stristr($fn, 'config.php')){return '';}
		ob_start();
		include filename_decode(real_path($fn));
		return trim(ob_get_clean());
	}
}

--- NEW FILE: class_stats_compat.php ---
<?php
/**
 * GEDCOM Statistics Compatability Class
 *
 * This class provides backwards compatability for older Advanced HTML block
 * tags.  It should not be used for new projects.
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * @version $Id: class_stats_compat.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 * @author Patrick Kellum
 * @package PhpGedView
 * @subpackage Lists
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_STATS_COMPAT_PHP', '');

require_once 'includes/classes/class_stats.php';
class stats_compat extends stats
{
///////////////////////////////////////////////////////////////////////////////
// GEDCOM                                                                    //
///////////////////////////////////////////////////////////////////////////////

	function GEDCOM() {return $this->gedcomFilename();}
	function GEDCOM_ID() {return $this->gedcomID();}
	function GEDCOM_TITLE() {return $this->gedcomTitle();}
	function CREATED_SOFTWARE() {return $this->gedcomCreatedSoftware();}
	function CREATED_VERSION() {return $this->gedcomCreatedVersion();}
	function CREATED_DATE() {return $this->gedcomDate();}
	function GEDCOM_UPDATED() {return $this->gedcomUpdated();}
	function HIGHLIGHT() {return $this->gedcomHighlight();}
	function HIGHLIGHT_LEFT() {return $this->gedcomHighlightLeft();}
	function HIGHLIGHT_RIGHT() {return $this->gedcomHighlightRight();}

///////////////////////////////////////////////////////////////////////////////
// Totals                                                                    //
///////////////////////////////////////////////////////////////////////////////

	function TOTAL_INDI() {return $this->totalIndividuals();}
	function TOTAL_FAM() {return $this->totalFamilies();}
	function TOTAL_SOUR() {return $this->totalSources();}
	function TOTAL_OTHER() {return $this->totalOtherRecords();}
	function TOTAL_SURNAMES() {return $this->totalSurnames();}
	function TOTAL_EVENTS() {return $this->totalEvents();}
	function TOTAL_EVENTS_BIRTH() {return $this->totalEventsBirth();}
	function TOTAL_EVENTS_DEATH() {return $this->totalEventsDeath();}
	function TOTAL_EVENTS_MARRIAGE() {return $this->totalEventsMarriage();}
	function TOTAL_EVENTS_OTHER() {return $this->totalEventsOther();}
	function TOTAL_MALES() {return $this->totalSexMales();}
	function TOTAL_FEMALES() {return $this->totalSexFemales();}
	function TOTAL_UNKNOWN_SEX() {return $this->totalSexUnknown();}
	function TOTAL_USERS() {return $this->totalUsers();}
	function TOTAL_MEDIA() {return $this->totalMedia();}

///////////////////////////////////////////////////////////////////////////////
// Births                                                                    //
///////////////////////////////////////////////////////////////////////////////

	function FIRST_BIRTH() {return $this->firstBirth();}
	function FIRST_BIRTH_YEAR() {return $this->firstBirthYear();}
	function FIRST_BIRTH_NAME() {return $this->firstBirthName();}
	function FIRST_BIRTH_PLACE() {return $this->firstBirthPlace();}
	function LAST_BIRTH() {return $this->lastBirth();}
	function LAST_BIRTH_YEAR() {return $this->lastBirthYear();}
	function LAST_BIRTH_NAME() {return $this->lastBirthName();}
	function LAST_BIRTH_PLACE() {return $this->lastBirthPlace();}

///////////////////////////////////////////////////////////////////////////////
// Deaths                                                                    //
///////////////////////////////////////////////////////////////////////////////

	function FIRST_DEATH() {return $this->firstDeath();}
	function FIRST_DEATH_YEAR() {return $this->firstDeathYear();}
	function FIRST_DEATH_NAME() {return $this->firstDeathName();}
	function FIRST_DEATH_PLACE() {return $this->firstDeathPlace();}
	function LAST_DEATH() {return $this->lastDeath();}
	function LAST_DEATH_YEAR() {return $this->lastDeathYear();}
	function LAST_DEATH_NAME() {return $this->lastDeathName();}
	function LAST_DEATH_PLACE() {return $this->lastDeathPlace();}

///////////////////////////////////////////////////////////////////////////////
// Lifespan                                                                  //
///////////////////////////////////////////////////////////////////////////////

	function LONG_LIFE() {return $this->longestLife();}
	function LONG_LIFE_AGE() {return $this->longestLifeAge();}
	function LONG_LIFE_NAME() {return $this->longestLifeName();}
	function TOP10_OLDEST() {return $this->topTenOldest();}
	function TOP10_OLDEST_LIST() {return $this->topTenOldestList();}
	function AVG_LIFE() {return $this->averageLifespan();}

///////////////////////////////////////////////////////////////////////////////
// Events                                                                    //
///////////////////////////////////////////////////////////////////////////////

	function FIRST_EVENT() {return $this->firstEvent();}
	function FIRST_EVENT_YEAR() {return $this->firstEventYear();}
	function FIRST_EVENT_TYPE() {return $this->firstEventType();}
	function FIRST_EVENT_NAME() {return $this->firstEventName();}
	function FIRST_EVENT_PLACE() {return $this->firstEventPlace();}
	function LAST_EVENT() {return $this->lastEvent();}
	function LAST_EVENT_YEAR() {return $this->lastEventYear();}
	function LAST_EVENT_TYPE() {return $this->lastEventType();}
	function LAST_EVENT_NAME() {return $this->lastEventName();}
	function LAST_EVENT_PLACE() {return $this->lastEventPlace();}

///////////////////////////////////////////////////////////////////////////////
// Family Size                                                               //
///////////////////////////////////////////////////////////////////////////////

	function MOST_CHILD() {return $this->largestFamily();}
	function MOST_CHILD_TOTAL() {return $this->largestFamilySize();}
	function MOST_CHILD_NAME() {return $this->largestFamilyName();}
	function TOP10_BIGFAM() {return $this->topTenLargestFamily();}
	function TOP10_BIGFAM_LIST() {return $this->topTenLargestFamilyList();}
	function AVG_CHILD() {return $this->averageChildren();}

///////////////////////////////////////////////////////////////////////////////
// Contact                                                                   //
///////////////////////////////////////////////////////////////////////////////

	function WEBMASTER_CONTACT() {return $this->contactWebmaster();}
	function GEDCOM_CONTACT() {return $this->contactGedcom();}

///////////////////////////////////////////////////////////////////////////////
// Date & Time                                                               //
///////////////////////////////////////////////////////////////////////////////

	function SERVER_DATE() {return $this->serverDate();}
	function SERVER_TIME() {return $this->serverTime();}
	function SERVER_TIME_24() {return $this->serverTime24();}
	function SERVER_TIMEZONE() {return $this->serverTimezone();}
	function LOCAL_DATE() {return $this->browserDate();}
	function LOCAL_TIME() {return $this->browserTime();}
	function LOCAL_TIME_24() {return $this->browserTime24();}
	function LOCAL_TIMEZONE() {return $this->browserTimezone();}

///////////////////////////////////////////////////////////////////////////////
// Misc.                                                                     //
///////////////////////////////////////////////////////////////////////////////

	function COMMON_SURNAMES() {return $this->commonSurnames();}
}
?>

--- NEW FILE: class_stats.php ---
<?php
/**
* GEDCOM Statistics Class
*
* This class provides a quick & easy method for accessing statistics
* about the GEDCOM.
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
[...2506 lines suppressed...]
		if ($count) {
			$sql=sql_limit_select_query($sql, $count);
		}

		$rows = array();
		$tempsql = dbquery($sql, true);
		if (!DB::isError($tempsql)) {
			$res=& $tempsql;
			while ($row =& $res->fetchRow(DB_FETCHMODE_ASSOC)) {
				$rows[] = $row;
			}
			$res->free();
			$cache[$id] = $rows;
			return $rows;
		}
		return false;
	}
}

?>

--- NEW FILE: class_feedcreator.php ---
<?php
/***************************************************************************

FeedCreator class v1.8.0-dev (development)
http://feedcreator.org
maintained by Mohammad Hafiz bin Ismail (info@...)
feedcreator.org

originally (c) Kai Blankenhorn
 http://www.bitfolge.de
kaib@...


v1.3 work by Scott Reynen (scott@...) and Kai Blankenhorn
v1.5 OPML support by Dirk Clemens
v1.7.2-mod on-the-fly feed generation by Fabian Wolf (info@...)
v1.7.2-ppt ATOM 1.0 support by Mohammad Hafiz bin Ismail (mypapit@...)

This library is free software; you can redistribute it and/or
[...1716 lines suppressed...]
	/**
	 * Overrrides parent to produce .js extensions
	 *
	 * @return string the feed cache filename
	 * @since 1.4
	 * @access private
	 */
	function _generateFilename() {
		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
	}

}






?>

--- NEW FILE: class_geclippings.php ---
<?php
/**
 *
 * phpGedView: Genealogy Viewer
 * Copyright (C) 2002 to 2008  PGV Development Team.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 * @package PhpGedView
 * @subpackage Tools
 * @version $Id: class_geclippings.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
 */

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_GECLIPPINGS_PHP', '');

require_once 'includes/classes/class_grampsexport.php';

class GEClippings extends GrampsExport {
/**
 * This function creates a family relation for a person and appends the relation
 * to the person element.
 *
 * It searches through the DOMDocument first to see if the person is created,
 * if they are not, the person is created and then the DOMDocument is queried
 * and the persons HLINK is retrieved.
 *
 * @param DOMElement $eParent - the parent XML element the date element should be appended to
 * @param GEDCOM record $personRec - the full INDI GEDCOM record of the person that the relation is being created
 * @param int $tag -  the name of the GEDCOM tag (FAMC, FAMS). This is used to allow the same function to work with childin and parent_in_family relations
 */
	function create_fam_relation($eParent, $personRec, $tag) {
		global $pgv_lang;
		$famid = get_gedcom_value($tag, 1, $personRec);
		$handle = $this->query_dom("./families/family[@id=\"$famid\"]/@handle");
		$created = false;
		if ($handle == null && id_in_cart($famid)) {
			$frec = find_family_record($famid);
			/*
			* If the family does not exist and their ID is in the clippings cart,
			* you must create the family before you can query them in the dom to get
			* their hlink. The hlink is generated when the person element is created.
			* This causes overhead creating objects that are never added to the XML file
			* perhaps there is some other way this can be done reducing the overhead?
			*
			*/
			$this->create_family($frec, $famid);
			$handle = $this->query_dom("./families/family[@id=\"$famid\"]/@handle");
		}
		if ($handle != null && id_in_cart($famid)) {
			$elementName = "";
			if ($tag == "FAMC")
				$elementName = "childof";
			else
				$elementName = "parentin";

			$eChildof = $this->dom->createElement($elementName);
			$eChildof->setAttribute("hlink", $handle);
			$eChildof = $eParent->appendChild($eChildof);
		}
	}
	/**
	* Creates the Family element and all of it's child elements, and appends it to the
	* Families element.  This function will search through the DOMDocument looking
	* for people in the family. If they are not created yet and they are in the clippings
	* cart, they will be created and ther hlink added to the family element.
	*
	* @param string $frec - the full FAM GEDCOM record of the family to be created
	* @param string $fid = the ID (F1, F2, F3) of the family that is being created
	*/
	function create_family($frec, $fid) {
		$check = $this->query_dom("./families/family[@id=\"$fid\"]/@id");
		if (($check == null || $check != $fid) && id_in_cart($fid)) {
			$famrec = $frec;
			$eFamily = $this->dom->createElement("family");
			$eFamily->setAttribute("id", $fid);
			$eFamily->setAttribute("handle", $this->generateHandle());
			$eFamily->setAttribute("change", time());
			$eFamily = $this->eFams->appendChild($eFamily);

			// Add the <father> element
			$id = get_gedcom_value("HUSB", 1, $famrec);
			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
			if (!isset ($pers) && id_in_cart($id)) {
				/*
				 *
				 * If the person does not exist and their ID is in the clippings cart,
				 * you must create the person before you can query them in the dom to get
				 * their hlink. The hlink is generated when the person element is created.
				 * This causes overhead creating objects that are never added to the XML file
				 * perhaps there is some other way this can be done reducing the overhead?
				 *
				 */
				$this->create_person(find_person_record($id), $id);
				$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
			}
			if (isset ($id) && trim($id) && id_in_cart($id)) {
				$eFather = $this->dom->createElement("father");
				$eFather->setAttribute("hlink", $pers);
				$eFather = $eFamily->appendChild($eFather);
			}

			// Add the <mother> element
			$id = get_gedcom_value("WIFE", 1, $famrec);
			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
			if (!isset ($pers) && id_in_cart($id)) {
				/*
				 *
				 * If the person does not exist and their ID is in the clippings cart,
				 * you must create the person before you can query them in the dom to get
				 * their hlink. The hlink is generated when the person element is created.
				 * This causes overhead creating objects that are never added to the XML file
				 * perhaps there is some other way this can be done reducing the overhead?
				 *
				 */
				$this->create_person(find_person_record($id), $id);
				$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");
			}
			if (isset ($id) && trim($id) != "" && $id != null && id_in_cart($id)) {
				$eMother = $this->dom->createElement("mother");
				$eMother->setAttribute("hlink", $pers);
				$eMother = $eFamily->appendChild($eMother);
			}

			foreach ($this->familyevents as $event) {
				$this->create_event_ref($eFamily, $frec, $event);
			}


			// Add the <child> element
			$childrenIds = find_children_in_record($famrec);
			foreach($childrenIds as $id)
			{
			$pers = $this->query_dom("./people/person[@id=\"$id\"]/@handle");

			global $type;
			if (isset ($id) && isset ($pers) && (id_in_cart($id)||$type==1)) {
				$eChild = $this->dom->createElement("childref");
				$eChild->setAttribute("hlink", $pers);
				$eChild = $eFamily->appendChild($eChild);
			}
			}


			if (($note = get_sub_record(1, "1 NOTE", $frec)) != null) {
				$this->create_note($eFamily, $note, 1);
			}

			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $frec, $num)) != null) {
				$this->create_sourceref($eFamily, $sourcerefRec, 1);
				$num++;
			}
			$num = 1;
			while (($nameSource = get_sub_record(1, "1 OBJE", $frec, $num)) != null) {

				$this->create_mediaref($eFamily, $nameSource, 1);
				$num++;
			}



		}
	}

	/**
	* Creates the lds_ord element and appends the correct information depending
	* on the type of lds_ord (Endowment, Sealing, Baptism). If there is a sealing,
	* the function will search if the family is in the clippings cart and if the
	* family is created or not. If the family is not created yet, it will be created
	* and added to the DOMDocument
	*
	* @param $indirec - The full INDI GEDCOM record of the person the lds_ord is being created
	* @param $eventName - the name of the LDS event (Baptism, Sealing, Endowment, etc...)
	* @param $eventABV - the event abbreviation in the GEDCOM (ie. SLGC, BAPL, ENDL)
	* @param $eParent - The parent element the lds event is attached to
	*/
	function create_lds_event($indirec, $eventName, $eventABV, $eParent) {
		global $ePerson, $TEMPLE_CODES, $clipping;
		require_once("includes/classes/class_person.php");
		if (($hasldsevent = get_sub_record(1, "1 " . $eventABV, $indirec)) != null) {

			// Create <lds_ord> and attaches the type attribute
			$eLdsEvent = $this->dom->createElement("lds_ord");
			$eLdsEvent->setAttribute("type", $eventName);

			if (($dateRec = get_sub_record(1, "2 DATE", $hasldsevent)) != null)
				$this->create_date($eLdsEvent, $dateRec, 2);

			// Create <temple>, this element is common with all lds ords
			if (($temple = get_gedcom_value($eventABV . ":TEMP", 1, $indirec)) != null) {
				$eTemple = $this->dom->createElement("temple");
				$eTemple->setAttribute("val", $temple);
				$eTemple = $eLdsEvent->appendChild($eTemple);
			}

			if (($place = get_gedcom_value($eventABV . ":PLAC", 1, $indirec)) != null) {
				$hlink = $this->query_dom("./places/placeobj[@title=\"$place\"]/@handle");
				if ($hlink == null) {
					$hlink = $this->generateHandle();
					$this->create_placeobj($place, $hlink);
					$this->create_place($eLdsEvent, $hlink);
				} else {
					$this->create_place($eLdsEvent, $hlink);
				}
			}

			// Check to see if the STAT of the ordinance is set and add it to the
			// <lds_ord> element
			if (($stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec)) != null) {
				$eStatus = $this->dom->createElement("status");
				$stat = get_gedcom_value($eventABV . ":STAT", 1, $indirec);
				$eStatus->setAttribute("val", isset ($stat));
				$eStatus = $eLdsEvent->appendChild($eStatus);
			}
			// If the event is a sealing
			if ($eventABV == "SLGC") {
				// Create an instance of person and look for their family record
				$person = Person :: getInstance($clipping["id"]);
				$famId = $person->getChildFamilyIds();
				$famrec = find_family_record($famId[0]);
				$fid = $famId[0];
				$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
				if ($handle == null && id_in_cart($fid)) {
					/*
					 * If the family does not exist and their ID is in the clippings cart,
					 * you must create the family before you can query them in the dom to get
					 * their hlink. The hlink is generated when the person element is created.
					 * This causes overhead creating objects that are never added to the XML file
					 * perhaps there is some other way this can be done reducing the overhead?
					 *
					 */
					$this->create_family($famrec, $famId[0]);
					$handle = $this->query_dom("./families/family[@id=\"$fid\"]/@handle");
					$eFam = $this->dom->createElement("sealed_to");
					$eFam->setAttribute("hlink", $handle);
					$eFam = $eLdsEvent->appendChild($eFam);
					$person = null;
				} else
					if ($handle != null && id_in_cart($fid)) {
						$eFam = $this->dom->createElement("sealed_to");
						$eFam->setAttribute("hlink", $handle);
						$eFam = $eLdsEvent->appendChild($eFam);
						$person = null;
					}
			}

			if (($note = get_sub_record(1, "2 NOTE", $hasldsevent)) != null)
				$this->create_note($eLdsEvent, $note, 2);

			$num = 1;
			while (($sourcerefRec = get_sub_record(2, "2 SOUR", $hasldsevent, $num)) != null) {
				$this->create_sourceref($eLdsEvent, $sourcerefRec, 2);
				$num++;
			}
			$eLdsEvent = $eParent->appendChild($eLdsEvent);
		}
	}


	/**
	* Creates the Person element and all of it's child elements, and appends it to the
	* 	People element.  Given the link for certain LDS events to a family, if the Family
	* 	has not been previously created, create_family is called to create the family.
	* 	The family relations in the LDS events and in the person element are only created
	* 	if the family they have a relation with are also included in the clippings cart
	*
	* @param string $personRec - the full INDI GEDCOM record of the person to be created
	* @param string $personID - the ID (I1, I2, I3) of the person the is being created
	*/
	function create_person($personRec = "", $personID = "") {
		global $pgv_lang;
		$check = $this->query_dom("./people/person[@id=\"$personID\"]");
		if ($check == null && id_in_cart($personID)) {
			$ePerson = $this->dom->createElement("person");
			$ePerson = $this->ePeople->appendChild($ePerson);
			//$ePerson = $this->ePeople->appendChild($ePerson);

			//set attributes for <person>
			$ePerson->setAttribute("id", $personID);
			$ePerson->setAttribute("handle", $this->generateHandle());
			$ePerson->setAttribute("change", time());

			$eGender = $this->dom->createElement("gender");
			$eGender = $ePerson->appendChild($eGender);
			if (($gender = get_gedcom_value("SEX", 1, $personRec)) != null)
				$etGender = $this->dom->createTextNode($gender);
			else
				$etGender = $this->dom->createTextNode("U");

			$num = 1;
			$etGender = $eGender->appendChild($etGender);

			if (($nameRec = get_sub_record(1, "1 NAME", $personRec)) != null) {
				//creates name
				$eName = $this->dom->createElement("name");
				$eName->setAttribute("type", "Birth Name");

				$givn = get_gedcom_value("GIVN", 2, $nameRec);
				$surn = get_gedcom_value("SURN", 2, $nameRec);
				//-- if no GIVN/SURN sub records then get the names from the 1 NAME line
				if (empty($surn) || empty($givn)) {
					$name = get_gedcom_value("NAME", 1, $nameRec);
					if (!empty($name)) {
						$nparts = explode('/', $name);
						$givn = trim($nparts[0]);
						if (count($nparts)>1) $surn = trim($nparts[1]);
						if (count($nparts)>2) $nnsfx = trim($nparts[2]);
					}
				}
				if (empty($surn))
					$surn = $pgv_lang["unknown"];
				if (empty($givn))
					$givn = $pgv_lang["unknown"];

				$eFirstName = $this->dom->createElement("first");
				$etFirstName = $this->dom->createTextNode($givn);
				$etFirstName = $eFirstName->appendChild($etFirstName);
				$eFirstName = $eName->appendChild($eFirstName);

				$eLastName = $this->dom->createElement("last");
				$etLastName = $this->dom->createTextNode($surn);
				$etLastName = $eLastName->appendChild($etLastName);
				$eLastName = $eName->appendChild($eLastName);
				$eName = $ePerson->appendChild($eName);

				if (!empty($nnsfx) || (($nsfx = get_gedcom_value("NSFX", 2, $nameRec)) != null)) {
					$eSuffix = $this->dom->createElement("suffix");
					if (empty($nsfx)) $nsfx = $nnsfx;
					$etSuffix = $this->dom->createTextNode($nsfx);
					$etSuffix = $eSuffix->appendChild($etSuffix);
					$eSuffix = $eName->appendChild($eSuffix);
				}

				//retrieves name prefix
				if (($npfx = get_gedcom_value("NPFX", 2, $nameRec)) != null) {
					$eTitle = $this->dom->createElement("title");
					$etTitle = $this->dom->createTextNode($npfx);
					$etTitle = $eTitle->appendChild($etTitle);
					$eTitle = $eName->appendChild($eTitle);
				}

				//retrieves the nickname
				if (($nick = get_gedcom_value("NICK", 2, $nameRec)) != null) {
					$eNick = $this->dom->createElement("nick");
					$etNick = $this->dom->createTextNode($nick);
					$etNick = $eNick->appendChild($etNick);
					$eNick = $ePerson->appendChild($eNick);
				}

				//creates note
				if (($nameNote = get_sub_record(2, "2 NOTE", $nameRec)) != null) {
					$this->create_note($eName, $nameNote, 2);
				}

				//creates SourceRef
				$num = 1;
				while (($nameSource = get_sub_record(2, "2 SOUR", $nameRec, $num)) != null) {
					$this->create_sourceref($eName, $nameSource, 2);
					$num++;
				}

			}

			foreach ($this->eventsArray as $event) {
				$this->create_event_ref($ePerson, $personRec, $event);
			}

			$this->create_lds_event($personRec, "baptism", "BAPL", $ePerson);
			$this->create_lds_event($personRec, "endowment", "ENDL", $ePerson);
			$this->create_lds_event($personRec, "sealed_to_parents", "SLGC", $ePerson);

			//creates media refs and media for all media files
			while (($nameSource = get_sub_record(1, "1 OBJE", $personRec, $num)) != null) {

				$this->create_mediaref($ePerson, $nameSource, 1);
				$num++;
			}

			/* This creates the family relation for a person, to link them to
			 * the family they are a child in and to link them to the family
			 * where they are a spouse. These relations will only be included
			 * if the family is also in the clippings cart. Otherwise, the relations
			 * are simply left out of the XML file.
			 *
			 *
			*create_fam_relation($ePerson,$personRec,"FAMC");
			*create_fam_relation($ePerson,$personRec,"FAMS");
			*/
			if (($note = get_sub_record(1, "1 NOTE", $personRec)) != null) {
				$this->create_note($ePerson, $note, 1);
			}
			$num = 1;
			while (($sourcerefRec = get_sub_record(1, "1 SOUR", $personRec, $num)) != null) {
				$this->create_sourceref($ePerson, $sourcerefRec, 1);
				$num++;
			}
		}

	}



	/**
	* Creates the SourceRef element and appends it to the Parent Element.  If the actual Source has not
	* 	been previously created, this will retrieve the record for that, and create that also.
	*
	* @param DOMElement $eParent - the parent DOMElement to which the created Note Element is appended
	* @param string $sourcerefRec - the record containing the reference to a Source
	* @param int $level - The GEDCOM line level where the SOUR tag may be found
	*/
	function create_sourceref($eParent, $sourcerefRec, $level) {
		if (($sourceID = get_gedcom_value("SOUR", $level, $sourcerefRec)) != null) {


			if (id_in_cart($sourceID)) {
				$eSourceRef = $this->dom->createElement("sourceref");
				$eSourceRef = $eParent->appendChild($eSourceRef);
				if (($sourceHlink = $this->query_dom("./sources/source[@id = \"$sourceID\"]/@handle")) == null)
					$this->create_source($sourceID, find_source_record($sourceID));

				$eSourceRef->setAttribute("hlink", $this->query_dom("./sources/source[@id = \"$sourceID\"]/@handle"));

				if (($page = get_gedcom_value("SOUR:PAGE", $level, $sourcerefRec)) != null) {
					$eSPage = $this->dom->createElement("spage");
					$etSPage = $this->dom->createTextNode($page);
					$etSPage = $eSPage->appendChild($etSPage);
					$eSPage = $eSourceRef->appendChild($eSPage);
				}

				if (($comments = get_gedcom_value("SOUR:NOTE", $level, $sourcerefRec)) != null) {
					$eSComments = $this->dom->createElement("scomments");
					$etSComments = $this->dom->createTextNode($comments);
					$etSComments = $eSComments->appendChild($etSComments);
					$eSComments = $eSourceRef->appendChild($eSComments);
				}

				if (($text = get_gedcom_value("SOUR:TEXT", $level, $sourcerefRec)) != null) {
					$num = 1;
					while (($cont = get_gedcom_value("SOUR:TEXT:CONT", $level, $sourcerefRec, $num)) != null) {
						$text .= $cont;
						$num++;
					}
					$eSText = $this->dom->createElement("stext");
					$etSText = $this->dom->createTextNode($text);
					$etSText = $eSText->appendChild($etSText);
					$eSText = $eSourceRef->appendChild($eSText);
				}

				if (($dateRec = get_sub_record(1, ($level +1) . " DATE", $sourcerefRec)) != null) {
					$this->create_date($eSourceRef, $dateRec, $level +1);
				}
			}
		}
	}

	/**
	  * Check if the element is in the cart
	  *
	  */

	function items_in_cart($elementName) {
		$passed = true;
		$people = $this->dom->getElementsByTagName($elementName);
		foreach ($people as $person) {
			$id = $person->attributes->item(0)->nodeValue;
			if (!id_in_cart($id)) {
				$passed = false;
			}
		}
		return $passed;
	}
}
?>

--- NEW FILE: class_gedcomrecord.php ---
<?php
/**
* Base class for all gedcom records
*
* phpGedView: Genealogy Viewer
* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*
* @package PhpGedView
* @subpackage DataModel
* @version $Id: class_gedcomrecord.php,v 1.1 2009/04/30 18:30:36 lsces Exp $
*/

if (!defined('PGV_PHPGEDVIEW')) {
	header('HTTP/1.0 403 Forbidden');
	exit;
}

define('PGV_CLASS_GEDCOMRECORD_PHP', '');

require_once 'includes/classes/class_person.php';
require_once 'includes/classes/class_family.php';
require_once 'includes/classes/class_source.php';
require_once 'includes/classes/class_repository.php';
require_once 'includes/classes/class_note.php';
require_once 'includes/classes/class_media.php';
require_once 'includes/classes/class_event.php';
require_once 'includes/classes/class_serviceclient.php';

class GedcomRecord {
	var $xref       =null;  // The record identifier
	var $type       =null;  // INDI, FAM, etc.
	var $ged_id     =null;  // The gedcom file, only set if this record comes from the database
	var $gedrec     =null;  // Raw gedcom text (privatised)
	private $changed=false; // Is this a new record from pgv_changes[]
	var $rfn        =null;
	var $facts      =null;
	var $changeEvent=null;
	var $disp       =true;  // Can we display details of