From f0eee3e4fba5db530699ead3dc5c7a2b67f92f7a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 27 Apr 2022 11:18:09 +0530 Subject: [PATCH] Remove blockadvertising --- config/xml/themes/default.xml | 1 - controllers/admin/AdminThemesController.php | 1 - modules/blockadvertising/CHANGELOG.txt | 14 - modules/blockadvertising/blockadvertising.php | 292 ------------------ modules/blockadvertising/blockadvertising.tpl | 30 -- .../img/fixtures/advertising.jpg | Bin 5264 -> 0 bytes modules/blockadvertising/index.php | 35 --- modules/blockadvertising/logo.gif | Bin 1052 -> 0 bytes modules/blockadvertising/logo.png | Bin 1672 -> 0 bytes .../blockadvertising/translations/index.php | 35 --- .../blockadvertising/upgrade/install-0.9.php | 36 --- 11 files changed, 444 deletions(-) delete mode 100644 modules/blockadvertising/CHANGELOG.txt delete mode 100644 modules/blockadvertising/blockadvertising.php delete mode 100644 modules/blockadvertising/blockadvertising.tpl delete mode 100644 modules/blockadvertising/img/fixtures/advertising.jpg delete mode 100644 modules/blockadvertising/index.php delete mode 100644 modules/blockadvertising/logo.gif delete mode 100644 modules/blockadvertising/logo.png delete mode 100644 modules/blockadvertising/translations/index.php delete mode 100644 modules/blockadvertising/upgrade/install-0.9.php diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index c754e2508..b90fe74b9 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -61,7 +61,6 @@ - diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index fff7b82bc..844bd2f35 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -2085,7 +2085,6 @@ class AdminThemesControllerCore extends AdminController return array( 'addsharethis', 'bankwire', - 'blockadvertising', 'blockcart', 'blockcmsinfo', 'blockcurrencies', diff --git a/modules/blockadvertising/CHANGELOG.txt b/modules/blockadvertising/CHANGELOG.txt deleted file mode 100644 index 65bd6cfa7..000000000 --- a/modules/blockadvertising/CHANGELOG.txt +++ /dev/null @@ -1,14 +0,0 @@ ------------------------------- -# V0.10.1 to V0.10.2 ------------------------------- - -## Improved/Changed Features: - -* [CO] :Images link are now generated dynamically - -_____________________________________________________________________________ - -2014-04-22 18:56:48 +0200 // Changelog updated -2014-04-15 17:23:48 +0200 [*] MO : blockadvertising - Changed the way images are stocked to avoid overwrite on update -2014-03-24 10:44:25 +0100 // MO BlockAdvertising : ps_versions_compliancy added -2014-03-20 14:19:12 +0100 Initial commit diff --git a/modules/blockadvertising/blockadvertising.php b/modules/blockadvertising/blockadvertising.php deleted file mode 100644 index ff14468cd..000000000 --- a/modules/blockadvertising/blockadvertising.php +++ /dev/null @@ -1,292 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -if (!defined('_PS_VERSION_')) - exit; - -class BlockAdvertising extends Module -{ - /* Title associated to the image */ - public $adv_title; - - /* Link associated to the image */ - public $adv_link; - - /* Name of the image without extension */ - public $adv_imgname; - - /* Image path with extension */ - public $adv_img; - - public function __construct() - { - $this->name = 'blockadvertising'; - $this->tab = 'advertising_marketing'; - $this->version = '0.10.2'; - $this->author = 'PrestaShop'; - $this->need_instance = 0; - - $this->bootstrap = true; - parent::__construct(); - - $this->displayName = $this->l('Advertising block'); - $this->description = $this->l('Adds an advertisement block to selected sections of your e-commerce website.'); - $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6.99.99'); - - $this->initialize(); - } - - /* - * Set the properties of the module, like the link to the image and the title (contextual to the current shop context) - */ - protected function initialize() - { - $this->adv_imgname = 'advertising'; - if ((Shop::getContext() == Shop::CONTEXT_GROUP || Shop::getContext() == Shop::CONTEXT_SHOP) - && (bool)Tools::file_get_contents($this->context->link->getMediaLink(_MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'-g'.$this->context->shop->getContextShopGroupID().'.'.Configuration::get('BLOCKADVERT_IMG_EXT'))) //bywebkul - ) - $this->adv_imgname .= '-g'.$this->context->shop->getContextShopGroupID(); - if (Shop::getContext() == Shop::CONTEXT_SHOP - && (bool)Tools::file_get_contents($this->context->link->getMediaLink(_MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'-s'.$this->context->shop->getContextShopID().'.'.Configuration::get('BLOCKADVERT_IMG_EXT'))) // by webkul - ) - $this->adv_imgname .= '-s'.$this->context->shop->getContextShopID(); - - // If none of them available go default - if ($this->adv_imgname == 'advertising') - $this->adv_img = Tools::getMediaServer($this->name)._MODULE_DIR_.$this->name.'/img/fixtures/'.$this->adv_imgname.'.jpg'; - else - $this->adv_img = Tools::getMediaServer($this->name)._MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'.'.Configuration::get('BLOCKADVERT_IMG_EXT'); - $this->adv_link = htmlentities(Configuration::get('BLOCKADVERT_LINK'), ENT_QUOTES, 'UTF-8'); - $this->adv_title = htmlentities(Configuration::get('BLOCKADVERT_TITLE'), ENT_QUOTES, 'UTF-8'); - } - - public function install() - { - if (!parent::install()) - return false; - - // Hook the module either on the left or right column - $theme = new Theme(Context::getContext()->shop->id_theme); - if ((!$theme->default_left_column || !$this->registerHook('leftColumn')) - && (!$theme->default_right_column || !$this->registerHook('rightColumn')) - ) - { - // If there are no colums implemented by the template, throw an error and uninstall the module - $this->_errors[] = $this->l('This module needs to be hooked to a column, but your theme does not implement one'); - parent::uninstall(); - - return false; - } - - Configuration::updateGlobalValue('BLOCKADVERT_LINK', 'http://www.prestashop.com/'); - Configuration::updateGlobalValue('BLOCKADVERT_TITLE', 'PrestaShop'); - // Try to update with the extension of the image that exists in the module directory - foreach (scandir(_PS_MODULE_DIR_.$this->name) as $file) - if (in_array($file, array('advertising.jpg', 'advertising.gif', 'advertising.png'))) - Configuration::updateGlobalValue('BLOCKADVERT_IMG_EXT', substr($file, strrpos($file, '.') + 1)); - - return true; - } - - public function uninstall() - { - Configuration::deleteByName('BLOCKADVERT_LINK'); - Configuration::deleteByName('BLOCKADVERT_TITLE'); - Configuration::deleteByName('BLOCKADVERT_IMG_EXT'); - - return (parent::uninstall()); - } - - /** - * delete the contextual image (it is not allowed to delete the default image) - * - * @return void - */ - private function _deleteCurrentImg() - { - // Delete the image file - if ($this->adv_imgname != 'advertising' && (bool)Tools::file_get_contents($this->context->link->getMediaLink(_PS_MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'.'.Configuration::get('BLOCKADVERT_IMG_EXT')))) // by webkul - Tools::deleteFile(_PS_MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'.'.Configuration::get('BLOCKADVERT_IMG_EXT')); - - // Update the extension to the global value or the shop group value if available - Configuration::deleteFromContext('BLOCKADVERT_IMG_EXT'); - Configuration::updateValue('BLOCKADVERT_IMG_EXT', Configuration::get('BLOCKADVERT_IMG_EXT')); - - // Reset the properties of the module - $this->initialize(); - } - - public function postProcess() - { - if (Tools::isSubmit('submitDeleteImgConf')) - $this->_deleteCurrentImg(); - - $errors = ''; - if (Tools::isSubmit('submitAdvConf')) - { - if (isset($_FILES['adv_img']) && isset($_FILES['adv_img']['tmp_name']) && !empty($_FILES['adv_img']['tmp_name'])) - { - if ($error = ImageManager::validateUpload($_FILES['adv_img'], Tools::convertBytes(ini_get('upload_max_filesize')))) - $errors .= $error; - else - { - Configuration::updateValue('BLOCKADVERT_IMG_EXT', substr($_FILES['adv_img']['name'], strrpos($_FILES['adv_img']['name'], '.') + 1)); - - // Set the image name with a name contextual to the shop context - $this->adv_imgname = 'advertising'; - if (Shop::getContext() == Shop::CONTEXT_GROUP) - $this->adv_imgname = 'advertising-g'.(int)$this->context->shop->getContextShopGroupID(); - elseif (Shop::getContext() == Shop::CONTEXT_SHOP) - $this->adv_imgname = 'advertising-s'.(int)$this->context->shop->getContextShopID(); - - // Copy the image in the module directory with its new name - if(!ImageManager::resize($_FILES['adv_img']['tmp_name'], _PS_MODULE_DIR_.$this->name.'/img/'.$this->adv_imgname.'.'.Configuration::get('BLOCKADVERT_IMG_EXT'))) { //by webkul - $errors .= $this->l('File upload error.'); - } - } - } - - // If the link is not set, then delete it in order to use the next default value (either the global value or the group value) - if ($link = Tools::getValue('adv_link')) - Configuration::updateValue('BLOCKADVERT_LINK', $link); - elseif (Shop::getContext() == Shop::CONTEXT_SHOP || Shop::getContext() == Shop::CONTEXT_GROUP) - Configuration::deleteFromContext('BLOCKADVERT_LINK'); - - // If the title is not set, then delete it in order to use the next default value (either the global value or the group value) - if ($title = Tools::getValue('adv_title')) - Configuration::updateValue('BLOCKADVERT_TITLE', $title); - elseif (Shop::getContext() == Shop::CONTEXT_SHOP || Shop::getContext() == Shop::CONTEXT_GROUP) - Configuration::deleteFromContext('BLOCKADVERT_TITLE'); - - // Reset the module properties - $this->initialize(); - $this->_clearCache('blockadvertising.tpl'); - - if (!$errors) - Tools::redirectAdmin(AdminController::$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'&conf=6'); - echo $this->displayError($errors); - } - - } - - /** - * getContent used to display admin module form - * - * @return string content - */ - public function getContent() - { - $this->postProcess(); - - return $this->renderForm(); - } - - public function hookRightColumn($params) - { - if (!$this->isCached('blockadvertising.tpl', $this->getCacheId())) - $this->smarty->assign( - array( - 'image' => $this->context->link->protocol_content.$this->adv_img, - 'adv_link' => $this->adv_link, - 'adv_title' => $this->adv_title, - ) - ); - - return $this->display(__FILE__, 'blockadvertising.tpl', $this->getCacheId()); - } - - public function hookLeftColumn($params) - { - return $this->hookRightColumn($params); - } - - public function hookHeader($params) - { - $this->context->controller->addCSS($this->_path.'blockadvertising.css', 'all'); - } - - public function renderForm() - { - $fields_form = array( - 'form' => array( - 'legend' => array( - 'title' => $this->l('Configuration'), - 'icon' => 'icon-cogs' - ), - 'input' => array( - array( - 'type' => 'file', - 'label' => $this->l('Image for the advertisement'), - 'name' => 'adv_img', - 'desc' => $this->l('By default the image will appear in the left column. The recommended dimensions are 155 x 163px.'), - 'thumb' => $this->context->link->protocol_content.$this->adv_img, - ), - array( - 'type' => 'text', - 'label' => $this->l('Target link for the image'), - 'name' => 'adv_link', - ), - array( - 'type' => 'text', - 'label' => $this->l('Title of the target link'), - 'name' => 'adv_title', - 'desc' => $this->l('This title will be displayed when you mouse over the advertisement block in your shop.') - ), - ), - 'submit' => array( - 'title' => $this->l('Save'), - ) - ), - ); - - $helper = new HelperForm(); - $helper->show_toolbar = false; - $helper->table = $this->table; - $lang = new Language((int)Configuration::get('PS_LANG_DEFAULT')); - $helper->default_form_language = $lang->id; - $helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0; - $this->fields_form = array(); - $helper->identifier = $this->identifier; - $helper->submit_action = 'submitAdvConf'; - $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name; - $helper->token = Tools::getAdminTokenLite('AdminModules'); - $helper->tpl_vars = array( - 'fields_value' => $this->getConfigFieldsValues(), - 'languages' => $this->context->controller->getLanguages(), - 'id_language' => $this->context->language->id - ); - - return $helper->generateForm(array($fields_form)); - } - - public function getConfigFieldsValues() - { - return array( - 'adv_link' => Tools::getValue('adv_link', Configuration::get('BLOCKADVERT_LINK')), - 'adv_title' => Tools::getValue('adv_title', Configuration::get('BLOCKADVERT_TITLE')), - ); - } -} diff --git a/modules/blockadvertising/blockadvertising.tpl b/modules/blockadvertising/blockadvertising.tpl deleted file mode 100644 index 1f1e07407..000000000 --- a/modules/blockadvertising/blockadvertising.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* 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/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. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - -
- {$adv_title} -
- diff --git a/modules/blockadvertising/img/fixtures/advertising.jpg b/modules/blockadvertising/img/fixtures/advertising.jpg deleted file mode 100644 index 61b4173241dc3792aa47ce4e09f2eb66085b27c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5264 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 diff --git a/modules/blockadvertising/index.php b/modules/blockadvertising/index.php deleted file mode 100644 index e5064df41..000000000 --- a/modules/blockadvertising/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/modules/blockadvertising/logo.gif b/modules/blockadvertising/logo.gif deleted file mode 100644 index a49608392d047a687aaf7932ac2350011464360c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1052 zcmZ?wbhEHb6krfwc)pauJX_K#N75!o(iVtvCGGQM5{kv5%f-`6MSZFbvn$0STO1l1 zM1y-Yk~*Bj`*qX${7a^WT%OE-dAh)r=>lsPm|dMIaCMeo*Mn<#^z?Gcw=L$ZokZ_4`S??Z{O8#;y|JTjT?>9?+-YofXJMG7f8Hzlb+`KW-O4X_`+nVP{e8ds z!n0l99(4V>-}&oN`>%%+e?IQ`{dne|XMKO3&HMjs*6-(w{s7U7nZI8y`tx$pua_(T zy7LkpHY;7m&ZN-jSCcFA{w}#A85Il7FoRF;HofQERssfsU zb0z*JIJXl^=ledT zMpweGDfPwgR;wTN$U*&)?Bf`1)c;t<`A1A~X*;Zk6+1P~Ds zfN66qXh)w~tOPm8_1=5_o5fO{pPXEDd-`;7u3IP0#6&3s@!t^8h>UzUj2(UG>jDS4 z$Vu*Z(>jpvjYJ{51VxR zl-kjVeJdF=Mv5?lVvrQ0UIN0BsHjn+7=Gj+SH<}8LT+k|l$2wDghI@^dC3wfg<}~A z_$o!Qs#*Pg<5m*_=*v~p_hk!OfDJKB`rnEFE2;371M(eF&`A(@*xK#T5+qP-P zGVCQIug%QVPYRZk6oe&6vf@EtyL8Y~2L+Ux@y^Yg<(9+IM-6HXxn8j;U*1Qev~S%i zo)s&k9F7&71svPXo)s28%h9eNF`jQ0Uv{<@Vrk?hg*wr=YnSe;wAsXi<4Fx_Q8RdL zNB^RfUvP^#Cr*?~2vn%Yp)3uY@l(s71|SGTMQ(ya^M;i<|5b_V^K^t-^BGE?T6C>sPMSPqwRY z!Bm(4+D@L7N)iJtd-v+TrtRDHGq?gQPxtN9HdWX@YEX-sMq9tt;ukCRX;D&AzZYUP zSb;}yc#)MQea+2!$@_bIrQ^~i-Ct#hy{Au0HR{#K375m6`)aUqIuPtR!Qz@ZQ>rl` zFII{g)S~9#H>!2LQt5?>iTyt0z+*&OZA5zW^QG~jmfwkJpYGTp!<7~!(LeyF zP6Yx0I!v;1to`7@0sHnths4Ph0>8^{*BaCs96+Q_LS$~!lqpgRqbImHdXPL!Jd!(& z2usiP>jQP~@#DJg!5(X|BS*xAwtMm7fdJe%|Fy`gx|kTL!`@SaS|$ng7TC`zb?$Cl zoOlqO4~bTXY-Q=Zcv0%G8ubW@eO=eC>Ha6f9K#nl0d<&ZJ+9x{LF25~L%0Fi??YhJ zpcXZQNywv+1bphDm8+%9s&&z z<``|0 zlkFfNL>p~~`Vd zaNFMZGd=Fdu&_G+!i7?e<-CXElp7V**9~$X?)DC#3#&u0&OVOOhPL#fFFD@#qx7xM z@+_tP_(rLlTb25Z%g8g_f|+&CohyEPa6Yix`w7ZZrFpYCfZ8 z@eJR_CDe;q|A`wiMX8+x>+Iv0Ip?#CPpaVv>Bl6(B#X@)8=hUq*Ghf+lTtmXuQBAr z8uoF_Trw8pV>28PAMEGUBvhJtpIZ&$O<&T7{5c)=_uS0L{^sww>5Cri@A-di3XXi% S?>6B80000 -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); - -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); - -header("Location: ../"); -exit; \ No newline at end of file diff --git a/modules/blockadvertising/upgrade/install-0.9.php b/modules/blockadvertising/upgrade/install-0.9.php deleted file mode 100644 index b76cb967e..000000000 --- a/modules/blockadvertising/upgrade/install-0.9.php +++ /dev/null @@ -1,36 +0,0 @@ -getLocalPath(); - $img_folder_path = $module->getLocalPath().'img'; - $fixture_img_path = $module->getLocalPath().'img'.DIRECTORY_SEPARATOR.'fixtures'; - - if (!Tools::file_exists_cache($img_folder_path)) - mkdir($img_folder_path); - - if (!Tools::file_exists_cache($fixture_img_path)) - mkdir($fixture_img_path); - - $files = scandir($module->getLocalPath()); - - foreach ($files as $file) - { - if (strncmp($file, 'advertising', 11) == 0) - { - if ($file == 'advertising.jpg') - copy($module_path.$file, $fixture_img_path.DIRECTORY_SEPARATOR.$file); - else - copy($module_path.$file, $img_folder_path.DIRECTORY_SEPARATOR.$file); - - unlink($module_path.$file); - } - } - - Tools::clearCache(Context::getContext()->smarty, $module->getTemplatePath('blockadvertising.tpl')); - - return true; -}