Version 1.2.0 for 1.5.7g

zencartpro · Dec 8, 2023 · 6a28758 · 6a28758
1 parent 9c46b4c
commit 6a28758
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/ANLEITUNG/index.html b/ANLEITUNG/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<title>Facebook Inventory 1.1.0 für Zen Cart 1.5.7 deutsch</title>
+<title>Facebook Inventory 1.2.0 für Zen Cart 1.5.7 deutsch</title>
 <meta http-equiv="pragma" content="no-cache">
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta http-equiv="content-language" content="de">
@@ -12,7 +12,7 @@
 <body>
 <div id="wrapper">
 <div id="header">
-<h1>Facebook Inventory 1.1.0 für Zen Cart 1.5.7 deutsch</h1>
+<h1>Facebook Inventory 1.2.0 für Zen Cart 1.5.7 deutsch</h1>
 </div>
 
 <div id="slidetabsmenu" style="display: none;">
@@ -50,10 +50,10 @@ <h2>Sinn und Zweck dieses Moduls</h2>
 </p>
 <h3>Copyright,  Lizenz, Changelog</h3>
 <p>Copyright dieser deutschen Anpassung/Anleitung für Zen Cart 1.5.7 deutsch<br>
-(c) 2021-2022 webchills (<a href="https://www.webchills.at" target="_blank">www.webchills.at</a>) <br>
+(c) 2021-2023 webchills (<a href="https://www.webchills.at" target="_blank">www.webchills.at</a>) <br>
 <br>
  Portions Copyright (c) 2003 osCommerce<br>
-  Portions Copyright     (c) 2003-2022 Zen Cart</p>
+  Portions Copyright     (c) 2003-2023 Zen Cart</p>
 <p>This contribution is subject to version 3.0 of the GPL license available through the world-wide-web at the following url:<br>
   <a href="http://www.zen-cart.com/license/3_0.txt">http://www.zen-cart-pro.at/license/3_0.txt</a></p>
 </div>

diff --git a/NEUE DATEIEN/DEINADMIN/includes/installers/facebook-inventory/1_2_0.php b/NEUE DATEIEN/DEINADMIN/includes/installers/facebook-inventory/1_2_0.php
@@ -0,0 +1,2 @@
+<?php
+$db->Execute("UPDATE " . TABLE_CONFIGURATION . " SET configuration_value = '1.2.0' WHERE configuration_key = 'FACEBOOKINVENTORY_MODUL_VERSION' LIMIT 1;");
diff --git a/NEUE DATEIEN/facebookinventory.php b/NEUE DATEIEN/facebookinventory.php
@@ -2,16 +2,16 @@
 /**
  * @package Facebook Inventory
  * based on Google Merchant Center Feeder Copyright 2007 Numinix Technology (www.numinix.com)
- * @copyright Copyright 2011-2022 webchills (www.webchills.at)
+ * @copyright Copyright 2011-2023 webchills (www.webchills.at)
  * @copyright Portions Copyright 2003-2022 Zen Cart Development Team
  * @copyright Portions Copyright 2003 osCommerce
  * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
- * @version $Id: facebookinventory.php 2022-02-24 16:37:54Z webchills $
+ * @version $Id: facebookinventory.php 2023-12-08 16:37:54Z webchills $
  */
  /* configuration */
   ini_set('max_execution_time', 900); // change to whatever time you need
   ini_set('mysql.connect_timeout', 300); // change to whatever time you need
-  ini_set('memory_limit','128M'); // change to whatever you need
+  ini_set('memory_limit','256M'); // change to whatever you need
   set_time_limit(900); // change to whatever time you need
   $keepAlive = 100;  // perform a keep alive every x number of products
   /* end configuration */  
@@ -151,7 +151,7 @@
                                AND p.product_is_call <> 1
                                AND p.product_is_free <> 1
                                AND pd.language_id = " . (int)$languages->fields['languages_id'] ."                             
-                             GROUP BY pd.products_name
+                             
                              ORDER BY p.products_id ASC" . $limit . $offset . ";";
 
           $products = $db->Execute($products_query);
@@ -278,19 +278,19 @@
                 $content["price"] = '<g:price>' . number_format($price, 2, '.', '') . '</g:price>';
 
                 if ($products->fields['products_model'] != '') {
-                  $content["mpn"] = '<g:mpn>' . $facebookinventory->facebookinventory_sanita($products->fields['products_model'], true) . '</g:mpn>';
+                  $content["mpn"] = '<g:mpn>' . $products->fields['products_model'] . '</g:mpn>';
                 }
                 if (FACEBOOKINVENTORY_EAN == 'true' && $products->fields['products_ean'] != '') {
-                $content["ean"] = '<g:ean>' . $facebookinventory->facebookinventory_sanita($products->fields['products_ean'], true) . '</g:ean>';
+                $content["ean"] = '<g:ean>' . $products->fields['products_ean'] . '</g:ean>';
                 }
                 if (FACEBOOKINVENTORY_ISBN == 'true' && $products->fields['products_isbn'] != '') {
-                $content["isbn"] = '<g:isbn>' . $facebookinventory->facebookinventory_sanita($products->fields['products_isbn'], true) . '</g:isbn>';
+                $content["isbn"] = '<g:isbn>' . $products->fields['products_isbn'] . '</g:isbn>';
                 }
                 if (FACEBOOKINVENTORY_BRAND == 'true' && $products->fields['products_brand'] != '') {
-                $content["brand"] = '<g:brand>' . $facebookinventory->facebookinventory_sanita($products->fields['products_brand'], true) . '</g:brand>';
+                $content["brand"] = '<g:brand>' . $products->fields['products_brand'] . '</g:brand>';
                 }
                 if (FACEBOOKINVENTORY_BRAND == 'true' && $products->fields['products_brand'] == '') {
-                $content["brand"] = '<g:brand>' . $facebookinventory->facebookinventory_sanita($products->fields['manufacturers_name'], true) . '</g:brand>';
+                $content["brand"] = '<g:brand>' . $products->fields['manufacturers_name'] . '</g:brand>';
                 }
                 // identifier_exists as required from july 2013
                 if (FACEBOOKINVENTORY_EAN == 'true' && $products->fields['products_ean'] == '' && $products->fields['manufacturers_name'] == '') {

diff --git a/NEUE DATEIEN/includes/classes/facebookinventory.php b/NEUE DATEIEN/includes/classes/facebookinventory.php
@@ -2,11 +2,11 @@
 /**
  * @package Facebook Inventory
  * based on Google Merchant Center Feeder Copyright 2007 Numinix Technology (www.numinix.com)
- * @copyright Copyright 2011-2022 webchills (www.webchills.at)
+ * @copyright Copyright 2011-2023 webchills (www.webchills.at)
  * @copyright Portions Copyright 2003-2022 Zen Cart Development Team
  * @copyright Portions Copyright 2003 osCommerce
  * @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
- * @version $Id: facebookinventory.php 2022-03-28 14:56:54Z webchills $
+ * @version $Id: facebookinventory.php 2023-12-08 17:56:54Z webchills $
  */
 
   class facebookinventory {
@@ -179,8 +179,8 @@ function facebookinventory_get_category($products_id) {
         }
       }
       if(isset($p2c[$products_id])) {
-        $retval = $categories_array[$p2c[$products_id]]['name'];
-        $cPath = $categories_array[$p2c[$products_id]]['cPath'];
+        $retval = $categories_array[$p2c[$products_id]]['name'] ?? '';
+        $cPath = $categories_array[$p2c[$products_id]]['cPath'] ?? '';
       } else {
         $cPath = $retval =  "";
       }