v1.2.0 Released

This commit is contained in:
Rohit
2018-09-25 21:15:24 +05:30
parent a739332b50
commit 37ce9bd597
1887 changed files with 25972 additions and 139770 deletions

View File

@@ -116,7 +116,7 @@ class AdminMetaControllerCore extends AdminController
$general_fields['PS_HTACCESS_DISABLE_MODSEC'] = array(
'title' => $this->l('Disable Apache\'s mod_security module'),
'hint' => $this->l('Some of PrestaShop\'s features might not work correctly with a specific configuration of Apache\'s mod_security module. We recommend to turn it off.'),
'hint' => $this->l('Some of Qloapps\'s features might not work correctly with a specific configuration of Apache\'s mod_security module. We recommend to turn it off.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
@@ -198,20 +198,21 @@ class AdminMetaControllerCore extends AdminController
if (!defined('_PS_HOST_MODE_')) {
$this->fields_options['shop_url'] = $shop_url_options;
} else {
$this->fields_options['manage_domain_name'] = array(
'title' => $this->l('Manage domain name'),
'description' => $this->l('You can search for a new domain name or add a domain name that you already own. You will be redirected to your PrestaShop account.'),
'buttons' => array(
array(
'title' => $this->l('Add a domain name'),
'href' => 'https://www.prestashop.com/cloud/',
'class' => 'pull-right', 'icon' => 'process-icon-new',
'js' => 'return !window.open(this.href);'
)
)
);
}
// else {
// $this->fields_options['manage_domain_name'] = array(
// 'title' => $this->l('Manage domain name'),
// 'description' => $this->l('You can search for a new domain name or add a domain name that you already own. You will be redirected to your PrestaShop account.'),
// 'buttons' => array(
// array(
// 'title' => $this->l('Add a domain name'),
// 'href' => 'https://www.prestashop.com/cloud/',
// 'class' => 'pull-right', 'icon' => 'process-icon-new',
// 'js' => 'return !window.open(this.href);'
// )
// )
// );
// }
// Add display route options to options form
if (Configuration::get('PS_REWRITING_SETTINGS') || Tools::getValue('PS_REWRITING_SETTINGS')) {
@@ -219,7 +220,7 @@ class AdminMetaControllerCore extends AdminController
$this->addAllRouteFields();
}
$this->fields_options['routes']['title'] = $this->l('Schema of URLs');
$this->fields_options['routes']['description'] = $this->l('This section enables you to change the default pattern of your links. In order to use this functionality, PrestaShop\'s "Friendly URL" option must be enabled, and Apache\'s URL rewriting module (mod_rewrite) must be activated on your web server.').'<br />'.$this->l('There are several available keywords for each route listed below; note that keywords with * are required!').'<br />'.$this->l('To add a keyword in your URL, use the {keyword} syntax. If the keyword is not empty, you can add text before or after the keyword with syntax {prepend:keyword:append}. For example {-hey-:meta_title} will add "-hey-my-title" in the URL if the meta title is set.');
$this->fields_options['routes']['description'] = $this->l('This section enables you to change the default pattern of your links. In order to use this functionality, Qloapps\'s "Friendly URL" option must be enabled, and Apache\'s URL rewriting module (mod_rewrite) must be activated on your web server.').'<br />'.$this->l('There are several available keywords for each route listed below; note that keywords with * are required!').'<br />'.$this->l('To add a keyword in your URL, use the {keyword} syntax. If the keyword is not empty, you can add text before or after the keyword with syntax {prepend:keyword:append}. For example {-hey-:meta_title} will add "-hey-my-title" in the URL if the meta title is set.');
$this->fields_options['routes']['submit'] = array('title' => $this->l('Save'));
}
@@ -467,8 +468,8 @@ class AdminMetaControllerCore extends AdminController
));
// PS Comments
fwrite($write_fd, "# robots.txt automaticaly generated by PrestaShop e-commerce open-source solution\n");
fwrite($write_fd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n");
fwrite($write_fd, "# robots.txt automaticaly generated by qloapps e-commerce open-source solution\n");
fwrite($write_fd, "# https://www.qloapps.com - https://forums.qloapps.com/\n");
fwrite($write_fd, "# This file is to prevent the crawling and indexing of certain parts\n");
fwrite($write_fd, "# of your site by web crawlers and spiders run by sites like Yahoo!\n");
fwrite($write_fd, "# and Google. By telling these \"robots\" where not to go on your site,\n");