diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/authentication.php | 8 | ||||
| -rw-r--r-- | includes/functions/functions_edit.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_import.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_rtl.php | 5 | ||||
| -rw-r--r-- | includes/session_spider.php | 2 |
5 files changed, 7 insertions, 12 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`". |