adjust version information

remove unnecessary metadata blocks

.noencode

@@ -0,0 +1 @@
+copyAsIsFiles=metadata.php, .php-cs-fixer.php, IntelliSenseHelper.php, migration, Application/views

.php-cs-fixer.php

@@ -4,10 +4,31 @@ $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
 ;
 
+$header = <<<EOF
+Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+
+For the full copyright and license information, please view
+the LICENSE file that was distributed with this source code.
+
+https://www.d3data.de
+
+@copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+@author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+@link      https://www.oxidmodule.com
+EOF;
+
 $config = new PhpCsFixer\Config();
 return $config->setRules([
-        '@PHP73Migration' => true,
-        '@PSR12' => true
+        '@PHP80Migration' => true,
+        '@PSR12' => true,
+        'header_comment' => [
+            'comment_type' => 'PHPDoc',
+            'header' => $header,
+            'location' => 'after_open',
+            'separate' => 'both',
+        ],
+        'php_unit_test_class_requires_covers' => true,
+        'doctrine_annotation_indentation' => true,
     ])
     ->setFinder($finder)
 ;

Application/Controller/Admin/ManufacturerInfoLongdesc.php

@@ -1,5 +1,18 @@
 <?php
-	
+
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Application\Controller\Admin;
@@ -12,120 +25,120 @@ use OxidEsales\Eshop\Core\Registry;
 
 class ManufacturerInfoLongdesc extends AdminDetailsController
 {
-	/**
-	 * @return string
-	 */
-	public function render()
-	{
-		parent::render();
-		
-		$this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class);
-		
-		$sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
-		if (isset($sOXID) && $sOXID != "-1") {
-			// load object
-			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
-			
-			if (!isset($d3manufacturerlang)) {
-				$d3manufacturerlang = $this->_iEditLang;
-			}
-			
-			$this->_aViewData["catlang"] = $d3manufacturerlang;
-			
-			$oManufacturer->loadInLang($d3manufacturerlang, $sOXID);
-			
-			//Disable editing for derived items
-			if ($oManufacturer->isDerived()) {
-				$this->_aViewData['readonly'] = true;
-			}
-			
-			foreach (\OxidEsales\Eshop\Core\Registry::getLang()->getLanguageNames() as $id => $language) {
-				$oLang = new \stdClass();
-				$oLang->sLangDesc = $language;
-				$oLang->selected = ($id == $this->_iEditLang);
-				$this->_aViewData["otherlang"][$id] = clone $oLang;
-			}
-		}
-		
-		$this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__D3DESCRIPTION", "list.tpl.css");
-		
-		return "d3manufacturerlongdesc.tpl";
-	}
-	
-	/**
-	 * @return void
-	 * @throws \Exception
-	 */
-	public function save()
-	{
-		parent::save();
-		
-		$iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
-		$sOXID = $this->getEditObjectId();
-		$this->setEditObjectId($sOXID);
-		
-		if ($sOXID == "-1") {
-			return;
-		}
-		
-		/** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
-		$oManufacturer = oxNew(Manufacturer::class);
-		$oManufacturer->loadInLang($iManufacturerLang, $sOXID);
-		
-		if (!$oManufacturer->load($sOXID)) {
-			return;
-		}
-		
-		$aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
-		$oManufacturer->assign($aParams);
-		
-		if (false === is_null($this->d3GetLongdescParamValue())) {
-			$oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
-			$oManufacturer->save();
-		}
-	}
-	
-	/**
-	 * Returns string which must be edited by editor
-	 *
-	 * @param \OxidEsales\Eshop\Core\Model\BaseModel $oObject object with field will be used for editing
-	 * @param string                                 $sField  name of editable field
-	 *
-	 * @return string
-	 * @deprecated underscore prefix violates PSR12, will be renamed to "getEditValue" in next major
-	 */
-	protected function _getEditValue($oManufacturer, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	{
-		$sEditObjectValue = '';
-		
-		if ($oManufacturer and $oManufacturer->getId()) {
-			$sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
-		}
-		
-		return $sEditObjectValue;
-	}
-	
-	/**
-	 * @return string
-	 */
-	public function d3GetLongdescParamValue() :string
-	{
-		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
-	}
-	
-	/**
-	 * inhaltliche Uebernahme analog Article_Main
-	 * wird genutzt zum Abspeichern der Artikel-Langbeschreibung
-	 *
-	 * @param $sValue
-	 *
-	 * @return mixed
-	 */
-	protected function _processLongDesc($sValue)
-	{
-		$aSearch  = ['&amp;nbsp;', '&amp;', '&quot;', '&lang=', '<p>&nbsp;</p>', '<p>&nbsp; </p>'];
-		$aReplace = ['&nbsp;', '&', '"', '&amp;lang=', '', ''];
-		
-		return str_replace($aSearch, $aReplace, $sValue);
-	}
-}
+    /**
+     * @return string
+     */
+    public function render()
+    {
+        parent::render();
+
+        $this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class);
+
+        $sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
+        if (isset($sOXID) && $sOXID != "-1") {
+            // load object
+            $d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
+
+            if (!isset($d3manufacturerlang)) {
+                $d3manufacturerlang = $this->_iEditLang;
+            }
+
+            $this->_aViewData["catlang"] = $d3manufacturerlang;
+
+            $oManufacturer->loadInLang($d3manufacturerlang, $sOXID);
+
+            //Disable editing for derived items
+            if ($oManufacturer->isDerived()) {
+                $this->_aViewData['readonly'] = true;
+            }
+
+            foreach (\OxidEsales\Eshop\Core\Registry::getLang()->getLanguageNames() as $id => $language) {
+                $oLang = new \stdClass();
+                $oLang->sLangDesc = $language;
+                $oLang->selected = ($id == $this->_iEditLang);
+                $this->_aViewData["otherlang"][$id] = clone $oLang;
+            }
+        }
+
+        $this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__d3description", "list.tpl.css");
+
+        return "d3manufacturerlongdesc.tpl";
+    }
+
+    /**
+     * @return void
+     * @throws \Exception
+     */
+    public function save()
+    {
+        parent::save();
+
+        $iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
+        $sOXID = $this->getEditObjectId();
+        $this->setEditObjectId($sOXID);
+
+        if ($sOXID == "-1") {
+            return;
+        }
+
+        /** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
+        $oManufacturer = oxNew(Manufacturer::class);
+        $oManufacturer->loadInLang($iManufacturerLang, $sOXID);
+
+        if (!$oManufacturer->load($sOXID)) {
+            return;
+        }
+
+        $aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
+        $oManufacturer->assign($aParams);
+
+        if (false === is_null($this->d3GetLongdescParamValue())) {
+            $oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
+            $oManufacturer->save();
+        }
+    }
+
+    /**
+     * Returns string which must be edited by editor
+     *
+     * @param \OxidEsales\Eshop\Core\Model\BaseModel $oObject object with field will be used for editing
+     * @param string                                 $sField  name of editable field
+     *
+     * @return string
+     * @deprecated underscore prefix violates PSR12, will be renamed to "getEditValue" in next major
+     */
+    protected function _getEditValue($oManufacturer, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
+    {
+        $sEditObjectValue = '';
+
+        if ($oManufacturer and $oManufacturer->getId()) {
+            $sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
+        }
+
+        return $sEditObjectValue;
+    }
+
+    /**
+     * @return string
+     */
+    public function d3GetLongdescParamValue(): string
+    {
+        return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
+    }
+
+    /**
+     * inhaltliche Uebernahme analog Article_Main
+     * wird genutzt zum Abspeichern der Artikel-Langbeschreibung
+     *
+     * @param $sValue
+     *
+     * @return mixed
+     */
+    protected function _processLongDesc($sValue)
+    {
+        $aSearch  = ['&amp;nbsp;', '&amp;', '&quot;', '&lang=', '<p>&nbsp;</p>', '<p>&nbsp; </p>'];
+        $aReplace = ['&nbsp;', '&', '"', '&amp;lang=', '', ''];
+
+        return str_replace($aSearch, $aReplace, $sValue);
+    }
+}

Application/Model/Constants.php

@@ -1,14 +1,26 @@
 <?php
-	
+
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Application\Model;
 
-
 class Constants
 {
-	public const OXID_MODULE_ID = 'd3manufacturerinformation';
-	
-	// Tables and Database
-	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'D3DESCRIPTION';
-}
+    public const OXID_MODULE_ID = 'd3manufacturerinformation';
+
+    // Tables and Database
+    public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'd3description';
+}

