diff options
| -rw-r--r-- | includes/session.php | 6 | ||||
| -rw-r--r-- | library/WT/Tree.php | 19 |
2 files changed, 11 insertions, 14 deletions
diff --git a/includes/session.php b/includes/session.php index 9393703607..210bdd1cf3 100644 --- a/includes/session.php +++ b/includes/session.php @@ -459,7 +459,7 @@ if (isset($_REQUEST['ged'])) { $WT_TREE = null; foreach (WT_Tree::getAll() as $tree) { $WT_TREE = $tree; - if ($WT_TREE->tree_name == $GEDCOM && ($WT_TREE->imported || Auth::isAdmin())) { + if ($WT_TREE->tree_name == $GEDCOM && ($WT_TREE->getPreference('imported') || Auth::isAdmin())) { break; } } @@ -470,7 +470,6 @@ if ($WT_TREE) { define('WT_GED_ID', $WT_TREE->tree_id); define('WT_GEDURL', $WT_TREE->tree_name_url); define('WT_TREE_TITLE', WT_Filter::escapeHtml($WT_TREE->tree_title)); - define('WT_IMPORTED', $WT_TREE->imported); define('WT_USER_GEDCOM_ADMIN', Auth::isManager($WT_TREE)); define('WT_USER_CAN_ACCEPT', Auth::isModerator($WT_TREE)); define('WT_USER_CAN_EDIT', Auth::isEditor($WT_TREE)); @@ -491,7 +490,6 @@ if ($WT_TREE) { define('WT_GED_ID', null); define('WT_GEDURL', ''); define('WT_TREE_TITLE', WT_WEBTREES); - define('WT_IMPORTED', false); define('WT_USER_GEDCOM_ADMIN', false); define('WT_USER_CAN_ACCEPT', false); define('WT_USER_CAN_EDIT', false); @@ -539,7 +537,7 @@ if (WT_Site::getPreference('LOGIN_URL')) { // If there is no current tree and we need one, then redirect somewhere if (WT_SCRIPT_NAME != 'admin_trees_manage.php' && WT_SCRIPT_NAME != 'admin_pgv_to_wt.php' && WT_SCRIPT_NAME != 'login.php' && WT_SCRIPT_NAME != 'logout.php' && WT_SCRIPT_NAME != 'import.php' && WT_SCRIPT_NAME != 'help_text.php' && WT_SCRIPT_NAME != 'message.php') { - if (!$WT_TREE || !WT_IMPORTED) { + if (!$WT_TREE || !$WT_TREE->getPreference('imported')) { if (Auth::isAdmin()) { header('Location: ' . WT_SERVER_NAME . WT_SCRIPT_PATH . 'admin_trees_manage.php'); } else { diff --git a/library/WT/Tree.php b/library/WT/Tree.php index db81cef75d..7e8992e797 100644 --- a/library/WT/Tree.php +++ b/library/WT/Tree.php @@ -51,14 +51,13 @@ class WT_Tree { * @param $tree_title * @param $imported */ - private function __construct($tree_id, $tree_name, $tree_title, $imported) { + private function __construct($tree_id, $tree_name, $tree_title) { $this->tree_id = $tree_id; $this->tree_name = $tree_name; $this->tree_name_url = rawurlencode($tree_name); $this->tree_name_html = WT_Filter::escapeHtml($tree_name); $this->tree_title = $tree_title; $this->tree_title_html = '<span dir="auto">' . WT_Filter::escapeHtml($tree_title) . '</span>'; - $this->imported = $imported; } /** @@ -114,7 +113,7 @@ class WT_Tree { // Update our cache $this->preferences[$setting_name] = $setting_value; // Audit log of changes - Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '"'); + Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '"', $this); } return $this; @@ -178,7 +177,7 @@ class WT_Tree { // Update our cache $this->user_preferences[$user->getUserId()][$setting_name] = $setting_value; // Audit log of changes - Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"'); + Log::addConfigurationLog('Tree setting "' . $setting_name . '" set to "' . $setting_value . '" for user "' . $user->getUserName() . '"', $this); } return $this; @@ -204,7 +203,7 @@ class WT_Tree { if (self::$trees === null) { self::$trees = array(); $rows = WT_DB::prepare( - "SELECT SQL_CACHE g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title, gs2.setting_value AS imported" . + "SELECT SQL_CACHE g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" . " FROM `##gedcom` g" . " LEFT JOIN `##gedcom_setting` gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" . " LEFT JOIN `##gedcom_setting` gs2 ON (g.gedcom_id=gs2.gedcom_id AND gs2.setting_name='imported')" . @@ -222,7 +221,7 @@ class WT_Tree { " ORDER BY g.sort_order, 3" )->execute(array(Auth::id(), Auth::id()))->fetchAll(); foreach ($rows as $row) { - self::$trees[$row->tree_id] = new WT_Tree($row->tree_id, $row->tree_name, $row->tree_title, $row->imported); + self::$trees[$row->tree_id] = new WT_Tree($row->tree_id, $row->tree_name, $row->tree_title); } } @@ -230,8 +229,7 @@ class WT_Tree { } /** - * Get the tree with a specific ID. TODO - is this function needed long-term, or just while - * we integrate this class into the rest of the code? + * Get the tree with a specific ID. * * @param integer $tree_id * @@ -324,6 +322,9 @@ class WT_Tree { self::$trees = null; $tree = self::get($tree_id); + $tree->setPreference('imported', '0'); + $tree->setPreference('title', $tree_title); + // Module privacy WT_Module::setDefaultAccess($tree_id); @@ -437,8 +438,6 @@ class WT_Tree { $tree->setPreference('WEBMASTER_USER_ID', Auth::id()); $tree->setPreference('WEBTREES_EMAIL', ''); $tree->setPreference('WORD_WRAPPED_NOTES', '0'); - $tree->setPreference('imported', '0'); - $tree->setPreference('title', $tree_title); // Default restriction settings $statement = WT_DB::prepare( |