diff --git a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl b/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl index 341197364..1fe43c383 100644 --- a/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl +++ b/admin/themes/default/template/controllers/backup/helpers/list/list_header.tpl @@ -68,14 +68,14 @@ {if $host_mode}

{l s='How to restore a database backup'}

- {l s='If you need to restore a database backup, we invite you to subscribe to a [1][2]technical support plan[/2][/1].' tags=['', '']} + {l s='If you need to restore a database backup, we invite you to subscribe to a [1][2]technical support plan[/2][/1].' tags=['', '']}
{l s='Our team will take care of restoring your database safely.'}

{l s='Why can\'t I restore it by myself?'}
- {l s='Your shop is hosted by PrestaShop. Although you can create backup files here below, there are core settings you cannot access for security reasons, like the database management. Thus, only our team can proceed to a restoration.'} + {l s='Your shop is hosted by QloApps. Although you can create backup files here below, there are core settings you cannot access for security reasons, like the database management. Thus, only our team can proceed to a restoration.'}
{else}
diff --git a/admin/themes/default/template/controllers/images/content.tpl b/admin/themes/default/template/controllers/images/content.tpl index 98e9a7578..cd20a3c3d 100644 --- a/admin/themes/default/template/controllers/images/content.tpl +++ b/admin/themes/default/template/controllers/images/content.tpl @@ -29,7 +29,7 @@ {if isset($display_move) && $display_move} {if $safe_mode}
-