Application/views/admin/de/d3manufacturerinformation_lang.php

@@ -1,11 +1,26 @@
 <?php
 
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = array(
+$aLang = [
     'charset'                                   => 'UTF-8',
-	
-    'mxd3manufacturerinfolongdesc'                                   => 'Langtext',
-);
+
+    'mxd3manufacturerinfolongdesc'                         => 'Langtext',
+    'SHOP_MODULE_GROUP_d3manufacturerinformation_main'     => 'Einstellungen',
+    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen',
+];

Application/views/admin/en/d3manufacturerinformation_lang.php

@@ -1,11 +1,26 @@
 <?php
 
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = array(
-	'charset'                                   => 'UTF-8',
-	
-	'mxd3manufacturerinfolongdesc'                                   => 'Text',
-);
+$aLang = [
+    'charset'                                   => 'UTF-8',
+
+    'mxd3manufacturerinfolongdesc'                         => 'Text',
+    'SHOP_MODULE_GROUP_d3manufacturerinformation_main'     => 'Settings',
+    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'display existing manufacturer texts on item details as a tab',
+];

Application/views/admin/tpl/d3manufacturer_longdesc.tpl

@@ -25,7 +25,7 @@
     <input type="hidden" name="editlanguage" value="[{$editlanguage}]">
 </form>
 
