Update some comments from PGV to webtrees

10 files changed, 38 insertions, 47 deletions

diff --git a/includes/authentication.php b/includes/authentication.php
index 73f60b1411..a712695962 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -99,9 +99,9 @@ function userUpdateLogin($user_id) {
  *
  * Returns 0 and NULL if we are not logged in.
  *
- * If you want to embed PGV within a content management system, you would probably
+ * If you want to embed webtrees within a content management system, you would probably
  * rewrite these functions to extract the data from the parent system, and then
- * populate PGV's user/user_setting/user_gedcom_setting tables as appropriate.
+ * populate webtrees' user/user_setting/user_gedcom_setting tables as appropriate.
  *
  */
 
@@ -261,8 +261,8 @@ function getUserGedcomId($user_id, $ged_id) {
 }
 
 // add a message into the log-file
-// Note that while transfering data from PGV to WT, we delete the WT users and
-// replace with PGV users.  Hence the current user_id is not always available.
+// Note that while transfering data from PhpGedView to WT, we delete the WT users and
+// replace with PhpGedView users.  Hence the current user_id is not always available.
 function AddToLog($log_message, $log_type='error') {
 	WT_DB::prepare(
 		"INSERT INTO `##log` (log_type, log_message, ip_address, user_id, gedcom_id) VALUES (?, ?, ?, ?, ?)"
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index 79d0240e02..d6bb10f8d0 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -740,7 +740,7 @@ function print_indi_form($nextaction, $famid, $linenum='', $namerec='', $famtag=
 	if (preg_match_all('/('.WT_REGEX_TAG.')/', $ADVANCED_NAME_FACTS, $match))
 		foreach ($match[1] as $tag)
 			$adv_name_fields[$tag]='';
-	// This is a custom tag, but PGV uses it extensively.
+	// This is a custom tag, but webtrees uses it extensively.
 	if ($SURNAME_TRADITION=='paternal' || $SURNAME_TRADITION=='polish' || $SURNAME_TRADITION=='lithuanian' || (strpos($namerec, '2 _MARNM')!==false)) {
 		$adv_name_fields['_MARNM']='';
 	}
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index 1e482e355f..bf25399ab1 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -1187,7 +1187,7 @@ function reject_all_changes($xref, $ged_id) {
 }
 
 // Find a string in a file, preceded by a any form of line-ending.
-// Although PGV always writes them as WT_EOL, it is possible that the file was
+// Although webtrees always writes them as WT_EOL, it is possible that the file was
 // edited externally by an editor that uses different endings.
 function find_newline_string($haystack, $needle, $offset=0) {
 	if ($pos=strpos($haystack, "\r\n{$needle}", $offset)) {
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index 90e0ba6e17..6585dcd2ec 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -1077,13 +1077,10 @@ function unhtmlentities($string)  {
  */
 function hasRTLText($text) {
 	global $RTLOrd;
-	//--- What if gedcom in ANSI?
-	// if (!(strpos($text, chr(215))=== false)) return true;  // OK?
 	for ($i=0; $i<strlen($text); $i++) {
 		if (in_array(ord(substr(trim($text),$i,2)),$RTLOrd)) return true;
 	}
 	return false;
-
 }
 
 /**
@@ -1094,8 +1091,6 @@ function hasRTLText($text) {
  */
 function hasLTRText($text) {
 	global $SpecialChar, $SpecialPar, $SpecialNum, $RTLOrd;
-	//--- What if gedcom in ANSI?
-	//--- Should have one fullspecial characters array in PGV -
 
 	for ($i=0; $i<strlen($text); $i++) {
 		if (in_array(ord(substr(trim($text),$i,2)),$RTLOrd) || in_array(ord(substr(trim($text),$i-1,2)),$RTLOrd)) $i++;
diff --git a/includes/session_spider.php b/includes/session_spider.php
index b9c5cc8f4e..a4410c0e64 100644
--- a/includes/session_spider.php
+++ b/includes/session_spider.php
@@ -308,7 +308,7 @@ if (!$real) {
 //   they are not automatically detected above.   Setting his own IP address
 //   in the ip_address table 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 update the table pgv_ip_address directly.
+//   mode or update the table wt_ip_address directly.
 try {
 	$search_engine=WT_DB::prepare(
 		"SELECT ip_address, comment FROM `##ip_address`".
diff --git a/js/jw_player/wmvVideo.php b/js/jw_player/wmvVideo.php
index bcb4461984..444c8070ae 100644
--- a/js/jw_player/wmvVideo.php
+++ b/js/jw_player/wmvVideo.php
@@ -1,35 +1,31 @@
 <?php
-/**
- * JW Player module for phpGedView
- *
- * Display wmv video media Items using JW Player in PGV
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2007 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 webtrees
- * @subpackage Module
- * @version $Id$
- * @author Brian Holland
- */
- ?>
+// JW Player module for phpGedView
+//
+// Display wmv video media Items using JW Player in webtrees
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2010 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2007 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
+//
+// $Id$
+
+?>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php // echo WT_I18N::html_markup(); ?>>
 <head>
 	<META HTTP-EQUIV="Expires" CONTENT="Tue, 01 Jan 1980 1:00:00 GMT">
diff --git a/library/WT/Controller/AdvancedSearch.php b/library/WT/Controller/AdvancedSearch.php
index f6e4c09e51..1a1ab36063 100644
--- a/library/WT/Controller/AdvancedSearch.php
+++ b/library/WT/Controller/AdvancedSearch.php
@@ -187,7 +187,7 @@ class WT_Controller_AdvancedSearch extends WT_Controller_Search {
 			$parts = preg_split("/:/", $field);
 			//-- handle names seperately
 			if ($parts[0]=="NAME") {
-				// The pgv_name table contains both names and soundex values
+				// The wt_name table contains both names and soundex values
 				if (!$namesTable) {
 					$sqltables.=" JOIN `##name` ON (i_file=n_file AND i_id=n_id) ";
 					$namesTable = true;
diff --git a/mediafirewall.php b/mediafirewall.php
index a7f5514448..f15deb1a96 100644
--- a/mediafirewall.php
+++ b/mediafirewall.php
@@ -342,7 +342,7 @@ if (empty($controller->pid)) {
 	}
 }
 
-// check PGV permissions
+// check webtrees permissions
 if (!$controller->record->canDisplayDetails()) {
 	// if no permissions, bail
 	// Note: the 404 error status is still in effect
diff --git a/modules_v3/batch_update/admin_batch_update.php b/modules_v3/batch_update/admin_batch_update.php
index b0b47c7548..405e0ff1dc 100644
--- a/modules_v3/batch_update/admin_batch_update.php
+++ b/modules_v3/batch_update/admin_batch_update.php
@@ -48,7 +48,7 @@ class batch_update {
 	var $next_xref=null; // The next xref to process
 	var $record   =null; // A GedcomRecord object corresponding to $curr_xref
 
-	// Main entry point - called by the PGV framework in response to module.php?mod=batch_update
+	// Main entry point - called by the webtrees framework in response to module.php?mod=batch_update
 	function main() {
 		// HTML common to all pages
 		$html=
diff --git a/reportengine.php b/reportengine.php
index cdbcc6be48..b508aa5fcd 100644
--- a/reportengine.php
+++ b/reportengine.php
@@ -1,7 +1,7 @@
 <?php
 // Report Engine
 //
-// Processes PGV XML Reports and generates a report
+// Processes webtrees XML Reports and generates a report
 //
 // webtrees: Web based Family History software
 // Copyright (C) 2011 webtrees development team.