{l s='PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}

+

{l s='QloApps has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should therefore continue to use the existing system.'}

{else}
diff --git a/admin/themes/default/template/controllers/login/content.tpl b/admin/themes/default/template/controllers/login/content.tpl index 687c668f3..09312efc6 100644 --- a/admin/themes/default/template/controllers/login/content.tpl +++ b/admin/themes/default/template/controllers/login/content.tpl @@ -25,7 +25,7 @@

- +

{$qloapps_version}
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl index 34492ea63..cd4994834 100644 --- a/admin/themes/default/template/footer.tpl +++ b/admin/themes/default/template/footer.tpl @@ -75,7 +75,7 @@ {if $host_mode} /  - + diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index bb6f6f97f..1c9232f1a 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -78,7 +78,7 @@ var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}'; var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}'; var update_success_msg = '{l s='Update successful' js=1}'; - var errorLogin = '{l s='PrestaShop was unable to log in to Addons. Please check your credentials and your Internet connection.' js=1}'; + var errorLogin = '{l s='QloApps was unable to log in to Addons. Please check your credentials and your Internet connection.' js=1}'; var search_product_msg = '{l s='Search for a product' js=1}'; {/if} @@ -343,7 +343,7 @@ diff --git a/classes/Tools.php b/classes/Tools.php index 2ffec4434..50b43992e 100644 --- a/classes/Tools.php +++ b/classes/Tools.php @@ -2374,9 +2374,9 @@ class ToolsCore } // Write data in .htaccess file - fwrite($write_fd, "# ~~start~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again\n"); - fwrite($write_fd, "# .htaccess automaticaly generated by PrestaShop e-commerce open-source solution\n"); - fwrite($write_fd, "# http://www.prestashop.com - http://www.prestashop.com/forums\n\n"); + fwrite($write_fd, "# ~~start~~ Do not remove this comment, QloApps will keep automatically the code outside this comment when .htaccess will be generated again\n"); + fwrite($write_fd, "# .htaccess automaticaly generated by QloApps hotel commerce open-source solution\n"); + fwrite($write_fd, "# https://www.qloapps.com\n\n"); if ($disable_modsec) { fwrite($write_fd, "\nSecFilterEngine Off\nSecFilterScanPOST Off\n\n\n"); @@ -2584,7 +2584,7 @@ FileETag none $domain = current($domains); fwrite($write_fd, 'ErrorDocument 404 '.$domain[0]['physical']."index.php?controller=404\n\n"); - fwrite($write_fd, "# ~~end~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again"); + fwrite($write_fd, "# ~~end~~ Do not remove this comment, QloApps will keep automatically the code outside this comment when .htaccess will be generated again"); if ($specific_after) { fwrite($write_fd, "\n\n".trim($specific_after)); } diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index df70a8412..9a2095ead 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -447,7 +447,7 @@ class AdminControllerCore extends Controller { global $timer_start; $this->timer_start = $timer_start; - // Has to be remove for the next Prestashop version + // Has to be remove for the next QloApps version global $token; $this->controller_type = 'admin'; @@ -2966,7 +2966,7 @@ class AdminControllerCore extends Controller */ public function init() { - // Has to be removed for the next Prestashop version + // Has to be removed for the next QloApps version global $currentIndex; parent::init(); diff --git a/controllers/admin/AdminPatternsController.php b/controllers/admin/AdminPatternsController.php index d49df4cad..e393e8d3e 100644 --- a/controllers/admin/AdminPatternsController.php +++ b/controllers/admin/AdminPatternsController.php @@ -513,7 +513,7 @@ class AdminPatternsControllerCore extends AdminController 'color_value' => 'red', 'blue' => 'Content in custom color in blue field', 'activeVisu_field' => 1, - 'editable_text' => "PrestaShop", + 'editable_text' => "QloApps", ), array( 'id' => 1, @@ -524,7 +524,7 @@ class AdminPatternsControllerCore extends AdminController 'color_value' => 'blue', 'blue' => 'Content in custom color in blue field', 'activeVisu_field' => 0, - 'editable_text' => "PrestaShop", + 'editable_text' => "QloApps", ), array( 'id' => 2, @@ -535,7 +535,7 @@ class AdminPatternsControllerCore extends AdminController 'color_value' => 'yellow', 'blue' => 'Content in custom color in blue field', 'activeVisu_field' => 1, - 'editable_text' => "PrestaShop Lorem ipsum dolor sit amet, consectetur adipiscing elit. ", + 'editable_text' => "QloApps Lorem ipsum dolor sit amet, consectetur adipiscing elit. ", ), array( 'id' => 9, @@ -546,7 +546,7 @@ class AdminPatternsControllerCore extends AdminController 'color_value' => '#CCCC99', 'blue' => 'Content in custom color in blue field', 'activeVisu_field' => 1, - 'editable_text' => "PrestaShop", + 'editable_text' => "QloApps", ), ); diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index 8748ca7af..e599d1654 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -309,7 +309,7 @@ class AdminPerformanceControllerCore extends AdminController 'title' => $this->l('CCC (Combine, Compress and Cache)'), 'icon' => 'icon-fullscreen' ), - 'description' => $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.'), + 'description' => $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.'), 'input' => array( array( 'type' => 'hidden', @@ -638,7 +638,7 @@ class AdminPerformanceControllerCore extends AdminController public function postProcess() { - /* PrestaShop demo mode */ + /* QloApps demo mode */ if (_PS_MODE_DEMO_) { $this->errors[] = Tools::displayError('This functionality has been disabled.'); return; @@ -941,11 +941,11 @@ class AdminPerformanceControllerCore extends AdminController public function displayAjaxTestServer() { - /* PrestaShop demo mode */ + /* QloApps demo mode */ if (_PS_MODE_DEMO_) { die(Tools::displayError('This functionality has been disabled.')); } - /* PrestaShop demo mode*/ + /* QloApps demo mode*/ if (Tools::isSubmit('action') && Tools::getValue('action') == 'test_server') { $host = pSQL(Tools::getValue('sHost', '')); $port = (int)Tools::getValue('sPort', 0); diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 859d32d19..6d340fefc 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -48,7 +48,7 @@ class AdminThemesControllerCore extends AdminController /** * Multidimensional array used to check [theme]/config.xml values, - * and also checks prestashop current configuration if not match. + * and also checks QloApps current configuration if not match. * * @var array */ @@ -58,7 +58,7 @@ class AdminThemesControllerCore extends AdminController 'available' => array( 'value' => 'true', /* - * accepted attribute value if value doesn't match, prestashop configuration value must have those values + * accepted attribute value if value doesn't match, QloApps configuration value must have those values */ 'check_if_not_valid' => array( 'PS_CSS_THEME_CACHE' => 0, @@ -68,7 +68,7 @@ class AdminThemesControllerCore extends AdminController ), ), ), - 'error' => 'This theme may not correctly use PrestaShop\'s "combine, compress and cache" options.', + 'error' => 'This theme may not correctly use QloApps "combine, compress and cache" options.', 'tab' => 'AdminPerformance', ), 'guest_checkout' => array( @@ -78,7 +78,7 @@ class AdminThemesControllerCore extends AdminController 'check_if_not_valid' => array('PS_GUEST_CHECKOUT_ENABLED' => 0) ), ), - 'error' => 'This theme may not correctly use PrestaShop\'s "guest checkout" feature.', + 'error' => 'This theme may not correctly use QloApps "guest checkout" feature.', 'tab' => 'AdminPreferences', ), 'one_page_checkout' => array( @@ -88,7 +88,7 @@ class AdminThemesControllerCore extends AdminController 'check_if_not_valid' => array('PS_ORDER_PROCESS_TYPE' => 0), ), ), - 'error' => 'This theme may not correctly use PrestaShop\'s "one-page checkout" feature.', + 'error' => 'This theme may not correctly use QloApps "one-page checkout" feature.', 'tab' => 'AdminPreferences', ), 'store_locator' => array( @@ -101,7 +101,7 @@ class AdminThemesControllerCore extends AdminController ), ) ), - 'error' => 'This theme may not correctly use PrestaShop\'s "store locator" feature.', + 'error' => 'This theme may not correctly use QloApps "store locator" feature.', 'tab' => 'AdminStores', ) ); @@ -963,7 +963,7 @@ class AdminThemesControllerCore extends AdminController private function generateXML($theme_to_export, $metas) { - $theme = new SimpleXMLElement(''); + $theme = new SimpleXMLElement(''); $theme->addAttribute('version', Tools::getValue('theme_version')); $theme->addAttribute('name', Tools::htmlentitiesUTF8(Tools::getValue('theme_name'))); $theme->addAttribute('directory', Tools::htmlentitiesUTF8(Tools::getValue('theme_directory'))); @@ -1930,18 +1930,6 @@ class AdminThemesControllerCore extends AdminController } } - public function ajaxProcessGetAddonsThemes() - { - $parent_domain = Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI']))); - $iso_lang = $this->context->language->iso_code; - $iso_currency = $this->context->currency->iso_code; - $iso_country = $this->context->country->iso_code; - $activity = Configuration::get('PS_SHOP_ACTIVITY'); - $addons_url = 'http://addons.prestashop.com/iframe/search-1.6.php?psVersion='._PS_VERSION_.'&onlyThemes=1&isoLang='.$iso_lang.'&isoCurrency='.$iso_currency.'&isoCountry='.$iso_country.'&activity='.(int)$activity.'&parentUrl='.$parent_domain; - - die(Tools::file_get_contents($addons_url)); - } - /** * This function checks if the theme designer has thunk to make his theme compatible 1.4, * and noticed it on the $theme_dir/config.xml file. If not, some new functionnalities has