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

// update advanced parameters

Browse Source
This commit is contained in:
Sarah Lorenzini
2013-08-02 15:10:58 +02:00
parent b34acf74f2
commit 142006e69a
17 changed files with 323 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminBackupController.php
+5 -2
View File
@@ -31,6 +31,7 @@ class AdminBackupControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'backup';
$this->className = 'Backup';
$this->identifier = 'filename';
@@ -59,8 +60,10 @@ class AdminBackupControllerCore extends AdminController
),
'PS_BACKUP_DROP_TABLE' => array(
'title' => $this->l('Drop existing tables during import'),
'desc' => $this->l('If enabled, the backup script will drop your tables prior to restoring data.').
'<br />(ie. "DROP TABLE IF EXISTS")',
'hint' => array(
$this->l('If enabled, the backup script will drop your tables prior to restoring data.'),
$this->l('(ie. "DROP TABLE IF EXISTS")'),
),
'cast' => 'intval',
'type' => 'bool'
)
controllers/admin/AdminEmailsController.php
+9 -13
View File
@@ -28,6 +28,7 @@ class AdminEmailsControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->className = 'Configuration';
$this->table = 'configuration';
@@ -83,40 +84,37 @@ class AdminEmailsControllerCore extends AdminController
'fields' => array(
'PS_MAIL_DOMAIN' => array(
'title' => $this->l('Mail domain name:'),
'desc' => $this->l('Fully qualified domain name (keep this field empty if you don\'t know).'),
'hint' => $this->l('Fully qualified domain name (keep this field empty if you don\'t know).'),
'empty' => true, 'validation' =>
'isUrl', 'size' => 30,
'isUrl',
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_SERVER' => array(
'title' => $this->l('SMTP server:'),
'desc' => $this->l('IP address or server name (e.g. smtp.mydomain.com)'),
'hint' => $this->l('IP address or server name (e.g. smtp.mydomain.com)'),
'validation' => 'isGenericName',
'size' => 30,
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_USER' => array(
'title' => $this->l('SMTP user:'),
'desc' => $this->l('Leave blank if not applicable.'),
'hint' => $this->l('Leave blank if not applicable.'),
'validation' => 'isGenericName',
'size' => 30,
'type' => 'text',
'visibility' => Shop::CONTEXT_ALL
),
'PS_MAIL_PASSWD' => array(
'title' => $this->l('SMTP password:'),
'desc' => $this->l('Leave blank if not applicable.'),
'hint' => $this->l('Leave blank if not applicable.'),
'validation' => 'isAnything',
'size' => 30,
'type' => 'password',
'visibility' => Shop::CONTEXT_ALL,
'autocomplete' => false
),
'PS_MAIL_SMTP_ENCRYPTION' => array(
'title' => $this->l('Encryption:'),
'desc' => $this->l('Use an encrypt protocol'),
'hint' => $this->l('Use an encrypt protocol'),
'type' => 'select',
'cast' => 'strval',
'identifier' => 'mode',
@@ -138,9 +136,8 @@ class AdminEmailsControllerCore extends AdminController
),
'PS_MAIL_SMTP_PORT' => array(
'title' => $this->l('Port:'),
'desc' => $this->l('Port number to use'),
'hint' => $this->l('Port number to use'),
'validation' => 'isInt',
'size' => 5,
'type' => 'text',
'cast' => 'intval',
'visibility' => Shop::CONTEXT_ALL
@@ -155,11 +152,10 @@ class AdminEmailsControllerCore extends AdminController
'PS_SHOP_EMAIL' => array(
'title' => $this->l('Send a test email to'),
'type' => 'text',
'size' => 40,
'id' => 'testEmail'
),
),
'bottom' => '<div class="margin-form"><input type="button" class="button" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
'bottom' => '<div class="row col-offset-3"><input type="button" class="btn btn-primary" name="btEmailTest" id="btEmailTest" value="'.$this->l('Send an email test').'" onclick="verifyMail();" /><br />
<p id="mailResultCheck" style="display:none;"></p></div>',
)
);
controllers/admin/AdminImportController.php
+2 -1
View File
@@ -80,6 +80,7 @@ class AdminImportControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->entities = array(
$this->l('Categories'),
$this->l('Products'),
@@ -553,7 +554,7 @@ class AdminImportControllerCore extends AdminController
// Header
for ($i = 0; $i < $nb_column; $i++)
if (MAX_COLUMNS * (int)$current_table <= $i && (int)$i < MAX_COLUMNS * ((int)$current_table + 1))
$html .= '<th style="width: '.(900 / MAX_COLUMNS).'px; vertical-align: top; padding: 4px">
$html .= '<th width:"'.(900 / MAX_COLUMNS).'" valign="top">
<select onchange="askFeatureName(this, '.$i.');"
style="width: '.(900 / MAX_COLUMNS).'px;"
id="type_value['.$i.']"
controllers/admin/AdminInformationController.php
+7
View File
@@ -26,6 +26,13 @@
class AdminInformationControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function initContent()
{
$this->display = 'view';
controllers/admin/AdminLogsController.php
+3 -3
View File
@@ -28,6 +28,7 @@ class AdminLogsControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
$this->table = 'log';
$this->className = 'Logger';
$this->lang = false;
@@ -53,10 +54,9 @@ class AdminLogsControllerCore extends AdminController
'fields' => array(
'PS_LOGS_BY_EMAIL' => array(
'title' => $this->l('Minimum severity level'),
'desc' => $this->l('Enter "5" if you do not want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
'hint' => $this->l('Enter "5" if you do not want to receive any emails.').'<br />'.$this->l('Emails will be sent to the shop owner.'),
'cast' => 'intval',
'type' => 'text',
'size' => 5
'type' => 'text'
)
),
'submit' => array()
controllers/admin/AdminModulesPositionsController.php
+6 -1
View File
@@ -28,9 +28,14 @@ class AdminModulesPositionsControllerCore extends AdminController
{
protected $display_key = 0;
public function postProcess()
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
public function postProcess()
{
// Getting key value for display
if (Tools::getValue('show_modules') && strval(Tools::getValue('show_modules')) != 'all')
$this->display_key = (int)Tools::getValue('show_modules');
controllers/admin/AdminPerformanceController.php
+44 -56
View File
@@ -29,6 +29,7 @@ class AdminPerformanceControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->className = 'Configuration';
parent::__construct();
}
@@ -38,7 +39,7 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[0]['form'] = array(
'legend' => array(
'title' => $this->l('Smarty'),
'image' => '../img/admin/prefs.gif'
'icon' => 'icon-briefcase'
),
'input' => array(
array(
@@ -49,34 +50,32 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'radio',
'label' => $this->l('Template cache'),
'name' => 'smarty_force_compile',
'class' => 't',
'br' => true,
'values' => array(
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_NO_COMPILE_,
'value' => _PS_SMARTY_NO_COMPILE_,
'label' => $this->l('Never recompile template files'),
'desc' => $this->l('This option should be used in a production environment.')
'hint' => $this->l('This option should be used in a production environment.')
),
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_CHECK_COMPILE_,
'value' => _PS_SMARTY_CHECK_COMPILE_,
'label' => $this->l('Recompile templates if the files have been updated'),
'desc' => $this->l('Templates are recompiled when they are updated. If you experience compilation troubles when you update your template files, you should use Force Compile instead of this option. It should never be used in a production environment.')
'hint' => $this->l('Templates are recompiled when they are updated. If you experience compilation troubles when you update your template files, you should use Force Compile instead of this option. It should never be used in a production environment.')
),
array(
'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
'value' => _PS_SMARTY_FORCE_COMPILE_,
'label' => $this->l('Force compilation'),
'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. Note: This should never be used in a production environment.')
'hint' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. Note: This should never be used in a production environment.')
)
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Cache'),
'name' => 'smarty_cache',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -90,13 +89,12 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('Should be enabled except for debugging.')
'hint' => $this->l('Should be enabled except for debugging.')
),
array(
'type' => 'radio',
'label' => $this->l('Debug console'),
'name' => 'smarty_console',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -108,13 +106,13 @@ class AdminPerformanceControllerCore extends AdminController
'id' => 'smarty_console_url',
'value' => 1,
'label' => $this->l('Open console with URL parameter (SMARTY_DEBUG)'),
'desc' => $this->l('To open the debug console, you simply pass the SMARTY_DEBUG parameter in the URL.')
'hint' => $this->l('To open the debug console, you simply pass the SMARTY_DEBUG parameter in the URL.')
),
array(
'id' => 'smarty_console_open',
'value' => 2,
'label' => $this->l('Always open console'),
'desc' => $this->l('Choose this option to always force the debug console to open.')
'hint' => $this->l('Choose this option to always force the debug console to open.')
)
)
),
@@ -131,19 +129,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[1]['form'] = array(
'legend' => array(
'title' => $this->l('Optional features'),
'image' => '../img/admin/tab-plugins.gif'
'icon' => 'icon-puzzle-piece'
),
'desc' => $this->l('Some features can be disabled in order to improve performance.'),
'hint' => $this->l('Some features can be disabled in order to improve performance.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'features_detachables_up'
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Combinations'),
'name' => 'combination',
'class' => 't',
'is_bool' => true,
'disabled' => Combination::isCurrentlyUsed(),
'values' => array(
@@ -158,13 +155,12 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('These features will be disabled')
'hint' => $this->l('These features will be disabled')
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Features'),
'name' => 'feature',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -178,7 +174,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('No')
)
),
'desc' => $this->l('These features will be disabled')
'hint' => $this->l('These features will be disabled')
)
)
);
@@ -192,19 +188,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[2]['form'] = array(
'legend' => array(
'title' => $this->l('CCC (Combine, Compress and Cache)'),
'image' => '../img/admin/arrow_in.png'
'icon' => 'icon-fullscreen'
),
'desc' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
'hint' => $this->l('CCC allows you to reduce the loading time of your page. With these settings you will gain performance without even touching the code of your theme. Make sure, however, that your theme is compatible with PrestaShop 1.4+. Otherwise, CCC will cause problems.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'ccc_up',
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Smart cache for CSS'),
'name' => 'PS_CSS_THEME_CACHE',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -220,10 +215,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Smart cache for JavaScript'),
'name' => 'PS_JS_THEME_CACHE',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -239,10 +233,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Minify HTML'),
'name' => 'PS_HTML_THEME_COMPRESSION',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -258,10 +251,9 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Compress inline JavaScript in HTML'),
'name' => 'PS_JS_HTML_THEME_COMPRESSION',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -277,11 +269,10 @@ class AdminPerformanceControllerCore extends AdminController
)
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Apache optimization'),
'name' => 'PS_HTACCESS_CACHE_CONTROL',
'class' => 't',
'desc' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
'hint' => $this->l('This will add directives to your .htaccess file, which should improve caching and compression.'),
'is_bool' => true,
'values' => array(
array(
@@ -312,9 +303,9 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[3]['form'] = array(
'legend' => array(
'title' => $this->l('Media servers (use only with CCC)'),
'image' => '../img/admin/subdomain.gif'
'icon' => 'icon-link'
),
'desc' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
'hint' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
'input' => array(
array(
'type' => 'hidden',
@@ -324,22 +315,19 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'text',
'label' => $this->l('Media server #1'),
'name' => '_MEDIA_SERVER_1_',
'size' => 30,
'desc' => $this->l('Name of the second domain of your shop, (e.g. myshop-media-server-1.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the second domain of your shop, (e.g. myshop-media-server-1.com). If you do not have another domain, leave this field blank.')
),
array(
'type' => 'text',
'label' => $this->l('Media server #2'),
'name' => '_MEDIA_SERVER_2_',
'size' => 30,
'desc' => $this->l('Name of the third domain of your shop, (e.g. myshop-media-server-2.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the third domain of your shop, (e.g. myshop-media-server-2.com). If you do not have another domain, leave this field blank.')
),
array(
'type' => 'text',
'label' => $this->l('Media server #3'),
'name' => '_MEDIA_SERVER_3_',
'size' => 30,
'desc' => $this->l('Name of the fourth domain of your shop, (e.g. myshop-media-server-3.com). If you do not have another domain, leave this field blank.')
'hint' => $this->l('Name of the fourth domain of your shop, (e.g. myshop-media-server-3.com). If you do not have another domain, leave this field blank.')
),
)
);
@@ -354,7 +342,7 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[4]['form'] = array(
'legend' => array(
'title' => $this->l('Ciphering'),
'image' => '../img/admin/computer_key.png'
'icon' => 'icon-desktop'
),
'desc' => $this->l('Mcrypt is faster than our custom BlowFish class, but requires the PHP extension "mcrypt". If you change this configuration, all cookies will be reset.'),
'input' => array(
@@ -366,7 +354,6 @@ class AdminPerformanceControllerCore extends AdminController
'type' => 'radio',
'label' => $this->l('Algorithm'),
'name' => 'PS_CIPHER_ALGORITHM',
'class' => 't',
'br' => true,
'values' => array(
array(
@@ -411,19 +398,18 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[5]['form'] = array(
'legend' => array(
'title' => $this->l('Caching'),
'image' => '../img/admin/computer_key.png'
'icon' => 'icon-desktop'
),
'desc' => $this->l('Caching systems are used to speed up your store by caching data into the server\'s memory, avoiding the exhausting task of querying the database.'),
'hint' => $this->l('Caching systems are used to speed up your store by caching data into the server\'s memory, avoiding the exhausting task of querying the database.'),
'input' => array(
array(
'type' => 'hidden',
'name' => 'cache_up'
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Use cache'),
'name' => 'active',
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -437,7 +423,7 @@ class AdminPerformanceControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable or disable caching system.')
'hint' => $this->l('Enable or disable caching system.')
),
array(
'type' => 'select',
@@ -452,13 +438,12 @@ class AdminPerformanceControllerCore extends AdminController
array(
'type' => 'text',
'label' => $this->l('Directory depth'),
'name' => 'ps_cache_fs_directory_depth',
'size' => 30
'name' => 'ps_cache_fs_directory_depth'
),
),
'submit' => array(
'title' => $this->l(' Save '),
'class' => 'button'
'title' => $this->l('Save'),
'class' => 'btn btn-default'
),
'memcachedServers' => true
);
@@ -477,12 +462,15 @@ class AdminPerformanceControllerCore extends AdminController
$this->fields_form[6]['form'] = array(
'legend' => array(
'title' => $this->l('CloudCache'),
'image' => '../img/admin/subdomain.gif'
'icon' => 'icon-cloud'
),
'desc' => $this->l('Performance matters! Improve speed and conversions the easy way.').'<br />'.
$this->l('CloudCache supercharges your site in minutes through its state-of-the-art content delivery network.').'<br /><br />'.
$this->l('Subscribe now using the code "presta25" and get an exclusive 25% monthly discount on every available package.').'<br /><br />
<a style="color: blue" href="index.php?controller=AdminModules&token='.Tools::getAdminTokenLite('AdminModules').'&filtername=cloudcache" id="installCloudCache">&gt; '.$this->l('Click here to install the CloudCache module for PrestaShop').'</a><br />'
'desc' =>
'<div class="alert alert-block">
<p>'.$this->l('Performance matters! Improve speed and conversions the easy way.').'</p>'.
'<p>'.$this->l('CloudCache supercharges your site in minutes through its state-of-the-art content delivery network.').'</p>'.
'<p>'.$this->l('Subscribe now using the code "presta25" and get an exclusive 25% monthly discount on every available package.').'</p>
<p><a href="index.php?controller=AdminModules&token='.Tools::getAdminTokenLite('AdminModules').'&filtername=cloudcache" id="installCloudCache">&gt; '.$this->l('Click here to install the CloudCache module for PrestaShop').'</a></p>
</div>'
);
}
controllers/admin/AdminRequestSqlController.php
+3 -2
View File
@@ -36,6 +36,7 @@ class AdminRequestSqlControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'request_sql';
$this->className = 'RequestSql';
$this->lang = false;
@@ -110,8 +111,8 @@ class AdminRequestSqlControllerCore extends AdminController
<ul>
<li>'.$this->l('Click "Add New".').'</li>
<li>'.$this->l('Fill in the fields and click "Save".').'</li>
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <img src="../img/admin/details.gif" /></li>
<li>'.$this->l('You can also export the query results as CSV file by clicking on the tab:').' <img src="../img/admin/export.gif" /></li>
<li>'.$this->l('You can then view the query results by clicking on the tab:').' <i class="icon-pencil"></i></li>
<li>'.$this->l('You can also export the query results as CSV file by clicking on the tab:').' <i class="icon-upload"></i></li>
</ul>');
$this->addRowAction('export');
controllers/admin/AdminThemesController.php
+7 -1
View File
@@ -26,6 +26,13 @@
class AdminThemesControllerCore extends AdminController
{
public function __construct()
{
$this->bootstrap = true;
parent::__construct();
}
/** This value is used in isThemeCompatible method. only version node with an
* higher version number will be used in [theme]/config.xml
* @since 1.4.0.11, check theme compatibility 1.4
@@ -100,7 +107,6 @@ class AdminThemesControllerCore extends AdminController
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
parent::init();
$this->bootstrap = true;
$this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false;
$this->fields_options = array(
controllers/admin/AdminWebserviceController.php
+7 -10
View File
@@ -32,6 +32,7 @@ class AdminWebserviceControllerCore extends AdminController
public function __construct()
{
$this->bootstrap = true;
$this->table = 'webservice_account';
$this->className = 'WebserviceKey';
$this->lang = false;
@@ -48,16 +49,14 @@ class AdminWebserviceControllerCore extends AdminController
$this->fields_list = array(
'key' => array(
'title' => $this->l('Key'),
'align' => 'center',
'width' => 32
'align' => 'center'
),
'active' => array(
'title' => $this->l('Enabled'),
'align' => 'center',
'active' => 'status',
'type' => 'bool',
'orderby' => false,
'width' => 32
'orderby' => false
),
'description' => array(
'title' => $this->l('Key description'),
@@ -111,9 +110,8 @@ class AdminWebserviceControllerCore extends AdminController
'label' => $this->l('Key:'),
'name' => 'key',
'id' => 'code',
'size' => 32,
'required' => true,
'desc' => $this->l('Webservice account key.'),
'hint' => $this->l('Webservice account key.'),
),
array(
'type' => 'textarea',
@@ -121,14 +119,13 @@ class AdminWebserviceControllerCore extends AdminController
'name' => 'description',
'rows' => 3,
'cols' => 110,
'desc' => $this->l('Key description'),
'hint' => $this->l('Key description'),
),
array(
'type' => 'radio',
'type' => 'switch',
'label' => $this->l('Status:'),
'name' => 'active',
'required' => false,
'class' => 't',
'is_bool' => true,
'values' => array(
array(
@@ -162,7 +159,7 @@ class AdminWebserviceControllerCore extends AdminController
$this->fields_form['submit'] = array(
'title' => $this->l('Save '),
'class' => 'button'
'class' => 'btn btn-primary'
);
if (!($obj = $this->loadObject(true)))