hydro and email bugs fixes

Author: steevenz

src/Http/Router.php

@@ -191,38 +191,40 @@ public function handle(KernelMessageUri $uri = null)
              * Try to find static page
              * ------------------------------------------------------------------------
              */
-            if (false !== ($pageFilePath = view()->getPageFilePath($this->uri->segments->__toString()))) {
-                presenter()->page->setFile($pageFilePath);
+            if(services()->has('view')){
+                if (false !== ($pageFilePath = view()->getPageFilePath($this->uri->segments->__toString()))) {
+                    presenter()->page->setFile($pageFilePath);
 
-                if($spaControllerClassName = $this->getControllerClassName('Pages')) {
-                    if (presenter()->page->file instanceof SplFileInfo) {
-                        $this->setController(
-                            (new KernelControllerDataStructure($spaControllerClassName))
-                                ->setRequestMethod('index')
-                        );
-
-                        return true;
-                    }
-                }
-            } elseif (class_exists($pagesModelClassName = modules()->top()->getNamespace() . 'Models\Pages')) {
-                models()->load($pagesModelClassName, 'controller');
-
-                if (false !== ($page = models('controller')->findWhere([
-                        'slug' => $this->uri->segments->__toString()
-                    ], 1))) {
-                    if (isset($page->content)) {
-                        foreach($page as $offset => $value) {
-                            presenter()->page->offsetSet($offset, $value);
-                        }
-
-                        if (class_exists($spaControllerClassName = modules()->top()->getNamespace() . 'Controllers\Pages')) {
+                    if($spaControllerClassName = $this->getControllerClassName('Pages')) {
+                        if (presenter()->page->file instanceof SplFileInfo) {
                             $this->setController(
                                 (new KernelControllerDataStructure($spaControllerClassName))
                                     ->setRequestMethod('index')
                             );
+
+                            return true;
                         }
+                    }
+                } elseif (class_exists($pagesModelClassName = modules()->top()->getNamespace() . 'Models\Pages')) {
+                    models()->load($pagesModelClassName, 'controller');
+
+                    if (false !== ($page = models('controller')->findWhere([
+                            'slug' => $this->uri->segments->__toString()
+                        ], 1))) {
+                        if (isset($page->content)) {
+                            foreach($page as $offset => $value) {
+                                presenter()->page->offsetSet($offset, $value);
+                            }
+
+                            if (class_exists($spaControllerClassName = modules()->top()->getNamespace() . 'Controllers\Pages')) {
+                                $this->setController(
+                                    (new KernelControllerDataStructure($spaControllerClassName))
+                                        ->setRequestMethod('index')
+                                );
+                            }
 
-                        return true;
+                            return true;
+                        }
                     }
                 }
             }

src/Models/Sql/System/Media.php

@@ -66,4 +66,19 @@ public function rebuildRow(&$row)
 
         $row->url = $row->record->type === 'IMAGE' ? images_url($filePath) : storage_url($filePath);
     }
+
+    // ------------------------------------------------------------------------
+    /**
+     * Media::image
+     *
+     * @return string
+     */
+    public function image(): string
+    {
+        $image = PATH_STORAGE . 'images/' .$this->row->filepath;
+        if (is_file($image)) {
+            return images_url($image);
+        }
+        return images_url('/images/default/no-image.jpg');
+    }
 }

src/Models/Sql/System/Storage/Authorities.php

@@ -130,4 +130,14 @@ public function profile()
         return $this->morphOneThrough(People::class, Relationships::class, 'relation');
     }
     // ------------------------------------------------------------------------
+
+    /**
+     * Users::avatar
+     *
+     * @return string
+     */
+    public function avatar()
+    {
+        return 'https://avatars.dicebear.com/v2/initials/' . preg_replace('/[^a-z0-9 _.-]+/i', '', $this->row->username) . '.svg';
+    }
 }

src/Models/Sql/System/Users.php

@@ -14,6 +14,7 @@
 
 // ------------------------------------------------------------------------
 
+use O2System\Session;
 use O2System\Spl\DataStructures\SplArrayStorage;
 
 /**
@@ -173,8 +174,10 @@ protected function insertRecordData(SplArrayStorage &$data)
     protected function updateRecordData(SplArrayStorage &$data)
     {
         if(is_null($this->recordUser)) {
-            if(session()->offsetExists('account')) {
-                $this->setRecordUser(session()->account->id);
+            if(session() instanceof Session) {
+                if(session()->offsetExists('account')) {
+                    $this->setRecordUser(session()->account->id);
+                }
             }
         }
 

src/Models/Sql/Traits/RecordTrait.php

@@ -36,6 +36,10 @@ public function __construct()
         if ($config = config()->loadFile('email', true)) {
             $this->setConfig($config->getArrayCopy());
         }
+
+        if(ENVIRONMENT === 'PRODUCTION') {
+            $this->config['debug'] = false;
+        }
     }
 
     // ------------------------------------------------------------------------