Correcting initial chicken and egg config save + correcting site var

idno · Dec 2, 2020 · 9d05714 · 9d05714
1 parent 1210518
commit 9d05714
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Idno/Core/Idno.php b/Idno/Core/Idno.php
@@ -441,19 +441,21 @@ function &site_details() : ? Site
 
                 $domain = $this->config()->host;
 
-                $this->site_details = Site::getOne([ 'domain' => $domain ]);
-
-                if (empty($this->site_details)) {
-
-                    $this->site_details = new Site();
-                    $this->site_details->domain = $domain;
-                    $this->site_details->save();
+                if (!empty($domain) && !empty($this->session())) {
 
+                    $this->site_details = Site::getOne([ 'domain' => $domain ]);
+
                     if (empty($this->site_details)) {
-                        throw new \RuntimeException($this->language()->_('Site entity for "%s" could not be created', [$domain]));
+
+                        $this->site_details = new Site();
+                        $this->site_details->domain = $domain;
+                        $this->site_details->save();
+
+                        if (empty($this->site_details)) {
+                            throw new \RuntimeException($this->language()->_('Site entity for "%s" could not be created', [$domain]));
+                        }
                     }
                 }
-
             }
 
             return $this->site_details;

diff --git a/Idno/Data/Mongo.php b/Idno/Data/Mongo.php
@@ -173,7 +173,7 @@ function saveRecord($collection, $array)
             if (empty($array['_id'])) {
 
                 // Save site
-                if (empty($array['siteid'])) {
+                if (empty($array['siteid']) && !empty(Idno::site()->site_details())) {
                     $array['siteid'] = Idno::site()->site_details()->uuid();
                 }
 

diff --git a/Idno/Data/MySQL.php b/Idno/Data/MySQL.php
@@ -181,7 +181,7 @@ function saveRecord($collection, $array)
             if (empty($array['_id'])) {
                 $array['_id'] = $this->generateID(); 
             }
-            if (empty($array['siteid'])) {
+            if (empty($array['siteid']) && !empty(Idno::site()->site_details())) {
                 $array['siteid'] = Idno::site()->site_details()->uuid();
             }
             if (empty($array['uuid'])) {
@@ -249,8 +249,6 @@ function saveRecord($collection, $array)
             $search = strtolower($search);
             $search = Idno::site()->language()->uncurlQuotes($search);
 
-            $site = Idno::site()->site_details()->uuid(); 
-
             $client = $this->client;
             /* @var \PDO $client */
 
@@ -263,7 +261,7 @@ function saveRecord($collection, $array)
                                                     values
                                                     (:uuid, :id, :siteid, :subtype, :owner, :contents, :publish_status, :created)
                                                     on duplicate key update `uuid` = :uuid, `entity_subtype` = :subtype, `owner` = :owner, `contents` = :contents, `publish_status` = :publish_status, `created` = :created");
-                if ($statement->execute(array(':uuid' => $array['uuid'], ':id' => $array['_id'], ':siteid' => $site, ':owner' => $array['owner'], ':subtype' => $array['entity_subtype'], ':contents' => $contents, ':publish_status' => $array['publish_status'], ':created' => $array['created']))) {
+                if ($statement->execute(array(':uuid' => $array['uuid'], ':id' => $array['_id'], ':siteid' => $array['siteid'], ':owner' => $array['owner'], ':subtype' => $array['entity_subtype'], ':contents' => $contents, ':publish_status' => $array['publish_status'], ':created' => $array['created']))) {
 
                     // Update FTS
                     $statement = $client->prepare("insert into {$collection}_search