From 5e6cd8f66bf74d6b1c357748d8871ad7c6476880 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 3 Jun 2021 11:58:42 +0800 Subject: [PATCH] syncing core_person and groups --- DataObjects/Core_company.php | 6 ++++++ DataObjects/Core_person.php | 3 --- DataObjects/Core_project.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php index ac634497..ba7df393 100644 --- a/DataObjects/Core_company.php +++ b/DataObjects/Core_company.php @@ -499,10 +499,16 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject } static function lookupOwner() { + static $cache = false; + if ($cache !== false) { + return clone($cache); // no updating this object.. + } + $enum = DB_DataObject::Factory('core_enum')->lookup('COMPTYPE', 'OWNER' ); $companies = DB_DataObject::factory('core_company'); $companies->comptype_id = $enum; if ($companies->find(true)) { + $cache = clone($companies); return $companies; } return false; diff --git a/DataObjects/Core_person.php b/DataObjects/Core_person.php index f473b5c0..7b61faf3 100644 --- a/DataObjects/Core_person.php +++ b/DataObjects/Core_person.php @@ -523,11 +523,8 @@ class Pman_Core_DataObjects_Core_person extends DB_DataObject $this->isAuth(); // force session start.. $sesPrefix = $this->sesPrefix(); - $_SESSION[get_class($this)][$sesPrefix .'-auth-timeout'] = -1; - $_SESSION[get_class($this)][$sesPrefix .'-auth'] = ""; - self::$authUser = false; } diff --git a/DataObjects/Core_project.php b/DataObjects/Core_project.php index 20bc6198..3e48b0af 100644 --- a/DataObjects/Core_project.php +++ b/DataObjects/Core_project.php @@ -130,7 +130,7 @@ class Pman_Core_DataObjects_Core_project extends DB_DataObject //&& $au->hasPerm('Documents.Documents','S') << this is dependant on the doc modules - if (!$au->hasPerm('Core.Projects_All','S') ) { + if (php_sapi_name() != 'cli' && !$au->hasPerm('Core.Projects_All','S') ) { -- 2.39.2