dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-01-26 14:44:24 +00:00
parent 96a58849a2
commit c280253f23
5 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockadvertising/blockadvertising.php
+6 -8
View File
@@ -92,7 +92,7 @@ class BlockAdvertising extends Module
if (!file_exists(_PS_MODULE_DIR_.$this->name.'/advertising.jpg'))
$this->adv_imgname = '';
else
Configuration::updateValue('BLOCKADVERT_IMG_EXT','jpg');
Configuration::updateValue('BLOCKADVERT_IMG_EXT', 'jpg');
}
if (!empty($this->adv_imgname))
@@ -140,25 +140,24 @@ class BlockAdvertising extends Module
if (Tools::isSubmit('submitAdvConf'))
{
$file = false;
if (isset($_FILES['adv_img']) AND isset($_FILES['adv_img']['tmp_name']) AND !empty($_FILES['adv_img']['tmp_name']))
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;
elseif ($dot_pos = strrpos($_FILES['adv_img']['name'],'.'))
elseif ($dot_pos = strrpos($_FILES['adv_img']['name'], '.'))
{
// as checkImage tell us it's a good image, we'll just copy the extension
$this->_deleteCurrentImg();
$this->adv_imgname = 'advertising';
$ext = substr($_FILES['adv_img']['name'], $dot_pos+1);
$ext = substr($_FILES['adv_img']['name'], $dot_pos + 1);
$newname = 'advertising_custom'.'-'.(int)$this->context->shop->id;
if (!move_uploaded_file($_FILES['adv_img']['tmp_name'],_PS_MODULE_DIR_.$this->name.'/'.$newname.'.'.$ext))
if (!move_uploaded_file($_FILES['adv_img']['tmp_name'], _PS_MODULE_DIR_.$this->name.'/'.$newname.'.'.$ext))
$errors .= $this->l('Error move uploaded file');
else
$this->adv_imgname = $newname;
Configuration::updateValue('BLOCKADVERT_IMG_EXT',$ext);
Configuration::updateValue('BLOCKADVERT_IMG_EXT', $ext);
$this->adv_img = Tools::getMediaServer($this->name)._MODULE_DIR_.$this->name.'/'.$this->adv_imgname.'.'.Configuration::get('BLOCKADVERT_IMG_EXT');
}
}
@@ -185,7 +184,6 @@ class BlockAdvertising extends Module
*/
public function getContent()
{
$this->postProcess();
$output = '<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">
<fieldset>