-<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__D3DESCRIPTION' );" style="padding: 0px;margin: 0px;height:0px;">
+<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__d3description' );" style="padding: 0;margin: 0;height:0;">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
     <input type="hidden" name="fnc" value="">
@@ -33,9 +33,11 @@
     <input type="hidden" name="voxid" value="[{$oxid}]">
     <input type="hidden" name="editval[oxmanufacturers__oxid]" value="[{$oxid}]">
     <input type="hidden" name="catlang" value="[{$catlang}]">
-    <input type="hidden" name="editval[oxmanufacturers__D3DESCRIPTION]" value="">
+    <input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
 
-    [{include file="include/category_text_editor.tpl"}]
+    <div style="margin-bottom: 40px">
+        [{include file="include/category_text_editor.tpl"}]
+    </div>
 </form>
 
 [{include file="bottomnaviitem.tpl"}]

Application/views/blocks/page/details/inc/details_productmain_manufacturersicon.html.tpl

@@ -0,0 +1,10 @@
+[{if $oManufacturer->oxmanufacturers__oxicon->value}]
+    [{$smarty.block.parent}]
+[{else}]
+    <div class="action-links text-left">
+        <a href="[{$oManufacturer->getLink()}]" title="[{$oManufacturer->oxmanufacturers__oxtitle->value}]">
+            [{oxmultilang ident="MANUFACTURER" suffix="COLON"}] [{$oManufacturer->oxmanufacturers__oxtitle->value}]
+        </a>
+        <span itemprop="brand" class="hidden">[{$oManufacturer->oxmanufacturers__oxtitle->value}]</span>
+    </div>
+[{/if}]

Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl

@@ -0,0 +1,16 @@
+[{$smarty.block.parent}]
+
+[{assign var="oConfig"       value=$oViewConf->getConfig()}]
+[{assign var="oManufacturer" value=$oView->getManufacturer()}]
+[{assign var="sShopURL"      value=$oConfig->getConfigParam('sShopURL')}]
+[{assign var="description"   value=$oManufacturer->d3GetLongdesc()}]
+
+[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->rawValue|strip_tags|trim}]
+    [{capture append="tabs"}]<a href="#manufacturertab" data-toggle="tab">[{oxmultilang ident="MANUFACTURER"}]</a>[{/capture}]
+    [{capture append="tabsContent"}]
+        <div id="manufacturertab" class="tab-pane[{if $blFirstTab}] active[{/if}]">
+            [{oxeval var=$description}]
+        </div>
+        [{assign var="blFirstTab" value=false}]
+    [{/capture}]
+[{/if}]

CHANGELOG.md

@@ -4,27 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.1.0.0...rel_1.x)
-
-## [1.1.0.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.1.0.0) - 2022-07-26
-### Added
-- another feature
-
-### Changed
-- changed old code
-
-### Deprecated
-- ...
-
-### Removed
-- ...
+## [unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.1.2.0...rel_1.1.x)
 
+## [1.1.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.1.1.0...1.1.2.0) - 2024-11-19
 ### Fixed
-- ...
+- show hidden save button
 
-### Security
-- ...
-
-## [1.0.0.0](https://git.d3data.de/D3Public/MyModule/releases/tag/1.0.0.0) - 2022-07-25
 ### Added
-- implemented features
+- hide empty HTML elements content
+
+## [1.1.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.1.0.0...1.1.1.0) - 2024-11-18
+### Fixed
+- installation instructions
+- show manufacturer link on article details page, if manufacturer hasn't an icon
+- prevent encoding HTML entities
+
+### Added
+- display manufacturer content as additional tab on article details page
+- make displaying manufacturer tab on details page configurable
+
+## [1.1.0.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.1.0.0) - 2024-11-13
+### Added
+- installability OXID 6.2.3 - 6.5.x
+
+## [1.0.0.0](https://git.d3data.de/D3Public/MyModule/releases/tag/1.0.0.0) - 2024-11-13
+- initial release

DEVELOPMENT.md

@@ -1,11 +0,0 @@
-# phpstan
-
-Install the dev packages manually, then run `./vendor/bin/phpstan -c./vendor/d3/oxtotp/phpstan.neon` from the projects root directory
-
-Analysis configuration is set in `phpstan.neon` file.
-
-# php-cs-fixer
-
-install the dev packages manually, then run `...` from the projects root directory
-
-Fixer configuration is set in `.php-cs-fixer.php` file.

IntelliSenseHelper.php

