From a735afdc4f1eec8819f11c9fd71422d050afda4e Mon Sep 17 00:00:00 2001 From: rGaillard Date: Wed, 23 Nov 2011 19:20:49 +0000 Subject: [PATCH] // Add license to some module --- modules/blockcontact/blockcontact.php | 14 +++++------ .../blockcontactinfos/blockcontactinfos.php | 14 +++++------ .../blockcustomerprivacy.php | 14 +++++------ modules/blockreinsurance/blockreinsurance.php | 24 +++++++------------ modules/blocksharefb/blocksharefb.php | 16 ++++++------- modules/blockspecials/blockspecials.php | 2 +- modules/favoriteproducts/FavoriteProduct.php | 8 +++---- modules/homeslider/HomeSlide.php | 8 +++---- modules/homeslider/ajax_homeslider.php | 6 ++--- modules/homeslider/homeslider.php | 12 +++++----- modules/vatnumber/VATNumberTaxManager.php | 6 ++--- 11 files changed, 59 insertions(+), 65 deletions(-) diff --git a/modules/blockcontact/blockcontact.php b/modules/blockcontact/blockcontact.php index acc37f166..c7f3ca7e0 100644 --- a/modules/blockcontact/blockcontact.php +++ b/modules/blockcontact/blockcontact.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockcontactinfos/blockcontactinfos.php b/modules/blockcontactinfos/blockcontactinfos.php index 36d0f70d0..b201e3f11 100644 --- a/modules/blockcontactinfos/blockcontactinfos.php +++ b/modules/blockcontactinfos/blockcontactinfos.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.php b/modules/blockcustomerprivacy/blockcustomerprivacy.php index eb037bf1a..321ebeaf3 100644 --- a/modules/blockcustomerprivacy/blockcustomerprivacy.php +++ b/modules/blockcustomerprivacy/blockcustomerprivacy.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/modules/blockreinsurance/blockreinsurance.php b/modules/blockreinsurance/blockreinsurance.php index f41661e7c..3fcfd3b30 100644 --- a/modules/blockreinsurance/blockreinsurance.php +++ b/modules/blockreinsurance/blockreinsurance.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -185,13 +185,7 @@ class blockreinsurance extends Module $content .= '
 

- -
 
-
- Addons - '.$this->l('This module has been developped by PrestaShop and can only be sold through').' addons.prestashop.com.
- '.$this->l('Please report all bugs to').' addons@prestashop.com '.$this->l('or using our').' '.$this->l('contact form').'. -
'; + '; return $content; } @@ -209,4 +203,4 @@ class blockreinsurance extends Module return $this->display(__FILE__, 'blockreinsurance.tpl'); } } -?> \ No newline at end of file +?> diff --git a/modules/blocksharefb/blocksharefb.php b/modules/blocksharefb/blocksharefb.php index d06e78326..caffb22a5 100644 --- a/modules/blocksharefb/blocksharefb.php +++ b/modules/blocksharefb/blocksharefb.php @@ -1,13 +1,13 @@ -* @copyright 2007-2010 Prestashop SA -* @version Release: $Revision: 1.4 $ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -76,4 +76,4 @@ class blocksharefb extends Module } } } -?> \ No newline at end of file +?> diff --git a/modules/blockspecials/blockspecials.php b/modules/blockspecials/blockspecials.php index fab1efac5..06b08c1e5 100644 --- a/modules/blockspecials/blockspecials.php +++ b/modules/blockspecials/blockspecials.php @@ -37,7 +37,7 @@ class BlockSpecials extends Module { $this->name = 'blockspecials'; $this->tab = 'pricing_promotion'; - $this->version = 0.8; + $this->version = '0.8'; $this->author = 'PrestaShop'; $this->need_instance = 0; diff --git a/modules/favoriteproducts/FavoriteProduct.php b/modules/favoriteproducts/FavoriteProduct.php index 1005ab48f..f1f4e9cf1 100644 --- a/modules/favoriteproducts/FavoriteProduct.php +++ b/modules/favoriteproducts/FavoriteProduct.php @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/osl-3.0.php +* http://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -21,7 +21,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -112,4 +112,4 @@ class FavoriteProduct extends ObjectModel AND `id_product` = '.(int)($id_product).' AND `id_shop` = '.(int)($shop->getID())); } -} \ No newline at end of file +} diff --git a/modules/homeslider/HomeSlide.php b/modules/homeslider/HomeSlide.php index 5011d24ea..a6451fec1 100644 --- a/modules/homeslider/HomeSlide.php +++ b/modules/homeslider/HomeSlide.php @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/osl-3.0.php +* http://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -21,7 +21,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -155,4 +155,4 @@ class HomeSlide extends ObjectModel } return true; } -} \ No newline at end of file +} diff --git a/modules/homeslider/ajax_homeslider.php b/modules/homeslider/ajax_homeslider.php index 5d3470318..9e39f82bd 100644 --- a/modules/homeslider/ajax_homeslider.php +++ b/modules/homeslider/ajax_homeslider.php @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/osl-3.0.php +* http://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -21,7 +21,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ include_once('../../config/config.inc.php'); diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php index b6e32c00e..36ae4b757 100644 --- a/modules/homeslider/homeslider.php +++ b/modules/homeslider/homeslider.php @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/osl-3.0.php +* http://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -21,7 +21,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -169,7 +169,7 @@ class HomeSlider extends Module
'.$this->l('Slider configuration').''; /* Begin form */ - $this->_html .= '
'; + $this->_html .= ''; /* Height field */ $this->_html .= ' @@ -260,7 +260,7 @@ class HomeSlider extends Module $this->_html = ''; /* Form */ - $this->_html .= ''; + $this->_html .= ''; /* Fieldset Upload */ $this->_html .= ' @@ -680,4 +680,4 @@ class HomeSlider extends Module $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($req); return ($row); } -} \ No newline at end of file +} diff --git a/modules/vatnumber/VATNumberTaxManager.php b/modules/vatnumber/VATNumberTaxManager.php index 7edd50685..7a088c506 100755 --- a/modules/vatnumber/VATNumberTaxManager.php +++ b/modules/vatnumber/VATNumberTaxManager.php @@ -4,10 +4,10 @@ * * NOTICE OF LICENSE * -* This source file is subject to the Open Software License (OSL 3.0) +* This source file is subject to the Academic Free License (AFL 3.0) * that is bundled with this package in the file LICENSE.txt. * It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/osl-3.0.php +* http://opensource.org/licenses/afl-3.0.php * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. @@ -21,7 +21,7 @@ * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA * @version Release: $Revision$ -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA */