diff --git a/modules/blockadvertising/blockadvertising.php b/modules/blockadvertising/blockadvertising.php index faffa8841..c1dd00b64 100644 --- a/modules/blockadvertising/blockadvertising.php +++ b/modules/blockadvertising/blockadvertising.php @@ -1,6 +1,6 @@ registerHook('leftColumn') OR !$this->registerHook('rightColumn')) + if (!$this->registerHook('leftColumn')) return false; return true; } /** * _deleteCurrentImg delete current image, (so this will use default image) - * + * * @return void */ private function _deleteCurrentImg() @@ -114,7 +114,7 @@ class BlockAdvertising extends Module { $errors = ''; if (Tools::isSubmit('submitDeleteImgConf')) - $this->_deleteCurrentImg(); + $this->_deleteCurrentImg(); if (Tools::isSubmit('submitAdvConf')) { @@ -160,12 +160,12 @@ class BlockAdvertising extends Module /** * getContent used to display admin module form - * + * * @return void */ public function getContent() { - + $this->postProcess(); $output = ''; $output .= ' diff --git a/modules/blocktags/blocktags.php b/modules/blocktags/blocktags.php index 5815b4de1..8eab3b959 100644 --- a/modules/blocktags/blocktags.php +++ b/modules/blocktags/blocktags.php @@ -1,6 +1,6 @@ need_instance = 0; parent::__construct(); - + $this->displayName = $this->l('Tags block'); $this->description = $this->l('Adds a block containing a tag cloud.'); } function install() { - if (parent::install() == false + if (parent::install() == false OR $this->registerHook('leftColumn') == false OR $this->registerHook('header') == false OR Configuration::updateValue('BLOCKTAGS_NBR', 10) == false) @@ -107,7 +107,7 @@ class BlockTags extends Module foreach ($tags AS &$tag) $tag['class'] = 'tag_level'.($tag['times'] > BLOCKTAGS_MAX_LEVEL ? BLOCKTAGS_MAX_LEVEL : $tag['times']); $this->context->smarty->assign('tags', $tags); - + return $this->display(__FILE__, 'blocktags.tpl'); } @@ -115,7 +115,7 @@ class BlockTags extends Module { return $this->hookLeftColumn($params); } - + function hookHeader($params) { $this->context->controller->addCSS(($this->_path).'blocktags.css', 'all'); diff --git a/modules/editorial/editorial.php b/modules/editorial/editorial.php index 566366386..e95e7f8e2 100644 --- a/modules/editorial/editorial.php +++ b/modules/editorial/editorial.php @@ -1,6 +1,6 @@ version = '1.6'; $this->author = 'PrestaShop'; $this->need_instance = 0; - + parent::__construct(); $this->displayName = $this->l('Home text editor'); @@ -52,7 +52,7 @@ class Editorial extends Module { if (!parent::install() OR !$this->registerHook('home') OR !$this->registerHook('header')) return false; - + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial` ( `id_editorial` int(10) unsigned NOT NULL auto_increment, @@ -60,7 +60,7 @@ class Editorial extends Module PRIMARY KEY (`id_editorial`)) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8')) return false; - + if (!Db::getInstance()->execute(' CREATE TABLE `'._DB_PREFIX_.'editorial_lang` ( `id_editorial` int(10) unsigned NOT NULL, @@ -72,24 +72,27 @@ class Editorial extends Module PRIMARY KEY (`id_editorial`, `id_lang`)) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8')) return false; - + if (!Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'editorial`(`id_editorial`, `body_home_logo_link`) - VALUES(1, "http://www.prestashop.com")')) + INSERT INTO `'._DB_PREFIX_.'editorial`(`body_home_logo_link`) + VALUES("http://www.prestashop.com")')) return false; - - if (!Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'editorial_lang`(`id_editorial`, `id_lang`, `body_title`, `body_subheading`, `body_paragraph`, `body_logo_subheading`) - VALUES(1, 1, "Lorem ipsum dolor sit amet", "Consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua", "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>", "Excepteur sint prestashop cupidatat non proident")')) - return false; - - if (!Db::getInstance()->execute(' - INSERT INTO `'._DB_PREFIX_.'editorial_lang`(`id_editorial`, `id_lang`, `body_title`, `body_subheading`, `body_paragraph`, `body_logo_subheading`) - VALUES(1, 2, "Lorem ipsum dolor sit amet", "Excepteur sint occaecat cupidatat non proident", "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>", "Lorem ipsum presta shop amet")')) - return false; - return true; + + $id_editorial = Db::getInstance()->Insert_ID(); + $result = true; + foreach (Language::getLanguages() as $lang) + $result &= Db::getInstance()->autoExecute(_DB_PREFIX_.'editorial_lang', array( + 'id_editorial' => $id_editorial, + 'id_lang' => $lang['id_lang'], + 'body_title' => 'Lorem ipsum dolor sit amet', + 'body_subheading' => 'Excepteur sint occaecat cupidatat non proident', + 'body_paragraph' => '

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum

', + 'body_logo_subheading' => 'Lorem ipsum presta shop amet', + ), 'INSERT'); + + return $result; } - + public function uninstall() { if (!parent::uninstall()) @@ -114,7 +117,7 @@ class Editorial extends Module public function getContent() { - + /* display the module name */ $this->_html = '

'.$this->displayName.'

'; $errors = ''; @@ -138,7 +141,7 @@ class Editorial extends Module { // Forbidden key $forbidden = array('submitUpdate'); - + $editorial = new EditorialClass(1); $editorial->copyFromPost(); $editorial->update(); @@ -170,7 +173,7 @@ class Editorial extends Module /* display the editorial's form */ $this->_displayForm(); - + return $this->_html; } @@ -187,7 +190,7 @@ class Editorial extends Module $isoTinyMCE = (file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en'); $ad = dirname($_SERVER["PHP_SELF"]); $this->_html .= ' -