@@ -1,21 +1,23 @@
 <?php
 
 /**
- * This Software is the property of Data Development and is protected
- * by copyright law - it is NOT Freeware.
- * Any unauthorized use of this software without a valid license
- * is a violation of the license agreement and will be prosecuted by
- * civil and criminal law.
- * http://www.shopmodule.com
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link          http://www.oxidmodule.com
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
  */
 
 namespace D3\ManufacturerInformation\Modules\Application\Model{
-	
-	use OxidEsales\Eshop\Application\Model\Manufacturer;
-	
-	class D3ManufacturerLongDesc_parent extends Manufacturer {}
-}
+
+    use OxidEsales\Eshop\Application\Model\Manufacturer;
+
+    class D3ManufacturerLongDesc_parent extends Manufacturer
+    {
+    }
+}

LICENSE.md

@@ -1,675 +1,9 @@
-### GNU GENERAL PUBLIC LICENSE
+# License
 
-Version 3, 29 June 2007
+This Software is the property of D3 Data Development and is protected by copyright law - it is NOT Freeware.
 
-Copyright (C) 2007 Free Software Foundation, Inc.
-<https://fsf.org/>
+Any unauthorized use of this software without a valid license is a violation of the license agreement and will be prosecuted by civil and criminal law.
 
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-### Preamble
-
-The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom
-to share and change all versions of a program--to make sure it remains
-free software for all its users. We, the Free Software Foundation, use
-the GNU General Public License for most of our software; it applies
-also to any other work released this way by its authors. You can apply
-it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you
-have certain responsibilities if you distribute copies of the
-software, or if you modify it: responsibilities to respect the freedom
-of others.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the
-manufacturer can do so. This is fundamentally incompatible with the
-aim of protecting users' freedom to change the software. The
-systematic pattern of such abuse occurs in the area of products for
-individuals to use, which is precisely where it is most unacceptable.
-Therefore, we have designed this version of the GPL to prohibit the
-practice for those products. If such problems arise substantially in
-other domains, we stand ready to extend this provision to those
-domains in future versions of the GPL, as needed to protect the
-freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish
-to avoid the special danger that patents applied to a free program
-could make it effectively proprietary. To prevent this, the GPL
-assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-### TERMS AND CONDITIONS
-
-#### 0. Definitions.
-
-"This License" refers to version 3 of the GNU General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of
-an exact copy. The resulting work is called a "modified version" of
-the earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user
-through a computer network, with no transfer of a copy, is not
-conveying.
-
-An interactive user interface displays "Appropriate Legal Notices" to
-the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-#### 1. Source Code.
-
-The "source code" for a work means the preferred form of the work for
-making modifications to it. "Object code" means any non-source form of
-a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can
-regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same
-work.
-
-#### 2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey,
-without conditions so long as your license otherwise remains in force.
-You may convey covered works to others for the sole purpose of having
-them make modifications exclusively for you, or provide you with
-facilities for running those works, provided that you comply with the
-terms of this License in conveying all material for which you do not
-control copyright. Those thus making or running the covered works for
-you must do so exclusively on your behalf, under your direction and
-control, on terms that prohibit them from making any copies of your
-copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the
-conditions stated below. Sublicensing is not allowed; section 10 makes
-it unnecessary.
-
-#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such
-circumvention is effected by exercising rights under this License with
-respect to the covered work, and you disclaim any intention to limit
-operation or modification of the work as a means of enforcing, against
-the work's users, your or third parties' legal rights to forbid
-circumvention of technological measures.
-
-#### 4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-#### 5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these
-conditions:
-
--   a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
--   b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under
-    section 7. This requirement modifies the requirement in section 4
-    to "keep intact all notices".
--   c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy. This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged. This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
--   d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-#### 6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of
-sections 4 and 5, provided that you also convey the machine-readable
-Corresponding Source under the terms of this License, in one of these
-ways:
-
--   a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
--   b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the Corresponding
-    Source from a network server at no charge.
--   c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source. This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
--   d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge. You need not require recipients to copy the
-    Corresponding Source along with the object code. If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source. Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
--   e) Convey the object code using peer-to-peer transmission,
-    provided you inform other peers where the object code and
-    Corresponding Source of the work are being offered to the general
-    public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal,
-family, or household purposes, or (2) anything designed or sold for
-incorporation into a dwelling. In determining whether a product is a
-consumer product, doubtful cases shall be resolved in favor of
-coverage. For a particular product received by a particular user,
-"normally used" refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way
-in which the particular user actually uses, or expects or is expected
-to use, the product. A product is a consumer product regardless of
-whether the product has substantial commercial, industrial or
-non-consumer uses, unless such uses represent the only significant
-mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to
-install and execute modified versions of a covered work in that User
-Product from a modified version of its Corresponding Source. The
-information must suffice to ensure that the continued functioning of
-the modified object code is in no case prevented or interfered with
-solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or
-updates for a work that has been modified or installed by the
-recipient, or for the User Product in which it has been modified or
-installed. Access to a network may be denied when the modification
-itself materially and adversely affects the operation of the network
-or violates the rules and protocols for communication across the
-network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-#### 7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders
-of that material) supplement the terms of this License with terms:
-
--   a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
--   b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
--   c) Prohibiting misrepresentation of the origin of that material,
-    or requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
--   d) Limiting the use for publicity purposes of names of licensors
-    or authors of the material; or
--   e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
--   f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions
-    of it) with contractual assumptions of liability to the recipient,
-    for any liability that these contractual assumptions directly
-    impose on those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions; the
-above requirements apply either way.
-
-#### 8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-#### 9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run
-a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-#### 10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-#### 11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims owned
-or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within the
-scope of its coverage, prohibits the exercise of, or is conditioned on
-the non-exercise of one or more of the rights that are specifically
-granted under this License. You may not convey a covered work if you
-are a party to an arrangement with a third party that is in the
-business of distributing software, under which you make payment to the
-third party based on the extent of your activity of conveying the
-work, and under which the third party grants, to any of the parties
-who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by
-you (or copies made from those copies), or (b) primarily for and in
-connection with specific products or compilations that contain the
-covered work, unless you entered into that arrangement, or that patent
-license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-#### 12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under
-this License and any other pertinent obligations, then as a
-consequence you may not convey it at all. For example, if you agree to
-terms that obligate you to collect a royalty for further conveying
-from those to whom you convey the Program, the only way you could
-satisfy both those terms and this License would be to refrain entirely
-from conveying the Program.
-
-#### 13. Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-#### 14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU General Public License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies that a certain numbered version of the GNU General Public
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that numbered version or
-of any later version published by the Free Software Foundation. If the
-Program does not specify a version number of the GNU General Public
-License, you may choose any version ever published by the Free
-Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions
-of the GNU General Public License can be used, that proxy's public
-statement of acceptance of a version permanently authorizes you to
-choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-#### 15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-#### 16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-#### 17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-### How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-To do so, attach the following notices to the program. It is safest to
-attach them to the start of each source file to most effectively state
-the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-        <one line to give the program's name and a brief idea of what it does.>
-        Copyright (C) <year>  <name of author>
-
-        This program is free software: you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation, either version 3 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-        <program>  Copyright (C) <year>  <name of author>
-        This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-        This is free software, and you are welcome to redistribute it
-        under certain conditions; type `show c' for details.
-
-The hypothetical commands \`show w' and \`show c' should show the
-appropriate parts of the General Public License. Of course, your
-program's commands might be different; for a GUI interface, you would
-use an "about box".
-
-You should also get your employer (if you work as a programmer) or
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. For more information on this, and how to apply and follow
-the GNU GPL, see <https://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your
-program into proprietary programs. If your program is a subroutine
-library, you may consider it more useful to permit linking proprietary
-applications with the library. If this is what you want to do, use the
-GNU Lesser General Public License instead of this License. But first,
-please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
+- copyright: (C) [D3 Data Development](https://www.d3data.de/) (Inh. Thomas Dartsch)
+- author:    D3 Data Development - Thomas Dartsch <support@shopmodule.com>
+- link:      https://www.oxidmodule.com

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -1,39 +1,53 @@
 <?php
-	
+
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Modules\Application\Model;
 
-
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
+use OxidEsales\Eshop\Core\Field;
 use OxidEsales\Eshop\Core\Registry;
 
 class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
 {
-	/**
-	 * @param string $sValue
-	 * @return void
-	 */
-	public function d3SetLongdesc(string $sValue) :bool
-	{
-		if ($this->getId() and $this->isLoaded()){
-			try {
-				$this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
-				$this->save();
-			}catch (\Exception $exception){
-				Registry::getLogger()->error($exception->getMessage());
-			}
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * @return string
-	 */
-	public function d3GetLongdesc(): string
-	{
-		return $this->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
-	}
-}
+    /**
+     * @param string $sValue
+     * @return void
+     */
+    public function d3SetLongdesc(string $sValue): bool
+    {
+        if ($this->getId() and $this->isLoaded()) {
+            try {
+                $this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
+                $this->save();
+            } catch (\Exception $exception) {
+                Registry::getLogger()->error($exception->getMessage());
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @return Field
+     */
+    public function d3GetLongdesc(): Field
+    {
+        $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+        return $this->$longName;
+    }
+}

Modules/Application/Model/ManufacturerInfoList.php

@@ -1,10 +1,22 @@
 <?php
-	
+
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Modules\Application\Model;
 
-
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
 use OxidEsales\Eshop\Application\Model\ManufacturerList;
@@ -12,14 +24,14 @@ use OxidEsales\Eshop\Core\Field;
 
 class ManufacturerInfoList extends ManufacturerInfoList_parent
 {
-	/**
-	 * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
-	 * @return void
-	 */
-	protected function _addCategoryFields($oManufacturer)
-	{
-		parent::_addCategoryFields($oManufacturer);
-		
-		$oManufacturer->oxcategories__oxlongdesc = new Field($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME), Field::T_RAW);
-	}
-}
+    /**
+     * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
+     * @return void
+     */
+    protected function _addCategoryFields($oManufacturer)
+    {
+        parent::_addCategoryFields($oManufacturer);
+
+        $oManufacturer->oxcategories__oxlongdesc = new Field($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME), Field::T_RAW);
+    }
+}

README.md

@@ -17,34 +17,31 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 
 
 ```bash
