Handle weblink not found error (#565)

* Handle weblink not found error

* CS

Author: joomdonation

src/administrator/components/com_weblinks/src/View/Weblink/HtmlView.php

@@ -157,7 +157,7 @@ protected function addToolbar()
 
             ToolbarHelper::cancel('weblink.cancel', 'JTOOLBAR_CLOSE');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 ToolbarHelper::versions('com_weblinks.weblink', $this->item->id);
             }
 

src/administrator/components/com_weblinks/src/View/Weblinks/HtmlView.php

@@ -12,14 +12,14 @@
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
+
 // phpcs:enable PSR1.Files.SideEffects
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Weblinks\Administrator\Model\WeblinksModel;
 
@@ -66,11 +66,11 @@ class HtmlView extends BaseHtmlView
     public $activeFilters;
 
     /**
-    * Is this view an Empty State
-    *
-    * @var  boolean
-    * @since 4.0.0
-    */
+     * Is this view an Empty State
+     *
+     * @var  boolean
+     * @since 4.0.0
+     */
     private $isEmptyState = false;
 
     /**
@@ -92,7 +92,7 @@ public function display($tpl = null)
         $this->activeFilters = $model->getActiveFilters();
 
         // Check for errors.
-        if (\count($errors = $this->get('Errors'))) {
+        if (\count($errors = $model->getErrors())) {
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 

src/components/com_weblinks/src/Model/WeblinkModel.php

@@ -163,7 +163,7 @@ public function getItem($pk = null)
                 }
 
                 // Compute access permissions.
-                if ($access = $this->getState('filter.access')) {
+                if ($this->getState('filter.access')) {
                     // If the access filter has been set, we already know this user can view.
                     $data->params->set('access-view', true);
                 } else {

src/components/com_weblinks/src/View/Weblink/HtmlView.php

@@ -11,6 +11,7 @@
 namespace Joomla\Component\Weblinks\Site\View\Weblink;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\Component\Weblinks\Site\Model\WeblinkModel;
 
@@ -54,17 +55,25 @@ class HtmlView extends BaseHtmlView
      *
      * @return  mixed  A string if successful, otherwise an Error object.
      *
+     * @throws  \Exception
      * @since   __DEPLOY_VERSION__
      */
     public function display($tpl = null)
     {
-        $app          = Factory::getApplication();
+        $app = Factory::getApplication();
 
-        /* @var WeblinkModel $model*/
+        /* @var WeblinkModel $model */
         $model        = $this->getModel();
         $this->item   = $model->getItem();
         $this->state  = $model->getState();
         $this->params = $this->state->get('params');
+
+        $errors = $model->getErrors();
+
+        if (\count($errors) > 0) {
+            $this->handleModelErrors($errors);
+        }
+
         // Create a shortcut for $item.
         $item         = $this->item;
         $item->slug   = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
@@ -82,4 +91,25 @@ public function display($tpl = null)
         $item->event->afterDisplayContent  = trim(implode("\n", $results));
         parent::display($tpl);
     }
+
+    /**
+     * Handle errors returned by model
+     *
+     * @param   array  $errors
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function handleModelErrors(array $errors): void
+    {
+        foreach ($errors as $error) {
+            // Throws 404 error if weblink item not found
+            if ($error instanceof \Exception && $error->getCode() === 404) {
+                throw $error;
+            }
+        }
+
+        // Otherwise, it is database runtime error, and we will throw error 500
+        throw new GenericDataException(implode("\n", $errors), 500);
+    }
 }