[K6.0] Check if the ebay is numeric and if config is defined before (#…

…9393)
Kunena · Nov 27, 2022 · 15e21ff · 15e21ff
1 parent 47e121a
commit 15e21ff
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/libraries/kunena/src/BBCode/KunenaBBCode.php b/src/libraries/kunena/src/BBCode/KunenaBBCode.php
@@ -1757,40 +1757,43 @@ public function DoEbay($bbcode, $action, $name, $default, $params, $content)
 
         $config = KunenaFactory::getConfig();
 
+        if (!is_numeric($content)) {
+            echo '<b>' . Text::_('COM_KUNENA_LIB_BBCODE_EBAY_ERROR_WRONG_ITEM_ID') . '</b>';
+
+            return false;
+        }
+
         // Display tag in activity streams etc..
         if (!empty($bbcode->parent->forceMinimal)) {
+            if (!is_numeric($config->ebayAffiliateId)) {
+                return false;
+            }
+
             return '<a target="_blank" rel="noopener noreferrer" href="http://www.ebay.com/itm/' . $content . '?lang=' . $config->ebayLanguageCode . '&campid=' . $config->ebayAffiliateId . '">www.ebay.com/itm/' . $content . '</a>';
         }
 
-        return self::renderEbayLayout($content);
+        return self::renderEbayLayout($content, $config);
     }
 
     /**
      * Render eBay layout from template
      *
-     * @param   int  $ItemID  id
+     * @param   int           $ItemID  id
+     * @param   KunenaConfig  $config  The KunenaConfig object
      *
      * @return  false|string
      *
      * @since   Kunena 6.0
      * @throws Exception
      */
-    public static function renderEbayLayout(int $ItemID)
+    public static function renderEbayLayout(int $ItemID, KunenaConfig $config)
     {
-        $config = KunenaFactory::getConfig();
-
         if (empty($config->ebayApiKey) || empty($config->ebayCertId)) {
             echo '<b>' . Text::_('COM_KUNENA_LIB_BBCODE_EBAY_ERROR_NO_EBAY_APP_ID') . '</b>';
 
             return false;
         }
 
-        if (!is_numeric($ItemID)) {
-            echo '<b>' . Text::_('COM_KUNENA_LIB_BBCODE_EBAY_ERROR_WRONG_ITEM_ID') . '</b>';
-
-            return false;
-        }
-
         $layout = KunenaLayout::factory('BBCode/eBay');
 
         if ($layout->getPath()) {