-composer require d3/manufacturerinformation:"~1.0"
+composer require d3/manufacturerinformation:"~1.1.0"
+```
 
+Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
+
+```bash
 ./vendor/bin/oe-eshop-db_migrate migrations:migrate d3manufacturerinformation
 
 ./vendor/bin/oe-console o:m:i source/modules/d3/manufacturerinformation
 ./vendor/bin/oe-console o:m:deact d3manufacturerinformation
 ./vendor/bin/oe-console o:m:act d3manufacturerinformation
+
+./vendor/bin/oe-eshop-db_views_generate
 ```
 
-Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
+Leeren Sie anschließend den Temp Ordner des Shops.
 
-Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
-
-## Roadmap/ ToDo
-- Darstellung auf herstellerseite
-- Mehrsprachig machen
-- Portieren für 6.1.x, 7.1.x, 7.2.x
-- schleifen
 
 ## Lizenz
-(Stand: 06.05.2021)
-
-Vertrieben unter der GPLv3 Lizenz.
+(Stand: 13.11.2024)
 
 ```
 Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
 
-Diese Software wird unter der GNU GENERAL PUBLIC LICENSE Version 3 vertrieben.
+Diese Software wird unter einer kommerziellen Lizenz vertrieben. Die Installation und der Einsatz ist ohne gültige Lizenz nicht gestattet.
 ```
 
 Die vollständigen Copyright- und Lizenzinformationen entnehmen Sie bitte der [LICENSE](LICENSE.md)-Datei, die mit diesem Quellcode verteilt wurde.

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "d3/manufacturerinformation",
-  "description": "adds core informations of the manufacturers to the Articlelist",
+  "description": "adds manufacturer information to the article list",
   "type": "oxideshop-module",
   "keywords": [
     "oxid",
@@ -21,16 +21,15 @@
   },
   "homepage": "https://www.oxidmodule.com/",
   "license": [
-    "GPL-3.0-or-later"
+	"proprietary"
   ],
   "require": {
-    "php": "~7.4 || ~8.0",
-    "oxid-esales/oxideshop-ce": "6.7.2 - 6.14.2"
+    "php": "~7.1 || ~8.0",
+    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
   },
   "require-dev": {
-    "phpunit/phpunit" : "^9.5",
-    "friendsofphp/php-cs-fixer": "^3.9",
-    "phpstan/phpstan": "^1.8"
+    "oxid-esales/oxideshop-ce": "~6.14.0",
+    "friendsofphp/php-cs-fixer": "^3.9"
   },
   "extra": {
     "oxideshop": {
@@ -47,5 +46,9 @@
     "psr-4": {
       "D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
     }
+  },
+  "scripts": {
+    "php-cs-fixer_audit": "./vendor/bin/php-cs-fixer list-files --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php",
+    "php-cs-fixer_fix": "./vendor/bin/php-cs-fixer fix --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php"
   }
 }

metadata.php

@@ -1,18 +1,20 @@
 <?php
 
 /**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
  * @link      https://www.oxidmodule.com
  */
 
 declare(strict_types=1);
-	
+
 use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
 use D3\ManufacturerInformation\Application\Model\Constants;
 use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
@@ -32,48 +34,42 @@ $aModule = [
     'id'          => $sModuleId,
     'title'       => $logo.' Herstellerinformationen',
     'description' => [
-        'de' => 'Beschreibung hinzufügen',
-        'en' => 'add desc',
+        'de' => 'fügt Informationen der Hersteller zur Artikelliste hinzu',
+        'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.0.0.0',
+    'version'     => '1.1.2.0',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'controllers' => [
-		"d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class
+        "d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class,
     ],
     'extend'      => [
-		// Model
-		OEManufacturer::class => D3ManufacturerLongDesc::class,
-	    OEManufacturerList::class => ManufacturerInfoList::class
-    ],
-    'events'      => [
-//      'onActivate'    => '\D3\ThisModule\Setup\Events::onActivate',
-//      'onDeactivate'  => '\D3\ThisModule\Setup\Events::onDeactivate',
+        OEManufacturer::class => D3ManufacturerLongDesc::class,
+        OEManufacturerList::class => ManufacturerInfoList::class,
     ],
     'templates'   => [
-	    'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
-//      'flow_theme' => [
-//          'd3FlowTemplateAlias.tpl' => 'd3/thismodule/Application/views/tpl/d3FlowTheme.tpl',
-//      ],
+        'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
     ],
     'settings'    => [
-//      [
-//          'group'     => $sModuleId.'_headline',
-//          'name'      => $sModuleId.'_name',
-//          'type'      => 'bool',
-//          'value'     => false,
-//      ],
+        [
+            'group'     => $sModuleId.'_main',
+            'name'      => $sModuleId.'_showManufacturertextOnDetailsPage',
+            'type'      => 'bool',
+            'value'     => true,
+        ],
     ],
     'blocks'      => [
-//      [
-//          'template'  => 'layout/footer.tpl',
-//          'block'     => 'footer_main',
-//          'file'      => 'Application/views/blocks/layout/footer_main_mymodule.tpl'
-//      ]
-    ],
-    'smartyPluginDirectories' => [
-//      'Core/Smarty/Plugin'
+        [
+            'template'  => 'page/details/inc/productmain.tpl',
+            'block'     => 'details_productmain_manufacturersicon',
+            'file'      => 'Application/views/blocks/page/details/inc/details_productmain_manufacturersicon.html.tpl',
+        ],
+        [
+            'template'  => 'page/details/inc/tabs.tpl',
+            'block'     => 'details_tabs_invite',
+            'file'      => 'Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl',
+        ],
     ],
 ];

migration/README.md

@@ -1,38 +0,0 @@
-# Arbeiten mit [Doctrine Migrations](https://www.doctrine-project.org/projects/doctrine-migrations/en/3.6/reference/introduction.html)
-
-Migrations bilden die Veränderung der Datenbankstruktur in programmierter Form ab. Jede Strukturänderung wird in einer einzelnen (jeweils neuen) Migrationsdatei abgelegt, die Teil des Moduls ist.
-
-Passe die `migrations.yml` an Dein Modul an.
-
-## Erstellen eines Skeletons für die erste oder zusätzliche Migrationen
-
-```
-./vendor/bin/oe-eshop-doctrine_migration migrations:generate d3moduleid
-```
-
-Arbeite die angelegte Datei entsprechend Deinen Anforderungen um.
-
-## Ausführen der noch nicht ausgeführten Migrations
-
-Doctrine überwacht selbst, welche Migrationen schon ausgeführt wurden und verhindert damit mehrfache Ausführungen der selben Migration.
-
-Im OXID-Shop werden Migrations mit folgendem Befehl ausgeführt:
-
-```
-./vendor/bin/oe-eshop-db_migrate migrations:migrate
-```
-
-Als Argument kann noch die Suite mitgegeben werden, wenn nur bestimmte Migrations ausgeführt werden sollen. Mögliche Angaben sind:
-
-- CE - für alle CE-Migrations
-- PE - für alle PE-Migrations
-- EE - für alle EE-Migrations
-- PR - für alle Projekt-Migrations
-- ModuleId - für alle Migrations des jeweiligen Moduls
-- ohne Angabe - werden die Migrations aller Suiten nacheinander ausgeführt
-
-## Abweichungen zwischen Doctrine Migrations und dem OXID Migration Wrapper
-
-In den originalen Doctrine Migrations können keine Suiten angegeben werden. Dafür gibt es die Möglichkeit, die Richtung (up / down) und eine Zielversion anzugeben.
-
-Bei OXID können Migrations ausschließlich aufwärts (up) und immer fix bis zur aktuellsten Version ausgeführt werden.

migration/data/Version20241023154223.php

@@ -1,14 +1,24 @@
 <?php
 
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\DateTimeType;
-use Doctrine\DBAL\Types\DateType;
-use Doctrine\DBAL\Types\IntegerType;
-use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\TextType;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -16,39 +26,38 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20241023154223 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function getDescription(): string
     {
         return 'Adds the D3 manufacturer longdesc column';
     }
-	
-	public function up(Schema $schema) : void
-	{
-		$this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-		
-		$this->d3AddLongdescColumnToOxmanufacturers($schema);
-	}
 
-    public function down(Schema $schema) : void
+    public function up(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
+        $this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
 
+        $this->d3AddLongdescColumnToOxmanufacturers($schema);
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+
+    /**
+     * @param Schema $schema
+     * @return void
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function d3AddLongdescColumnToOxmanufacturers(Schema $schema)
+    {
+        $table = !$schema->hasTable('oxmanufacturers') ?
+            $schema->createTable('oxmanufacturers') :
+            $schema->getTable('oxmanufacturers');
+
+        // Beschreibung
+        if (!$table->hasColumn('D3DESCRIPTION')) {
+            $table->addColumn('D3DESCRIPTION', (new TextType())->getName())
+                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
+                ->setNotnull(true);
+        }
     }
-	
-	/**
-	 * @param Schema $schema
-	 * @return void
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	public function d3AddLongdescColumnToOxmanufacturers(Schema $schema){
-		$table = !$schema->hasTable('oxmanufacturers') ?
-			$schema->createTable('oxmanufacturers') :
-			$schema->getTable('oxmanufacturers');
-		
-		// Beschreibung
-		if (!$table->hasColumn('D3DESCRIPTION')) {
-			$table->addColumn('D3DESCRIPTION', (new StringType())->getName())
-				->setLength(255)
-				->setNotnull(true);
-		}
-	}
 }

migration/data/Version20241028172608.php

@@ -1,11 +1,24 @@
 <?php
 
+/**
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
 declare(strict_types=1);
 
 namespace D3\ManufacturerInformation\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\StringType;
+use Doctrine\DBAL\Types\TextType;
 use Doctrine\Migrations\AbstractMigration;
 
 /**
@@ -13,53 +26,52 @@ use Doctrine\Migrations\AbstractMigration;
  */
 final class Version20241028172608 extends AbstractMigration
 {
-    public function getDescription() : string
+    public function getDescription(): string
     {
-	    return 'Adds multilang tables';
+        return 'Adds multilang tables for the D3 manufacturer longdesc';
     }
-	
-	public function up(Schema $schema) : void
-	{
-		$this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-		
-		$this->d3AddLongdescMultilangColumnsToOxmanufacturers($schema);
-	}
 
-    public function down(Schema $schema) : void
+    public function up(Schema $schema): void
     {
-        // this down() migration is auto-generated, please modify it to your needs
+        $this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
 
+        $this->d3AddLongdescMultilangColumnsToOxmanufacturers($schema);
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+
+    /**
+     * @param Schema $schema
+     * @return void
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    public function d3AddLongdescMultilangColumnsToOxmanufacturers(Schema $schema)
+    {
+        $table = !$schema->hasTable('oxmanufacturers') ?
+            $schema->createTable('oxmanufacturers') :
+            $schema->getTable('oxmanufacturers');
+
+        // lang 1
+        if (!$table->hasColumn('D3DESCRIPTION_1')) {
+            $table->addColumn('D3DESCRIPTION_1', (new TextType())->getName())
+                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
+                ->setNotnull(true);
+        }
+
+        // lang 2
+        if (!$table->hasColumn('D3DESCRIPTION_2')) {
+            $table->addColumn('D3DESCRIPTION_2', (new TextType())->getName())
+                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
+                ->setNotnull(true);
+        }
+
+        // lang 3
+        if (!$table->hasColumn('D3DESCRIPTION_3')) {
+            $table->addColumn('D3DESCRIPTION_3', (new TextType())->getName())
+                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
+                ->setNotnull(true);
+        }
     }
-	
-	/**
-	 * @param Schema $schema
-	 * @return void
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	public function d3AddLongdescMultilangColumnsToOxmanufacturers(Schema $schema){
-		$table = !$schema->hasTable('oxmanufacturers') ?
-			$schema->createTable('oxmanufacturers') :
-			$schema->getTable('oxmanufacturers');
-		
-		// lang 1
-		if (!$table->hasColumn('D3DESCRIPTION_1')) {
-			$table->addColumn('D3DESCRIPTION_1', (new StringType())->getName())
-				->setLength(255)
-				->setNotnull(true);
-		}
-		
-		// lang 2
-		if (!$table->hasColumn('D3DESCRIPTION_2')) {
-			$table->addColumn('D3DESCRIPTION_2', (new StringType())->getName())
-				->setLength(255)
-				->setNotnull(true);
-		}
-		
-		// lang 3
-		if (!$table->hasColumn('D3DESCRIPTION_3')) {
-			$table->addColumn('D3DESCRIPTION_3', (new StringType())->getName())
-				->setLength(255)
-				->setNotnull(true);
-		}
-	}
 }

phpstan.neon

@@ -1,12 +0,0 @@
-parameters:
-    scanFiles:
-        - IntelliSenseHelper.php
-        - ../../oxid-esales/oxideshop-ce/source/oxfunctions.php
-        - ../../oxid-esales/oxideshop-ce/source/overridablefunctions.php
-    paths:
-        - src
-    level: 9
-    phpVersion: 70100
-    checkMissingIterableValueType: false
-    ignoreErrors:
-        - '#Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'

phpunit.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <report>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <testsuite name="myModule">
-    <directory>./Tests</directory>
-  </testsuite>
-  <logging/>
-</phpunit>