summaryrefslogtreecommitdiff
path: root/includes/functions
diff options
context:
space:
mode:
authorfisharebest <fisharebest@gmail.com>2010-04-26 20:26:24 +0000
committerfisharebest <fisharebest@gmail.com>2010-04-26 20:26:24 +0000
commit3269cbd3d4d7dfe7c8f60516b566ebb2ac25823a (patch)
tree3a4dee60f2a7220a8c55f21b8a9d40a729f6fbb4 /includes/functions
parentb329be8841aceed6551b9bfc0cb5436f83a57e35 (diff)
downloadwebtrees-3269cbd3d4d7dfe7c8f60516b566ebb2ac25823a.tar.gz
webtrees-3269cbd3d4d7dfe7c8f60516b566ebb2ac25823a.tar.bz2
webtrees-3269cbd3d4d7dfe7c8f60516b566ebb2ac25823a.zip
Diffstat (limited to 'includes/functions')
-rw-r--r--includes/functions/functions_export.php12
-rw-r--r--includes/functions/functions_privacy.php10
2 files changed, 11 insertions, 11 deletions
diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php
index 984a1b99ad..5a0287c7af 100644
--- a/includes/functions/functions_export.php
+++ b/includes/functions/functions_export.php
@@ -271,8 +271,8 @@ function export_gedcom($gedcom, $gedout, $exportOptions) {
$export_user_id = createTempUser($tempUserID, $exportOptions['privatize'], $gedcom); // Create a temporary userid
// Temporarily become this user
- $_SESSION["org_user"]=$_SESSION["pgv_user"];
- $_SESSION["pgv_user"]=$tempUserID;
+ $_SESSION["org_user"]=$_SESSION["wt_user"];
+ $_SESSION["wt_user"]=$tempUserID;
}
$head=gedcom_header($gedcom);
@@ -364,7 +364,7 @@ function export_gedcom($gedcom, $gedout, $exportOptions) {
fwrite($gedout, $buffer."0 TRLR".WT_EOL);
if ($exportOptions['privatize']!='none') {
- $_SESSION["pgv_user"]=$_SESSION["org_user"];
+ $_SESSION["wt_user"]=$_SESSION["org_user"];
delete_user($export_user_id);
AddToLog("deleted dummy user -> {$tempUserID} <-", 'auth');
}
@@ -400,8 +400,8 @@ function export_gramps($gedcom, $gedout, $exportOptions) {
$export_user_id = createTempUser($tempUserID, $exportOptions['privatize'], $gedcom); // Create a temporary userid
// Temporarily become this user
- $_SESSION["org_user"]=$_SESSION["pgv_user"];
- $_SESSION["pgv_user"]=$tempUserID;
+ $_SESSION["org_user"]=$_SESSION["wt_user"];
+ $_SESSION["wt_user"]=$tempUserID;
}
$geDownloadGedcom=new GEDownloadGedcom();
@@ -450,7 +450,7 @@ function export_gramps($gedcom, $gedout, $exportOptions) {
fwrite($gedout,$geDownloadGedcom->dom->saveXML());
if ($exportOptions['privatize']!='none') {
- $_SESSION["pgv_user"]=$_SESSION["org_user"];
+ $_SESSION["wt_user"]=$_SESSION["org_user"];
delete_user($export_user_id);
AddToLog("deleted dummy user -> {$tempUserID} <-", 'auth');
}
diff --git a/includes/functions/functions_privacy.php b/includes/functions/functions_privacy.php
index f11a9832bd..3a22cb30e4 100644
--- a/includes/functions/functions_privacy.php
+++ b/includes/functions/functions_privacy.php
@@ -351,7 +351,7 @@ function displayDetailsById($pid, $type = "INDI", $sitemap = false) {
global $GEDCOM;
$ged_id=get_id_from_gedcom($GEDCOM);
- if ($_SESSION["pgv_user"]==WT_USER_ID) {
+ if ($_SESSION["wt_user"]==WT_USER_ID) {
// Normal operation
$pgv_GEDCOM = WT_GEDCOM;
$pgv_GED_ID = WT_GED_ID;
@@ -667,7 +667,7 @@ function showLivingNameById($pid) {
global $GEDCOM;
global $SHOW_LIVING_NAMES, $person_privacy, $user_privacy;
- if ($_SESSION["pgv_user"]==WT_USER_ID) {
+ if ($_SESSION["wt_user"]==WT_USER_ID) {
// Normal operation
$pgv_USER_NAME = WT_USER_NAME;
$pgv_USER_ACCESS_LEVEL = WT_USER_ACCESS_LEVEL;
@@ -717,7 +717,7 @@ function showFact($fact, $pid, $type='INDI') {
global $GEDCOM;
global $global_facts, $person_facts, $SHOW_SOURCES;
- if ($_SESSION["pgv_user"]==WT_USER_ID) {
+ if ($_SESSION["wt_user"]==WT_USER_ID) {
// Normal operation
$pgv_USER_ACCESS_LEVEL = WT_USER_ACCESS_LEVEL;
} else {
@@ -768,7 +768,7 @@ function showFactDetails($fact, $pid) {
global $GEDCOM;
global $global_facts, $person_facts;
- if ($_SESSION["pgv_user"]==WT_USER_ID) {
+ if ($_SESSION["wt_user"]==WT_USER_ID) {
// Normal operation
$pgv_USER_ACCESS_LEVEL = WT_USER_ACCESS_LEVEL;
} else {
@@ -966,7 +966,7 @@ function FactEditRestricted($pid, $factrec) {
* @return int Allowed or not allowed
*/
function FactViewRestricted($pid, $factrec) {
- if ($_SESSION['pgv_user']==WT_USER_ID) {
+ if ($_SESSION['wt_user']==WT_USER_ID) {
// Normal operation
$pgv_GED_ID = WT_GED_ID;
$pgv_USER_GEDCOM_ADMIN = WT_USER_GEDCOM_ADMIN;