From 844439f03607791f784cce3db8c952cabb87d147 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 25 Feb 2015 23:40:39 -0500 Subject: [PATCH 01/50] added check for box visibility to mainpage categories listing --- catalog/includes/modules/content/mainpage_categories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/modules/content/mainpage_categories.php b/catalog/includes/modules/content/mainpage_categories.php index cfacc126b..3dcbe0df1 100644 --- a/catalog/includes/modules/content/mainpage_categories.php +++ b/catalog/includes/modules/content/mainpage_categories.php @@ -35,7 +35,7 @@ public function __construct() { public function initialize() { global $lC_Database, $lC_Language, $lC_CategoryTree; - $Qcategories = $lC_Database->query('select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.categories_mode, c.categories_link_target, c.categories_custom_url from :table_categories c, :table_categories_description cd where c.parent_id = :parent_id and c.categories_id = cd.categories_id and cd.language_id = :language_id and c.categories_status = 1 order by sort_order, cd.categories_name'); + $Qcategories = $lC_Database->query('select c.categories_id, cd.categories_name, c.categories_image, c.parent_id, c.categories_mode, c.categories_link_target, c.categories_custom_url from :table_categories c, :table_categories_description cd where c.parent_id = :parent_id and c.categories_id = cd.categories_id and cd.language_id = :language_id and c.categories_status = 1 and c.categories_visibility_box = 1 order by sort_order, cd.categories_name'); $Qcategories->bindTable(':table_categories', TABLE_CATEGORIES); $Qcategories->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION); $Qcategories->bindInt(':parent_id', 0); From 1c141926001c57432b1926c24941fde40fa87da4 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 3 Mar 2015 20:11:32 -0500 Subject: [PATCH 02/50] removed duplicate "as $module" from row causing blank content on success page --- catalog/templates/core/content/checkout/checkout_success.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/templates/core/content/checkout/checkout_success.php b/catalog/templates/core/content/checkout/checkout_success.php index f4d434e6c..7f08a7359 100644 --- a/catalog/templates/core/content/checkout/checkout_success.php +++ b/catalog/templates/core/content/checkout/checkout_success.php @@ -111,7 +111,7 @@
Date: Wed, 25 Mar 2015 22:33:51 -0400 Subject: [PATCH 03/50] products status set to 1 in upgrader class. --- catalog/install/includes/classes/upgrader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 11e4a6027..0ac331a69 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -856,7 +856,7 @@ public function importProducts($switch = null) { $tQry->bindDate (':products_last_modified', $product['products_last_modified']); $tQry->bindFloat(':products_weight' , $product['products_weight']); $tQry->bindValue(':products_weight_class' , $product['products_weight_class']); - $tQry->bindInt (':products_status' , $product['products_status']); + $tQry->bindInt (':products_status' , 1); $tQry->bindInt (':products_tax_class_id' , $product['products_tax_class_id']); $tQry->bindInt (':manufacturers_id' , $product['manufacturers_id']); $tQry->bindInt (':products_ordered' , $product['products_ordered']); From 1f78a0c15027fae2f11bbe6fd1df9524072a3560 Mon Sep 17 00:00:00 2001 From: Kiran Date: Wed, 8 Apr 2015 02:16:03 +0530 Subject: [PATCH 04/50] [B550] Fixed module displayed prices are same as price displayed on product info. --- catalog/includes/modules/content/also_purchased_products.php | 1 + 1 file changed, 1 insertion(+) diff --git a/catalog/includes/modules/content/also_purchased_products.php b/catalog/includes/modules/content/also_purchased_products.php index 15d123477..2977fd6a0 100644 --- a/catalog/includes/modules/content/also_purchased_products.php +++ b/catalog/includes/modules/content/also_purchased_products.php @@ -59,6 +59,7 @@ public function initialize() { $this->_content = ''; while ($Qorders->next()) { + $lC_Product = new lC_Product($Qorders->value('products_id')); // VQMOD-hookpoint; DO NOT MODIFY OR REMOVE THE LINE BELOW $this->_content .= '
' . "\n"; if ($lC_Product->hasImage()) { From 0976611b978fe69ab432b4607d828a84459a9f0f Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 23 Apr 2015 01:00:13 -0400 Subject: [PATCH 05/50] => Fix for &action=cart_add url issue when SEO URL's not enabled from product info page. => Update to upgrader class for getting DISTINCT orders from source db resolving errors with duplicate order id's during upgrade import into target db. => Update to upgrader class for value2 insert into product attributes table, TEXT/BLOB can not have default values, so value2 set to '' (empty) during import. --- catalog/includes/functions/html_output.php | 6 ++++-- catalog/install/includes/classes/upgrader.php | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/catalog/includes/functions/html_output.php b/catalog/includes/functions/html_output.php index a3998d5c3..04a782314 100644 --- a/catalog/includes/functions/html_output.php +++ b/catalog/includes/functions/html_output.php @@ -183,8 +183,10 @@ function lc_href_link($page = null, $parameters = null, $connection = 'NONSSL', } } } else { - if (strpos($link, '&') !== false) { - $link = str_replace('&', '&', $link); + if (strpos($link, 'cart_add') === false) { + if (strpos($link, '&') !== false) { + $link = str_replace('&', '&', $link); + } } } } diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 0ac331a69..c469488d9 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -1114,17 +1114,20 @@ public function importProducts($switch = null) { $aQry = $target_db->query('INSERT INTO :table_product_attributes (id, products_id, languages_id, - value) + value, + value2) VALUES (:id, :products_id, :languages_id, - :value)'); + :value, + :value2)'); $aQry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); $aQry->bindInt(':id' , $mQry->value('id')); $aQry->bindInt(':products_id' , $sQry->value($map['products_id'])); $aQry->bindInt(':languages_id' , 0); $aQry->bindInt(':value' , ($sQry->value($map['manufacturers_id']) != '' || $sQry->value($map['manufacturers_id']) != NULL) ? $sQry->value($map['manufacturers_id']) : 0); + $aQry->bindInt(':value2' , ''); $aQry->execute(); if ($target_db->isError()) { @@ -3769,7 +3772,7 @@ class, $map = $this->_data_mapping['orders']; $orders = array(); - $sQry = $source_db->query('SELECT o.*, o.ipaddy as customers_ip_address, o.customers_address_format_id AS customers_address_format, o.billing_address_format_id AS billing_address_format, o.delivery_address_format_id AS delivery_address_format, c.countries_iso_code_2 AS customers_country_iso2, c.countries_iso_code_3 AS customers_country_iso3, z.zone_code AS customers_state_code, zz.zone_code AS delivery_state_code, cc.countries_iso_code_2 AS delivery_country_iso2, cc.countries_iso_code_3 AS delivery_country_iso3, zzz.zone_code AS billing_state_code, ccc.countries_iso_code_2 AS billing_country_iso2, ccc.countries_iso_code_3 AS billing_country_iso3 FROM orders o LEFT JOIN countries c ON o.customers_country = c.countries_name LEFT JOIN countries cc ON o.delivery_country = cc.countries_name LEFT JOIN countries ccc ON o.billing_country = ccc.countries_name LEFT JOIN zones z ON o.customers_state = z.zone_name LEFT JOIN zones zz ON o.delivery_state = zz.zone_name LEFT JOIN zones zzz ON o.billing_state = zzz.zone_name'); + $sQry = $source_db->query('SELECT DISTINCT o.*, o.ipaddy as customers_ip_address, o.customers_address_format_id AS customers_address_format, o.billing_address_format_id AS billing_address_format, o.delivery_address_format_id AS delivery_address_format, c.countries_iso_code_2 AS customers_country_iso2, c.countries_iso_code_3 AS customers_country_iso3, z.zone_code AS customers_state_code, zz.zone_code AS delivery_state_code, cc.countries_iso_code_2 AS delivery_country_iso2, cc.countries_iso_code_3 AS delivery_country_iso3, zzz.zone_code AS billing_state_code, ccc.countries_iso_code_2 AS billing_country_iso2, ccc.countries_iso_code_3 AS billing_country_iso3 FROM orders o LEFT JOIN countries c ON o.customers_country = c.countries_name LEFT JOIN countries cc ON o.delivery_country = cc.countries_name LEFT JOIN countries ccc ON o.billing_country = ccc.countries_name LEFT JOIN zones z ON o.customers_state = z.zone_name LEFT JOIN zones zz ON o.delivery_state = zz.zone_name LEFT JOIN zones zzz ON o.billing_state = zzz.zone_name'); $sQry->execute(); if (!isset($pending_id) || $pending_id == null || $pending_id == '') $pending_id = 1; From f0c7929ddc28cf141b03e9198cc0bbe0350d96c9 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Wed, 29 Apr 2015 01:20:41 -0400 Subject: [PATCH 06/50] Removed un needed $products array line... Not 100% sure why the line for building a $products[] array was left in the upgrader class, it must have been some type of possibly needed array for later in the function, but was causing a "shift null" javascript error during upgrade. This line is not needed in the upgrader class and has been removed to clean up and repair the upgrader. --- catalog/install/includes/classes/upgrader.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index c469488d9..b5282d1e7 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -802,9 +802,7 @@ public function importProducts($switch = null) { , 'products_price10_qty' => $sQry->value('products_price10_qty') , 'products_price11_qty' => $sQry->value('products_price11_qty') , 'has_children' => 0 - ); - - $products[] = $product; + ); $tQry = $target_db->query('INSERT INTO :table_products (products_id, parent_id, @@ -6552,4 +6550,4 @@ public function getAddressFormat($name = null, $iso2 = null, $iso3 = null) { return $address_format; } } -?> \ No newline at end of file +?> From 5725120aca0279a47d4e79fd1f033df026088025 Mon Sep 17 00:00:00 2001 From: datazen Date: Wed, 29 Apr 2015 13:27:35 -0400 Subject: [PATCH 07/50] [IC] updates for localization --- catalog/includes/classes/product.php | 7 +++++ catalog/includes/classes/session.php | 12 ++++----- catalog/includes/classes/tax.php | 7 +++++ catalog/includes/functions/compatibility.php | 27 +++++++++++++++----- catalog/includes/functions/html_output.php | 10 ++++++++ 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index 66657ef32..1811920ec 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -344,6 +344,13 @@ public function getPriceInfo($product_id, $customers_group_id = 1, $data) { $base_price = self::getProductPrice($vpID); } } + + // added for localization + if (isset($_SESSION['localization']['base_price_modifier']) && $_SESSION['localization']['base_price_modifier'] > 0) { + $modified_amt = round((($base_price * (float)$_SESSION['localization']['base_price_modifier']) / 100), DECIMAL_PLACES); + $base_price = ($base_price + $modified_amt); + } + $price = (float)$base_price; // options modifiers diff --git a/catalog/includes/classes/session.php b/catalog/includes/classes/session.php index fa5982b59..27ca239f7 100644 --- a/catalog/includes/classes/session.php +++ b/catalog/includes/classes/session.php @@ -132,16 +132,16 @@ public function start() { } elseif ( isset($_COOKIE[$this->_name]) && (empty($_COOKIE[$this->_name]) || (ctype_alnum($_COOKIE[$this->_name]) === false)) ) { $sane_session_id = false; } - + if ( $sane_session_id === false ) { - if ( isset($_COOKIE[$this->_name]) ) { + if ( isset($_COOKIE[$this->_name]) ) { setcookie($this->_name, '', time()-42000, $this->getCookieParameters('path'), $this->getCookieParameters('domain')); } - + lc_redirect(lc_href_link(FILENAME_DEFAULT, null, 'NONSSL', false)); - } else if (isset($_GET['lCsid']) && $_GET['lCsid'] != NULL && isset($_GET['qr']) && $_GET['qr'] == '1') { - - $this->_is_started = true; + } else if (isset($_GET['lCsid']) && $_GET['lCsid'] != NULL || isset($_GET['qr']) && $_GET['qr'] == '1') { + + $this->_is_started = true; $this->_id = $_GET['lCsid']; session_id($_GET['lCsid']); session_start(); diff --git a/catalog/includes/classes/tax.php b/catalog/includes/classes/tax.php index c227a35cc..7a653ab39 100644 --- a/catalog/includes/classes/tax.php +++ b/catalog/includes/classes/tax.php @@ -23,6 +23,9 @@ public function getTaxRate($class_id, $country_id = -1, $zone_id = -1) { $country_id = $lC_ShoppingCart->getTaxingAddress('country_id'); $zone_id = $lC_ShoppingCart->getTaxingAddress('zone_id'); } + + // added for localization + if (isset($_SESSION['localization']['default_tax_zone']) && $_SESSION['localization']['default_tax_zone'] != null) $zone_id = $_SESSION['localization']['default_tax_zone']; if (isset($this->tax_rates[$class_id][$country_id][$zone_id]['rate']) == false) { $Qtax = $lC_Database->query('select sum(tax_rate) as tax_rate from :table_tax_rates tr left join :table_zones_to_geo_zones za on (tr.tax_zone_id = za.geo_zone_id) left join :table_geo_zones tz on (tz.geo_zone_id = tr.tax_zone_id) where (za.zone_country_id is null or za.zone_country_id = 0 or za.zone_country_id = :zone_country_id) and (za.zone_id is null or za.zone_id = 0 or za.zone_id = :zone_id) and tr.tax_class_id = :tax_class_id group by tr.tax_priority'); @@ -82,8 +85,12 @@ public function getTaxRateDescription($class_id, $country_id, $zone_id) { public function calculate($price, $tax_rate) { global $lC_Currencies; + + // added for localization + if (isset($_SESSION['localization']['show_tax']) && $_SESSION['localization']['show_tax'] == 0) $tax_rate = 1; return lc_round($price * $tax_rate / 100, $lC_Currencies->currencies[DEFAULT_CURRENCY]['decimal_places']); + } public function displayTaxRateValue($value, $padding = null) { diff --git a/catalog/includes/functions/compatibility.php b/catalog/includes/functions/compatibility.php index 1e450c62a..39328b51f 100644 --- a/catalog/includes/functions/compatibility.php +++ b/catalog/includes/functions/compatibility.php @@ -214,26 +214,39 @@ function getRequestType() { if (!function_exists('setLocalization')) { function setLocalization() { - global $lC_Database, $lC_Currencies, $lC_Language; - - if (isset($_SESSION['localization']['currency']) || isset($_SESSION['localization']['language'])) return; + global $lC_Database, $lC_Currencies, $lC_Language, $lC_Session; + +//unset($_SESSION['localization']); + + // if (isset($_SESSION['localization']['currency']) || isset($_SESSION['localization']['language'])) return; $_SESSION['localization'] = array(); $Qlocal = $lC_Database->query('select * from :table_localization where domain = :domain limit 1'); $Qlocal->bindTable(':table_localization', TABLE_LOCALIZATION); $Qlocal->bindValue(':domain', $_SERVER['HTTP_HOST']); - $Qlocal->execute(); + $Qlocal->execute(); if ($Qlocal->numberOfRows() > 0) { - - // set the language $_SESSION['currency'] = $lC_Currencies->getCode($Qlocal->valueInt('currencies_id')); $_SESSION['language'] = $lC_Language->getCodeFromID($Qlocal->valueInt('language_id')); + $_SESSION['localization']['domain'] = $Qlocal->value('domain'); $_SESSION['localization']['show_tax'] = $Qlocal->valueInt('show_tax'); $_SESSION['localization']['language'] = $lC_Language->getCodeFromID($Qlocal->valueInt('language_id')); - $_SESSION['localization']['currency'] = $lC_Currencies->getCode($Qlocal->valueInt('currencies_id')); + $_SESSION['localization']['currency'] = $lC_Currencies->getCode($Qlocal->valueInt('currencies_id')); + $_SESSION['localization']['default_tax_zone'] = $Qlocal->valueInt('default_tax_zone'); + $_SESSION['localization']['base_price_modifier'] = $Qlocal->valueDecimal('base_price_modifier'); + $_SESSION['localization']['session_id'] = $lC_Session->getID(); + $_SESSION['localization']['session_name'] = $lC_Session->getName(); + + $lC_Language->set($_SESSION['localization']['language']); + $lC_Language->load('general'); + $lC_Language->load('modules-boxes'); + $lC_Language->load('modules-content'); + header('Content-Type: text/html; charset=' . $lC_Language->getCharacterSet()); + lc_setlocale(LC_TIME, explode(',', $lC_Language->getLocale())); } + $Qlocal->freeResult(); // overrides diff --git a/catalog/includes/functions/html_output.php b/catalog/includes/functions/html_output.php index 04a782314..8dae3a746 100644 --- a/catalog/includes/functions/html_output.php +++ b/catalog/includes/functions/html_output.php @@ -62,6 +62,15 @@ function lc_href_link($page = null, $parameters = null, $connection = 'NONSSL', $link = HTTP_SERVER . DIR_WS_HTTP_CATALOG; } } + + // added for localization + if (!strstr($page, '.css') && !strstr($page, '.js')) { + if (isset($_SESSION['localization']['domain']) && empty($_SESSION['localization']['domain']) === false) { + $config_domain = str_replace('http://', '', HTTP_SERVER); + $link = str_replace($config_domain, $_SESSION['localization']['domain'], $link); + } + } + $link .= $page; @@ -82,6 +91,7 @@ function lc_href_link($page = null, $parameters = null, $connection = 'NONSSL', // Add the session ID when moving from different HTTP and HTTPS servers, or when SID is defined if ( ($add_session_id === true) && $lC_Session->hasStarted() && (SERVICE_SESSION_FORCE_COOKIE_USAGE == '-1') ) { + if (!lc_empty(SID)) { $_sid = SID; } elseif ( (($request_type == 'http') && ($connection == 'SSL') && (ENABLE_SSL === true)) || (($request_type == 'https') && ($connection != 'SSL')) ) { From 58902c65a90d58909a749efe6df44318f44026f7 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Wed, 29 Apr 2015 15:27:28 -0400 Subject: [PATCH 08/50] Removed "&&" causing page load issue in admin. --- catalog/includes/modules/boxes/specials.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/includes/modules/boxes/specials.php b/catalog/includes/modules/boxes/specials.php index 34c072d71..d5bf77aba 100644 --- a/catalog/includes/modules/boxes/specials.php +++ b/catalog/includes/modules/boxes/specials.php @@ -49,7 +49,7 @@ public function initialize() { $data['products_price'] = '' . $lC_Currencies->displayPrice($Qspecials->valueDecimal('products_price'), $Qspecials->valueInt('products_tax_class_id')) . ' ' . $lC_Currencies->displayPrice($Qspecials->valueDecimal('specials_new_products_price'), $Qspecials->valueInt('products_tax_class_id')) . ''; - if ($lC_Cache->isEnabled() &&) $lC_Cache->write($data); + if ($lC_Cache->isEnabled()) $lC_Cache->write($data); } } @@ -83,4 +83,4 @@ public function getKeys() { return $this->_keys; } } -?> \ No newline at end of file +?> From c0e5a99676e467a405886f5cb32d0b5a4d6307c7 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Thu, 30 Apr 2015 00:20:28 -0400 Subject: [PATCH 09/50] added search results equalheight js --- catalog/templates/core/javascript/general.js.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog/templates/core/javascript/general.js.php b/catalog/templates/core/javascript/general.js.php index a65afd218..9fd48d11a 100644 --- a/catalog/templates/core/javascript/general.js.php +++ b/catalog/templates/core/javascript/general.js.php @@ -94,6 +94,7 @@ $(window).load(function() { equalheight('.content-new-products-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); + equalheight('.product-listing-module-items .thumbnail'); equalheight('.content-categories-container .thumbnail'); equalheight('.content-also-purchased-products-container .thumbnail'); equalheight('.content-featured-products-container .thumbnail'); @@ -104,10 +105,11 @@ $(window).resize(function(){ equalheight('.content-new-products-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); + equalheight('.product-listing-module-items .thumbnail'); equalheight('.content-categories-container .thumbnail'); equalheight('.content-also-purchased-products-container .thumbnail'); equalheight('.content-featured-products-container .thumbnail'); equalheight('.content-recently-visited-container .thumbnail'); equalheight('.content-upcoming-products-container .thumbnail'); }); -//--> \ No newline at end of file +//--> From 7738185099bea7524458b7b8566c8def1adfdec3 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 30 Apr 2015 03:03:21 -0400 Subject: [PATCH 10/50] Added Specials on Mainpage Content Module --- .../en_US/modules/content/specials.xml | 15 +++ catalog/includes/modules/content/specials.php | 109 ++++++++++++++++++ .../core/modules/content/specials.php | 72 ++++++++++++ 3 files changed, 196 insertions(+) create mode 100644 catalog/includes/languages/en_US/modules/content/specials.xml create mode 100644 catalog/includes/modules/content/specials.php create mode 100644 catalog/templates/core/modules/content/specials.php diff --git a/catalog/includes/languages/en_US/modules/content/specials.xml b/catalog/includes/languages/en_US/modules/content/specials.xml new file mode 100644 index 000000000..254c6192c --- /dev/null +++ b/catalog/includes/languages/en_US/modules/content/specials.xml @@ -0,0 +1,15 @@ + + + + + specials_title + + modules-content + + + specials_button_buy_now + + modules-content + + + diff --git a/catalog/includes/modules/content/specials.php b/catalog/includes/modules/content/specials.php new file mode 100644 index 000000000..dd33a9029 --- /dev/null +++ b/catalog/includes/modules/content/specials.php @@ -0,0 +1,109 @@ +injectDefinitions)) $lC_Language->injectDefinitions('modules/' . $_GET['set'] . '/' . $this->_code . '.xml'); + + $this->_title = $lC_Language->get('specials_title'); + } + /* + * Returns the specials HTML + * + * @access public + * @return string + */ + public function initialize() { + global $lC_Database, $lC_Cache, $lC_Language, $lC_Currencies, $lC_Image, $current_category_id; + + $data = array(); + + if ( ($lC_Cache->isEnabled() && MODULE_CONTENT_SPECIALS_CACHE > 0) && $lC_Cache->read('specials-' . $lC_Language->getCode() . '-' . $lC_Currencies->getCode() . '-' . $current_category_id, MODULE_CONTENT_SPECIALS_CACHE) ) { + $data = $lC_Cache->getCache(); + } else { + $Qproducts = $lC_Database->query('select distinct p.products_id, pi.image, pd.products_name from :table_products p, :table_products_images pi, :table_products_description pd, :table_specials s where p.products_status = :products_status and p.is_subproduct = :is_subproduct and s.status = :specials_status and p.products_id = s.products_id and pi.id = s.products_id and pd.products_id = s.products_id order by rand() limit :max_display_specials'); + $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); + $Qproducts->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); + $Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); + $Qproducts->bindTable(':table_specials', TABLE_SPECIALS); + $Qproducts->bindInt(':products_status', 1); + $Qproducts->bindInt(':is_subproduct', 0); + $Qproducts->bindInt(':specials_status', 1); + $Qproducts->bindInt(':max_display_specials', MODULE_CONTENT_SPECIALS_MAX_DISPLAY); + $Qproducts->execute(); + + while ( $Qproducts->next() ) { + // VQMOD-hookpoint; DO NOT MODIFY OR REMOVE THE LINE BELOW + $lC_Product = new lC_Product($Qproducts->valueInt('products_id')); + + $data[$lC_Product->getID()] = $lC_Product->getData(); + $data[$lC_Product->getID()]['display_price'] = $lC_Product->getPriceFormated(true); + $data[$lC_Product->getID()]['display_image'] = $lC_Product->getImage(); + } + + if ($lC_Cache->isEnabled()) $lC_Cache->write($data); + } + + if ( !empty($data) ) { + + $this->_content = ''; + foreach ( $data as $product ) { + $this->_content .= '
' . "\n"; + $this->_content .= '
' . lc_link_object(lc_href_link(FILENAME_PRODUCTS, $product['keyword']), $lC_Image->show($product['display_image'], $product['name'], 'class="content-specials-image-src"')) . '
' . "\n" . + '
' . lc_link_object(lc_href_link(FILENAME_PRODUCTS, $product['keyword']), $product['name']) . '
' . "\n" . + '
' . ((strlen(lc_clean_html($product['description'])) > 65) ? substr(lc_clean_html($product['description']), 0, 62) . '...' : lc_clean_html($product['description'])) . '
' . "\n" . + '
' . $product['display_price']. '
' . "\n" . + '
' . "\n"; + $this->_content .= '
' . "\n"; + } + } + } + + /* + * Install the module + * + * @access public + * @return void + */ + public function install() { + global $lC_Database; + + parent::install(); + + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Maximum Entries To Display', 'MODULE_CONTENT_SPECIALS_MAX_DISPLAY', '9', 'Maximum number of specials to display', '6', '0', now())"); + $lC_Database->simpleQuery("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Cache Contents', 'MODULE_CONTENT_SPECIALS_CACHE', '60', 'Number of minutes to keep the contents cached (0 = no cache)', '6', '0', now())"); + } + /* + * Return the module keys + * + * @access public + * @return array + */ + public function getKeys() { + if (!isset($this->_keys)) { + $this->_keys = array('MODULE_CONTENT_SPECIALS_MAX_DISPLAY', 'MODULE_CONTENT_SPECIALS_CACHE'); + } + + return $this->_keys; + } +} +?> \ No newline at end of file diff --git a/catalog/templates/core/modules/content/specials.php b/catalog/templates/core/modules/content/specials.php new file mode 100644 index 000000000..8f63d15cd --- /dev/null +++ b/catalog/templates/core/modules/content/specials.php @@ -0,0 +1,72 @@ + + +
+
+

getTitle(); ?>

+ getContent(); ?> +
+
+ + \ No newline at end of file From 1e173a74a43a38bd2d4e7f5e1bfd6ce3e399c7e3 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 30 Apr 2015 03:06:38 -0400 Subject: [PATCH 11/50] added equal height for specials mainpage listing to core general js --- catalog/templates/core/javascript/general.js.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/templates/core/javascript/general.js.php b/catalog/templates/core/javascript/general.js.php index 9fd48d11a..98b8ec6a7 100644 --- a/catalog/templates/core/javascript/general.js.php +++ b/catalog/templates/core/javascript/general.js.php @@ -93,6 +93,7 @@ $(window).load(function() { equalheight('.content-new-products-container .thumbnail'); + equalheight('.content-specials-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); equalheight('.product-listing-module-items .thumbnail'); equalheight('.content-categories-container .thumbnail'); @@ -104,6 +105,7 @@ $(window).resize(function(){ equalheight('.content-new-products-container .thumbnail'); + equalheight('.content-specials-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); equalheight('.product-listing-module-items .thumbnail'); equalheight('.content-categories-container .thumbnail'); From a4c8cbe85ac56ad518ba7a185447f55c2da10718 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 30 Apr 2015 04:07:23 -0400 Subject: [PATCH 12/50] added check for get manufacturers and set box dropdown accordingly --- catalog/includes/modules/boxes/manufacturers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/modules/boxes/manufacturers.php b/catalog/includes/modules/boxes/manufacturers.php index 7fb0b4152..4093f3036 100644 --- a/catalog/includes/modules/boxes/manufacturers.php +++ b/catalog/includes/modules/boxes/manufacturers.php @@ -39,7 +39,7 @@ public function initialize() { $Qmanufacturers->freeResult(); foreach ($manufacturers_array as $man) { - $manufacturers .= ''; + $manufacturers .= ''; } $this->_content = '
  • ' . ' +
    • +
    +
    +
    + +
    get('text_inventory_settings'); ?>
    diff --git a/catalog/admin/includes/languages/en_US/products.php b/catalog/admin/includes/languages/en_US/products.php index c0d323380..807476154 100644 --- a/catalog/admin/includes/languages/en_US/products.php +++ b/catalog/admin/includes/languages/en_US/products.php @@ -208,6 +208,7 @@ text_days_to_ship = Days to Ship text_default = Default text_dimensions = Dimensions +text_display_settings = Display Settings text_edit_on_content_tab = Edit on Content Tab text_edit_qoh_sku = Edit QOH and SKU in the Options Tab text_group_pricing = Group Pricing @@ -268,6 +269,7 @@ text_simple_inventory_options = Simple Inventory Options text_simple_options = Simple Options text_sku = SKU Number +text_sort_order = Sort Order text_default_selected_combo = Default Selected Combo text_set_default_combo = Set Default Combo text_special_price = Special Price diff --git a/catalog/includes/classes/category_tree.php b/catalog/includes/classes/category_tree.php index 0154e6623..5b5feb421 100644 --- a/catalog/includes/classes/category_tree.php +++ b/catalog/includes/classes/category_tree.php @@ -127,7 +127,7 @@ public function __construct() { $this->_data = $catArr; } - if ($lC_Cache->isEnabled()) $lC_Cache->write($this->_data); + // if ($lC_Cache->isEnabled()) $lC_Cache->write($this->_data); } } diff --git a/catalog/includes/classes/products.php b/catalog/includes/classes/products.php index 027c04eec..9e6b4fba4 100644 --- a/catalog/includes/classes/products.php +++ b/catalog/includes/classes/products.php @@ -71,7 +71,10 @@ function setSortBy($field, $direction = '+') { case 'last_added': $this->_sort_by = 'p.products_date_added'; $direction = '-'; - break; + break; + case 'sort_order': + $this->_sort_by = 'p.products_sort_order'; + break; } $this->_sort_by_direction = ($direction == '-') ? '-' : '+'; diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 769f0113b..600d58e92 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -488,8 +488,8 @@ public static function updateDB() { } if (!defined('PRODUCT_LISTING_DISPLAY_ORDER')) { - $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added''))');"); - parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added''))');"); + $lC_Database->simpleQuery("INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added'', ''Sort Order''))');"); + parent::log("Database Update: INSERT INTO `" . $pf . "configuration` (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES('Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added'', ''Sort Order''))');"); } } diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index ad7029cbe..f0e0e0c78 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -1254,7 +1254,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(189, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(190, 'Top Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(191, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', 'All', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(192, 'Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(192, 'Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added'', ''Sort Order''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 90ecb66a5..740ab60fb 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -1253,7 +1253,7 @@ INSERT INTO lc_configuration (configuration_id, configuration_title, configurati INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(189, 'Show Product Count', 'BOX_PRODUCT_CATEGORIES_SHOW_PRODUCT_COUNT', '-1', 'Show the amount of products each category has', '6', '0', now(), now(), 'lc_cfg_use_get_boolean_value', 'lc_cfg_set_boolean_value(array(1, -1))'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(190, 'Top Category', 'BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY', 1, 'Select the Top Category of the Product Categories Infobox', 6, 0, now(), now(), 'lc_cfg_set_categories_top_category(BOX_PRODUCT_CATEGORIES_ROOT_CATEGORY)', 'lc_cfg_set_categories_top_category'); INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(191, 'Expand Menu Item', 'BOX_PRODUCT_CATEGORIES_MAX_LEVEL', 'All', 'How many levels to expand the category tree.', 6, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''None'', ''1'', ''2'', ''3'', ''All''))'); -INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(192, 'Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added''))'); +INSERT INTO lc_configuration (configuration_id, configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES(192, 'Products Display Order', 'PRODUCT_LISTING_DISPLAY_ORDER', 'Name', 'Products displayed on listing pages are ordered by this value.', 8, 0, now(), now(), null, 'lc_cfg_set_boolean_value(array(''Name'', ''Model'', ''Price'', ''Manufacturer'', ''Quantity'', ''Weight'', ''Last Added'', ''Sort Order''))'); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(1, 'My Store', 'General information about my store', 1, 1); INSERT INTO lc_configuration_group (configuration_group_id, configuration_group_title, configuration_group_description, sort_order, visible) VALUES(2, 'Minimum Values', 'The minimum values for functions / data', 2, 1); From c3e453d77cb109213e29acad15a1e8b4dd535f02 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 11 May 2015 11:43:31 -0400 Subject: [PATCH 23/50] added code to grab any product specific simple options values pricing modifiers and not first match based on limit 1 --- .../includes/applications/products/classes/products.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php index 5b4b58fe5..14baea3b9 100644 --- a/catalog/admin/includes/applications/products/classes/products.php +++ b/catalog/admin/includes/applications/products/classes/products.php @@ -1689,10 +1689,12 @@ public static function getSimpleOptionEntryData($eData) { $optionsArr = array(); foreach($veData as $key => $value) { - $Qoption = $lC_Database->query('select price_modifier from :table_products_simple_options_values where options_id = :options_id limit 1'); + $Qoption = $lC_Database->query('select price_modifier from :table_products_simple_options_values where products_id = :products_id and options_id = :options_id and values_id = :values_id limit 1'); $Qoption->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); - $Qoption->bindValue(':options_id', $value['id']); - $Qoption->bindValue(':languages_id', $value['languages_id']); + $Qoption->bindInt(':products_id', $eData['products']); + $Qoption->bindInt(':options_id', $eData['group']); + $Qoption->bindInt(':values_id', $value['id']); + $Qoption->bindInt(':languages_id', $value['languages_id']); $Qoption->execute(); $optionsArr[$key] = array('id' => $value['id'], From 67ba6933972c6daccef1076987f2cd05dc3bf663 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Mon, 11 May 2015 18:06:50 -0400 Subject: [PATCH 24/50] update to disable add to cart button for out of stock sub products --- catalog/includes/classes/product.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index 1811920ec..dc64e1caf 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -994,10 +994,11 @@ public function hasSubProducts($id) { public function getSubProducts($id) { global $lC_Database, $lC_Language; - $Qproducts = $lC_Database->query('select p.*, pd.products_name, pd.products_keyword from :table_products p, :table_products_description pd where p.parent_id = :parent_id and p.products_id = pd.products_id and pd.language_id = :language_id'); + $Qproducts = $lC_Database->query('select p.*, pd.products_name, pd.products_keyword from :table_products p, :table_products_description pd where p.parent_id = :parent_id and p.products_id = pd.products_id and p.products_status = :products_status and pd.language_id = :language_id'); $Qproducts->bindTable(':table_products', TABLE_PRODUCTS); $Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); $Qproducts->bindInt(':parent_id', $id); + $Qproducts->bindInt(':products_status', 1); $Qproducts->bindInt(':language_id', $lC_Language->getID()); $Qproducts->execute(); @@ -1037,9 +1038,9 @@ public function parseSubProducts($data) { $output = ''; foreach ($data as $key => $value) { - $extra = ''; - // $extra = (isset($value['products_model']) && empty($value['products_model']) === false) ? '' . $lC_Language->get('listing_model_heading') . ': ' . $value['products_model'] . '' : null; - // if ($extra == null && isset($value['products_sku']) && empty($value['products_sku']) === false) $extra = '' . $lC_Language->get('listing_sku_heading') . ': ' . $value['products_sku'] . ''; + $extra = ''; + // $extra = (isset($value['products_model']) && empty($value['products_model']) === false) ? '' . $lC_Language->get('listing_model_heading') . ': ' . $value['products_model'] . '' : null; + // if ($extra == null && isset($value['products_sku']) && empty($value['products_sku']) === false) $extra = '' . $lC_Language->get('listing_sku_heading') . ': ' . $value['products_sku'] . ''; $img = (isset($value['image']) && empty($value['image']) === false) ? $lC_Image->getAddress($value['image'], 'small') : 'images/pixel_trans.gif'; $height = (isset($value['image']) && empty($value['image']) === false) ? $lC_Image->getHeight('small') : 1; @@ -1067,17 +1068,22 @@ public function parseSubProducts($data) { '
    ' . '
    ' . ' ' . $lC_Currencies->format($price) . ''; - + + $disabled = ''; + if (DISABLE_ADD_TO_CART == 1 && $value['products_quantity'] < 1) { + $disabled = ' disabled'; + } + if ($purchase_type == 'single') { $output .= ' ' . - '
    ' . + '
    ' . '     '; } else { $output .= ' ' . - ' ' . + ' ' . ' '; } - + $output .= '
    ' . ''; } From 39f62c93d13bacbe167991a67ae1b498d88af8eb Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 12 May 2015 01:13:45 -0400 Subject: [PATCH 25/50] split upgrade orders import into 6 smaller parts to assist with larger stores timing out on order related data, updated template output class for static functions --- catalog/install/includes/classes/upgrader.php | 956 ++++++++++++------ .../includes/languages/en_US/upgrade.php | 15 + catalog/install/loadedcommerce.sql | 8 +- catalog/install/loadedcommerce_innodb.sql | 8 +- catalog/install/rpc.php | 116 ++- catalog/install/templates/css/styles/form.css | 6 +- catalog/install/templates/pages/upgrade_3.php | 274 +++-- catalog/templates/core/classes/output.php | 6 +- 8 files changed, 999 insertions(+), 390 deletions(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index b5282d1e7..0db9c8c77 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -3376,9 +3376,9 @@ public function importCustomerGroups($switch = null) { :customers_group_name)'); $tQry->bindTable(':table_customers_groups', TABLE_CUSTOMERS_GROUPS); - $tQry->bindInt (':customers_group_id' , $customers_group['customers_group_id']); - $tQry->bindInt (':language_id' , $customers_group['language_id']); - $tQry->bindValue(':customers_group_name', $customers_group['customers_group_name']); + $tQry->bindInt (':customers_group_id' , $customers_group['customers_group_id']); + $tQry->bindInt (':language_id' , $customers_group['language_id']); + $tQry->bindValue(':customers_group_name' , $customers_group['customers_group_name']); $tQry->execute(); if ($target_db->isError()) { @@ -3397,8 +3397,8 @@ public function importCustomerGroups($switch = null) { :baseline_discount)'); $tQry->bindTable(':table_customers_groups_data', TABLE_CUSTOMERS_GROUPS_DATA); - $tQry->bindInt (':customers_group_id', $customers_group_data['customers_group_id']); - $tQry->bindValue(':baseline_discount' , $customers_group_data['baseline_discount']); + $tQry->bindInt (':customers_group_id' , $customers_group_data['customers_group_id']); + $tQry->bindValue(':baseline_discount' , $customers_group_data['baseline_discount']); $tQry->execute(); if ($target_db->isError()) { @@ -3438,8 +3438,7 @@ public function importCustomerGroups($switch = null) { /* * function name : importOrders() * - * description : load orders, orders_products, orders_status, orders_status_history, orders_total and orders_products_download - * from the source database to the new loaded7 database + * description : load orders from the source database to the new loaded7 database * * returns : true or false * @@ -3498,272 +3497,10 @@ public function importOrders($switch = null) { $tQry = $target_db->query('truncate table ' . TABLE_ORDERS); $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_PRODUCTS); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_STATUS); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_STATUS_HISTORY); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_TOTAL); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_PRODUCTS_DOWNLOAD); - $tQry->execute(); // END TRUNCATE ORDERS TABLE IN TARGET DB - // ########## - - // LOAD ORDERS STATUS FROM SOURCE DB - - $map = $this->_data_mapping['orders_status']; - $orders_status = array(); - - $sQry = $source_db->query('SELECT * FROM orders_status'); - $sQry->execute(); - - $numrows = $sQry->numberOfRows(); - if ($numrows > 0) { - $cnt = 0; - while ($sQry->next()) { - if ($sQry->value($map['language_id']) == $this->_languages_id_default && $sQry->value($map['orders_status_name']) == 'Pending') { - $pending_id = $sQry->value($map['orders_status_id']); - } - $orders_stat = array( - 'orders_status_id' => $sQry->value($map['orders_status_id']) - , 'language_id' => $sQry->value($map['language_id']) - , 'orders_status_name' => $sQry->value($map['orders_status_name']) - ); - - $tQry = $target_db->query('INSERT INTO :table_orders_status (orders_status_id, - language_id, - orders_status_name) - VALUES (:orders_status_id, - :language_id, - :orders_status_name)'); - - $tQry->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); - $tQry->bindInt (':orders_status_id' , $orders_stat['orders_status_id']); - $tQry->bindInt (':language_id' , $orders_stat['language_id']); - $tQry->bindValue(':orders_status_name', $orders_stat['orders_status_name']); - $tQry->execute(); - $cnt++; - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - } - - $sQry->freeResult(); - } - - // END LOAD ORDERS STATUS FROM SOURCE DB - - $orders_stat = null; - - // ########## - - // LOAD ORDERS STATUS HISTORY FROM SOURCE DB - - $map = $this->_data_mapping['orders_status_history']; - $orders_status_histories = array(); - - $sQry = $source_db->query('SELECT * FROM orders_status_history'); - $sQry->execute(); - - $numrows = $sQry->numberOfRows(); - if ($numrows > 0) { - $cnt = 0; - while ($sQry->next()) { - $orders_status_history = array( - 'orders_status_history_id' => $sQry->value($map['orders_status_history_id']) - , 'orders_id' => $sQry->value($map['orders_id']) - , 'orders_status_id' => $sQry->value($map['orders_status_id']) - , 'date_added' => $sQry->value($map['date_added']) - , 'customer_notified' => $sQry->value($map['customer_notified']) - , 'comments' => $sQry->value($map['comments']) - ); - - $tQry = $target_db->query('INSERT INTO :table_orders_status_history (orders_status_history_id, - orders_id, - orders_status_id, - date_added, - customer_notified, - comments) - VALUES (:orders_status_history_id, - :orders_id, - :orders_status_id, - :date_added, - :customer_notified, - :comments)'); - - $tQry->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY); - $tQry->bindInt (':orders_status_history_id', $orders_status_history['orders_status_history_id']); - $tQry->bindInt (':orders_id' , $orders_status_history['orders_id']); - $tQry->bindInt (':orders_status_id' , $orders_status_history['orders_status_id']); - $tQry->bindValue(':date_added' , $orders_status_history['date_added']); - $tQry->bindInt (':customer_notified' , $orders_status_history['customer_notified']); - $tQry->bindValue(':comments' , $orders_status_history['comments']); - $tQry->execute(); - - $cnt++; - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - } - - $sQry->freeResult(); - } - - // END LOAD ORDERS STATUS HISTORY FROM SOURCE DB - - $orders_status_history = null; - - // ########## - - // LOAD ORDERS TOTAL FROM SOURCE DB - - $map = $this->_data_mapping['orders_total']; - $orders_total = array(); - - $sQry = $source_db->query('SELECT * FROM orders_total'); - $sQry->execute(); - - $orders_total_map = array( - 'ot_coupon' => 'coupon' - , 'ot_shipping' => 'shipping' - , 'ot_tax' => 'tax' - , 'ot_subtotal' => 'subtotal' - , 'ot_total' => 'total' - , 'xxxxxxxx' => 'low_order_fee' - ); - - $numrows= $sQry->numberOfRows(); - if ($numrows > 0) { - $cnt = 0; - while ($sQry->next()) { - $order_total = array( - 'orders_total_id' => $sQry->value('orders_total_id') - , 'orders_id' => $sQry->value('orders_id') - , 'title' => $sQry->value('title') - , 'text' => $sQry->value('text') - , 'value' => $sQry->value('value') - , 'class' => $sQry->value('class') - , 'sort_order' => $sQry->value('sort_order') - ); - - $tQry = $target_db->query('INSERT INTO :table_orders_total (orders_total_id, - orders_id, - title, - text, - value, - class, - sort_order) - VALUES (:orders_total_id, - :orders_id, - :title, - :text, - :value, - :class, - :sort_order)'); - - $tQry->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); - $tQry->bindInt (':orders_total_id', $order_total['orders_total_id']); - $tQry->bindInt (':orders_id' , $order_total['orders_id']); - $tQry->bindValue(':title' , $order_total['title']); - $tQry->bindValue(':text' , $order_total['text']); - $tQry->bindValue(':value' , $order_total['value']); - $tQry->bindValue(':class' , $orders_total_map[$order_total['class']]); - $tQry->bindInt (':sort_order' , $order_total['sort_order']); - $tQry->execute(); - - $cnt++; - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - } - - $sQry->freeResult(); - } - - // END LOAD ORDERS TOTAL FROM SOURCE DB - - $orders_total = null; - - // END LOAD ORDERS TOTAL TO TARGET DB - - // ########## - - // LOAD ORDERS PRODUCTS DOWNLOAD FROM SOURCE DB - - $map = $this->_data_mapping['orders_products_download']; - $orders_products_download = array(); - - $sQry = $source_db->query('SELECT * FROM orders_products_download'); - $sQry->execute(); - - $numrows= $sQry->numberOfRows(); - if ($numrows > 0) { - $cnt = 0; - while ($sQry->next()) { - $orders_product_download = array( - 'orders_products_download_id' => $sQry->value($map['orders_products_download_id']) - , 'orders_id' => $sQry->value($map['orders_id']) - , 'orders_products_id' => $sQry->value($map['orders_products_id']) - , 'orders_products_filename' => $sQry->value($map['orders_products_filename']) - , 'download_maxdays' => $sQry->value($map['download_maxdays']) - , 'download_count' => $sQry->value($map['download_count']) - ); - - $tQry = $target_db->query('INSERT INTO :table_orders_products_download (orders_products_download_id, - orders_id, - orders_products_id, - orders_products_filename, - download_maxdays, - download_count) - VALUES (:orders_products_download_id, - :orders_id, - :orders_products_id, - :orders_products_filename, - :download_maxdays, - :download_count)'); - - $tQry->bindTable(':table_orders_products_download', TABLE_ORDERS_PRODUCTS_DOWNLOAD); - $tQry->bindInt (':orders_products_download_id', $orders_product_download['orders_products_download_id']); - $tQry->bindInt (':orders_id' , $orders_product_download['orders_id']); - $tQry->bindInt (':orders_products_id' , $orders_product_download['orders_products_id']); - $tQry->bindValue(':orders_products_filename' , $orders_product_download['orders_products_filename']); - $tQry->bindInt (':download_maxdays' , $orders_product_download['download_maxdays']); - $tQry->bindInt (':download_count' , $orders_product_download['download_count']); - $tQry->execute(); - - $cnt++; - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - } - - $sQry->freeResult(); - } - - // END LOAD PRODUCTS DOWNLOAD FROM SOURCE DB - - $orders_products_download = null; - - // END LOAD ORDERS PRODUCTS DOWNLOAD TO TARGET DB - - // ########## + // ########## // LOAD ORDERS FROM SOURCE DB @@ -3929,7 +3666,7 @@ class, :orders_date_finished, :currency, :currency_value)'); - $tQry->bindTable(':table_orders', TABLE_ORDERS); + $tQry->bindTable(':table_orders' , TABLE_ORDERS); $tQry->bindInt (':orders_id' , $order['orders_id']); $tQry->bindInt (':customers_id' , $order['customers_id']); $tQry->bindValue(':customers_name' , $order['customers_name']); @@ -4020,21 +3757,101 @@ class, // ########## - // LOAD ORDERS PRODUCTS FROM SOURCE DB + // END DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); - $map = $this->_data_mapping['orders_products']; - $orders_products = array(); - - $sQry = $source_db->query('SELECT o.orders_products_id, o.orders_id, o.products_id, o.products_model, o.products_name, o.products_price, o.products_tax, o.products_quantity FROM orders_products AS o'); - $sQry->execute(); + // ########## - $numrows= $sQry->numberOfRows(); - if ($numrows > 0) { - $cnt = 0; - while ($sQry->next()) { - $orders_products_id = $sQry->value($map['orders_products_id']); - - // ADDED FOR ORDERS SIMPLE OPTIONS META DATA FIX + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importOrders + + /* + * function name : importOrdersProducts() + * + * description : load orders_products from the source database to the new loaded7 database + * + * returns : true or false + * + */ + public function importOrdersProducts($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // ########## + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // ########## + + // TRUNCATE ORDERS PRODUCTS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_PRODUCTS); + $tQry->execute(); + + // END TRUNCATE ORDERS PRODUCTS TABLE IN TARGET DB + + // ########## + + // LOAD ORDERS PRODUCTS FROM SOURCE DB + + $map = $this->_data_mapping['orders_products']; + $orders_products = array(); + + $sQry = $source_db->query('SELECT o.orders_products_id, o.orders_id, o.products_id, o.products_model, o.products_name, o.products_price, o.products_tax, o.products_quantity FROM orders_products AS o'); + $sQry->execute(); + + $numrows= $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + $orders_products_id = $sQry->value($map['orders_products_id']); + + // ADDED FOR ORDERS SIMPLE OPTIONS META DATA FIX $products_simple_options_meta_data = array(); @@ -4104,7 +3921,7 @@ class, :products_quantity, :products_simple_options_meta_data)'); - $tQry->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS); + $tQry->bindTable(':table_orders_products' , TABLE_ORDERS_PRODUCTS); $tQry->bindInt (':orders_products_id' , $orders_product['orders_products_id']); $tQry->bindInt (':orders_id' , $orders_product['orders_id']); $tQry->bindInt (':products_id' , $orders_product['products_id']); @@ -4145,7 +3962,574 @@ class, return true; - } // end importOrders + } // end importOrdersProducts + + /* + * function name : importOrdersProductsDownload() + * + * description : load orders_products_download from the source database to the new loaded7 database + * + * returns : true or false + * + */ + public function importOrdersProductsDownload($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // ########## + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // ########## + + // TRUNCATE ORDERS PRODUCTS DOWNLOAD TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_PRODUCTS_DOWNLOAD); + $tQry->execute(); + + // END TRUNCATE ORDERS PRODUCTS DOWNLOAD TABLE IN TARGET DB + + // ########## + + // LOAD ORDERS PRODUCTS DOWNLOAD FROM SOURCE DB + + $map = $this->_data_mapping['orders_products_download']; + $orders_products_download = array(); + + $sQry = $source_db->query('SELECT * FROM orders_products_download'); + $sQry->execute(); + + $numrows= $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + $orders_product_download = array( + 'orders_products_download_id' => $sQry->value($map['orders_products_download_id']) + , 'orders_id' => $sQry->value($map['orders_id']) + , 'orders_products_id' => $sQry->value($map['orders_products_id']) + , 'orders_products_filename' => $sQry->value($map['orders_products_filename']) + , 'download_maxdays' => $sQry->value($map['download_maxdays']) + , 'download_count' => $sQry->value($map['download_count']) + ); + + $tQry = $target_db->query('INSERT INTO :table_orders_products_download (orders_products_download_id, + orders_id, + orders_products_id, + orders_products_filename, + download_maxdays, + download_count) + VALUES (:orders_products_download_id, + :orders_id, + :orders_products_id, + :orders_products_filename, + :download_maxdays, + :download_count)'); + + $tQry->bindTable(':table_orders_products_download', TABLE_ORDERS_PRODUCTS_DOWNLOAD); + $tQry->bindInt (':orders_products_download_id' , $orders_product_download['orders_products_download_id']); + $tQry->bindInt (':orders_id' , $orders_product_download['orders_id']); + $tQry->bindInt (':orders_products_id' , $orders_product_download['orders_products_id']); + $tQry->bindValue(':orders_products_filename' , $orders_product_download['orders_products_filename']); + $tQry->bindInt (':download_maxdays' , $orders_product_download['download_maxdays']); + $tQry->bindInt (':download_count' , $orders_product_download['download_count']); + $tQry->execute(); + + $cnt++; + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + } + + $sQry->freeResult(); + } + + // END LOAD PRODUCTS DOWNLOAD FROM SOURCE DB + + $orders_products_download = null; + + // END LOAD ORDERS PRODUCTS DOWNLOAD TO TARGET DB + + // ########## + + // END DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // ########## + + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importOrdersProductsDownload + + /* + * function name : importOrdersStatus() + * + * description : load orders_status from the source database to the new loaded7 database + * + * returns : true or false + * + */ + public function importOrdersStatus($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // ########## + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // ########## + + // TRUNCATE ORDERS STATUS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_STATUS); + $tQry->execute(); + + // END TRUNCATE ORDERS STATUS TABLE IN TARGET DB + + // ########## + + // LOAD ORDERS STATUS FROM SOURCE DB + + $map = $this->_data_mapping['orders_status']; + $orders_status = array(); + + $sQry = $source_db->query('SELECT * FROM orders_status'); + $sQry->execute(); + + $numrows = $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + if ($sQry->value($map['language_id']) == $this->_languages_id_default && $sQry->value($map['orders_status_name']) == 'Pending') { + $pending_id = $sQry->value($map['orders_status_id']); + } + $orders_stat = array( + 'orders_status_id' => $sQry->value($map['orders_status_id']) + , 'language_id' => $sQry->value($map['language_id']) + , 'orders_status_name' => $sQry->value($map['orders_status_name']) + ); + + $tQry = $target_db->query('INSERT INTO :table_orders_status (orders_status_id, + language_id, + orders_status_name) + VALUES (:orders_status_id, + :language_id, + :orders_status_name)'); + + $tQry->bindTable(':table_orders_status', TABLE_ORDERS_STATUS); + $tQry->bindInt (':orders_status_id' , $orders_stat['orders_status_id']); + $tQry->bindInt (':language_id' , $orders_stat['language_id']); + $tQry->bindValue(':orders_status_name' , $orders_stat['orders_status_name']); + $tQry->execute(); + $cnt++; + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + } + + $sQry->freeResult(); + } + + // END LOAD ORDERS STATUS FROM SOURCE DB + + $orders_stat = null; + + // ########## + + // END DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // ########## + + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importOrdersStatus + + /* + * function name : importOrdersStatusHistory() + * + * description : load orders_status_history from the source database to the new loaded7 database + * + * returns : true or false + * + */ + public function importOrdersStatusHistory($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // ########## + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // ########## + + // TRUNCATE ORDERS STATUS HISTORY TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_STATUS_HISTORY); + $tQry->execute(); + + // END TRUNCATE ORDERS STATUS HISTORY TABLE IN TARGET DB + + // ########## + + // LOAD ORDERS STATUS HISTORY FROM SOURCE DB + + $map = $this->_data_mapping['orders_status_history']; + $orders_status_histories = array(); + + $sQry = $source_db->query('SELECT * FROM orders_status_history'); + $sQry->execute(); + + $numrows = $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + $orders_status_history = array( + 'orders_status_history_id' => $sQry->value($map['orders_status_history_id']) + , 'orders_id' => $sQry->value($map['orders_id']) + , 'orders_status_id' => $sQry->value($map['orders_status_id']) + , 'date_added' => $sQry->value($map['date_added']) + , 'customer_notified' => $sQry->value($map['customer_notified']) + , 'comments' => $sQry->value($map['comments']) + ); + + $tQry = $target_db->query('INSERT INTO :table_orders_status_history (orders_status_history_id, + orders_id, + orders_status_id, + date_added, + customer_notified, + comments) + VALUES (:orders_status_history_id, + :orders_id, + :orders_status_id, + :date_added, + :customer_notified, + :comments)'); + + $tQry->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY); + $tQry->bindInt (':orders_status_history_id' , $orders_status_history['orders_status_history_id']); + $tQry->bindInt (':orders_id' , $orders_status_history['orders_id']); + $tQry->bindInt (':orders_status_id' , $orders_status_history['orders_status_id']); + $tQry->bindValue(':date_added' , $orders_status_history['date_added']); + $tQry->bindInt (':customer_notified' , $orders_status_history['customer_notified']); + $tQry->bindValue(':comments' , $orders_status_history['comments']); + $tQry->execute(); + + $cnt++; + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + } + + $sQry->freeResult(); + } + + // END LOAD ORDERS STATUS HISTORY FROM SOURCE DB + + $orders_status_history = null; + + // ########## + + // END DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // ########## + + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importOrdersStatusHistory + + /* + * function name : importOrdersTotal() + * + * description : load orders_total from the source database to the new loaded7 database + * + * returns : true or false + * + */ + public function importOrdersTotal($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // ########## + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // ########## + + // TRUNCATE ORDERS TOTAL TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ORDERS_TOTAL); + $tQry->execute(); + + // END TRUNCATE ORDERS TOTAL TABLE IN TARGET DB + + // ########## + + // LOAD ORDERS TOTAL FROM SOURCE DB + + $map = $this->_data_mapping['orders_total']; + $orders_total = array(); + + $sQry = $source_db->query('SELECT * FROM orders_total'); + $sQry->execute(); + + $orders_total_map = array( + 'ot_coupon' => 'coupon' + , 'ot_shipping' => 'shipping' + , 'ot_tax' => 'tax' + , 'ot_subtotal' => 'subtotal' + , 'ot_total' => 'total' + , 'xxxxxxxx' => 'low_order_fee' + ); + + $numrows= $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + $order_total = array( + 'orders_total_id' => $sQry->value('orders_total_id') + , 'orders_id' => $sQry->value('orders_id') + , 'title' => $sQry->value('title') + , 'text' => $sQry->value('text') + , 'value' => $sQry->value('value') + , 'class' => $sQry->value('class') + , 'sort_order' => $sQry->value('sort_order') + ); + + $tQry = $target_db->query('INSERT INTO :table_orders_total (orders_total_id, + orders_id, + title, + text, + value, + class, + sort_order) + VALUES (:orders_total_id, + :orders_id, + :title, + :text, + :value, + :class, + :sort_order)'); + + $tQry->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL); + $tQry->bindInt (':orders_total_id' , $order_total['orders_total_id']); + $tQry->bindInt (':orders_id' , $order_total['orders_id']); + $tQry->bindValue(':title' , $order_total['title']); + $tQry->bindValue(':text' , $order_total['text']); + $tQry->bindValue(':value' , $order_total['value']); + $tQry->bindValue(':class' , $orders_total_map[$order_total['class']]); + $tQry->bindInt (':sort_order' , $order_total['sort_order']); + $tQry->execute(); + + $cnt++; + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + } + + $sQry->freeResult(); + } + + // END LOAD ORDERS TOTAL FROM SOURCE DB + + $orders_total = null; + + // END LOAD ORDERS TOTAL TO TARGET DB + + // ########## + + // END DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // ########## + + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importOrdersTotal /* * function name : importAttributes() diff --git a/catalog/install/includes/languages/en_US/upgrade.php b/catalog/install/includes/languages/en_US/upgrade.php index 9301b0506..9716a6eb0 100644 --- a/catalog/install/includes/languages/en_US/upgrade.php +++ b/catalog/install/includes/languages/en_US/upgrade.php @@ -123,6 +123,21 @@ param_import_orders = ORDERS param_import_orders_description = importing Orders data +param_import_orders_products = ORDERS PRODUCTS +param_import_orders_products_description = importing Orders Products data + +param_import_orders_products_download = ORDERS PRODUCTS DOWNLOAD +param_import_orders_products_download_description = importing Orders Products Download data + +param_import_orders_status = ORDERS STATUS +param_import_orders_status_description = importing Orders Status data + +param_import_orders_status_history = ORDERS STATUS HISTORY +param_import_orders_status_history_description = importing Orders Status History data + +param_import_orders_total = ORDERS TOTAL +param_import_orders_total_description = importing Orders Total data + param_import_cds = CONTENT DIRECTOR param_import_cds_description = importing Content Director data diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index f0e0e0c78..066e1ab17 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -328,10 +328,10 @@ CREATE TABLE lc_customers_groups_data ( baseline_discount decimal(5,2) NOT NULL DEFAULT '0.00', customers_access_levels varchar(255) NOT NULL DEFAULT '', payment_terms varchar(255) NOT NULL DEFAULT '', - hidden_products_notification tinyint(1) NOT NULL, - taxable tinyint(1) NOT NULL, - payment_modules varchar(255) NOT NULL, - shipping_modules varchar(255) NOT NULL, + hidden_products_notification tinyint(1) NOT NULL DEFAULT -1, + taxable tinyint(1) NOT NULL DEFAULT -1, + payment_modules varchar(255) NOT NULL DEFAULT '', + shipping_modules varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (id) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 740ab60fb..c1d7932d9 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -328,10 +328,10 @@ CREATE TABLE lc_customers_groups_data ( baseline_discount decimal(5,2) NOT NULL DEFAULT '0.00', customers_access_levels varchar(255) NOT NULL DEFAULT '', payment_terms varchar(255) NOT NULL DEFAULT '', - hidden_products_notification tinyint(1) NOT NULL, - taxable tinyint(1) NOT NULL, - payment_modules varchar(255) NOT NULL, - shipping_modules varchar(255) NOT NULL, + hidden_products_notification tinyint(1) NOT NULL DEFAULT -1, + taxable tinyint(1) NOT NULL DEFAULT -1, + payment_modules varchar(255) NOT NULL DEFAULT '', + shipping_modules varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/catalog/install/rpc.php b/catalog/install/rpc.php index ee68cddcb..10b1fe730 100644 --- a/catalog/install/rpc.php +++ b/catalog/install/rpc.php @@ -442,22 +442,112 @@ return true; } exit; - break; + break; case 'import_orders': { - require_once("includes/classes/upgrader.php"); - $upgrader = UpgraderFactory::create($_POST['upgrade_method']); - $upgrader->setConnectDetails($_POST); - $rslt = $upgrader->importOrders($_POST['db_switch']); - - if ($rslt == false) { - echo '[[0|'.$upgrader->displayMessage().']]'; - return false; - } - - echo '[[1]]'; - return true; + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrders($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_orders_products': + { + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrdersProducts($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_orders_products_download': + { + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrdersProductsDownload($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_orders_status': + { + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrdersStatus($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_orders_status_history': + { + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrdersStatusHistory($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_orders_total': + { + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importOrdersTotal($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; } exit; break; diff --git a/catalog/install/templates/css/styles/form.css b/catalog/install/templates/css/styles/form.css index 7611e011e..764cc5b10 100644 --- a/catalog/install/templates/css/styles/form.css +++ b/catalog/install/templates/css/styles/form.css @@ -1561,9 +1561,9 @@ input:-moz-placeholder { .field-block .label, .field-drop .label { float: left; - text-align: right; - margin: 0 0 0 -190px; - width: 170px; + margin: 0 0 0 -225px; + text-align: right; + width: 240px; } /* Field drop */ diff --git a/catalog/install/templates/pages/upgrade_3.php b/catalog/install/templates/pages/upgrade_3.php index 3b3d3edf0..a942eaffa 100644 --- a/catalog/install/templates/pages/upgrade_3.php +++ b/catalog/install/templates/pages/upgrade_3.php @@ -236,22 +236,97 @@ function prepareWork() {

    - +
    -
    -

    - - - -

    -
    - -
    +
    +

    + + + +

    +
    + + +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    @@ -469,101 +544,146 @@ function prepareWork() { if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; $('#eBoxContents_orders').html(_rslt); $('#eBox_customer_orders').show(); - } - - $('#img_copy_progress_cds').show(); + } + + $('#img_copy_progress_orders_products').show(); setTimeout(function() { - _rslt = doImport('_cds'); + _rslt = doImport('_orders_products'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_cds').html(_rslt); - $('#eBox_customer_cds').show(); + $('#eBoxContents_orders_products').html(_rslt); + $('#eBox_customer_orders_products').show(); } - - $('#img_copy_progress_administrators').show(); + + $('#img_copy_progress_orders_products_download').show(); setTimeout(function() { - _rslt = doImport('_administrators'); + _rslt = doImport('_orders_products_download'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_administrators').html(_rslt); - $('#eBox_customer_administrators').show(); + $('#eBoxContents_orders_products_download').html(_rslt); + $('#eBox_customer_orders_products_download').show(); } - - $('#img_copy_progress_newsletter').show(); + + $('#img_copy_progress_orders_status').show(); setTimeout(function() { - _rslt = doImport('_newsletter'); + _rslt = doImport('_orders_status'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_newsletter').html(_rslt); - $('#eBox_customer_newsletter').show(); + $('#eBoxContents_orders_status').html(_rslt); + $('#eBox_customer_orders_status').show(); } - - $('#img_copy_progress_banners').show(); + + $('#img_copy_progress_orders_status_history').show(); setTimeout(function() { - _rslt = doImport('_banners'); + _rslt = doImport('_orders_status_history'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_banners').html(_rslt); - $('#eBox_customer_banners').show(); + $('#eBoxContents_orders_status_history').html(_rslt); + $('#eBox_customer_orders_status_history').show(); } - - $('#img_copy_progress_configuration').show(); + + $('#img_copy_progress_orders_total').show(); setTimeout(function() { - _rslt = doImport('_configuration'); + _rslt = doImport('_orders_total'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_configuration').html(_rslt); - $('#eBox_customer_configuration').show(); + $('#eBoxContents_orders_total').html(_rslt); + $('#eBox_customer_orders_total').show(); } - - $('#img_copy_progress_coupons').show(); + + $('#img_copy_progress_cds').show(); setTimeout(function() { - _rslt = doImport('_coupons'); + _rslt = doImport('_cds'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_coupons').html(_rslt); - $('#eBox_customer_coupons').show(); + $('#eBoxContents_cds').html(_rslt); + $('#eBox_customer_cds').show(); } - - $('#img_copy_progress_taxclasses').show(); + + $('#img_copy_progress_administrators').show(); setTimeout(function() { - _rslt = doImport('_taxclasses'); + _rslt = doImport('_administrators'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_taxclasses').html(_rslt); - $('#eBox_customer_taxclasses').show(); + $('#eBoxContents_administrators').html(_rslt); + $('#eBox_customer_administrators').show(); } - $('#img_copy_progress_languages').show(); + $('#img_copy_progress_newsletter').show(); setTimeout(function() { - _rslt = doImport('_languages'); + _rslt = doImport('_newsletter'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_languages').html(_rslt); - $('#eBox_languages').show(); + $('#eBoxContents_newsletter').html(_rslt); + $('#eBox_customer_newsletter').show(); } - $('#img_copy_progress_currencies').show(); + $('#img_copy_progress_banners').show(); setTimeout(function() { - _rslt = doImport('_currencies'); + _rslt = doImport('_banners'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_currencies').html(_rslt); - $('#eBox_currencies').show(); + $('#eBoxContents_banners').html(_rslt); + $('#eBox_customer_banners').show(); } - - // DONE - $('#pBox').hide(); - - if (_err === false) { - $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); - $('#mBoxSuccess').show(); - $("#upgradeForm").attr("action", "upgrade.php?step=4"); - $('#btn_continue').show(); - $('#btn_retry').hide(); - } else { - $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); - $('#mBox').show(); + $('#img_copy_progress_configuration').show(); + setTimeout(function() { + _rslt = doImport('_configuration'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_configuration').html(_rslt); + $('#eBox_customer_configuration').show(); + } + + $('#img_copy_progress_coupons').show(); + setTimeout(function() { + _rslt = doImport('_coupons'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_coupons').html(_rslt); + $('#eBox_customer_coupons').show(); + } + + $('#img_copy_progress_taxclasses').show(); + setTimeout(function() { + _rslt = doImport('_taxclasses'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_taxclasses').html(_rslt); + $('#eBox_customer_taxclasses').show(); + } + + $('#img_copy_progress_languages').show(); + setTimeout(function() { + _rslt = doImport('_languages'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_languages').html(_rslt); + $('#eBox_languages').show(); + } + + $('#img_copy_progress_currencies').show(); + setTimeout(function() { + _rslt = doImport('_currencies'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_currencies').html(_rslt); + $('#eBox_currencies').show(); + } + + // DONE + $('#pBox').hide(); + + if (_err === false) { + $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); + $('#mBoxSuccess').show(); - $("#upgradeForm").attr("action", "upgrade.php?step=3"); - $('#btn_continue').hide(); - $('#btn_retry').show(); - } - - $('#buttonContainer').show(); + $("#upgradeForm").attr("action", "upgrade.php?step=4"); + $('#btn_continue').show(); + $('#btn_retry').hide(); + } else { + $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); + $('#mBox').show(); + + $("#upgradeForm").attr("action", "upgrade.php?step=3"); + $('#btn_continue').hide(); + $('#btn_retry').show(); + } + + $('#buttonContainer').show(); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); }, 3000); }, 3000); }, 3000); diff --git a/catalog/templates/core/classes/output.php b/catalog/templates/core/classes/output.php index 57eb1b946..e3255fb10 100644 --- a/catalog/templates/core/classes/output.php +++ b/catalog/templates/core/classes/output.php @@ -162,7 +162,7 @@ public static function getCategoryListing() { * @access public * @return array */ - function getCategoryNav($categoryId = 0, $level = 0) { + public static function getCategoryNav($categoryId = 0, $level = 0) { global $lC_Database, $lC_Language, $lC_CategoryTree; if ($level == 0) { @@ -351,7 +351,7 @@ public static function getCategoriesStatus($id) { * @access public * @return array */ - public function getTemplateLanguageSelection($include_image = true, $include_name = false, $params = '') { + public static function getTemplateLanguageSelection($include_image = true, $include_name = false, $params = '') { global $lC_Language; $text = ''; @@ -375,7 +375,7 @@ public function getTemplateLanguageSelection($include_image = true, $include_nam * @access public * @return array */ - public function getTemplateCurrenciesSelection($include_symbol = true, $include_name = false, $params = '') { + public static function getTemplateCurrenciesSelection($include_symbol = true, $include_name = false, $params = '') { global $lC_Currencies; $currency_data = array(); From 4301a11941ccf698575f87a4d47920d478cdafa7 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 12 May 2015 01:23:00 -0400 Subject: [PATCH 26/50] fix for install schema missing default values, and smtp email transport option based on PHPMailer --- catalog/ext/phpmailer/LICENSE | 504 +++ catalog/ext/phpmailer/PHPMailerAutoload.php | 49 + catalog/ext/phpmailer/README.md | 171 + catalog/ext/phpmailer/VERSION | 1 + catalog/ext/phpmailer/changelog.md | 598 +++ catalog/ext/phpmailer/class.phpmailer.php | 3622 +++++++++++++++++++ catalog/ext/phpmailer/class.pop3.php | 397 ++ catalog/ext/phpmailer/class.smtp.php | 1152 ++++++ catalog/install/loadedcommerce.sql | 8 +- catalog/install/loadedcommerce_innodb.sql | 8 +- 10 files changed, 6502 insertions(+), 8 deletions(-) create mode 100644 catalog/ext/phpmailer/LICENSE create mode 100644 catalog/ext/phpmailer/PHPMailerAutoload.php create mode 100644 catalog/ext/phpmailer/README.md create mode 100644 catalog/ext/phpmailer/VERSION create mode 100644 catalog/ext/phpmailer/changelog.md create mode 100644 catalog/ext/phpmailer/class.phpmailer.php create mode 100644 catalog/ext/phpmailer/class.pop3.php create mode 100644 catalog/ext/phpmailer/class.smtp.php diff --git a/catalog/ext/phpmailer/LICENSE b/catalog/ext/phpmailer/LICENSE new file mode 100644 index 000000000..8e0763d1c --- /dev/null +++ b/catalog/ext/phpmailer/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/catalog/ext/phpmailer/PHPMailerAutoload.php b/catalog/ext/phpmailer/PHPMailerAutoload.php new file mode 100644 index 000000000..eaa2e3034 --- /dev/null +++ b/catalog/ext/phpmailer/PHPMailerAutoload.php @@ -0,0 +1,49 @@ + + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + * @copyright 2012 - 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer SPL autoloader. + * @param string $classname The name of the class to load + */ +function PHPMailerAutoload($classname) +{ + //Can't use __DIR__ as it's only in PHP 5.3+ + $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php'; + if (is_readable($filename)) { + require $filename; + } +} + +if (version_compare(PHP_VERSION, '5.1.2', '>=')) { + //SPL autoloading was introduced in PHP 5.1.2 + if (version_compare(PHP_VERSION, '5.3.0', '>=')) { + spl_autoload_register('PHPMailerAutoload', true, true); + } else { + spl_autoload_register('PHPMailerAutoload'); + } +} else { + /** + * Fall back to traditional autoload for old PHP versions + * @param string $classname The name of the class to load + */ + function __autoload($classname) + { + PHPMailerAutoload($classname); + } +} diff --git a/catalog/ext/phpmailer/README.md b/catalog/ext/phpmailer/README.md new file mode 100644 index 000000000..bb5484eaf --- /dev/null +++ b/catalog/ext/phpmailer/README.md @@ -0,0 +1,171 @@ +![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png) + +# PHPMailer - A full-featured email creation and transfer class for PHP + +Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer) +[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/quality-score.png?s=3758e21d279becdf847a557a56a3ed16dfec9d5d)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/) +[![Code Coverage](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/coverage.png?s=3fe6ca5fe8cd2cdf96285756e42932f7ca256962)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/) + +[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![Latest Unstable Version](https://poser.pugx.org/phpmailer/phpmailer/v/unstable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer) + +## Class Features + +- Probably the world's most popular code for sending email from PHP! +- Used by many open-source projects: Wordpress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more +- Integrated SMTP support - send without a local mail server +- Send emails with multiple TOs, CCs, BCCs and REPLY-TOs +- Multipart/alternative emails for mail clients that do not read HTML email +- Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings +- SMTP authentication with LOGIN, PLAIN, NTLM and CRAM-MD5 mechanisms over SSL and TLS transports +- Error messages in 47 languages! +- DKIM and S/MIME signing support +- Compatible with PHP 5.0 and later +- Much more! + +## Why you might need it + +Many PHP developers utilize email in their code. The only PHP function that supports this is the mail() function. However, it does not provide any assistance for making use of popular features such as HTML-based emails and attachments. + +Formatting email correctly is surprisingly difficult. There are myriad overlapping RFCs, requiring tight adherence to horribly complicated formatting and encoding rules - the vast majority of code that you'll find online that uses the mail() function directly is just plain wrong! +*Please* don't be tempted to do it yourself - if you don't use PHPMailer, there are many other excellent libraries that you should look at before rolling your own - try SwiftMailer, Zend_Mail, eZcomponents etc. + +The PHP mail() function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD and OS X platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP implementation allows email sending on Windows platforms without a local mail server. + +## License + +This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license. Please read LICENSE for information on the +software availability and distribution. + +## Installation & loading + +PHPMailer is available via [Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), so just add this line to your `composer.json` file: + + "phpmailer/phpmailer": "~5.2" + +Alternatively, copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub. + +If you're not using composer's autoloader, PHPMailer provides an SPL-compatible autoloader, and that is the preferred way of loading the library - just `require '/path/to/PHPMailerAutoload.php';` and everything should work. The autoloader does not throw errors if it can't find classes so it prepends itself to the SPL list, allowing your own (or your framework's) autoloader to catch errors. SPL autoloading was introduced in PHP 5.1.0, so if you are using a version older than that you will need to require/include each class manually. + +PHPMailer does *not* declare a namespace because namespaces were only introduced in PHP 5.3. + +### Minimal installation + +While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [class.phpmailer.php](class.phpmailer.php). If you're using SMTP, you'll need [class.smtp.php](class.smtp.php), and if you're using POP-before SMTP, you'll need [class.pop3.php](class.pop3.php). For all of these, we recommend you use [the autoloader](PHPMailerAutoload.php) too as otherwise you will either have to `require` all classes manually or use some other autoloader. You can skip the [language](language/) folder if you're not showing errors to users and can make do with English-only errors. You may need the additional classes in the [extras](extras/) folder if you are using those features, including NTLM authentication and ics generation. + +## A Simple Example + +```php +SMTPDebug = 3; // Enable verbose debug output + +$mail->isSMTP(); // Set mailer to use SMTP +$mail->Host = 'smtp1.example.com;smtp2.example.com'; // Specify main and backup SMTP servers +$mail->SMTPAuth = true; // Enable SMTP authentication +$mail->Username = 'user@example.com'; // SMTP username +$mail->Password = 'secret'; // SMTP password +$mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted +$mail->Port = 587; // TCP port to connect to + +$mail->From = 'from@example.com'; +$mail->FromName = 'Mailer'; +$mail->addAddress('joe@example.net', 'Joe User'); // Add a recipient +$mail->addAddress('ellen@example.com'); // Name is optional +$mail->addReplyTo('info@example.com', 'Information'); +$mail->addCC('cc@example.com'); +$mail->addBCC('bcc@example.com'); + +$mail->addAttachment('/var/tmp/file.tar.gz'); // Add attachments +$mail->addAttachment('/tmp/image.jpg', 'new.jpg'); // Optional name +$mail->isHTML(true); // Set email format to HTML + +$mail->Subject = 'Here is the subject'; +$mail->Body = 'This is the HTML message body in bold!'; +$mail->AltBody = 'This is the body in plain text for non-HTML mail clients'; + +if(!$mail->send()) { + echo 'Message could not be sent.'; + echo 'Mailer Error: ' . $mail->ErrorInfo; +} else { + echo 'Message has been sent'; +} +``` + +You'll find plenty more to play with in the [examples](examples/) folder. + +That's it. You should now be ready to use PHPMailer! + +## Localization +PHPMailer defaults to English, but in the [language](language/) folder you'll find numerous (46 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this: + +```php +// To load the French version +$mail->setLanguage('fr', '/optional/path/to/language/directory/'); +``` + +We welcome corrections and new languages - if you're looking for corrections to do, run the [phpmailerLangTest.php](test/phpmailerLangTest.php) script in the tests folder and it will show any missing translations. + +## Documentation + +Examples of how to use PHPMailer for common scenarios can be found in the [examples](examples/) folder. If you're looking for a good starting point, we recommend you start with [the gmail example](examples/gmail.phps). + +There are tips and a troubleshooting guide in the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated. + +Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/). + +You'll find some basic user-level docs in the [docs](docs/) folder, and you can generate complete API-level documentation using the [generatedocs.sh](docs/generatedocs.sh) shell script in the docs folder, though you'll need to install [PHPDocumentor](http://www.phpdoc.org) first. You may find [the unit tests](test/phpmailerTest.php) a good source of how to do various operations such as encryption. + +If the documentation doesn't cover what you need, search the [many questions on StackOverflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting). + +## Tests + +There is a PHPUnit test script in the [test](test/) folder. + +Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer) + +If this isn't passing, is there something you can do to help? + +## Contributing + +Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues). + +We're particularly interested in fixing edge-cases, expanding test coverage and updating translations. + +With the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone: + +`git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git` + +Please *don't* use the SourceForge or Google Code projects any more. + +## Sponsorship + +Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), a powerful email marketing system. + +Smartmessages email marketing + +Other contributions are gladly received, whether in beer 🍺, T-shirts 👕, Amazon wishlist raids, or cold, hard cash 💰. + +## Changelog + +See [changelog](changelog.md). + +## History +- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/). +- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004. +- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski. +- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer). +- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer. +- PHPMailer moves to the [PHPMailer organisation](https://github.com/PHPMailer) on GitHub. + +### What's changed since moving from SourceForge? +- Official successor to the SourceForge and Google Code projects. +- Test suite. +- Continuous integration with Travis-CI. +- Composer support. +- Public development. +- Additional languages and language strings. +- CRAM-MD5 authentication support. +- Preserves full repo history of authors, commits and branches from the original SourceForge project. diff --git a/catalog/ext/phpmailer/VERSION b/catalog/ext/phpmailer/VERSION new file mode 100644 index 000000000..b4e08793d --- /dev/null +++ b/catalog/ext/phpmailer/VERSION @@ -0,0 +1 @@ +5.2.10 \ No newline at end of file diff --git a/catalog/ext/phpmailer/changelog.md b/catalog/ext/phpmailer/changelog.md new file mode 100644 index 000000000..5ab4690c8 --- /dev/null +++ b/catalog/ext/phpmailer/changelog.md @@ -0,0 +1,598 @@ +# ChangeLog + +* Don't switch to quoted-printable for long lines if already using base64 +* Fixed Travis-CI config when run on PHP 7 + +## Version 5.2.10 (May 4th 2015) +* Add custom header getter +* Use `application/javascript` for .js attachments +* Improve RFC2821 compliance for timelimits, especially for end-of-data +* Add Azerbaijani translations (Thanks to @mirjalal) +* Minor code cleanup for robustness +* Add Indonesian translations (Thanks to @ceceprawiro) +* Avoid `error_log` Debugoutput naming clash +* Add ability to parse server capabilities in response to EHLO (useful for SendGrid etc) +* Amended default values for WordWrap to match RFC +* Remove html2text converter class (has incompatible license) +* Provide new mechanism for injecting html to text converters +* Improve pointers to docs and support in README +* Add example file upload script +* Refactor and major cleanup of EasyPeasyICS, now a lot more usable +* Make set() method simpler and more reliable +* Add Malay translation (Thanks to @nawawi) +* Add Bulgarian translation (Thanks to @mialy) +* Add Armenian translation (Thanks to Hrayr Grigoryan) +* Add Slovenian translation (Thanks to Klemen Tušar) +* More efficient word wrapping +* Add support for S/MIME signing with additional CA certificate (thanks to @IgitBuh) +* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372) +* Improved checks and error messages for missing extensions +* Store and report SMTP errors more consistently +* Add MIME multipart preamble for better Outlook compatibility +* Enable TLS encryption automatically if the server offers it +* Provide detailed errors when individual recipients fail +* Report more errors when connecting +* Add extras classes to composer classmap +* Expose stream_context_create options via new SMTPOptions property +* Automatic encoding switch to quoted-printable if message lines are too long +* Add Korean translation (Thanks to @ChalkPE) +* Provide a pointer to troubleshooting docs on SMTP connection failure + +## Version 5.2.9 (Sept 25th 2014) +* **Important: The autoloader is no longer autoloaded by the PHPMailer class** +* Update html2text from https://github.com/mtibben/html2text +* Improve Arabic translations (Thanks to @tarekdj) +* Consistent handling of connection variables in SMTP and POP3 +* PHPDoc cleanup +* Update composer to use PHPUnit 4.1 +* Pass consistent params to callbacks +* More consistent handling of error states and debug output +* Use property defaults, remove constructors +* Remove unreachable code +* Use older regex validation pattern for troublesome PCRE library versions +* Improve PCRE detection in older PHP versions +* Handle debug output consistently, and always in UTF-8 +* Allow user-defined debug output method via a callable +* msgHTML now converts data URIs to embedded images +* SMTP::getLastReply() will now always be populated +* Improved example code in README +* Ensure long filenames in Content-Disposition are encoded correctly +* Simplify SMTP debug output mechanism, clarify levels with constants +* Add SMTP connection check example +* Simplify examples, don't use mysql* functions + +## Version 5.2.8 (May 14th 2014) +* Increase timeout to match RFC2821 section 4.5.3.2 and thus not fail greetdelays, fixes #104 +* Add timestamps to default debug output +* Add connection events and new level 3 to debug output options +* Chinese language update (Thanks to @binaryoung) +* Allow custom Mailer types (Thanks to @michield) +* Cope with spaces around SMTP host specs +* Fix processing of multiple hosts in connect string +* Added Galician translation (Thanks to @donatorouco) +* Autoloader now prepends +* Docs updates +* Add Latvian translation (Thanks to @eddsstudio) +* Add Belarusian translation (Thanks to @amaksymiuk) +* Make autoloader work better on older PHP versions +* Avoid double-encoding if mbstring is overloading mail() +* Add Portuguese translation (Thanks to @Jonadabe) +* Make quoted-printable encoder respect line ending setting +* Improve Chinese translation (Thanks to @PeterDaveHello) +* Add Georgian translation (Thanks to @akalongman) +* Add Greek translation (Thanks to @lenasterg) +* Fix serverHostname on PHP < 5.3 +* Improve performance of SMTP class +* Implement automatic 7bit downgrade +* Add Vietnamese translation (Thanks to @vinades) +* Improve example images, switch to PNG +* Add Croatian translation (Thanks to @hrvoj3e) +* Remove setting the Return-Path and deprecate the Return-path property - it's just wrong! +* Fix language file loading if CWD has changed (@stephandesouza) +* Add HTML5 email validation pattern +* Improve Turkish translations (Thanks to @yasinaydin) +* Improve Romanian translations (Thanks to @aflorea) +* Check php.ini for path to sendmail/qmail before using default +* Improve Farsi translation (Thanks to @MHM5000) +* Don't use quoted-printable encoding for multipart types +* Add Serbian translation (Thanks to ajevremovic at gmail.com) +* Remove useless PHP5 check +* Use SVG for build status badges +* Store MessageDate on creation +* Better default behaviour for validateAddress + +## Version 5.2.7 (September 12th 2013) +* Add Ukrainian translation from @Krezalis +* Support for do_verp +* Fix bug in CRAM-MD5 AUTH +* Propagate Debugoutput option to SMTP class (@Reblutus) +* Determine MIME type of attachments automatically +* Add cross-platform, multibyte-safe pathinfo replacement (with tests) and use it +* Add a new 'html' Debugoutput type +* Clean up SMTP debug output, remove embedded HTML +* Some small changes in header formatting to improve IETF msglint test results +* Update test_script to use some recently changed features, rename to code_generator +* Generated code actually works! +* Update SyntaxHighlighter +* Major overhaul and cleanup of example code +* New PHPMailer graphic +* msgHTML now uses RFC2392-compliant content ids +* Add line break normalization function and use it in msgHTML +* Don't set unnecessary reply-to addresses +* Make fakesendmail.sh a bit cleaner and safer +* Set a content-transfer-encoding on multiparts (fixes msglint error) +* Fix cid generation in msgHTML (Thanks to @digitalthought) +* Fix handling of multiple SMTP servers (Thanks to @NanoCaiordo) +* SMTP->connect() now supports stream context options (Thanks to @stanislavdavid) +* Add support for iCal event alternatives (Thanks to @reblutus) +* Update to Polish language file (Thanks to Krzysztof Kowalewski) +* Update to Norwegian language file (Thanks to @datagutten) +* Update to Hungarian language file (Thanks to @dominicus-75) +* Add Persian/Farsi translation from @jaii +* Make SMTPDebug property type match type in SMTP class +* Add unit tests for DKIM +* Major refactor of SMTP class +* Reformat to PSR-2 coding standard +* Introduce autoloader +* Allow overriding of SMTP class +* Overhaul of PHPDocs +* Fix broken Q-encoding +* Czech language update (Thanks to @nemelu) +* Removal of excess blank lines in messages +* Added fake POP server and unit tests for POP-before-SMTP + +## Version 5.2.6 (April 11th 2013) +* Reflect move to PHPMailer GitHub organisation at https://github.com/PHPMailer/PHPMailer +* Fix unbumped version numbers +* Update packagist.org with new location +* Clean up Changelog + +## Version 5.2.5 (April 6th 2013) +* First official release after move from Google Code +* Fixes for qmail when sending via mail() +* Merge in changes from Google code 5.2.4 release +* Minor coding standards cleanup in SMTP class +* Improved unit tests, now tests S/MIME signing +* Travis-CI support on GitHub, runs tests with fake SMTP server + +## Version 5.2.4 (February 19, 2013) +* Fix tag and version bug. +* un-deprecate isSMTP(), isMail(), IsSendmail() and isQmail(). +* Numerous translation updates + +## Version 5.2.3 (February 8, 2013) +* Fix issue with older PCREs and ValidateAddress() (Bugz: 124) +* Add CRAM-MD5 authentication, thanks to Elijah madden, https://github.com/okonomiyaki3000 +* Replacement of obsolete Quoted-Printable encoder with a much better implementation +* Composer package definition +* New language added: Hebrew + +## Version 5.2.2 (December 3, 2012) +* Some fixes and syncs from https://github.com/Synchro/PHPMailer +* Add Slovak translation, thanks to Michal Tinka + +## Version 5.2.2-rc2 (November 6, 2012) +* Fix SMTP server rotation (Bugz: 118) +* Allow override of autogen'ed 'Date' header (for Drupal's + og_mailinglist module) +* No whitespace after '-f' option (Bugz: 116) +* Work around potential warning (Bugz: 114) + +## Version 5.2.2-rc1 (September 28, 2012) +* Header encoding works with long lines (Bugz: 93) +* Turkish language update (Bugz: 94) +* undefined $pattern in EncodeQ bug squashed (Bugz: 98) +* use of mail() in safe_mode now works (Bugz: 96) +* ValidateAddress() now 'public static' so people can override the + default and use their own validation scheme. +* ValidateAddress() no longer uses broken FILTER_VALIDATE_EMAIL +* Added in AUTH PLAIN SMTP authentication + +## Version 5.2.2-beta2 (August 17, 2012) +* Fixed Postfix VERP support (Bugz: 92) +* Allow action_function callbacks to pass/use + the From address (passed as final param) +* Prevent inf look for get_lines() (Bugz: 77) +* New public var ($UseSendmailOptions). Only pass sendmail() + options iff we really are using sendmail or something sendmail + compatible. (Bugz: 75) +* default setting for LE returned to "\n" due to popular demand. + +## Version 5.2.2-beta1 (July 13, 2012) +* Expose PreSend() and PostSend() as public methods to allow + for more control if serializing message sending. +* GetSentMIMEMessage() only constructs the message copy when + needed. Save memory. +* Only pass params to mail() if the underlying MTA is + "sendmail" (as defined as "having the string sendmail + in its pathname") [#69] +* Attachments now work with Amazon SES and others [Bugz#70] +* Debug output now sent to stdout (via echo) or error_log [Bugz#5] +* New var: Debugoutput (for above) [Bugz#5] +* SMTP reads now Timeout aware (new var: Timeout=15) [Bugz#71] +* SMTP reads now can have a Timelimit associated with them + (new var: Timelimit=30)[Bugz#71] +* Fix quoting issue associated with charsets +* default setting for LE is now RFC compliant: "\r\n" +* Return-Path can now be user defined (new var: ReturnPath) + (the default is "" which implies no change from previous + behavior, which was to use either From or Sender) [Bugz#46] +* X-Mailer header can now be disabled (by setting to a + whitespace string, eg " ") [Bugz#66] +* Bugz closed: #68, #60, #42, #43, #59, #55, #66, #48, #49, + #52, #31, #41, #5. #70, #69 + +## Version 5.2.1 (January 16, 2012) +* Closed several bugs #5 +* Performance improvements +* MsgHTML() now returns the message as required. +* New method: GetSentMIMEMessage() (returns full copy of sent message) + +## Version 5.2 (July 19, 2011) +* protected MIME body and header +* better DKIM DNS Resource Record support +* better aly handling +* htmlfilter class added to extras +* moved to Apache Extras + +## Version 5.1 (October 20, 2009) +* fixed filename issue with AddStringAttachment (thanks to Tony) +* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in + addition to PHP mail() +* added DKIM digital signing functionality, new properties: + - DKIM_domain (sets the domain name) + - DKIM_private (holds DKIM private key) + - DKIM_passphrase (holds your DKIM passphrase) + - DKIM_selector (holds the DKIM "selector") + - DKIM_identity (holds the identifying email address) +* added callback function support + - callback function parameters include: + result, to, cc, bcc, subject and body + - see the test/test_callback.php file for usage. +* added "auto" identity functionality + - can automatically add: + - Return-path (if Sender not set) + - Reply-To (if ReplyTo not set) + - can be disabled: + - $mail->SetFrom('yourname@yourdomain.com','First Last',false); + - or by adding the $mail->Sender and/or $mail->ReplyTo properties + +Note: "auto" identity added to help with emails ending up in spam or junk boxes because of missing headers + +## Version 5.0.2 (May 24, 2009) +* Fix for missing attachments when inline graphics are present +* Fix for missing Cc in header when using SMTP (mail was sent, + but not displayed in header -- Cc receiver only saw email To: + line and no Cc line, but did get the email (To receiver + saw same) + +## Version 5.0.1 (April 05, 2009) +* Temporary fix for missing attachments + +## Version 5.0.0 (April 02, 2009) +With the release of this version, we are initiating a new version numbering +system to differentiate from the PHP4 version of PHPMailer. +Most notable in this release is fully object oriented code. + +### class.smtp.php: +* Refactored class.smtp.php to support new exception handling +* code size reduced from 29.2 Kb to 25.6 Kb +* Removed unnecessary functions from class.smtp.php: + - public function Expand($name) { + - public function Help($keyword="") { + - public function Noop() { + - public function Send($from) { + - public function SendOrMail($from) { + - public function Verify($name) { + +### class.phpmailer.php: +* Refactored class.phpmailer.php with new exception handling +* Changed processing functionality of Sendmail and Qmail so they cannot be + inadvertently used +* removed getFile() function, just became a simple wrapper for + file_get_contents() +* added check for PHP version (will gracefully exit if not at least PHP 5.0) +* enhanced code to check if an attachment source is the same as an embedded or + inline graphic source to eliminate duplicate attachments + +### New /test_script +We have written a test script you can use to test the script as part of your +installation. Once you press submit, the test script will send a multi-mime +email with either the message you type in or an HTML email with an inline +graphic. Two attachments are included in the email (one of the attachments +is also the inline graphic so you can see that only one copy of the graphic +is sent in the email). The test script will also display the functional +script that you can copy/paste to your editor to duplicate the functionality. + +### New examples +All new examples in both basic and advanced modes. Advanced examples show + Exception handling. + +### PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0 +All new documentation + +## Version 2.3 (November 06, 2008) +* added Arabic language (many thanks to Bahjat Al Mostafa) +* removed English language from language files and made it a default within + class.phpmailer.php - if no language is found, it will default to use + the english language translation +* fixed public/private declarations +* corrected line 1728, $basedir to $directory +* added $sign_cert_file to avoid improper duplicate use of $sign_key_file +* corrected $this->Hello on line 612 to $this->Helo +* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user + if default is not acceptable +* removed trim() from return results in EncodeQP +* /test and three files it contained are removed from version 2.3 +* fixed phpunit.php for compliance with PHP5 +* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg); +* We have removed the /phpdoc from the downloads. All documentation is now on + the http://phpmailer.codeworxtech.com website. + +## Version 2.2.1 () July 19 2008 +* fixed line 1092 in class.smtp.php (my apologies, error on my part) + +## Version 2.2 () July 15 2008 +* Fixed redirect issue (display of UTF-8 in thank you redirect) +* fixed error in getResponse function declaration (class.pop3.php) +* PHPMailer now PHP6 compliant +* fixed line 1092 in class.smtp.php (endless loop from missing = sign) + +## Version 2.1 (Wed, June 04 2008) +NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE APPRECIATED. + +* added S/MIME functionality (ability to digitally sign emails) + BIG THANKS TO "sergiocambra" for posting this patch back in November 2007. + The "Signed Emails" functionality adds the Sign method to pass the private key + filename and the password to read it, and then email will be sent with + content-type multipart/signed and with the digital signature attached. +* fully compatible with E_STRICT error level + - Please note: + In about half the test environments this development version was subjected + to, an error was thrown for the date() functions used (line 1565 and 1569). + This is NOT a PHPMailer error, it is the result of an incorrectly configured + PHP5 installation. The fix is to modify your 'php.ini' file and include the + date.timezone = Etc/UTC (or your own zone) + directive, to your own server timezone + - If you do get this error, and are unable to access your php.ini file: + In your PHP script, add + `date_default_timezone_set('Etc/UTC');` + - do not try to use + `$myVar = date_default_timezone_get();` + as a test, it will throw an error. +* added ability to define path (mainly for embedded images) + function `MsgHTML($message,$basedir='')` ... where: + `$basedir` is the fully qualified path +* fixed `MsgHTML()` function: + - Embedded Images where images are specified by `://` will not be altered or embedded +* fixed the return value of SMTP exit code ( pclose ) +* addressed issue of multibyte characters in subject line and truncating +* added ability to have user specified Message ID + (default is still that PHPMailer create a unique Message ID) +* corrected unidentified message type to 'application/octet-stream' +* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al). +* added check for added attachments +* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny") + +## Version 2.1.0beta2 (Sun, Dec 02 2007) +* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon) +* finished all testing, all known bugs corrected, enhancements tested + +Note: will NOT work with PHP4. + +Please note, this is BETA software **DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS; INTENDED STRICTLY FOR TESTING** + +## Version 2.1.0beta1 +Please note, this is BETA software +** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS + INTENDED STRICTLY FOR TESTING + +## Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release +* implements new property to control VERP in class.smtp.php + example (requires instantiating class.smtp.php): + $mail->do_verp = true; +* POP-before-SMTP functionality included, thanks to Richard Davey + (see class.pop3.php & pop3_before_smtp_test.php for examples) +* included example showing how to use PHPMailer with GMAIL +* fixed the missing Cc in SendMail() and Mail() + +## Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release +* dramatically simplified using inline graphics ... it's fully automated and requires no user input +* added automatic document type detection for attachments and pictures +* added MsgHTML() function to replace Body tag for HTML emails +* fixed the SendMail security issues (input validation vulnerability) +* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address +* removed the need to use the AltBody method (set from the HTML, or default text used) +* set the PHP Mail() function as the default (still support SendMail, SMTP Mail) +* removed the need to set the IsHTML property (set automatically) +* added Estonian language file by Indrek Päri +* added header injection patch +* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc. +* fixed warning message in SMTP get_lines method +* added TLS/SSL SMTP support. +* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7) +* Works with PHP installed as a module or as CGI-PHP +NOTE: will NOT work with PHP5 in E_STRICT error mode + +## Version 1.73 (Sun, Jun 10 2005) +* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf +* Now has a total of 20 translations +* Fixed alt attachments bug: http://tinyurl.com/98u9k + +## Version 1.72 (Wed, May 25 2004) +* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. +* Received: Removed this method because spam filter programs like + SpamAssassin reject this header. +* Fixed error count bug. +* SetLanguage default is now "language/". +* Fixed magic_quotes_runtime bug. + +## Version 1.71 (Tue, Jul 28 2003) +* Made several speed enhancements +* Added German and Italian translation files +* Fixed HELO/AUTH bugs on keep-alive connects +* Now provides an error message if language file does not load +* Fixed attachment EOL bug +* Updated some unclear documentation +* Added additional tests and improved others + +## Version 1.70 (Mon, Jun 20 2003) +* Added SMTP keep-alive support +* Added IsError method for error detection +* Added error message translation support (SetLanguage) +* Refactored many methods to increase library performance +* Hello now sends the newer EHLO message before HELO as per RFC 2821 +* Removed the boundary class and replaced it with GetBoundary +* Removed queue support methods +* New $Hostname variable +* New Message-ID header +* Received header reformat +* Helo variable default changed to $Hostname +* Removed extra spaces in Content-Type definition (#667182) +* Return-Path should be set to Sender when set +* Adds Q or B encoding to headers when necessary +* quoted-encoding should now encode NULs \000 +* Fixed encoding of body/AltBody (#553370) +* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC) +* Multiple bug fixes + +## Version 1.65 (Fri, Aug 09 2002) +* Fixed non-visible attachment bug (#585097) for Outlook +* SMTP connections are now closed after each transaction +* Fixed SMTP::Expand return value +* Converted SMTP class documentation to phpDocumentor format + +## Version 1.62 (Wed, Jun 26 2002) +* Fixed multi-attach bug +* Set proper word wrapping +* Reduced memory use with attachments +* Added more debugging +* Changed documentation to phpDocumentor format + +## Version 1.60 (Sat, Mar 30 2002) +* Sendmail pipe and address patch (Christian Holtje) +* Added embedded image and read confirmation support (A. Ognio) +* Added unit tests +* Added SMTP timeout support (*nix only) +* Added possibly temporary PluginDir variable for SMTP class +* Added LE message line ending variable +* Refactored boundary and attachment code +* Eliminated SMTP class warnings +* Added SendToQueue method for future queuing support + +## Version 1.54 (Wed, Dec 19 2001) +* Add some queuing support code +* Fixed a pesky multi/alt bug +* Messages are no longer forced to have "To" addresses + +## Version 1.50 (Thu, Nov 08 2001) +* Fix extra lines when not using SMTP mailer +* Set WordWrap variable to int with a zero default + +## Version 1.47 (Tue, Oct 16 2001) +* Fixed Received header code format +* Fixed AltBody order error +* Fixed alternate port warning + +## Version 1.45 (Tue, Sep 25 2001) +* Added enhanced SMTP debug support +* Added support for multiple ports on SMTP +* Added Received header for tracing +* Fixed AddStringAttachment encoding +* Fixed possible header name quote bug +* Fixed wordwrap() trim bug +* Couple other small bug fixes + +## Version 1.41 (Wed, Aug 22 2001) +* Fixed AltBody bug w/o attachments +* Fixed rfc_date() for certain mail servers + +## Version 1.40 (Sun, Aug 12 2001) +* Added multipart/alternative support (AltBody) +* Documentation update +* Fixed bug in Mercury MTA + +## Version 1.29 (Fri, Aug 03 2001) +* Added AddStringAttachment() method +* Added SMTP authentication support + +## Version 1.28 (Mon, Jul 30 2001) +* Fixed a typo in SMTP class +* Fixed header issue with Imail (win32) SMTP server +* Made fopen() calls for attachments use "rb" to fix win32 error + +## Version 1.25 (Mon, Jul 02 2001) +* Added RFC 822 date fix (Patrice) +* Added improved error handling by adding a $ErrorInfo variable +* Removed MailerDebug variable (obsolete with new error handler) + +## Version 1.20 (Mon, Jun 25 2001) +* Added quoted-printable encoding (Patrice) +* Set Version as public and removed PrintVersion() +* Changed phpdoc to only display public variables and methods + +## Version 1.19 (Thu, Jun 21 2001) +* Fixed MS Mail header bug +* Added fix for Bcc problem with mail(). *Does not work on Win32* + (See PHP bug report: http://www.php.net/bugs.php?id=11616) +* mail() no longer passes a fifth parameter when not needed + +## Version 1.15 (Fri, Jun 15 2001) +Note: these changes contributed by Patrice Fournier +* Changed all remaining \n to \r\n +* Bcc: header no longer written to message except + when sent directly to sendmail +* Added a small message to non-MIME compliant mail reader +* Added Sender variable to change the Sender email + used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode +* Changed boundary setting to a place it will be set only once +* Removed transfer encoding for whole message when using multipart +* Message body now uses Encoding in multipart messages +* Can set encoding and type to attachments 7bit, 8bit + and binary attachment are sent as is, base64 are encoded +* Can set Encoding to base64 to send 8 bits body + through 7 bits servers + +## Version 1.10 (Tue, Jun 12 2001) +* Fixed win32 mail header bug (printed out headers in message body) + +## Version 1.09 (Fri, Jun 08 2001) +* Changed date header to work with Netscape mail programs +* Altered phpdoc documentation + +## Version 1.08 (Tue, Jun 05 2001) +* Added enhanced error-checking +* Added phpdoc documentation to source + +## Version 1.06 (Fri, Jun 01 2001) +* Added optional name for file attachments + +## Version 1.05 (Tue, May 29 2001) +* Code cleanup +* Eliminated sendmail header warning message +* Fixed possible SMTP error + +## Version 1.03 (Thu, May 24 2001) +* Fixed problem where qmail sends out duplicate messages + +## Version 1.02 (Wed, May 23 2001) +* Added multiple recipient and attachment Clear* methods +* Added Sendmail public variable +* Fixed problem with loading SMTP library multiple times + +## Version 0.98 (Tue, May 22 2001) +* Fixed problem with redundant mail hosts sending out multiple messages +* Added additional error handler code +* Added AddCustomHeader() function +* Added support for Microsoft mail client headers (affects priority) +* Fixed small bug with Mailer variable +* Added PrintVersion() function + +## Version 0.92 (Tue, May 15 2001) +* Changed file names to class.phpmailer.php and class.smtp.php to match + current PHP class trend. +* Fixed problem where body not being printed when a message is attached +* Several small bug fixes + +## Version 0.90 (Tue, April 17 2001) +* Initial public release diff --git a/catalog/ext/phpmailer/class.phpmailer.php b/catalog/ext/phpmailer/class.phpmailer.php new file mode 100644 index 000000000..09bbd553c --- /dev/null +++ b/catalog/ext/phpmailer/class.phpmailer.php @@ -0,0 +1,3622 @@ + + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + * @copyright 2012 - 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer - PHP email creation and transport class. + * @package PHPMailer + * @author Marcus Bointon (Synchro/coolbru) + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + */ +class PHPMailer +{ + /** + * The PHPMailer Version number. + * @type string + */ + public $Version = '5.2.10'; + + /** + * Email priority. + * Options: 1 = High, 3 = Normal, 5 = low. + * @type integer + */ + public $Priority = 3; + + /** + * The character set of the message. + * @type string + */ + public $CharSet = 'iso-8859-1'; + + /** + * The MIME Content-type of the message. + * @type string + */ + public $ContentType = 'text/plain'; + + /** + * The message encoding. + * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable". + * @type string + */ + public $Encoding = '8bit'; + + /** + * Holds the most recent mailer error message. + * @type string + */ + public $ErrorInfo = ''; + + /** + * The From email address for the message. + * @type string + */ + public $From = 'root@localhost'; + + /** + * The From name of the message. + * @type string + */ + public $FromName = 'Root User'; + + /** + * The Sender email (Return-Path) of the message. + * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode. + * @type string + */ + public $Sender = ''; + + /** + * The Return-Path of the message. + * If empty, it will be set to either From or Sender. + * @type string + * @deprecated Email senders should never set a return-path header; + * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything. + * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference + */ + public $ReturnPath = ''; + + /** + * The Subject of the message. + * @type string + */ + public $Subject = ''; + + /** + * An HTML or plain text message body. + * If HTML then call isHTML(true). + * @type string + */ + public $Body = ''; + + /** + * The plain-text message body. + * This body can be read by mail clients that do not have HTML email + * capability such as mutt & Eudora. + * Clients that can read HTML will view the normal Body. + * @type string + */ + public $AltBody = ''; + + /** + * An iCal message part body. + * Only supported in simple alt or alt_inline message types + * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator + * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/ + * @link http://kigkonsult.se/iCalcreator/ + * @type string + */ + public $Ical = ''; + + /** + * The complete compiled MIME message body. + * @access protected + * @type string + */ + protected $MIMEBody = ''; + + /** + * The complete compiled MIME message headers. + * @type string + * @access protected + */ + protected $MIMEHeader = ''; + + /** + * Extra headers that createHeader() doesn't fold in. + * @type string + * @access protected + */ + protected $mailHeader = ''; + + /** + * Word-wrap the message body to this number of chars. + * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance. + * @type integer + */ + public $WordWrap = 0; + + /** + * Which method to use to send mail. + * Options: "mail", "sendmail", or "smtp". + * @type string + */ + public $Mailer = 'mail'; + + /** + * The path to the sendmail program. + * @type string + */ + public $Sendmail = '/usr/sbin/sendmail'; + + /** + * Whether mail() uses a fully sendmail-compatible MTA. + * One which supports sendmail's "-oi -f" options. + * @type boolean + */ + public $UseSendmailOptions = true; + + /** + * Path to PHPMailer plugins. + * Useful if the SMTP class is not in the PHP include path. + * @type string + * @deprecated Should not be needed now there is an autoloader. + */ + public $PluginDir = ''; + + /** + * The email address that a reading confirmation should be sent to. + * @type string + */ + public $ConfirmReadingTo = ''; + + /** + * The hostname to use in Message-Id and Received headers + * and as default HELO string. + * If empty, the value returned + * by SERVER_NAME is used or 'localhost.localdomain'. + * @type string + */ + public $Hostname = ''; + + /** + * An ID to be used in the Message-Id header. + * If empty, a unique id will be generated. + * @type string + */ + public $MessageID = ''; + + /** + * The message Date to be used in the Date header. + * If empty, the current date will be added. + * @type string + */ + public $MessageDate = ''; + + /** + * SMTP hosts. + * Either a single hostname or multiple semicolon-delimited hostnames. + * You can also specify a different port + * for each host by using this format: [hostname:port] + * (e.g. "smtp1.example.com:25;smtp2.example.com"). + * You can also specify encryption type, for example: + * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465"). + * Hosts will be tried in order. + * @type string + */ + public $Host = 'localhost'; + + /** + * The default SMTP server port. + * @type integer + * @TODO Why is this needed when the SMTP class takes care of it? + */ + public $Port = 25; + + /** + * The SMTP HELO of the message. + * Default is $Hostname. + * @type string + * @see PHPMailer::$Hostname + */ + public $Helo = ''; + + /** + * What kind of encryption to use on the SMTP connection. + * Options: '', 'ssl' or 'tls' + * @type string + */ + public $SMTPSecure = ''; + + /** + * Whether to enable TLS encryption automatically if a server supports it, + * even if `SMTPSecure` is not set to 'tls'. + * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid. + * @type boolean + */ + public $SMTPAutoTLS = true; + + /** + * Whether to use SMTP authentication. + * Uses the Username and Password properties. + * @type boolean + * @see PHPMailer::$Username + * @see PHPMailer::$Password + */ + public $SMTPAuth = false; + + /** + * Options array passed to stream_context_create when connecting via SMTP. + * @type array + */ + public $SMTPOptions = array(); + + /** + * SMTP username. + * @type string + */ + public $Username = ''; + + /** + * SMTP password. + * @type string + */ + public $Password = ''; + + /** + * SMTP auth type. + * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5 + * @type string + */ + public $AuthType = ''; + + /** + * SMTP realm. + * Used for NTLM auth + * @type string + */ + public $Realm = ''; + + /** + * SMTP workstation. + * Used for NTLM auth + * @type string + */ + public $Workstation = ''; + + /** + * The SMTP server timeout in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * @type integer + */ + public $Timeout = 300; + + /** + * SMTP class debug output mode. + * Debug output level. + * Options: + * * `0` No output + * * `1` Commands + * * `2` Data and commands + * * `3` As 2 plus connection status + * * `4` Low-level data output + * @type integer + * @see SMTP::$do_debug + */ + public $SMTPDebug = 0; + + /** + * How to handle debug output. + * Options: + * * `echo` Output plain-text as-is, appropriate for CLI + * * `html` Output escaped, line breaks converted to `
    `, appropriate for browser output + * * `error_log` Output to error log as configured in php.ini + * + * Alternatively, you can provide a callable expecting two params: a message string and the debug level: + * + * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";}; + * + * @type string|callable + * @see SMTP::$Debugoutput + */ + public $Debugoutput = 'echo'; + + /** + * Whether to keep SMTP connection open after each message. + * If this is set to true then to close the connection + * requires an explicit call to smtpClose(). + * @type boolean + */ + public $SMTPKeepAlive = false; + + /** + * Whether to split multiple to addresses into multiple messages + * or send them all in one message. + * @type boolean + */ + public $SingleTo = false; + + /** + * Storage for addresses when SingleTo is enabled. + * @type array + * @TODO This should really not be public + */ + public $SingleToArray = array(); + + /** + * Whether to generate VERP addresses on send. + * Only applicable when sending via SMTP. + * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path + * @link http://www.postfix.org/VERP_README.html Postfix VERP info + * @type boolean + */ + public $do_verp = false; + + /** + * Whether to allow sending messages with an empty body. + * @type boolean + */ + public $AllowEmpty = false; + + /** + * The default line ending. + * @note The default remains "\n". We force CRLF where we know + * it must be used via self::CRLF. + * @type string + */ + public $LE = "\n"; + + /** + * DKIM selector. + * @type string + */ + public $DKIM_selector = ''; + + /** + * DKIM Identity. + * Usually the email address used as the source of the email + * @type string + */ + public $DKIM_identity = ''; + + /** + * DKIM passphrase. + * Used if your key is encrypted. + * @type string + */ + public $DKIM_passphrase = ''; + + /** + * DKIM signing domain name. + * @example 'example.com' + * @type string + */ + public $DKIM_domain = ''; + + /** + * DKIM private key file path. + * @type string + */ + public $DKIM_private = ''; + + /** + * Callback Action function name. + * + * The function that handles the result of the send email action. + * It is called out by send() for each email sent. + * + * Value can be any php callable: http://www.php.net/is_callable + * + * Parameters: + * boolean $result result of the send action + * string $to email address of the recipient + * string $cc cc email addresses + * string $bcc bcc email addresses + * string $subject the subject + * string $body the email body + * string $from email address of sender + * @type string + */ + public $action_function = ''; + + /** + * What to put in the X-Mailer header. + * Options: An empty string for PHPMailer default, whitespace for none, or a string to use + * @type string + */ + public $XMailer = ''; + + /** + * An instance of the SMTP sender class. + * @type SMTP + * @access protected + */ + protected $smtp = null; + + /** + * The array of 'to' addresses. + * @type array + * @access protected + */ + protected $to = array(); + + /** + * The array of 'cc' addresses. + * @type array + * @access protected + */ + protected $cc = array(); + + /** + * The array of 'bcc' addresses. + * @type array + * @access protected + */ + protected $bcc = array(); + + /** + * The array of reply-to names and addresses. + * @type array + * @access protected + */ + protected $ReplyTo = array(); + + /** + * An array of all kinds of addresses. + * Includes all of $to, $cc, $bcc + * @type array + * @access protected + */ + protected $all_recipients = array(); + + /** + * The array of attachments. + * @type array + * @access protected + */ + protected $attachment = array(); + + /** + * The array of custom headers. + * @type array + * @access protected + */ + protected $CustomHeader = array(); + + /** + * The most recent Message-ID (including angular brackets). + * @type string + * @access protected + */ + protected $lastMessageID = ''; + + /** + * The message's MIME type. + * @type string + * @access protected + */ + protected $message_type = ''; + + /** + * The array of MIME boundary strings. + * @type array + * @access protected + */ + protected $boundary = array(); + + /** + * The array of available languages. + * @type array + * @access protected + */ + protected $language = array(); + + /** + * The number of errors encountered. + * @type integer + * @access protected + */ + protected $error_count = 0; + + /** + * The S/MIME certificate file path. + * @type string + * @access protected + */ + protected $sign_cert_file = ''; + + /** + * The S/MIME key file path. + * @type string + * @access protected + */ + protected $sign_key_file = ''; + + /** + * The optional S/MIME extra certificates ("CA Chain") file path. + * @type string + * @access protected + */ + protected $sign_extracerts_file = ''; + + /** + * The S/MIME password for the key. + * Used only if the key is encrypted. + * @type string + * @access protected + */ + protected $sign_key_pass = ''; + + /** + * Whether to throw exceptions for errors. + * @type boolean + * @access protected + */ + protected $exceptions = false; + + /** + * Unique ID used for message ID and boundaries. + * @type string + * @access protected + */ + protected $uniqueid = ''; + + /** + * Error severity: message only, continue processing. + */ + const STOP_MESSAGE = 0; + + /** + * Error severity: message, likely ok to continue processing. + */ + const STOP_CONTINUE = 1; + + /** + * Error severity: message, plus full stop, critical error reached. + */ + const STOP_CRITICAL = 2; + + /** + * SMTP RFC standard line ending. + */ + const CRLF = "\r\n"; + + /** + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @type integer + */ + const MAX_LINE_LENGTH = 998; + + /** + * Constructor. + * @param boolean $exceptions Should we throw external exceptions? + */ + public function __construct($exceptions = false) + { + $this->exceptions = (boolean)$exceptions; + } + + /** + * Destructor. + */ + public function __destruct() + { + //Close any open SMTP connection nicely + if ($this->Mailer == 'smtp') { + $this->smtpClose(); + } + } + + /** + * Call mail() in a safe_mode-aware fashion. + * Also, unless sendmail_path points to sendmail (or something that + * claims to be sendmail), don't pass params (not a perfect fix, + * but it will do) + * @param string $to To + * @param string $subject Subject + * @param string $body Message Body + * @param string $header Additional Header(s) + * @param string $params Params + * @access private + * @return boolean + */ + private function mailPassthru($to, $subject, $body, $header, $params) + { + //Check overloading of mail function to avoid double-encoding + if (ini_get('mbstring.func_overload') & 1) { + $subject = $this->secureHeader($subject); + } else { + $subject = $this->encodeHeader($this->secureHeader($subject)); + } + if (ini_get('safe_mode') || !($this->UseSendmailOptions)) { + $result = @mail($to, $subject, $body, $header); + } else { + $result = @mail($to, $subject, $body, $header, $params); + } + return $result; + } + + /** + * Output debugging info via user-defined method. + * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug). + * @see PHPMailer::$Debugoutput + * @see PHPMailer::$SMTPDebug + * @param string $str + */ + protected function edebug($str) + { + if ($this->SMTPDebug <= 0) { + return; + } + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { + call_user_func($this->Debugoutput, $str, $this->SMTPDebug); + return; + } + switch ($this->Debugoutput) { + case 'error_log': + //Don't output, just log + error_log($str); + break; + case 'html': + //Cleans up output a bit for a better looking, HTML-safe output + echo htmlentities( + preg_replace('/[\r\n]+/', '', $str), + ENT_QUOTES, + 'UTF-8' + ) + . "
    \n"; + break; + case 'echo': + default: + //Normalize line breaks + $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( + "\n", + "\n \t ", + trim($str) + ) . "\n"; + } + } + + /** + * Sets message type to HTML or plain. + * @param boolean $isHtml True for HTML mode. + * @return void + */ + public function isHTML($isHtml = true) + { + if ($isHtml) { + $this->ContentType = 'text/html'; + } else { + $this->ContentType = 'text/plain'; + } + } + + /** + * Send messages using SMTP. + * @return void + */ + public function isSMTP() + { + $this->Mailer = 'smtp'; + } + + /** + * Send messages using PHP's mail() function. + * @return void + */ + public function isMail() + { + $this->Mailer = 'mail'; + } + + /** + * Send messages using $Sendmail. + * @return void + */ + public function isSendmail() + { + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'sendmail')) { + $this->Sendmail = '/usr/sbin/sendmail'; + } else { + $this->Sendmail = $ini_sendmail_path; + } + $this->Mailer = 'sendmail'; + } + + /** + * Send messages using qmail. + * @return void + */ + public function isQmail() + { + $ini_sendmail_path = ini_get('sendmail_path'); + + if (!stristr($ini_sendmail_path, 'qmail')) { + $this->Sendmail = '/var/qmail/bin/qmail-inject'; + } else { + $this->Sendmail = $ini_sendmail_path; + } + $this->Mailer = 'qmail'; + } + + /** + * Add a "To" address. + * @param string $address + * @param string $name + * @return boolean true on success, false if address already used + */ + public function addAddress($address, $name = '') + { + return $this->addAnAddress('to', $address, $name); + } + + /** + * Add a "CC" address. + * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * @param string $address + * @param string $name + * @return boolean true on success, false if address already used + */ + public function addCC($address, $name = '') + { + return $this->addAnAddress('cc', $address, $name); + } + + /** + * Add a "BCC" address. + * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer. + * @param string $address + * @param string $name + * @return boolean true on success, false if address already used + */ + public function addBCC($address, $name = '') + { + return $this->addAnAddress('bcc', $address, $name); + } + + /** + * Add a "Reply-to" address. + * @param string $address + * @param string $name + * @return boolean + */ + public function addReplyTo($address, $name = '') + { + return $this->addAnAddress('Reply-To', $address, $name); + } + + /** + * Add an address to one of the recipient arrays. + * Addresses that have been added already return false, but do not throw exceptions + * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo' + * @param string $address The email address to send to + * @param string $name + * @throws phpmailerException + * @return boolean true on success, false if address already used or invalid in some way + * @access protected + */ + protected function addAnAddress($kind, $address, $name = '') + { + if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) { + $this->setError($this->lang('Invalid recipient array') . ': ' . $kind); + $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind); + if ($this->exceptions) { + throw new phpmailerException('Invalid recipient array: ' . $kind); + } + return false; + } + $address = trim($address); + $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim + if (!$this->validateAddress($address)) { + $this->setError($this->lang('invalid_address') . ': ' . $address); + $this->edebug($this->lang('invalid_address') . ': ' . $address); + if ($this->exceptions) { + throw new phpmailerException($this->lang('invalid_address') . ': ' . $address); + } + return false; + } + if ($kind != 'Reply-To') { + if (!isset($this->all_recipients[strtolower($address)])) { + array_push($this->$kind, array($address, $name)); + $this->all_recipients[strtolower($address)] = true; + return true; + } + } else { + if (!array_key_exists(strtolower($address), $this->ReplyTo)) { + $this->ReplyTo[strtolower($address)] = array($address, $name); + return true; + } + } + return false; + } + + /** + * Set the From and FromName properties. + * @param string $address + * @param string $name + * @param boolean $auto Whether to also set the Sender address, defaults to true + * @throws phpmailerException + * @return boolean + */ + public function setFrom($address, $name = '', $auto = true) + { + $address = trim($address); + $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim + if (!$this->validateAddress($address)) { + $this->setError($this->lang('invalid_address') . ': ' . $address); + $this->edebug($this->lang('invalid_address') . ': ' . $address); + if ($this->exceptions) { + throw new phpmailerException($this->lang('invalid_address') . ': ' . $address); + } + return false; + } + $this->From = $address; + $this->FromName = $name; + if ($auto) { + if (empty($this->Sender)) { + $this->Sender = $address; + } + } + return true; + } + + /** + * Return the Message-ID header of the last email. + * Technically this is the value from the last time the headers were created, + * but it's also the message ID of the last sent message except in + * pathological cases. + * @return string + */ + public function getLastMessageID() + { + return $this->lastMessageID; + } + + /** + * Check that a string looks like an email address. + * @param string $address The email address to check + * @param string $patternselect A selector for the validation pattern to use : + * * `auto` Pick strictest one automatically; + * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14; + * * `pcre` Use old PCRE implementation; + * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains; + * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements. + * * `noregex` Don't use a regex: super fast, really dumb. + * @return boolean + * @static + * @access public + */ + public static function validateAddress($address, $patternselect = 'auto') + { + if (!$patternselect or $patternselect == 'auto') { + //Check this constant first so it works when extension_loaded() is disabled by safe mode + //Constant was added in PHP 5.2.4 + if (defined('PCRE_VERSION')) { + //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2 + if (version_compare(PCRE_VERSION, '8.0.3') >= 0) { + $patternselect = 'pcre8'; + } else { + $patternselect = 'pcre'; + } + } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) { + //Fall back to older PCRE + $patternselect = 'pcre'; + } else { + //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension + if (version_compare(PHP_VERSION, '5.2.0') >= 0) { + $patternselect = 'php'; + } else { + $patternselect = 'noregex'; + } + } + } + switch ($patternselect) { + case 'pcre8': + /** + * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains. + * @link http://squiloople.com/2009/12/20/email-address-validation/ + * @copyright 2009-2010 Michael Rushton + * Feel free to use and redistribute this code. But please keep this copyright notice. + */ + return (boolean)preg_match( + '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' . + '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' . + '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' . + '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' . + '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' . + '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' . + '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' . + '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' . + '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', + $address + ); + case 'pcre': + //An older regex that doesn't need a recent PCRE + return (boolean)preg_match( + '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' . + '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' . + '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' . + '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' . + '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' . + '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' . + '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' . + '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' . + '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' . + '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD', + $address + ); + case 'html5': + /** + * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements. + * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email) + */ + return (boolean)preg_match( + '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' . + '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD', + $address + ); + case 'noregex': + //No PCRE! Do something _very_ approximate! + //Check the address is 3 chars or longer and contains an @ that's not the first or last char + return (strlen($address) >= 3 + and strpos($address, '@') >= 1 + and strpos($address, '@') != strlen($address) - 1); + case 'php': + default: + return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL); + } + } + + /** + * Create a message and send it. + * Uses the sending method specified by $Mailer. + * @throws phpmailerException + * @return boolean false on error - See the ErrorInfo property for details of the error. + */ + public function send() + { + try { + if (!$this->preSend()) { + return false; + } + return $this->postSend(); + } catch (phpmailerException $exc) { + $this->mailHeader = ''; + $this->setError($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + } + + /** + * Prepare a message for sending. + * @throws phpmailerException + * @return boolean + */ + public function preSend() + { + try { + $this->mailHeader = ''; + if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) { + throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL); + } + + // Set whether the message is multipart/alternative + if (!empty($this->AltBody)) { + $this->ContentType = 'multipart/alternative'; + } + + $this->error_count = 0; // Reset errors + $this->setMessageType(); + // Refuse to send an empty message unless we are specifically allowing it + if (!$this->AllowEmpty and empty($this->Body)) { + throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL); + } + + // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding) + $this->MIMEHeader = ''; + $this->MIMEBody = $this->createBody(); + // createBody may have added some headers, so retain them + $tempheaders = $this->MIMEHeader; + $this->MIMEHeader = $this->createHeader(); + $this->MIMEHeader .= $tempheaders; + + // To capture the complete message when using mail(), create + // an extra header list which createHeader() doesn't fold in + if ($this->Mailer == 'mail') { + if (count($this->to) > 0) { + $this->mailHeader .= $this->addrAppend('To', $this->to); + } else { + $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;'); + } + $this->mailHeader .= $this->headerLine( + 'Subject', + $this->encodeHeader($this->secureHeader(trim($this->Subject))) + ); + } + + // Sign with DKIM if enabled + if (!empty($this->DKIM_domain) + && !empty($this->DKIM_private) + && !empty($this->DKIM_selector) + && file_exists($this->DKIM_private)) { + $header_dkim = $this->DKIM_Add( + $this->MIMEHeader . $this->mailHeader, + $this->encodeHeader($this->secureHeader($this->Subject)), + $this->MIMEBody + ); + $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF . + str_replace("\r\n", "\n", $header_dkim) . self::CRLF; + } + return true; + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + } + + /** + * Actually send a message. + * Send the email via the selected mechanism + * @throws phpmailerException + * @return boolean + */ + public function postSend() + { + try { + // Choose the mailer and send through it + switch ($this->Mailer) { + case 'sendmail': + case 'qmail': + return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody); + case 'smtp': + return $this->smtpSend($this->MIMEHeader, $this->MIMEBody); + case 'mail': + return $this->mailSend($this->MIMEHeader, $this->MIMEBody); + default: + $sendMethod = $this->Mailer.'Send'; + if (method_exists($this, $sendMethod)) { + return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody); + } + + return $this->mailSend($this->MIMEHeader, $this->MIMEBody); + } + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + } + return false; + } + + /** + * Send mail using the $Sendmail program. + * @param string $header The message headers + * @param string $body The message body + * @see PHPMailer::$Sendmail + * @throws phpmailerException + * @access protected + * @return boolean + */ + protected function sendmailSend($header, $body) + { + if ($this->Sender != '') { + if ($this->Mailer == 'qmail') { + $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + } else { + $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender)); + } + } else { + if ($this->Mailer == 'qmail') { + $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail)); + } else { + $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail)); + } + } + if ($this->SingleTo) { + foreach ($this->SingleToArray as $toAddr) { + if (!@$mail = popen($sendmail, 'w')) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + fputs($mail, 'To: ' . $toAddr . "\n"); + fputs($mail, $header); + fputs($mail, $body); + $result = pclose($mail); + $this->doCallback( + ($result == 0), + array($toAddr), + $this->cc, + $this->bcc, + $this->Subject, + $body, + $this->From + ); + if ($result != 0) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + } + } else { + if (!@$mail = popen($sendmail, 'w')) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + fputs($mail, $header); + fputs($mail, $body); + $result = pclose($mail); + $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + if ($result != 0) { + throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); + } + } + return true; + } + + /** + * Send mail using the PHP mail() function. + * @param string $header The message headers + * @param string $body The message body + * @link http://www.php.net/manual/en/book.mail.php + * @throws phpmailerException + * @access protected + * @return boolean + */ + protected function mailSend($header, $body) + { + $toArr = array(); + foreach ($this->to as $toaddr) { + $toArr[] = $this->addrFormat($toaddr); + } + $to = implode(', ', $toArr); + + if (empty($this->Sender)) { + $params = ' '; + } else { + $params = sprintf('-f%s', $this->Sender); + } + if ($this->Sender != '' and !ini_get('safe_mode')) { + $old_from = ini_get('sendmail_from'); + ini_set('sendmail_from', $this->Sender); + } + $result = false; + if ($this->SingleTo && count($toArr) > 1) { + foreach ($toArr as $toAddr) { + $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); + $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From); + } + } else { + $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params); + $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From); + } + if (isset($old_from)) { + ini_set('sendmail_from', $old_from); + } + if (!$result) { + throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL); + } + return true; + } + + /** + * Get an instance to use for SMTP operations. + * Override this function to load your own SMTP implementation + * @return SMTP + */ + public function getSMTPInstance() + { + if (!is_object($this->smtp)) { + $this->smtp = new SMTP; + } + return $this->smtp; + } + + /** + * Send mail via SMTP. + * Returns false if there is a bad MAIL FROM, RCPT, or DATA input. + * Uses the PHPMailerSMTP class by default. + * @see PHPMailer::getSMTPInstance() to use a different class. + * @param string $header The message headers + * @param string $body The message body + * @throws phpmailerException + * @uses SMTP + * @access protected + * @return boolean + */ + protected function smtpSend($header, $body) + { + $bad_rcpt = array(); + if (!$this->smtpConnect($this->SMTPOptions)) { + throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); + } + if ('' == $this->Sender) { + $smtp_from = $this->From; + } else { + $smtp_from = $this->Sender; + } + if (!$this->smtp->mail($smtp_from)) { + $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError())); + throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); + } + + // Attempt to send to all recipients + foreach (array($this->to, $this->cc, $this->bcc) as $togroup) { + foreach ($togroup as $to) { + if (!$this->smtp->recipient($to[0])) { + $error = $this->smtp->getError(); + $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']); + $isSent = false; + } else { + $isSent = true; + } + $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); + } + } + + // Only send the DATA command if we have viable recipients + if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) { + throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL); + } + if ($this->SMTPKeepAlive) { + $this->smtp->reset(); + } else { + $this->smtp->quit(); + $this->smtp->close(); + } + //Create error message for any bad addresses + if (count($bad_rcpt) > 0) { + $errstr = ''; + foreach ($bad_rcpt as $bad) { + $errstr .= $bad['to'] . ': ' . $bad['error']; + } + throw new phpmailerException( + $this->lang('recipients_failed') . $errstr, + self::STOP_CONTINUE + ); + } + return true; + } + + /** + * Initiate a connection to an SMTP server. + * Returns false if the operation failed. + * @param array $options An array of options compatible with stream_context_create() + * @uses SMTP + * @access public + * @throws phpmailerException + * @return boolean + */ + public function smtpConnect($options = array()) + { + if (is_null($this->smtp)) { + $this->smtp = $this->getSMTPInstance(); + } + + // Already connected? + if ($this->smtp->connected()) { + return true; + } + + $this->smtp->setTimeout($this->Timeout); + $this->smtp->setDebugLevel($this->SMTPDebug); + $this->smtp->setDebugOutput($this->Debugoutput); + $this->smtp->setVerp($this->do_verp); + $hosts = explode(';', $this->Host); + $lastexception = null; + + foreach ($hosts as $hostentry) { + $hostinfo = array(); + if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) { + // Not a valid host entry + continue; + } + // $hostinfo[2]: optional ssl or tls prefix + // $hostinfo[3]: the hostname + // $hostinfo[4]: optional port number + // The host string prefix can temporarily override the current setting for SMTPSecure + // If it's not specified, the default value is used + $prefix = ''; + $secure = $this->SMTPSecure; + $tls = ($this->SMTPSecure == 'tls'); + if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) { + $prefix = 'ssl://'; + $tls = false; // Can't have SSL and TLS at the same time + $secure = 'ssl'; + } elseif ($hostinfo[2] == 'tls') { + $tls = true; + // tls doesn't use a prefix + $secure = 'tls'; + } + //Do we need the OpenSSL extension? + $sslext = defined('OPENSSL_ALGO_SHA1'); + if ('tls' === $secure or 'ssl' === $secure) { + //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled + if (!$sslext) { + throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL); + } + } + $host = $hostinfo[3]; + $port = $this->Port; + $tport = (integer)$hostinfo[4]; + if ($tport > 0 and $tport < 65536) { + $port = $tport; + } + if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) { + try { + if ($this->Helo) { + $hello = $this->Helo; + } else { + $hello = $this->serverHostname(); + } + $this->smtp->hello($hello); + //Automatically enable TLS encryption if: + // * it's not disabled + // * we have openssl extension + // * we are not already using SSL + // * the server offers STARTTLS + if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) { + $tls = true; + } + if ($tls) { + if (!$this->smtp->startTLS()) { + throw new phpmailerException($this->lang('connect_host')); + } + // We must resend HELO after tls negotiation + $this->smtp->hello($hello); + } + if ($this->SMTPAuth) { + if (!$this->smtp->authenticate( + $this->Username, + $this->Password, + $this->AuthType, + $this->Realm, + $this->Workstation + ) + ) { + throw new phpmailerException($this->lang('authenticate')); + } + } + return true; + } catch (phpmailerException $exc) { + $lastexception = $exc; + $this->edebug($exc->getMessage()); + // We must have connected, but then failed TLS or Auth, so close connection nicely + $this->smtp->quit(); + } + } + } + // If we get here, all connection attempts have failed, so close connection hard + $this->smtp->close(); + // As we've caught all exceptions, just report whatever the last one was + if ($this->exceptions and !is_null($lastexception)) { + throw $lastexception; + } + return false; + } + + /** + * Close the active SMTP session if one exists. + * @return void + */ + public function smtpClose() + { + if ($this->smtp !== null) { + if ($this->smtp->connected()) { + $this->smtp->quit(); + $this->smtp->close(); + } + } + } + + /** + * Set the language for error messages. + * Returns false if it cannot load the language file. + * The default language is English. + * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr") + * @param string $lang_path Path to the language file directory, with trailing separator (slash) + * @return boolean + * @access public + */ + public function setLanguage($langcode = 'en', $lang_path = '') + { + // Define full set of translatable strings in English + $PHPMAILER_LANG = array( + 'authenticate' => 'SMTP Error: Could not authenticate.', + 'connect_host' => 'SMTP Error: Could not connect to SMTP host.', + 'data_not_accepted' => 'SMTP Error: data not accepted.', + 'empty_message' => 'Message body empty', + 'encoding' => 'Unknown encoding: ', + 'execute' => 'Could not execute: ', + 'file_access' => 'Could not access file: ', + 'file_open' => 'File Error: Could not open file: ', + 'from_failed' => 'The following From address failed: ', + 'instantiate' => 'Could not instantiate mail function.', + 'invalid_address' => 'Invalid address', + 'mailer_not_supported' => ' mailer is not supported.', + 'provide_address' => 'You must provide at least one recipient email address.', + 'recipients_failed' => 'SMTP Error: The following recipients failed: ', + 'signing' => 'Signing Error: ', + 'smtp_connect_failed' => 'SMTP connect() failed.', + 'smtp_error' => 'SMTP server error: ', + 'variable_set' => 'Cannot set or reset variable: ', + 'extension_missing' => 'Extension missing: ' + ); + if (empty($lang_path)) { + // Calculate an absolute path so it can work if CWD is not here + $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR; + } + $foundlang = true; + $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php'; + // There is no English translation file + if ($langcode != 'en') { + // Make sure language file path is readable + if (!is_readable($lang_file)) { + $foundlang = false; + } else { + // Overwrite language-specific strings. + // This way we'll never have missing translation keys. + $foundlang = include $lang_file; + } + } + $this->language = $PHPMAILER_LANG; + return (boolean)$foundlang; // Returns false if language not found + } + + /** + * Get the array of strings for the current language. + * @return array + */ + public function getTranslations() + { + return $this->language; + } + + /** + * Create recipient headers. + * @access public + * @param string $type + * @param array $addr An array of recipient, + * where each recipient is a 2-element indexed array with element 0 containing an address + * and element 1 containing a name, like: + * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User')) + * @return string + */ + public function addrAppend($type, $addr) + { + $addresses = array(); + foreach ($addr as $address) { + $addresses[] = $this->addrFormat($address); + } + return $type . ': ' . implode(', ', $addresses) . $this->LE; + } + + /** + * Format an address for use in a message header. + * @access public + * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name + * like array('joe@example.com', 'Joe User') + * @return string + */ + public function addrFormat($addr) + { + if (empty($addr[1])) { // No name provided + return $this->secureHeader($addr[0]); + } else { + return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader( + $addr[0] + ) . '>'; + } + } + + /** + * Word-wrap message. + * For use with mailers that do not automatically perform wrapping + * and for quoted-printable encoded messages. + * Original written by philippe. + * @param string $message The message to wrap + * @param integer $length The line length to wrap to + * @param boolean $qp_mode Whether to run in Quoted-Printable mode + * @access public + * @return string + */ + public function wrapText($message, $length, $qp_mode = false) + { + if ($qp_mode) { + $soft_break = sprintf(' =%s', $this->LE); + } else { + $soft_break = $this->LE; + } + // If utf-8 encoding is used, we will need to make sure we don't + // split multibyte characters when we wrap + $is_utf8 = (strtolower($this->CharSet) == 'utf-8'); + $lelen = strlen($this->LE); + $crlflen = strlen(self::CRLF); + + $message = $this->fixEOL($message); + //Remove a trailing line break + if (substr($message, -$lelen) == $this->LE) { + $message = substr($message, 0, -$lelen); + } + + //Split message into lines + $lines = explode($this->LE, $message); + //Message will be rebuilt in here + $message = ''; + foreach ($lines as $line) { + $words = explode(' ', $line); + $buf = ''; + $firstword = true; + foreach ($words as $word) { + if ($qp_mode and (strlen($word) > $length)) { + $space_left = $length - strlen($buf) - $crlflen; + if (!$firstword) { + if ($space_left > 20) { + $len = $space_left; + if ($is_utf8) { + $len = $this->utf8CharBoundary($word, $len); + } elseif (substr($word, $len - 1, 1) == '=') { + $len--; + } elseif (substr($word, $len - 2, 1) == '=') { + $len -= 2; + } + $part = substr($word, 0, $len); + $word = substr($word, $len); + $buf .= ' ' . $part; + $message .= $buf . sprintf('=%s', self::CRLF); + } else { + $message .= $buf . $soft_break; + } + $buf = ''; + } + while (strlen($word) > 0) { + if ($length <= 0) { + break; + } + $len = $length; + if ($is_utf8) { + $len = $this->utf8CharBoundary($word, $len); + } elseif (substr($word, $len - 1, 1) == '=') { + $len--; + } elseif (substr($word, $len - 2, 1) == '=') { + $len -= 2; + } + $part = substr($word, 0, $len); + $word = substr($word, $len); + + if (strlen($word) > 0) { + $message .= $part . sprintf('=%s', self::CRLF); + } else { + $buf = $part; + } + } + } else { + $buf_o = $buf; + if (!$firstword) { + $buf .= ' '; + } + $buf .= $word; + + if (strlen($buf) > $length and $buf_o != '') { + $message .= $buf_o . $soft_break; + $buf = $word; + } + } + $firstword = false; + } + $message .= $buf . self::CRLF; + } + + return $message; + } + + /** + * Find the last character boundary prior to $maxLength in a utf-8 + * quoted-printable encoded string. + * Original written by Colin Brown. + * @access public + * @param string $encodedText utf-8 QP text + * @param integer $maxLength Find the last character boundary prior to this length + * @return integer + */ + public function utf8CharBoundary($encodedText, $maxLength) + { + $foundSplitPos = false; + $lookBack = 3; + while (!$foundSplitPos) { + $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); + $encodedCharPos = strpos($lastChunk, '='); + if (false !== $encodedCharPos) { + // Found start of encoded character byte within $lookBack block. + // Check the encoded byte value (the 2 chars after the '=') + $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); + $dec = hexdec($hex); + if ($dec < 128) { + // Single byte character. + // If the encoded char was found at pos 0, it will fit + // otherwise reduce maxLength to start of the encoded char + if ($encodedCharPos > 0) { + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + } + $foundSplitPos = true; + } elseif ($dec >= 192) { + // First byte of a multi byte character + // Reduce maxLength to split at start of character + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + $foundSplitPos = true; + } elseif ($dec < 192) { + // Middle byte of a multi byte character, look further back + $lookBack += 3; + } + } else { + // No encoded character found + $foundSplitPos = true; + } + } + return $maxLength; + } + + /** + * Apply word wrapping to the message body. + * Wraps the message body to the number of chars set in the WordWrap property. + * You should only do this to plain-text bodies as wrapping HTML tags may break them. + * This is called automatically by createBody(), so you don't need to call it yourself. + * @access public + * @return void + */ + public function setWordWrap() + { + if ($this->WordWrap < 1) { + return; + } + + switch ($this->message_type) { + case 'alt': + case 'alt_inline': + case 'alt_attach': + case 'alt_inline_attach': + $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap); + break; + default: + $this->Body = $this->wrapText($this->Body, $this->WordWrap); + break; + } + } + + /** + * Assemble message headers. + * @access public + * @return string The assembled headers + */ + public function createHeader() + { + $result = ''; + + if ($this->MessageDate == '') { + $this->MessageDate = self::rfcDate(); + } + $result .= $this->headerLine('Date', $this->MessageDate); + + + // To be created automatically by mail() + if ($this->SingleTo) { + if ($this->Mailer != 'mail') { + foreach ($this->to as $toaddr) { + $this->SingleToArray[] = $this->addrFormat($toaddr); + } + } + } else { + if (count($this->to) > 0) { + if ($this->Mailer != 'mail') { + $result .= $this->addrAppend('To', $this->to); + } + } elseif (count($this->cc) == 0) { + $result .= $this->headerLine('To', 'undisclosed-recipients:;'); + } + } + + $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName))); + + // sendmail and mail() extract Cc from the header before sending + if (count($this->cc) > 0) { + $result .= $this->addrAppend('Cc', $this->cc); + } + + // sendmail and mail() extract Bcc from the header before sending + if (( + $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail' + ) + and count($this->bcc) > 0 + ) { + $result .= $this->addrAppend('Bcc', $this->bcc); + } + + if (count($this->ReplyTo) > 0) { + $result .= $this->addrAppend('Reply-To', $this->ReplyTo); + } + + // mail() sets the subject itself + if ($this->Mailer != 'mail') { + $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject))); + } + + if ($this->MessageID != '') { + $this->lastMessageID = $this->MessageID; + } else { + $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->ServerHostname()); + } + $result .= $this->headerLine('Message-ID', $this->lastMessageID); + $result .= $this->headerLine('X-Priority', $this->Priority); + if ($this->XMailer == '') { + $result .= $this->headerLine( + 'X-Mailer', + 'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)' + ); + } else { + $myXmailer = trim($this->XMailer); + if ($myXmailer) { + $result .= $this->headerLine('X-Mailer', $myXmailer); + } + } + + if ($this->ConfirmReadingTo != '') { + $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>'); + } + + // Add custom headers + foreach ($this->CustomHeader as $header) { + $result .= $this->headerLine( + trim($header[0]), + $this->encodeHeader(trim($header[1])) + ); + } + if (!$this->sign_key_file) { + $result .= $this->headerLine('MIME-Version', '1.0'); + $result .= $this->getMailMIME(); + } + + return $result; + } + + /** + * Get the message MIME type headers. + * @access public + * @return string + */ + public function getMailMIME() + { + $result = ''; + $ismultipart = true; + switch ($this->message_type) { + case 'inline': + $result .= $this->headerLine('Content-Type', 'multipart/related;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + case 'attach': + case 'inline_attach': + case 'alt_attach': + case 'alt_inline_attach': + $result .= $this->headerLine('Content-Type', 'multipart/mixed;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + case 'alt': + case 'alt_inline': + $result .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"'); + break; + default: + // Catches case 'plain': and case '': + $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet); + $ismultipart = false; + break; + } + // RFC1341 part 5 says 7bit is assumed if not specified + if ($this->Encoding != '7bit') { + // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE + if ($ismultipart) { + if ($this->Encoding == '8bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', '8bit'); + } + // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible + } else { + $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding); + } + } + + if ($this->Mailer != 'mail') { + $result .= $this->LE; + } + + return $result; + } + + /** + * Returns the whole MIME message. + * Includes complete headers and body. + * Only valid post preSend(). + * @see PHPMailer::preSend() + * @access public + * @return string + */ + public function getSentMIMEMessage() + { + return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody; + } + + /** + * Assemble the message body. + * Returns an empty string on failure. + * @access public + * @throws phpmailerException + * @return string The assembled message body + */ + public function createBody() + { + $body = ''; + //Create unique IDs and preset boundaries + $this->uniqueid = md5(uniqid(time())); + $this->boundary[1] = 'b1_' . $this->uniqueid; + $this->boundary[2] = 'b2_' . $this->uniqueid; + $this->boundary[3] = 'b3_' . $this->uniqueid; + + if ($this->sign_key_file) { + $body .= $this->getMailMIME() . $this->LE; + } + + $this->setWordWrap(); + + $bodyEncoding = $this->Encoding; + $bodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) { + $bodyEncoding = '7bit'; + $bodyCharSet = 'us-ascii'; + } + //If lines are too long, and we're not already using an encoding that will shorten them, + //change to quoted-printable transfer encoding + if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) { + $this->Encoding = 'quoted-printable'; + $bodyEncoding = 'quoted-printable'; + } + + $altBodyEncoding = $this->Encoding; + $altBodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? + if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) { + $altBodyEncoding = '7bit'; + $altBodyCharSet = 'us-ascii'; + } + //If lines are too long, change to quoted-printable transfer encoding + if (self::hasLineLongerThanMax($this->AltBody)) { + $altBodyEncoding = 'quoted-printable'; + } + //Use this as a preamble in all multipart message types + $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; + switch ($this->message_type) { + case 'inline': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[1]); + break; + case 'attach': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'inline_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'alt': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + if (!empty($this->Ical)) { + $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', ''); + $body .= $this->encodeString($this->Ical, $this->Encoding); + $body .= $this->LE . $this->LE; + } + $body .= $this->endBoundary($this->boundary[1]); + break; + case 'alt_inline': + $body .= $mimepre; + $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[2]); + $body .= $this->LE; + $body .= $this->endBoundary($this->boundary[1]); + break; + case 'alt_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->endBoundary($this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + case 'alt_inline_attach': + $body .= $mimepre; + $body .= $this->textLine('--' . $this->boundary[1]); + $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding); + $body .= $this->encodeString($this->AltBody, $altBodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->textLine('--' . $this->boundary[2]); + $body .= $this->headerLine('Content-Type', 'multipart/related;'); + $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"'); + $body .= $this->LE; + $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding); + $body .= $this->encodeString($this->Body, $bodyEncoding); + $body .= $this->LE . $this->LE; + $body .= $this->attachAll('inline', $this->boundary[3]); + $body .= $this->LE; + $body .= $this->endBoundary($this->boundary[2]); + $body .= $this->LE; + $body .= $this->attachAll('attachment', $this->boundary[1]); + break; + default: + // catch case 'plain' and case '' + $body .= $this->encodeString($this->Body, $bodyEncoding); + break; + } + + if ($this->isError()) { + $body = ''; + } elseif ($this->sign_key_file) { + try { + if (!defined('PKCS7_TEXT')) { + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); + } + // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1 + $file = tempnam(sys_get_temp_dir(), 'mail'); + if (false === file_put_contents($file, $body)) { + throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); + } + $signed = tempnam(sys_get_temp_dir(), 'signed'); + //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 + if (empty($this->sign_extracerts_file)) { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null + ); + } else { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null, + PKCS7_DETACHED, + $this->sign_extracerts_file + ); + } + if ($sign) { + @unlink($file); + $body = file_get_contents($signed); + @unlink($signed); + //The message returned by openssl contains both headers and body, so need to split them up + $parts = explode("\n\n", $body, 2); + $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE; + $body = $parts[1]; + } else { + @unlink($file); + @unlink($signed); + throw new phpmailerException($this->lang('signing') . openssl_error_string()); + } + } catch (phpmailerException $exc) { + $body = ''; + if ($this->exceptions) { + throw $exc; + } + } + } + return $body; + } + + /** + * Return the start of a message boundary. + * @access protected + * @param string $boundary + * @param string $charSet + * @param string $contentType + * @param string $encoding + * @return string + */ + protected function getBoundary($boundary, $charSet, $contentType, $encoding) + { + $result = ''; + if ($charSet == '') { + $charSet = $this->CharSet; + } + if ($contentType == '') { + $contentType = $this->ContentType; + } + if ($encoding == '') { + $encoding = $this->Encoding; + } + $result .= $this->textLine('--' . $boundary); + $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet); + $result .= $this->LE; + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $result .= $this->headerLine('Content-Transfer-Encoding', $encoding); + } + $result .= $this->LE; + + return $result; + } + + /** + * Return the end of a message boundary. + * @access protected + * @param string $boundary + * @return string + */ + protected function endBoundary($boundary) + { + return $this->LE . '--' . $boundary . '--' . $this->LE; + } + + /** + * Set the message type. + * PHPMailer only supports some preset message types, + * not arbitrary MIME structures. + * @access protected + * @return void + */ + protected function setMessageType() + { + $type = array(); + if ($this->alternativeExists()) { + $type[] = 'alt'; + } + if ($this->inlineImageExists()) { + $type[] = 'inline'; + } + if ($this->attachmentExists()) { + $type[] = 'attach'; + } + $this->message_type = implode('_', $type); + if ($this->message_type == '') { + $this->message_type = 'plain'; + } + } + + /** + * Format a header line. + * @access public + * @param string $name + * @param string $value + * @return string + */ + public function headerLine($name, $value) + { + return $name . ': ' . $value . $this->LE; + } + + /** + * Return a formatted mail line. + * @access public + * @param string $value + * @return string + */ + public function textLine($value) + { + return $value . $this->LE; + } + + /** + * Add an attachment from a path on the filesystem. + * Returns false if the file could not be found or read. + * @param string $path Path to the attachment. + * @param string $name Overrides the attachment name. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File extension (MIME) type. + * @param string $disposition Disposition to use + * @throws phpmailerException + * @return boolean + */ + public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment') + { + try { + if (!@is_file($path)) { + throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE); + } + + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($path); + } + + $filename = basename($path); + if ($name == '') { + $name = $filename; + } + + $this->attachment[] = array( + 0 => $path, + 1 => $filename, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => false, // isStringAttachment + 6 => $disposition, + 7 => 0 + ); + + } catch (phpmailerException $exc) { + $this->setError($exc->getMessage()); + $this->edebug($exc->getMessage()); + if ($this->exceptions) { + throw $exc; + } + return false; + } + return true; + } + + /** + * Return the array of attachments. + * @return array + */ + public function getAttachments() + { + return $this->attachment; + } + + /** + * Attach all file, string, and binary attachments to the message. + * Returns an empty string on failure. + * @access protected + * @param string $disposition_type + * @param string $boundary + * @return string + */ + protected function attachAll($disposition_type, $boundary) + { + // Return text of body + $mime = array(); + $cidUniq = array(); + $incl = array(); + + // Add all attachments + foreach ($this->attachment as $attachment) { + // Check if it is a valid disposition_filter + if ($attachment[6] == $disposition_type) { + // Check for string attachment + $string = ''; + $path = ''; + $bString = $attachment[5]; + if ($bString) { + $string = $attachment[0]; + } else { + $path = $attachment[0]; + } + + $inclhash = md5(serialize($attachment)); + if (in_array($inclhash, $incl)) { + continue; + } + $incl[] = $inclhash; + $name = $attachment[2]; + $encoding = $attachment[3]; + $type = $attachment[4]; + $disposition = $attachment[6]; + $cid = $attachment[7]; + if ($disposition == 'inline' && isset($cidUniq[$cid])) { + continue; + } + $cidUniq[$cid] = true; + + $mime[] = sprintf('--%s%s', $boundary, $this->LE); + $mime[] = sprintf( + 'Content-Type: %s; name="%s"%s', + $type, + $this->encodeHeader($this->secureHeader($name)), + $this->LE + ); + // RFC1341 part 5 says 7bit is assumed if not specified + if ($encoding != '7bit') { + $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE); + } + + if ($disposition == 'inline') { + $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE); + } + + // If a filename contains any of these chars, it should be quoted, + // but not otherwise: RFC2183 & RFC2045 5.1 + // Fixes a warning in IETF's msglint MIME checker + // Allow for bypassing the Content-Disposition header totally + if (!(empty($disposition))) { + $encoded_name = $this->encodeHeader($this->secureHeader($name)); + if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) { + $mime[] = sprintf( + 'Content-Disposition: %s; filename="%s"%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Disposition: %s; filename=%s%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } + } else { + $mime[] = $this->LE; + } + + // Encode as string attachment + if ($bString) { + $mime[] = $this->encodeString($string, $encoding); + if ($this->isError()) { + return ''; + } + $mime[] = $this->LE . $this->LE; + } else { + $mime[] = $this->encodeFile($path, $encoding); + if ($this->isError()) { + return ''; + } + $mime[] = $this->LE . $this->LE; + } + } + } + + $mime[] = sprintf('--%s--%s', $boundary, $this->LE); + + return implode('', $mime); + } + + /** + * Encode a file attachment in requested format. + * Returns an empty string on failure. + * @param string $path The full path to the file + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' + * @throws phpmailerException + * @see EncodeFile(encodeFile + * @access protected + * @return string + */ + protected function encodeFile($path, $encoding = 'base64') + { + try { + if (!is_readable($path)) { + throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE); + } + $magic_quotes = get_magic_quotes_runtime(); + if ($magic_quotes) { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + set_magic_quotes_runtime(false); + } else { + //Doesn't exist in PHP 5.4, but we don't need to check because + //get_magic_quotes_runtime always returns false in 5.4+ + //so it will never get here + ini_set('magic_quotes_runtime', false); + } + } + $file_buffer = file_get_contents($path); + $file_buffer = $this->encodeString($file_buffer, $encoding); + if ($magic_quotes) { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + set_magic_quotes_runtime($magic_quotes); + } else { + ini_set('magic_quotes_runtime', $magic_quotes); + } + } + return $file_buffer; + } catch (Exception $exc) { + $this->setError($exc->getMessage()); + return ''; + } + } + + /** + * Encode a string in requested format. + * Returns an empty string on failure. + * @param string $str The text to encode + * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable' + * @access public + * @return string + */ + public function encodeString($str, $encoding = 'base64') + { + $encoded = ''; + switch (strtolower($encoding)) { + case 'base64': + $encoded = chunk_split(base64_encode($str), 76, $this->LE); + break; + case '7bit': + case '8bit': + $encoded = $this->fixEOL($str); + // Make sure it ends with a line break + if (substr($encoded, -(strlen($this->LE))) != $this->LE) { + $encoded .= $this->LE; + } + break; + case 'binary': + $encoded = $str; + break; + case 'quoted-printable': + $encoded = $this->encodeQP($str); + break; + default: + $this->setError($this->lang('encoding') . $encoding); + break; + } + return $encoded; + } + + /** + * Encode a header string optimally. + * Picks shortest of Q, B, quoted-printable or none. + * @access public + * @param string $str + * @param string $position + * @return string + */ + public function encodeHeader($str, $position = 'text') + { + $matchcount = 0; + switch (strtolower($position)) { + case 'phrase': + if (!preg_match('/[\200-\377]/', $str)) { + // Can't use addslashes as we don't know the value of magic_quotes_sybase + $encoded = addcslashes($str, "\0..\37\177\\\""); + if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) { + return ($encoded); + } else { + return ("\"$encoded\""); + } + } + $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches); + break; + /** @noinspection PhpMissingBreakStatementInspection */ + case 'comment': + $matchcount = preg_match_all('/[()"]/', $str, $matches); + // Intentional fall-through + case 'text': + default: + $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches); + break; + } + + //There are no chars that need encoding + if ($matchcount == 0) { + return ($str); + } + + $maxlen = 75 - 7 - strlen($this->CharSet); + // Try to select the encoding which should produce the shortest output + if ($matchcount > strlen($str) / 3) { + // More than a third of the content will need encoding, so B encoding will be most efficient + $encoding = 'B'; + if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) { + // Use a custom function which correctly encodes and wraps long + // multibyte strings without breaking lines within a character + $encoded = $this->base64EncodeWrapMB($str, "\n"); + } else { + $encoded = base64_encode($str); + $maxlen -= $maxlen % 4; + $encoded = trim(chunk_split($encoded, $maxlen, "\n")); + } + } else { + $encoding = 'Q'; + $encoded = $this->encodeQ($str, $position); + $encoded = $this->wrapText($encoded, $maxlen, true); + $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded)); + } + + $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded); + $encoded = trim(str_replace("\n", $this->LE, $encoded)); + + return $encoded; + } + + /** + * Check if a string contains multi-byte characters. + * @access public + * @param string $str multi-byte text to wrap encode + * @return boolean + */ + public function hasMultiBytes($str) + { + if (function_exists('mb_strlen')) { + return (strlen($str) > mb_strlen($str, $this->CharSet)); + } else { // Assume no multibytes (we can't handle without mbstring functions anyway) + return false; + } + } + + /** + * Does a string contain any 8-bit chars (in any charset)? + * @param string $text + * @return boolean + */ + public function has8bitChars($text) + { + return (boolean)preg_match('/[\x80-\xFF]/', $text); + } + + /** + * Encode and wrap long multibyte strings for mail headers + * without breaking lines within a character. + * Adapted from a function by paravoid + * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283 + * @access public + * @param string $str multi-byte text to wrap encode + * @param string $linebreak string to use as linefeed/end-of-line + * @return string + */ + public function base64EncodeWrapMB($str, $linebreak = null) + { + $start = '=?' . $this->CharSet . '?B?'; + $end = '?='; + $encoded = ''; + if ($linebreak === null) { + $linebreak = $this->LE; + } + + $mb_length = mb_strlen($str, $this->CharSet); + // Each line must have length <= 75, including $start and $end + $length = 75 - strlen($start) - strlen($end); + // Average multi-byte ratio + $ratio = $mb_length / strlen($str); + // Base64 has a 4:3 ratio + $avgLength = floor($length * $ratio * .75); + + for ($i = 0; $i < $mb_length; $i += $offset) { + $lookBack = 0; + do { + $offset = $avgLength - $lookBack; + $chunk = mb_substr($str, $i, $offset, $this->CharSet); + $chunk = base64_encode($chunk); + $lookBack++; + } while (strlen($chunk) > $length); + $encoded .= $chunk . $linebreak; + } + + // Chomp the last linefeed + $encoded = substr($encoded, 0, -strlen($linebreak)); + return $encoded; + } + + /** + * Encode a string in quoted-printable format. + * According to RFC2045 section 6.7. + * @access public + * @param string $string The text to encode + * @param integer $line_max Number of chars allowed on a line before wrapping + * @return string + * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment + */ + public function encodeQP($string, $line_max = 76) + { + // Use native function if it's available (>= PHP5.3) + if (function_exists('quoted_printable_encode')) { + return $this->fixEOL(quoted_printable_encode($string)); + } + // Fall back to a pure PHP implementation + $string = str_replace( + array('%20', '%0D%0A.', '%0D%0A', '%'), + array(' ', "\r\n=2E", "\r\n", '='), + rawurlencode($string) + ); + $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); + return $this->fixEOL($string); + } + + /** + * Backward compatibility wrapper for an old QP encoding function that was removed. + * @see PHPMailer::encodeQP() + * @access public + * @param string $string + * @param integer $line_max + * @param boolean $space_conv + * @return string + * @deprecated Use encodeQP instead. + */ + public function encodeQPphp( + $string, + $line_max = 76, + /** @noinspection PhpUnusedParameterInspection */ $space_conv = false + ) { + return $this->encodeQP($string, $line_max); + } + + /** + * Encode a string using Q encoding. + * @link http://tools.ietf.org/html/rfc2047 + * @param string $str the text to encode + * @param string $position Where the text is going to be used, see the RFC for what that means + * @access public + * @return string + */ + public function encodeQ($str, $position = 'text') + { + // There should not be any EOL in the string + $pattern = ''; + $encoded = str_replace(array("\r", "\n"), '', $str); + switch (strtolower($position)) { + case 'phrase': + // RFC 2047 section 5.3 + $pattern = '^A-Za-z0-9!*+\/ -'; + break; + /** @noinspection PhpMissingBreakStatementInspection */ + case 'comment': + // RFC 2047 section 5.2 + $pattern = '\(\)"'; + // intentional fall-through + // for this reason we build the $pattern without including delimiters and [] + case 'text': + default: + // RFC 2047 section 5.1 + // Replace every high ascii, control, =, ? and _ characters + $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern; + break; + } + $matches = array(); + if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) { + // If the string contains an '=', make sure it's the first thing we replace + // so as to avoid double-encoding + $eqkey = array_search('=', $matches[0]); + if (false !== $eqkey) { + unset($matches[0][$eqkey]); + array_unshift($matches[0], '='); + } + foreach (array_unique($matches[0]) as $char) { + $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded); + } + } + // Replace every spaces to _ (more readable than =20) + return str_replace(' ', '_', $encoded); + } + + + /** + * Add a string or binary attachment (non-filesystem). + * This method can be used to attach ascii or binary data, + * such as a BLOB record from a database. + * @param string $string String attachment data. + * @param string $filename Name of the attachment. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File extension (MIME) type. + * @param string $disposition Disposition to use + * @return void + */ + public function addStringAttachment( + $string, + $filename, + $encoding = 'base64', + $type = '', + $disposition = 'attachment' + ) { + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($filename); + } + // Append to $attachment array + $this->attachment[] = array( + 0 => $string, + 1 => $filename, + 2 => basename($filename), + 3 => $encoding, + 4 => $type, + 5 => true, // isStringAttachment + 6 => $disposition, + 7 => 0 + ); + } + + /** + * Add an embedded (inline) attachment from a file. + * This can include images, sounds, and just about any other document type. + * These differ from 'regular' attachments in that they are intended to be + * displayed inline with the message, not just attached for download. + * This is used in HTML messages that embed the images + * the HTML refers to using the $cid value. + * @param string $path Path to the attachment. + * @param string $cid Content ID of the attachment; Use this to reference + * the content when using an embedded image in HTML. + * @param string $name Overrides the attachment name. + * @param string $encoding File encoding (see $Encoding). + * @param string $type File MIME type. + * @param string $disposition Disposition to use + * @return boolean True on successfully adding an attachment + */ + public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline') + { + if (!@is_file($path)) { + $this->setError($this->lang('file_access') . $path); + return false; + } + + // If a MIME type is not specified, try to work it out from the file name + if ($type == '') { + $type = self::filenameToType($path); + } + + $filename = basename($path); + if ($name == '') { + $name = $filename; + } + + // Append to $attachment array + $this->attachment[] = array( + 0 => $path, + 1 => $filename, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => false, // isStringAttachment + 6 => $disposition, + 7 => $cid + ); + return true; + } + + /** + * Add an embedded stringified attachment. + * This can include images, sounds, and just about any other document type. + * Be sure to set the $type to an image type for images: + * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'. + * @param string $string The attachment binary data. + * @param string $cid Content ID of the attachment; Use this to reference + * the content when using an embedded image in HTML. + * @param string $name + * @param string $encoding File encoding (see $Encoding). + * @param string $type MIME type. + * @param string $disposition Disposition to use + * @return boolean True on successfully adding an attachment + */ + public function addStringEmbeddedImage( + $string, + $cid, + $name = '', + $encoding = 'base64', + $type = '', + $disposition = 'inline' + ) { + // If a MIME type is not specified, try to work it out from the name + if ($type == '') { + $type = self::filenameToType($name); + } + + // Append to $attachment array + $this->attachment[] = array( + 0 => $string, + 1 => $name, + 2 => $name, + 3 => $encoding, + 4 => $type, + 5 => true, // isStringAttachment + 6 => $disposition, + 7 => $cid + ); + return true; + } + + /** + * Check if an inline attachment is present. + * @access public + * @return boolean + */ + public function inlineImageExists() + { + foreach ($this->attachment as $attachment) { + if ($attachment[6] == 'inline') { + return true; + } + } + return false; + } + + /** + * Check if an attachment (non-inline) is present. + * @return boolean + */ + public function attachmentExists() + { + foreach ($this->attachment as $attachment) { + if ($attachment[6] == 'attachment') { + return true; + } + } + return false; + } + + /** + * Check if this message has an alternative body set. + * @return boolean + */ + public function alternativeExists() + { + return !empty($this->AltBody); + } + + /** + * Clear all To recipients. + * @return void + */ + public function clearAddresses() + { + foreach ($this->to as $to) { + unset($this->all_recipients[strtolower($to[0])]); + } + $this->to = array(); + } + + /** + * Clear all CC recipients. + * @return void + */ + public function clearCCs() + { + foreach ($this->cc as $cc) { + unset($this->all_recipients[strtolower($cc[0])]); + } + $this->cc = array(); + } + + /** + * Clear all BCC recipients. + * @return void + */ + public function clearBCCs() + { + foreach ($this->bcc as $bcc) { + unset($this->all_recipients[strtolower($bcc[0])]); + } + $this->bcc = array(); + } + + /** + * Clear all ReplyTo recipients. + * @return void + */ + public function clearReplyTos() + { + $this->ReplyTo = array(); + } + + /** + * Clear all recipient types. + * @return void + */ + public function clearAllRecipients() + { + $this->to = array(); + $this->cc = array(); + $this->bcc = array(); + $this->all_recipients = array(); + } + + /** + * Clear all filesystem, string, and binary attachments. + * @return void + */ + public function clearAttachments() + { + $this->attachment = array(); + } + + /** + * Clear all custom headers. + * @return void + */ + public function clearCustomHeaders() + { + $this->CustomHeader = array(); + } + + /** + * Add an error message to the error container. + * @access protected + * @param string $msg + * @return void + */ + protected function setError($msg) + { + $this->error_count++; + if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { + $lasterror = $this->smtp->getError(); + if (!empty($lasterror['error'])) { + $msg .= $this->lang('smtp_error') . $lasterror['error']; + if (!empty($lasterror['detail'])) { + $msg .= ' Detail: '. $lasterror['detail']; + } + if (!empty($lasterror['smtp_code'])) { + $msg .= ' SMTP code: ' . $lasterror['smtp_code']; + } + if (!empty($lasterror['smtp_code_ex'])) { + $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex']; + } + } + } + $this->ErrorInfo = $msg; + } + + /** + * Return an RFC 822 formatted date. + * @access public + * @return string + * @static + */ + public static function rfcDate() + { + // Set the time zone to whatever the default is to avoid 500 errors + // Will default to UTC if it's not set properly in php.ini + date_default_timezone_set(@date_default_timezone_get()); + return date('D, j M Y H:i:s O'); + } + + /** + * Get the server hostname. + * Returns 'localhost.localdomain' if unknown. + * @access protected + * @return string + */ + protected function serverHostname() + { + $result = 'localhost.localdomain'; + if (!empty($this->Hostname)) { + $result = $this->Hostname; + } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) { + $result = $_SERVER['SERVER_NAME']; + } elseif (function_exists('gethostname') && gethostname() !== false) { + $result = gethostname(); + } elseif (php_uname('n') !== false) { + $result = php_uname('n'); + } + return $result; + } + + /** + * Get an error message in the current language. + * @access protected + * @param string $key + * @return string + */ + protected function lang($key) + { + if (count($this->language) < 1) { + $this->setLanguage('en'); // set the default language + } + + if (array_key_exists($key, $this->language)) { + if ($key == 'smtp_connect_failed') { + //Include a link to troubleshooting docs on SMTP connection failure + //this is by far the biggest cause of support questions + //but it's usually not PHPMailer's fault. + return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting'; + } + return $this->language[$key]; + } else { + //Return the key as a fallback + return $key; + } + } + + /** + * Check if an error occurred. + * @access public + * @return boolean True if an error did occur. + */ + public function isError() + { + return ($this->error_count > 0); + } + + /** + * Ensure consistent line endings in a string. + * Changes every end of line from CRLF, CR or LF to $this->LE. + * @access public + * @param string $str String to fixEOL + * @return string + */ + public function fixEOL($str) + { + // Normalise to \n + $nstr = str_replace(array("\r\n", "\r"), "\n", $str); + // Now convert LE as needed + if ($this->LE !== "\n") { + $nstr = str_replace("\n", $this->LE, $nstr); + } + return $nstr; + } + + /** + * Add a custom header. + * $name value can be overloaded to contain + * both header name and value (name:value) + * @access public + * @param string $name Custom header name + * @param string $value Header value + * @return void + */ + public function addCustomHeader($name, $value = null) + { + if ($value === null) { + // Value passed in as name:value + $this->CustomHeader[] = explode(':', $name, 2); + } else { + $this->CustomHeader[] = array($name, $value); + } + } + + /** + * Returns all custom headers + * + * @return array + */ + public function getCustomHeaders() + { + return $this->CustomHeader; + } + + /** + * Create a message from an HTML string. + * Automatically makes modifications for inline images and backgrounds + * and creates a plain-text version by converting the HTML. + * Overwrites any existing values in $this->Body and $this->AltBody + * @access public + * @param string $message HTML message string + * @param string $basedir baseline directory for path + * @param boolean|callable $advanced Whether to use the internal HTML to text converter + * or your own custom converter @see html2text() + * @return string $message + */ + public function msgHTML($message, $basedir = '', $advanced = false) + { + preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images); + if (isset($images[2])) { + foreach ($images[2] as $imgindex => $url) { + // Convert data URIs into embedded images + if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) { + $data = substr($url, strpos($url, ',')); + if ($match[2]) { + $data = base64_decode($data); + } else { + $data = rawurldecode($data); + } + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 + if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) { + $message = str_replace( + $images[0][$imgindex], + $images[1][$imgindex] . '="cid:' . $cid . '"', + $message + ); + } + } elseif (!preg_match('#^[A-z]+://#', $url)) { + // Do not change urls for absolute images (thanks to corvuscorax) + $filename = basename($url); + $directory = dirname($url); + if ($directory == '.') { + $directory = ''; + } + $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2 + if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { + $basedir .= '/'; + } + if (strlen($directory) > 1 && substr($directory, -1) != '/') { + $directory .= '/'; + } + if ($this->addEmbeddedImage( + $basedir . $directory . $filename, + $cid, + $filename, + 'base64', + self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION)) + ) + ) { + $message = preg_replace( + '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui', + $images[1][$imgindex] . '="cid:' . $cid . '"', + $message + ); + } + } + } + } + $this->isHTML(true); + // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better + $this->Body = $this->normalizeBreaks($message); + $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced)); + if (empty($this->AltBody)) { + $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . + self::CRLF . self::CRLF; + } + return $this->Body; + } + + /** + * Convert an HTML string into plain text. + * This is used by msgHTML(). + * Note - older versions of this function used a bundled advanced converter + * which was been removed for license reasons in #232 + * Example usage: + * + * // Use default conversion + * $plain = $mail->html2text($html); + * // Use your own custom converter + * $plain = $mail->html2text($html, function($html) { + * $converter = new MyHtml2text($html); + * return $converter->get_text(); + * }); + * + * @param string $html The HTML text to convert + * @param boolean|callable $advanced Any boolean value to use the internal converter, + * or provide your own callable for custom conversion. + * @return string + */ + public function html2text($html, $advanced = false) + { + if (is_callable($advanced)) { + return call_user_func($advanced, $html); + } + return html_entity_decode( + trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))), + ENT_QUOTES, + $this->CharSet + ); + } + + /** + * Get the MIME type for a file extension. + * @param string $ext File extension + * @access public + * @return string MIME type of file. + * @static + */ + public static function _mime_types($ext = '') + { + $mimes = array( + 'xl' => 'application/excel', + 'js' => 'application/javascript', + 'hqx' => 'application/mac-binhex40', + 'cpt' => 'application/mac-compactpro', + 'bin' => 'application/macbinary', + 'doc' => 'application/msword', + 'word' => 'application/msword', + 'class' => 'application/octet-stream', + 'dll' => 'application/octet-stream', + 'dms' => 'application/octet-stream', + 'exe' => 'application/octet-stream', + 'lha' => 'application/octet-stream', + 'lzh' => 'application/octet-stream', + 'psd' => 'application/octet-stream', + 'sea' => 'application/octet-stream', + 'so' => 'application/octet-stream', + 'oda' => 'application/oda', + 'pdf' => 'application/pdf', + 'ai' => 'application/postscript', + 'eps' => 'application/postscript', + 'ps' => 'application/postscript', + 'smi' => 'application/smil', + 'smil' => 'application/smil', + 'mif' => 'application/vnd.mif', + 'xls' => 'application/vnd.ms-excel', + 'ppt' => 'application/vnd.ms-powerpoint', + 'wbxml' => 'application/vnd.wap.wbxml', + 'wmlc' => 'application/vnd.wap.wmlc', + 'dcr' => 'application/x-director', + 'dir' => 'application/x-director', + 'dxr' => 'application/x-director', + 'dvi' => 'application/x-dvi', + 'gtar' => 'application/x-gtar', + 'php3' => 'application/x-httpd-php', + 'php4' => 'application/x-httpd-php', + 'php' => 'application/x-httpd-php', + 'phtml' => 'application/x-httpd-php', + 'phps' => 'application/x-httpd-php-source', + 'swf' => 'application/x-shockwave-flash', + 'sit' => 'application/x-stuffit', + 'tar' => 'application/x-tar', + 'tgz' => 'application/x-tar', + 'xht' => 'application/xhtml+xml', + 'xhtml' => 'application/xhtml+xml', + 'zip' => 'application/zip', + 'mid' => 'audio/midi', + 'midi' => 'audio/midi', + 'mp2' => 'audio/mpeg', + 'mp3' => 'audio/mpeg', + 'mpga' => 'audio/mpeg', + 'aif' => 'audio/x-aiff', + 'aifc' => 'audio/x-aiff', + 'aiff' => 'audio/x-aiff', + 'ram' => 'audio/x-pn-realaudio', + 'rm' => 'audio/x-pn-realaudio', + 'rpm' => 'audio/x-pn-realaudio-plugin', + 'ra' => 'audio/x-realaudio', + 'wav' => 'audio/x-wav', + 'bmp' => 'image/bmp', + 'gif' => 'image/gif', + 'jpeg' => 'image/jpeg', + 'jpe' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'png' => 'image/png', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'eml' => 'message/rfc822', + 'css' => 'text/css', + 'html' => 'text/html', + 'htm' => 'text/html', + 'shtml' => 'text/html', + 'log' => 'text/plain', + 'text' => 'text/plain', + 'txt' => 'text/plain', + 'rtx' => 'text/richtext', + 'rtf' => 'text/rtf', + 'vcf' => 'text/vcard', + 'vcard' => 'text/vcard', + 'xml' => 'text/xml', + 'xsl' => 'text/xml', + 'mpeg' => 'video/mpeg', + 'mpe' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'mov' => 'video/quicktime', + 'qt' => 'video/quicktime', + 'rv' => 'video/vnd.rn-realvideo', + 'avi' => 'video/x-msvideo', + 'movie' => 'video/x-sgi-movie' + ); + if (array_key_exists(strtolower($ext), $mimes)) { + return $mimes[strtolower($ext)]; + } + return 'application/octet-stream'; + } + + /** + * Map a file name to a MIME type. + * Defaults to 'application/octet-stream', i.e.. arbitrary binary data. + * @param string $filename A file name or full path, does not need to exist as a file + * @return string + * @static + */ + public static function filenameToType($filename) + { + // In case the path is a URL, strip any query string before getting extension + $qpos = strpos($filename, '?'); + if (false !== $qpos) { + $filename = substr($filename, 0, $qpos); + } + $pathinfo = self::mb_pathinfo($filename); + return self::_mime_types($pathinfo['extension']); + } + + /** + * Multi-byte-safe pathinfo replacement. + * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe. + * Works similarly to the one in PHP >= 5.2.0 + * @link http://www.php.net/manual/en/function.pathinfo.php#107461 + * @param string $path A filename or path, does not need to exist as a file + * @param integer|string $options Either a PATHINFO_* constant, + * or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2 + * @return string|array + * @static + */ + public static function mb_pathinfo($path, $options = null) + { + $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''); + $pathinfo = array(); + if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) { + if (array_key_exists(1, $pathinfo)) { + $ret['dirname'] = $pathinfo[1]; + } + if (array_key_exists(2, $pathinfo)) { + $ret['basename'] = $pathinfo[2]; + } + if (array_key_exists(5, $pathinfo)) { + $ret['extension'] = $pathinfo[5]; + } + if (array_key_exists(3, $pathinfo)) { + $ret['filename'] = $pathinfo[3]; + } + } + switch ($options) { + case PATHINFO_DIRNAME: + case 'dirname': + return $ret['dirname']; + case PATHINFO_BASENAME: + case 'basename': + return $ret['basename']; + case PATHINFO_EXTENSION: + case 'extension': + return $ret['extension']; + case PATHINFO_FILENAME: + case 'filename': + return $ret['filename']; + default: + return $ret; + } + } + + /** + * Set or reset instance properties. + * You should avoid this function - it's more verbose, less efficient, more error-prone and + * harder to debug than setting properties directly. + * Usage Example: + * `$mail->set('SMTPSecure', 'tls');` + * is the same as: + * `$mail->SMTPSecure = 'tls';` + * @access public + * @param string $name The property name to set + * @param mixed $value The value to set the property to + * @return boolean + * @TODO Should this not be using the __set() magic function? + */ + public function set($name, $value = '') + { + if (property_exists($this, $name)) { + $this->$name = $value; + return true; + } else { + $this->setError($this->lang('variable_set') . $name); + return false; + } + } + + /** + * Strip newlines to prevent header injection. + * @access public + * @param string $str + * @return string + */ + public function secureHeader($str) + { + return trim(str_replace(array("\r", "\n"), '', $str)); + } + + /** + * Normalize line breaks in a string. + * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format. + * Defaults to CRLF (for message bodies) and preserves consecutive breaks. + * @param string $text + * @param string $breaktype What kind of line break to use, defaults to CRLF + * @return string + * @access public + * @static + */ + public static function normalizeBreaks($text, $breaktype = "\r\n") + { + return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text); + } + + + /** + * Set the public and private key files and password for S/MIME signing. + * @access public + * @param string $cert_filename + * @param string $key_filename + * @param string $key_pass Password for private key + * @param string $extracerts_filename Optional path to chain certificate + */ + public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '') + { + $this->sign_cert_file = $cert_filename; + $this->sign_key_file = $key_filename; + $this->sign_key_pass = $key_pass; + $this->sign_extracerts_file = $extracerts_filename; + } + + /** + * Quoted-Printable-encode a DKIM header. + * @access public + * @param string $txt + * @return string + */ + public function DKIM_QP($txt) + { + $line = ''; + for ($i = 0; $i < strlen($txt); $i++) { + $ord = ord($txt[$i]); + if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) { + $line .= $txt[$i]; + } else { + $line .= '=' . sprintf('%02X', $ord); + } + } + return $line; + } + + /** + * Generate a DKIM signature. + * @access public + * @param string $signHeader + * @throws phpmailerException + * @return string + */ + public function DKIM_Sign($signHeader) + { + if (!defined('PKCS7_TEXT')) { + if ($this->exceptions) { + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); + } + return ''; + } + $privKeyStr = file_get_contents($this->DKIM_private); + if ($this->DKIM_passphrase != '') { + $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase); + } else { + $privKey = $privKeyStr; + } + if (openssl_sign($signHeader, $signature, $privKey)) { + return base64_encode($signature); + } + return ''; + } + + /** + * Generate a DKIM canonicalization header. + * @access public + * @param string $signHeader Header + * @return string + */ + public function DKIM_HeaderC($signHeader) + { + $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader); + $lines = explode("\r\n", $signHeader); + foreach ($lines as $key => $line) { + list($heading, $value) = explode(':', $line, 2); + $heading = strtolower($heading); + $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces + $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value + } + $signHeader = implode("\r\n", $lines); + return $signHeader; + } + + /** + * Generate a DKIM canonicalization body. + * @access public + * @param string $body Message Body + * @return string + */ + public function DKIM_BodyC($body) + { + if ($body == '') { + return "\r\n"; + } + // stabilize line endings + $body = str_replace("\r\n", "\n", $body); + $body = str_replace("\n", "\r\n", $body); + // END stabilize line endings + while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") { + $body = substr($body, 0, strlen($body) - 2); + } + return $body; + } + + /** + * Create the DKIM header and body in a new message header. + * @access public + * @param string $headers_line Header lines + * @param string $subject Subject + * @param string $body Body + * @return string + */ + public function DKIM_Add($headers_line, $subject, $body) + { + $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms + $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body + $DKIMquery = 'dns/txt'; // Query method + $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone) + $subject_header = "Subject: $subject"; + $headers = explode($this->LE, $headers_line); + $from_header = ''; + $to_header = ''; + $current = ''; + foreach ($headers as $header) { + if (strpos($header, 'From:') === 0) { + $from_header = $header; + $current = 'from_header'; + } elseif (strpos($header, 'To:') === 0) { + $to_header = $header; + $current = 'to_header'; + } else { + if (!empty($$current) && strpos($header, ' =?') === 0) { + $$current .= $header; + } else { + $current = ''; + } + } + } + $from = str_replace('|', '=7C', $this->DKIM_QP($from_header)); + $to = str_replace('|', '=7C', $this->DKIM_QP($to_header)); + $subject = str_replace( + '|', + '=7C', + $this->DKIM_QP($subject_header) + ); // Copied header fields (dkim-quoted-printable) + $body = $this->DKIM_BodyC($body); + $DKIMlen = strlen($body); // Length of body + $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body + if ('' == $this->DKIM_identity) { + $ident = ''; + } else { + $ident = ' i=' . $this->DKIM_identity . ';'; + } + $dkimhdrs = 'DKIM-Signature: v=1; a=' . + $DKIMsignatureType . '; q=' . + $DKIMquery . '; l=' . + $DKIMlen . '; s=' . + $this->DKIM_selector . + ";\r\n" . + "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" . + "\th=From:To:Subject;\r\n" . + "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" . + "\tz=$from\r\n" . + "\t|$to\r\n" . + "\t|$subject;\r\n" . + "\tbh=" . $DKIMb64 . ";\r\n" . + "\tb="; + $toSign = $this->DKIM_HeaderC( + $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs + ); + $signed = $this->DKIM_Sign($toSign); + return $dkimhdrs . $signed . "\r\n"; + } + + /** + * Detect if a string contains a line longer than the maximum line length allowed. + * @param string $str + * @return boolean + * @static + */ + public static function hasLineLongerThanMax($str) + { + //+2 to include CRLF line break for a 1000 total + return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str); + } + + /** + * Allows for public read access to 'to' property. + * @access public + * @return array + */ + public function getToAddresses() + { + return $this->to; + } + + /** + * Allows for public read access to 'cc' property. + * @access public + * @return array + */ + public function getCcAddresses() + { + return $this->cc; + } + + /** + * Allows for public read access to 'bcc' property. + * @access public + * @return array + */ + public function getBccAddresses() + { + return $this->bcc; + } + + /** + * Allows for public read access to 'ReplyTo' property. + * @access public + * @return array + */ + public function getReplyToAddresses() + { + return $this->ReplyTo; + } + + /** + * Allows for public read access to 'all_recipients' property. + * @access public + * @return array + */ + public function getAllRecipientAddresses() + { + return $this->all_recipients; + } + + /** + * Perform a callback. + * @param boolean $isSent + * @param array $to + * @param array $cc + * @param array $bcc + * @param string $subject + * @param string $body + * @param string $from + */ + protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from) + { + if (!empty($this->action_function) && is_callable($this->action_function)) { + $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from); + call_user_func_array($this->action_function, $params); + } + } +} + +/** + * PHPMailer exception handler + * @package PHPMailer + */ +class phpmailerException extends Exception +{ + /** + * Prettify error message output + * @return string + */ + public function errorMessage() + { + $errorMsg = '' . $this->getMessage() . "
    \n"; + return $errorMsg; + } +} diff --git a/catalog/ext/phpmailer/class.pop3.php b/catalog/ext/phpmailer/class.pop3.php new file mode 100644 index 000000000..f63619c3c --- /dev/null +++ b/catalog/ext/phpmailer/class.pop3.php @@ -0,0 +1,397 @@ + + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + * @copyright 2012 - 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer POP-Before-SMTP Authentication Class. + * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication. + * Does not support APOP. + * @package PHPMailer + * @author Richard Davey (original author) + * @author Marcus Bointon (Synchro/coolbru) + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + */ +class POP3 +{ + /** + * The POP3 PHPMailer Version number. + * @type string + * @access public + */ + public $Version = '5.2.10'; + + /** + * Default POP3 port number. + * @type integer + * @access public + */ + public $POP3_PORT = 110; + + /** + * Default timeout in seconds. + * @type integer + * @access public + */ + public $POP3_TIMEOUT = 30; + + /** + * POP3 Carriage Return + Line Feed. + * @type string + * @access public + * @deprecated Use the constant instead + */ + public $CRLF = "\r\n"; + + /** + * Debug display level. + * Options: 0 = no, 1+ = yes + * @type integer + * @access public + */ + public $do_debug = 0; + + /** + * POP3 mail server hostname. + * @type string + * @access public + */ + public $host; + + /** + * POP3 port number. + * @type integer + * @access public + */ + public $port; + + /** + * POP3 Timeout Value in seconds. + * @type integer + * @access public + */ + public $tval; + + /** + * POP3 username + * @type string + * @access public + */ + public $username; + + /** + * POP3 password. + * @type string + * @access public + */ + public $password; + + /** + * Resource handle for the POP3 connection socket. + * @type resource + * @access private + */ + private $pop_conn; + + /** + * Are we connected? + * @type boolean + * @access private + */ + private $connected = false; + + /** + * Error container. + * @type array + * @access private + */ + private $errors = array(); + + /** + * Line break constant + */ + const CRLF = "\r\n"; + + /** + * Simple static wrapper for all-in-one POP before SMTP + * @param $host + * @param integer|boolean $port The port number to connect to + * @param integer|boolean $timeout The timeout value + * @param string $username + * @param string $password + * @param integer $debug_level + * @return boolean + */ + public static function popBeforeSmtp( + $host, + $port = false, + $timeout = false, + $username = '', + $password = '', + $debug_level = 0 + ) { + $pop = new POP3; + return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level); + } + + /** + * Authenticate with a POP3 server. + * A connect, login, disconnect sequence + * appropriate for POP-before SMTP authorisation. + * @access public + * @param string $host The hostname to connect to + * @param integer|boolean $port The port number to connect to + * @param integer|boolean $timeout The timeout value + * @param string $username + * @param string $password + * @param integer $debug_level + * @return boolean + */ + public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0) + { + $this->host = $host; + // If no port value provided, use default + if (false === $port) { + $this->port = $this->POP3_PORT; + } else { + $this->port = (integer)$port; + } + // If no timeout value provided, use default + if (false === $timeout) { + $this->tval = $this->POP3_TIMEOUT; + } else { + $this->tval = (integer)$timeout; + } + $this->do_debug = $debug_level; + $this->username = $username; + $this->password = $password; + // Reset the error log + $this->errors = array(); + // connect + $result = $this->connect($this->host, $this->port, $this->tval); + if ($result) { + $login_result = $this->login($this->username, $this->password); + if ($login_result) { + $this->disconnect(); + return true; + } + } + // We need to disconnect regardless of whether the login succeeded + $this->disconnect(); + return false; + } + + /** + * Connect to a POP3 server. + * @access public + * @param string $host + * @param integer|boolean $port + * @param integer $tval + * @return boolean + */ + public function connect($host, $port = false, $tval = 30) + { + // Are we already connected? + if ($this->connected) { + return true; + } + + //On Windows this will raise a PHP Warning error if the hostname doesn't exist. + //Rather than suppress it with @fsockopen, capture it cleanly instead + set_error_handler(array($this, 'catchWarning')); + + if (false === $port) { + $port = $this->POP3_PORT; + } + + // connect to the POP3 server + $this->pop_conn = fsockopen( + $host, // POP3 Host + $port, // Port # + $errno, // Error Number + $errstr, // Error Message + $tval + ); // Timeout (seconds) + // Restore the error handler + restore_error_handler(); + + // Did we connect? + if (false === $this->pop_conn) { + // It would appear not... + $this->setError(array( + 'error' => "Failed to connect to server $host on port $port", + 'errno' => $errno, + 'errstr' => $errstr + )); + return false; + } + + // Increase the stream time-out + stream_set_timeout($this->pop_conn, $tval, 0); + + // Get the POP3 server response + $pop3_response = $this->getResponse(); + // Check for the +OK + if ($this->checkResponse($pop3_response)) { + // The connection is established and the POP3 server is talking + $this->connected = true; + return true; + } + return false; + } + + /** + * Log in to the POP3 server. + * Does not support APOP (RFC 2828, 4949). + * @access public + * @param string $username + * @param string $password + * @return boolean + */ + public function login($username = '', $password = '') + { + if (!$this->connected) { + $this->setError('Not connected to POP3 server'); + } + if (empty($username)) { + $username = $this->username; + } + if (empty($password)) { + $password = $this->password; + } + + // Send the Username + $this->sendString("USER $username" . self::CRLF); + $pop3_response = $this->getResponse(); + if ($this->checkResponse($pop3_response)) { + // Send the Password + $this->sendString("PASS $password" . self::CRLF); + $pop3_response = $this->getResponse(); + if ($this->checkResponse($pop3_response)) { + return true; + } + } + return false; + } + + /** + * Disconnect from the POP3 server. + * @access public + */ + public function disconnect() + { + $this->sendString('QUIT'); + //The QUIT command may cause the daemon to exit, which will kill our connection + //So ignore errors here + try { + @fclose($this->pop_conn); + } catch (Exception $e) { + //Do nothing + }; + } + + /** + * Get a response from the POP3 server. + * $size is the maximum number of bytes to retrieve + * @param integer $size + * @return string + * @access private + */ + private function getResponse($size = 128) + { + $response = fgets($this->pop_conn, $size); + if ($this->do_debug >= 1) { + echo "Server -> Client: $response"; + } + return $response; + } + + /** + * Send raw data to the POP3 server. + * @param string $string + * @return integer + * @access private + */ + private function sendString($string) + { + if ($this->pop_conn) { + if ($this->do_debug >= 2) { //Show client messages when debug >= 2 + echo "Client -> Server: $string"; + } + return fwrite($this->pop_conn, $string, strlen($string)); + } + return 0; + } + + /** + * Checks the POP3 server response. + * Looks for for +OK or -ERR. + * @param string $string + * @return boolean + * @access private + */ + private function checkResponse($string) + { + if (substr($string, 0, 3) !== '+OK') { + $this->setError(array( + 'error' => "Server reported an error: $string", + 'errno' => 0, + 'errstr' => '' + )); + return false; + } else { + return true; + } + } + + /** + * Add an error to the internal error store. + * Also display debug output if it's enabled. + * @param $error + */ + private function setError($error) + { + $this->errors[] = $error; + if ($this->do_debug >= 1) { + echo '

    ';
+            foreach ($this->errors as $error) {
+                print_r($error);
+            }
+            echo '
    '; + } + } + + /** + * POP3 connection error handler. + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline + * @access private + */ + private function catchWarning($errno, $errstr, $errfile, $errline) + { + $this->setError(array( + 'error' => "Connecting to the POP3 server raised a PHP warning: ", + 'errno' => $errno, + 'errstr' => $errstr, + 'errfile' => $errfile, + 'errline' => $errline + )); + } +} diff --git a/catalog/ext/phpmailer/class.smtp.php b/catalog/ext/phpmailer/class.smtp.php new file mode 100644 index 000000000..b2dfdc189 --- /dev/null +++ b/catalog/ext/phpmailer/class.smtp.php @@ -0,0 +1,1152 @@ + + * @author Jim Jagielski (jimjag) + * @author Andy Prevost (codeworxtech) + * @author Brent R. Matzelle (original founder) + * @copyright 2014 Marcus Bointon + * @copyright 2010 - 2012 Jim Jagielski + * @copyright 2004 - 2009 Andy Prevost + * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @note This program is distributed in the hope that it will be useful - WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + */ + +/** + * PHPMailer RFC821 SMTP email transport class. + * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server. + * @package PHPMailer + * @author Chris Ryan + * @author Marcus Bointon + */ +class SMTP +{ + /** + * The PHPMailer SMTP version number. + * @type string + */ + const VERSION = '5.2.10'; + + /** + * SMTP line break constant. + * @type string + */ + const CRLF = "\r\n"; + + /** + * The SMTP port to use if one is not specified. + * @type integer + */ + const DEFAULT_SMTP_PORT = 25; + + /** + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @type integer + */ + const MAX_LINE_LENGTH = 998; + + /** + * Debug level for no output + */ + const DEBUG_OFF = 0; + + /** + * Debug level to show client -> server messages + */ + const DEBUG_CLIENT = 1; + + /** + * Debug level to show client -> server and server -> client messages + */ + const DEBUG_SERVER = 2; + + /** + * Debug level to show connection status, client -> server and server -> client messages + */ + const DEBUG_CONNECTION = 3; + + /** + * Debug level to show all messages + */ + const DEBUG_LOWLEVEL = 4; + + /** + * The PHPMailer SMTP Version number. + * @type string + * @deprecated Use the `VERSION` constant instead + * @see SMTP::VERSION + */ + public $Version = '5.2.10'; + + /** + * SMTP server port number. + * @type integer + * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead + * @see SMTP::DEFAULT_SMTP_PORT + */ + public $SMTP_PORT = 25; + + /** + * SMTP reply line ending. + * @type string + * @deprecated Use the `CRLF` constant instead + * @see SMTP::CRLF + */ + public $CRLF = "\r\n"; + + /** + * Debug output level. + * Options: + * * self::DEBUG_OFF (`0`) No debug output, default + * * self::DEBUG_CLIENT (`1`) Client commands + * * self::DEBUG_SERVER (`2`) Client commands and server responses + * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status + * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages + * @type integer + */ + public $do_debug = self::DEBUG_OFF; + + /** + * How to handle debug output. + * Options: + * * `echo` Output plain-text as-is, appropriate for CLI + * * `html` Output escaped, line breaks converted to `
    `, appropriate for browser output + * * `error_log` Output to error log as configured in php.ini + * + * Alternatively, you can provide a callable expecting two params: a message string and the debug level: + * + * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";}; + * + * @type string|callable + */ + public $Debugoutput = 'echo'; + + /** + * Whether to use VERP. + * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path + * @link http://www.postfix.org/VERP_README.html Info on VERP + * @type boolean + */ + public $do_verp = false; + + /** + * The timeout value for connection, in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure. + * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2 + * @type integer + */ + public $Timeout = 300; + + /** + * How long to wait for commands to complete, in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 + * @type integer + */ + public $Timelimit = 300; + + /** + * The socket for the server connection. + * @type resource + */ + protected $smtp_conn; + + /** + * Error information, if any, for the last SMTP command. + * @type array + */ + protected $error = array( + 'error' => '', + 'detail' => '', + 'smtp_code' => '', + 'smtp_code_ex' => '' + ); + + /** + * The reply the server sent to us for HELO. + * If null, no HELO string has yet been received. + * @type string|null + */ + protected $helo_rply = null; + + /** + * The set of SMTP extensions sent in reply to EHLO command. + * Indexes of the array are extension names. + * Value at index 'HELO' or 'EHLO' (according to command that was sent) + * represents the server name. In case of HELO it is the only element of the array. + * Other values can be boolean TRUE or an array containing extension options. + * If null, no HELO/EHLO string has yet been received. + * @type array|null + */ + protected $server_caps = null; + + /** + * The most recent reply received from the server. + * @type string + */ + protected $last_reply = ''; + + /** + * Output debugging info via a user-selected method. + * @see SMTP::$Debugoutput + * @see SMTP::$do_debug + * @param string $str Debug string to output + * @param integer $level The debug level of this message; see DEBUG_* constants + * @return void + */ + protected function edebug($str, $level = 0) + { + if ($level > $this->do_debug) { + return; + } + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { + call_user_func($this->Debugoutput, $str, $this->do_debug); + return; + } + switch ($this->Debugoutput) { + case 'error_log': + //Don't output, just log + error_log($str); + break; + case 'html': + //Cleans up output a bit for a better looking, HTML-safe output + echo htmlentities( + preg_replace('/[\r\n]+/', '', $str), + ENT_QUOTES, + 'UTF-8' + ) + . "
    \n"; + break; + case 'echo': + default: + //Normalize line breaks + $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str); + echo gmdate('Y-m-d H:i:s') . "\t" . str_replace( + "\n", + "\n \t ", + trim($str) + )."\n"; + } + } + + /** + * Connect to an SMTP server. + * @param string $host SMTP server IP or host name + * @param integer $port The port number to connect to + * @param integer $timeout How long to wait for the connection to open + * @param array $options An array of options for stream_context_create() + * @access public + * @return boolean + */ + public function connect($host, $port = null, $timeout = 30, $options = array()) + { + static $streamok; + //This is enabled by default since 5.0.0 but some providers disable it + //Check this once and cache the result + if (is_null($streamok)) { + $streamok = function_exists('stream_socket_client'); + } + // Clear errors to avoid confusion + $this->setError(''); + // Make sure we are __not__ connected + if ($this->connected()) { + // Already connected, generate error + $this->setError('Already connected to a server'); + return false; + } + if (empty($port)) { + $port = self::DEFAULT_SMTP_PORT; + } + // Connect to the SMTP server + $this->edebug( + "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true), + self::DEBUG_CONNECTION + ); + $errno = 0; + $errstr = ''; + if ($streamok) { + $socket_context = stream_context_create($options); + //Suppress errors; connection failures are handled at a higher level + $this->smtp_conn = @stream_socket_client( + $host . ":" . $port, + $errno, + $errstr, + $timeout, + STREAM_CLIENT_CONNECT, + $socket_context + ); + } else { + //Fall back to fsockopen which should work in more places, but is missing some features + $this->edebug( + "Connection: stream_socket_client not available, falling back to fsockopen", + self::DEBUG_CONNECTION + ); + $this->smtp_conn = fsockopen( + $host, + $port, + $errno, + $errstr, + $timeout + ); + } + // Verify we connected properly + if (!is_resource($this->smtp_conn)) { + $this->setError( + 'Failed to connect to server', + $errno, + $errstr + ); + $this->edebug( + 'SMTP ERROR: ' . $this->error['error'] + . ": $errstr ($errno)", + self::DEBUG_CLIENT + ); + return false; + } + $this->edebug('Connection: opened', self::DEBUG_CONNECTION); + // SMTP server can take longer to respond, give longer timeout for first read + // Windows does not have support for this timeout function + if (substr(PHP_OS, 0, 3) != 'WIN') { + $max = ini_get('max_execution_time'); + // Don't bother if unlimited + if ($max != 0 && $timeout > $max) { + @set_time_limit($timeout); + } + stream_set_timeout($this->smtp_conn, $timeout, 0); + } + // Get any announcement + $announce = $this->get_lines(); + $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER); + return true; + } + + /** + * Initiate a TLS (encrypted) session. + * @access public + * @return boolean + */ + public function startTLS() + { + if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) { + return false; + } + // Begin encrypted connection + if (!stream_socket_enable_crypto( + $this->smtp_conn, + true, + STREAM_CRYPTO_METHOD_TLS_CLIENT + )) { + return false; + } + return true; + } + + /** + * Perform SMTP authentication. + * Must be run after hello(). + * @see hello() + * @param string $username The user name + * @param string $password The password + * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5) + * @param string $realm The auth realm for NTLM + * @param string $workstation The auth workstation for NTLM + * @access public + * @return boolean True if successfully authenticated. + */ + public function authenticate( + $username, + $password, + $authtype = null, + $realm = '', + $workstation = '' + ) { + if (!$this->server_caps) { + $this->setError('Authentication is not allowed before HELO/EHLO'); + return false; + } + + if (array_key_exists('EHLO', $this->server_caps)) { + // SMTP extensions are available. Let's try to find a proper authentication method + + if (!array_key_exists('AUTH', $this->server_caps)) { + $this->setError('Authentication is not allowed at this stage'); + // 'at this stage' means that auth may be allowed after the stage changes + // e.g. after STARTTLS + return false; + } + + self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL); + self::edebug( + 'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']), + self::DEBUG_LOWLEVEL + ); + + if (empty($authtype)) { + foreach (array('LOGIN', 'CRAM-MD5', 'NTLM', 'PLAIN') as $method) { + if (in_array($method, $this->server_caps['AUTH'])) { + $authtype = $method; + break; + } + } + if (empty($authtype)) { + $this->setError('No supported authentication methods found'); + return false; + } + self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL); + } + + if (!in_array($authtype, $this->server_caps['AUTH'])) { + $this->setError("The requested authentication method \"$authtype\" is not supported by the server"); + return false; + } + } elseif (empty($authtype)) { + $authtype = 'LOGIN'; + } + switch ($authtype) { + case 'PLAIN': + // Start authentication + if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) { + return false; + } + // Send encoded username and password + if (!$this->sendCommand( + 'User & Password', + base64_encode("\0" . $username . "\0" . $password), + 235 + ) + ) { + return false; + } + break; + case 'LOGIN': + // Start authentication + if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) { + return false; + } + if (!$this->sendCommand("Username", base64_encode($username), 334)) { + return false; + } + if (!$this->sendCommand("Password", base64_encode($password), 235)) { + return false; + } + break; + case 'NTLM': + /* + * ntlm_sasl_client.php + * Bundled with Permission + * + * How to telnet in windows: + * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx + * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication + */ + require_once 'extras/ntlm_sasl_client.php'; + $temp = new stdClass; + $ntlm_client = new ntlm_sasl_client_class; + //Check that functions are available + if (!$ntlm_client->Initialize($temp)) { + $this->setError($temp->error); + $this->edebug( + 'You need to enable some modules in your php.ini file: ' + . $this->error['error'], + self::DEBUG_CLIENT + ); + return false; + } + //msg1 + $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1 + + if (!$this->sendCommand( + 'AUTH NTLM', + 'AUTH NTLM ' . base64_encode($msg1), + 334 + ) + ) { + return false; + } + //Though 0 based, there is a white space after the 3 digit number + //msg2 + $challenge = substr($this->last_reply, 3); + $challenge = base64_decode($challenge); + $ntlm_res = $ntlm_client->NTLMResponse( + substr($challenge, 24, 8), + $password + ); + //msg3 + $msg3 = $ntlm_client->TypeMsg3( + $ntlm_res, + $username, + $realm, + $workstation + ); + // send encoded username + return $this->sendCommand('Username', base64_encode($msg3), 235); + case 'CRAM-MD5': + // Start authentication + if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) { + return false; + } + // Get the challenge + $challenge = base64_decode(substr($this->last_reply, 4)); + + // Build the response + $response = $username . ' ' . $this->hmac($challenge, $password); + + // send encoded credentials + return $this->sendCommand('Username', base64_encode($response), 235); + default: + $this->setError("Authentication method \"$authtype\" is not supported"); + return false; + } + return true; + } + + /** + * Calculate an MD5 HMAC hash. + * Works like hash_hmac('md5', $data, $key) + * in case that function is not available + * @param string $data The data to hash + * @param string $key The key to hash with + * @access protected + * @return string + */ + protected function hmac($data, $key) + { + if (function_exists('hash_hmac')) { + return hash_hmac('md5', $data, $key); + } + + // The following borrowed from + // http://php.net/manual/en/function.mhash.php#27225 + + // RFC 2104 HMAC implementation for php. + // Creates an md5 HMAC. + // Eliminates the need to install mhash to compute a HMAC + // by Lance Rushing + + $bytelen = 64; // byte length for md5 + if (strlen($key) > $bytelen) { + $key = pack('H*', md5($key)); + } + $key = str_pad($key, $bytelen, chr(0x00)); + $ipad = str_pad('', $bytelen, chr(0x36)); + $opad = str_pad('', $bytelen, chr(0x5c)); + $k_ipad = $key ^ $ipad; + $k_opad = $key ^ $opad; + + return md5($k_opad . pack('H*', md5($k_ipad . $data))); + } + + /** + * Check connection state. + * @access public + * @return boolean True if connected. + */ + public function connected() + { + if (is_resource($this->smtp_conn)) { + $sock_status = stream_get_meta_data($this->smtp_conn); + if ($sock_status['eof']) { + // The socket is valid but we are not connected + $this->edebug( + 'SMTP NOTICE: EOF caught while checking if connected', + self::DEBUG_CLIENT + ); + $this->close(); + return false; + } + return true; // everything looks good + } + return false; + } + + /** + * Close the socket and clean up the state of the class. + * Don't use this function without first trying to use QUIT. + * @see quit() + * @access public + * @return void + */ + public function close() + { + $this->setError(''); + $this->server_caps = null; + $this->helo_rply = null; + if (is_resource($this->smtp_conn)) { + // close the connection and cleanup + fclose($this->smtp_conn); + $this->smtp_conn = null; //Makes for cleaner serialization + $this->edebug('Connection: closed', self::DEBUG_CONNECTION); + } + } + + /** + * Send an SMTP DATA command. + * Issues a data command and sends the msg_data to the server, + * finializing the mail transaction. $msg_data is the message + * that is to be send with the headers. Each header needs to be + * on a single line followed by a with the message headers + * and the message body being separated by and additional . + * Implements rfc 821: DATA + * @param string $msg_data Message data to send + * @access public + * @return boolean + */ + public function data($msg_data) + { + //This will use the standard timelimit + if (!$this->sendCommand('DATA', 'DATA', 354)) { + return false; + } + + /* The server is ready to accept data! + * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF) + * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into + * smaller lines to fit within the limit. + * We will also look for lines that start with a '.' and prepend an additional '.'. + * NOTE: this does not count towards line-length limit. + */ + + // Normalize line breaks before exploding + $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data)); + + /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field + * of the first line (':' separated) does not contain a space then it _should_ be a header and we will + * process all lines before a blank line as headers. + */ + + $field = substr($lines[0], 0, strpos($lines[0], ':')); + $in_headers = false; + if (!empty($field) && strpos($field, ' ') === false) { + $in_headers = true; + } + + foreach ($lines as $line) { + $lines_out = array(); + if ($in_headers and $line == '') { + $in_headers = false; + } + //Break this line up into several smaller lines if it's too long + //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len), + while (isset($line[self::MAX_LINE_LENGTH])) { + //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on + //so as to avoid breaking in the middle of a word + $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' '); + //Deliberately matches both false and 0 + if (!$pos) { + //No nice break found, add a hard break + $pos = self::MAX_LINE_LENGTH - 1; + $lines_out[] = substr($line, 0, $pos); + $line = substr($line, $pos); + } else { + //Break at the found point + $lines_out[] = substr($line, 0, $pos); + //Move along by the amount we dealt with + $line = substr($line, $pos + 1); + } + //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1 + if ($in_headers) { + $line = "\t" . $line; + } + } + $lines_out[] = $line; + + //Send the lines to the server + foreach ($lines_out as $line_out) { + //RFC2821 section 4.5.2 + if (!empty($line_out) and $line_out[0] == '.') { + $line_out = '.' . $line_out; + } + $this->client_send($line_out . self::CRLF); + } + } + + //Message data has been sent, complete the command + //Increase timelimit for end of DATA command + $savetimelimit = $this->Timelimit; + $this->Timelimit = $this->Timelimit * 2; + $result = $this->sendCommand('DATA END', '.', 250); + //Restore timelimit + $this->Timelimit = $savetimelimit; + return $result; + } + + /** + * Send an SMTP HELO or EHLO command. + * Used to identify the sending server to the receiving server. + * This makes sure that client and server are in a known state. + * Implements RFC 821: HELO + * and RFC 2821 EHLO. + * @param string $host The host name or IP to connect to + * @access public + * @return boolean + */ + public function hello($host = '') + { + //Try extended hello first (RFC 2821) + return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host)); + } + + /** + * Send an SMTP HELO or EHLO command. + * Low-level implementation used by hello() + * @see hello() + * @param string $hello The HELO string + * @param string $host The hostname to say we are + * @access protected + * @return boolean + */ + protected function sendHello($hello, $host) + { + $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250); + $this->helo_rply = $this->last_reply; + if ($noerror) { + $this->parseHelloFields($hello); + } else { + $this->server_caps = null; + } + return $noerror; + } + + /** + * Parse a reply to HELO/EHLO command to discover server extensions. + * In case of HELO, the only parameter that can be discovered is a server name. + * @access protected + * @param string $type - 'HELO' or 'EHLO' + */ + protected function parseHelloFields($type) + { + $this->server_caps = array(); + $lines = explode("\n", $this->last_reply); + foreach ($lines as $n => $s) { + $s = trim(substr($s, 4)); + if (!$s) { + continue; + } + $fields = explode(' ', $s); + if (!empty($fields)) { + if (!$n) { + $name = $type; + $fields = $fields[0]; + } else { + $name = array_shift($fields); + if ($name == 'SIZE') { + $fields = ($fields) ? $fields[0] : 0; + } + } + $this->server_caps[$name] = ($fields ? $fields : true); + } + } + } + + /** + * Send an SMTP MAIL command. + * Starts a mail transaction from the email address specified in + * $from. Returns true if successful or false otherwise. If True + * the mail transaction is started and then one or more recipient + * commands may be called followed by a data command. + * Implements rfc 821: MAIL FROM: + * @param string $from Source address of this message + * @access public + * @return boolean + */ + public function mail($from) + { + $useVerp = ($this->do_verp ? ' XVERP' : ''); + return $this->sendCommand( + 'MAIL FROM', + 'MAIL FROM:<' . $from . '>' . $useVerp, + 250 + ); + } + + /** + * Send an SMTP QUIT command. + * Closes the socket if there is no error or the $close_on_error argument is true. + * Implements from rfc 821: QUIT + * @param boolean $close_on_error Should the connection close if an error occurs? + * @access public + * @return boolean + */ + public function quit($close_on_error = true) + { + $noerror = $this->sendCommand('QUIT', 'QUIT', 221); + $err = $this->error; //Save any error + if ($noerror or $close_on_error) { + $this->close(); + $this->error = $err; //Restore any error from the quit command + } + return $noerror; + } + + /** + * Send an SMTP RCPT command. + * Sets the TO argument to $toaddr. + * Returns true if the recipient was accepted false if it was rejected. + * Implements from rfc 821: RCPT TO: + * @param string $toaddr The address the message is being sent to + * @access public + * @return boolean + */ + public function recipient($toaddr) + { + return $this->sendCommand( + 'RCPT TO', + 'RCPT TO:<' . $toaddr . '>', + array(250, 251) + ); + } + + /** + * Send an SMTP RSET command. + * Abort any transaction that is currently in progress. + * Implements rfc 821: RSET + * @access public + * @return boolean True on success. + */ + public function reset() + { + return $this->sendCommand('RSET', 'RSET', 250); + } + + /** + * Send a command to an SMTP server and check its return code. + * @param string $command The command name - not sent to the server + * @param string $commandstring The actual command to send + * @param integer|array $expect One or more expected integer success codes + * @access protected + * @return boolean True on success. + */ + protected function sendCommand($command, $commandstring, $expect) + { + if (!$this->connected()) { + $this->setError("Called $command without being connected"); + return false; + } + $this->client_send($commandstring . self::CRLF); + + $this->last_reply = $this->get_lines(); + // Fetch SMTP code and possible error code explanation + $matches = array(); + if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) { + $code = $matches[1]; + $code_ex = (count($matches) > 2 ? $matches[2] : null); + // Cut off error code from each response line + $detail = preg_replace( + "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m", + '', + $this->last_reply + ); + } else { + // Fall back to simple parsing if regex fails + $code = substr($this->last_reply, 0, 3); + $code_ex = null; + $detail = substr($this->last_reply, 4); + } + + $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER); + + if (!in_array($code, (array)$expect)) { + $this->setError( + "$command command failed", + $detail, + $code, + $code_ex + ); + $this->edebug( + 'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply, + self::DEBUG_CLIENT + ); + return false; + } + + $this->setError(''); + return true; + } + + /** + * Send an SMTP SAML command. + * Starts a mail transaction from the email address specified in $from. + * Returns true if successful or false otherwise. If True + * the mail transaction is started and then one or more recipient + * commands may be called followed by a data command. This command + * will send the message to the users terminal if they are logged + * in and send them an email. + * Implements rfc 821: SAML FROM: + * @param string $from The address the message is from + * @access public + * @return boolean + */ + public function sendAndMail($from) + { + return $this->sendCommand('SAML', "SAML FROM:$from", 250); + } + + /** + * Send an SMTP VRFY command. + * @param string $name The name to verify + * @access public + * @return boolean + */ + public function verify($name) + { + return $this->sendCommand('VRFY', "VRFY $name", array(250, 251)); + } + + /** + * Send an SMTP NOOP command. + * Used to keep keep-alives alive, doesn't actually do anything + * @access public + * @return boolean + */ + public function noop() + { + return $this->sendCommand('NOOP', 'NOOP', 250); + } + + /** + * Send an SMTP TURN command. + * This is an optional command for SMTP that this class does not support. + * This method is here to make the RFC821 Definition complete for this class + * and _may_ be implemented in future + * Implements from rfc 821: TURN + * @access public + * @return boolean + */ + public function turn() + { + $this->setError('The SMTP TURN command is not implemented'); + $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT); + return false; + } + + /** + * Send raw data to the server. + * @param string $data The data to send + * @access public + * @return integer|boolean The number of bytes sent to the server or false on error + */ + public function client_send($data) + { + $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT); + return fwrite($this->smtp_conn, $data); + } + + /** + * Get the latest error. + * @access public + * @return array + */ + public function getError() + { + return $this->error; + } + + /** + * Get SMTP extensions available on the server + * @access public + * @return array|null + */ + public function getServerExtList() + { + return $this->server_caps; + } + + /** + * A multipurpose method + * The method works in three ways, dependent on argument value and current state + * 1. HELO/EHLO was not sent - returns null and set up $this->error + * 2. HELO was sent + * $name = 'HELO': returns server name + * $name = 'EHLO': returns boolean false + * $name = any string: returns null and set up $this->error + * 3. EHLO was sent + * $name = 'HELO'|'EHLO': returns server name + * $name = any string: if extension $name exists, returns boolean True + * or its options. Otherwise returns boolean False + * In other words, one can use this method to detect 3 conditions: + * - null returned: handshake was not or we don't know about ext (refer to $this->error) + * - false returned: the requested feature exactly not exists + * - positive value returned: the requested feature exists + * @param string $name Name of SMTP extension or 'HELO'|'EHLO' + * @return mixed + */ + public function getServerExt($name) + { + if (!$this->server_caps) { + $this->setError('No HELO/EHLO was sent'); + return null; + } + + // the tight logic knot ;) + if (!array_key_exists($name, $this->server_caps)) { + if ($name == 'HELO') { + return $this->server_caps['EHLO']; + } + if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) { + return false; + } + $this->setError('HELO handshake was used. Client knows nothing about server extensions'); + return null; + } + + return $this->server_caps[$name]; + } + + /** + * Get the last reply from the server. + * @access public + * @return string + */ + public function getLastReply() + { + return $this->last_reply; + } + + /** + * Read the SMTP server's response. + * Either before eof or socket timeout occurs on the operation. + * With SMTP we can tell if we have more lines to read if the + * 4th character is '-' symbol. If it is a space then we don't + * need to read anything else. + * @access protected + * @return string + */ + protected function get_lines() + { + // If the connection is bad, give up straight away + if (!is_resource($this->smtp_conn)) { + return ''; + } + $data = ''; + $endtime = 0; + stream_set_timeout($this->smtp_conn, $this->Timeout); + if ($this->Timelimit > 0) { + $endtime = time() + $this->Timelimit; + } + while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) { + $str = @fgets($this->smtp_conn, 515); + $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL); + $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL); + $data .= $str; + $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL); + // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen + if ((isset($str[3]) and $str[3] == ' ')) { + break; + } + // Timed-out? Log and break + $info = stream_get_meta_data($this->smtp_conn); + if ($info['timed_out']) { + $this->edebug( + 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)', + self::DEBUG_LOWLEVEL + ); + break; + } + // Now check if reads took too long + if ($endtime and time() > $endtime) { + $this->edebug( + 'SMTP -> get_lines(): timelimit reached ('. + $this->Timelimit . ' sec)', + self::DEBUG_LOWLEVEL + ); + break; + } + } + return $data; + } + + /** + * Enable or disable VERP address generation. + * @param boolean $enabled + */ + public function setVerp($enabled = false) + { + $this->do_verp = $enabled; + } + + /** + * Get VERP address generation mode. + * @return boolean + */ + public function getVerp() + { + return $this->do_verp; + } + + /** + * Set error messages and codes. + * @param string $message The error message + * @param string $detail Further detail on the error + * @param string $smtp_code An associated SMTP error code + * @param string $smtp_code_ex Extended SMTP code + */ + protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '') + { + $this->error = array( + 'error' => $message, + 'detail' => $detail, + 'smtp_code' => $smtp_code, + 'smtp_code_ex' => $smtp_code_ex + ); + } + + /** + * Set debug output method. + * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it. + */ + public function setDebugOutput($method = 'echo') + { + $this->Debugoutput = $method; + } + + /** + * Get debug output method. + * @return string + */ + public function getDebugOutput() + { + return $this->Debugoutput; + } + + /** + * Set debug output level. + * @param integer $level + */ + public function setDebugLevel($level = 0) + { + $this->do_debug = $level; + } + + /** + * Get debug output level. + * @return integer + */ + public function getDebugLevel() + { + return $this->do_debug; + } + + /** + * Set SMTP timeout. + * @param integer $timeout + */ + public function setTimeout($timeout = 0) + { + $this->Timeout = $timeout; + } + + /** + * Get SMTP timeout. + * @return integer + */ + public function getTimeout() + { + return $this->Timeout; + } +} diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index f0e0e0c78..066e1ab17 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -328,10 +328,10 @@ CREATE TABLE lc_customers_groups_data ( baseline_discount decimal(5,2) NOT NULL DEFAULT '0.00', customers_access_levels varchar(255) NOT NULL DEFAULT '', payment_terms varchar(255) NOT NULL DEFAULT '', - hidden_products_notification tinyint(1) NOT NULL, - taxable tinyint(1) NOT NULL, - payment_modules varchar(255) NOT NULL, - shipping_modules varchar(255) NOT NULL, + hidden_products_notification tinyint(1) NOT NULL DEFAULT -1, + taxable tinyint(1) NOT NULL DEFAULT -1, + payment_modules varchar(255) NOT NULL DEFAULT '', + shipping_modules varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (id) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 740ab60fb..c1d7932d9 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -328,10 +328,10 @@ CREATE TABLE lc_customers_groups_data ( baseline_discount decimal(5,2) NOT NULL DEFAULT '0.00', customers_access_levels varchar(255) NOT NULL DEFAULT '', payment_terms varchar(255) NOT NULL DEFAULT '', - hidden_products_notification tinyint(1) NOT NULL, - taxable tinyint(1) NOT NULL, - payment_modules varchar(255) NOT NULL, - shipping_modules varchar(255) NOT NULL, + hidden_products_notification tinyint(1) NOT NULL DEFAULT -1, + taxable tinyint(1) NOT NULL DEFAULT -1, + payment_modules varchar(255) NOT NULL DEFAULT '', + shipping_modules varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; From 628cf1f1ebbbf4124a3d139933fe2ba5dc39498d Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 12 May 2015 15:34:58 -0400 Subject: [PATCH 27/50] localization updates --- catalog/includes/classes/template.php | 4 ++-- catalog/includes/functions/compatibility.php | 13 ++++++++++++- .../includes/work/updates/runAfter/controller.php | 4 ++-- catalog/install/loadedcommerce.sql | 10 +++++----- catalog/install/loadedcommerce_innodb.sql | 10 +++++----- catalog/templates/core.php | 7 +++++-- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/catalog/includes/classes/template.php b/catalog/includes/classes/template.php index d5d77e211..574dd537f 100644 --- a/catalog/includes/classes/template.php +++ b/catalog/includes/classes/template.php @@ -1015,7 +1015,7 @@ public function loadBrandingCSS() { /** * Cleans OGP and Meta tags and restrict OGP and Meta description to 300 characters * - * @access private + * @access public * @return string */ public function cleanMetaTags($data){ @@ -1028,4 +1028,4 @@ public function cleanMetaTags($data){ return $string; } } -?> +?> \ No newline at end of file diff --git a/catalog/includes/functions/compatibility.php b/catalog/includes/functions/compatibility.php index 8b12fbedc..c9f95ad43 100644 --- a/catalog/includes/functions/compatibility.php +++ b/catalog/includes/functions/compatibility.php @@ -216,12 +216,23 @@ function getRequestType() { function setLocalization() { global $lC_Database, $lC_Currencies, $lC_Language, $lC_Session; -//unset($_SESSION['localization']); +unset($_SESSION['localization']); // if (isset($_SESSION['localization']['currency']) || isset($_SESSION['localization']['language'])) return; $_SESSION['localization'] = array(); + $Qalt = $lC_Database->query('select * from :table_localization where alt_domain = :alt_domain'); + $Qalt->bindTable(':table_localization', TABLE_LOCALIZATION); + $Qalt->bindInt(':alt_domain', 1); + $Qalt->execute(); + + while ($Qalt->next()) { + $_SESSION['localization']['alt'][] = $Qalt->toArray(); + } + + $Qalt->freeResult(); + $Qlocal = $lC_Database->query('select * from :table_localization where domain = :domain limit 1'); $Qlocal->bindTable(':table_localization', TABLE_LOCALIZATION); $Qlocal->bindValue(':domain', $_SERVER['HTTP_HOST']); diff --git a/catalog/includes/work/updates/runAfter/controller.php b/catalog/includes/work/updates/runAfter/controller.php index 600d58e92..a9e24d1ba 100644 --- a/catalog/includes/work/updates/runAfter/controller.php +++ b/catalog/includes/work/updates/runAfter/controller.php @@ -470,8 +470,8 @@ public static function updateDB() { $lC_Database->simpleQuery("ALTER IGNORE TABLE `" . $pf . "product_attributes` ADD `value2` TEXT NOT NULL AFTER `value`"); parent::log("Database Update: ALTER IGNORE TABLE `" . $pf . "product_attributes` ADD `value2` TEXT NOT NULL AFTER `value`"); - $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "localization` (id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain varchar(255) NOT NULL, currencies_id int(11) NOT NULL, language_id int(11) NOT NULL, show_tax tinyint(1) NOT NULL, default_tax_zone int(11) NOT NULL, base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); - parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "localization` (id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain varchar(255) NOT NULL, currencies_id int(11) NOT NULL, language_id int(11) NOT NULL, show_tax tinyint(1) NOT NULL, default_tax_zone int(11) NOT NULL, base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "localization` (id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain tinyint(1) NOT NULL DEFAULT '0', currencies_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '0', show_tax tinyint(1) NOT NULL DEFAULT '0', default_tax_zone int(11) NOT NULL DEFAULT '0', base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain tinyint(1) NOT NULL DEFAULT '0', currencies_id int(11) NOT NULL, language_id int(11) NOT NULL, show_tax tinyint(1) NOT NULL, default_tax_zone int(11) NOT NULL, base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); + parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "localization` (id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain tinyint(1) NOT NULL DEFAULT '0', currencies_id int(11) NOT NULL DEFAULT '0', language_id int(11) NOT NULL DEFAULT '0', show_tax tinyint(1) NOT NULL DEFAULT '0', default_tax_zone int(11) NOT NULL DEFAULT '0', base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, alt_domain tinyint(1) NOT NULL DEFAULT '0', currencies_id int(11) NOT NULL, language_id int(11) NOT NULL, show_tax tinyint(1) NOT NULL, default_tax_zone int(11) NOT NULL, base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); $lC_Database->simpleQuery("CREATE TABLE IF NOT EXISTS `" . $pf . "customers_access` ( id int(11) NOT NULL AUTO_INCREMENT, `level` varchar(128) NOT NULL, `status` tinyint(1) NOT NULL, PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); parent::log("Database Update: CREATE TABLE IF NOT EXISTS `" . $pf . "customers_access` ( id int(11) NOT NULL AUTO_INCREMENT, `level` varchar(128) NOT NULL, `status` tinyint(1) NOT NULL, PRIMARY KEY (id)) ENGINE=" . $engine . " CHARACTER SET utf8 COLLATE utf8_general_ci;"); diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 066e1ab17..829cf24f5 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -392,11 +392,11 @@ DROP TABLE IF EXISTS lc_localization; CREATE TABLE IF NOT EXISTS lc_localization ( id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, - alt_domain varchar(255) NOT NULL, - currencies_id int(11) NOT NULL, - language_id int(11) NOT NULL, - show_tax tinyint(1) NOT NULL, - default_tax_zone int(11) NOT NULL, + alt_domain tinyint(1) NOT NULL DEFAULT '0', + currencies_id int(11) NOT NULL DEFAULT '0', + language_id int(11) NOT NULL DEFAULT '0', + show_tax tinyint(1) NOT NULL DEFAULT '0', + default_tax_zone int(11) NOT NULL DEFAULT '0', base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id) diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index c1d7932d9..4c600f623 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -392,11 +392,11 @@ DROP TABLE IF EXISTS lc_localization; CREATE TABLE IF NOT EXISTS lc_localization ( id int(11) NOT NULL AUTO_INCREMENT, domain varchar(255) NOT NULL, - alt_domain varchar(255) NOT NULL, - currencies_id int(11) NOT NULL, - language_id int(11) NOT NULL, - show_tax tinyint(1) NOT NULL, - default_tax_zone int(11) NOT NULL, + alt_domain tinyint(1) NOT NULL DEFAULT '0', + currencies_id int(11) NOT NULL DEFAULT '0', + language_id int(11) NOT NULL DEFAULT '0', + show_tax tinyint(1) NOT NULL DEFAULT '0', + default_tax_zone int(11) NOT NULL DEFAULT '0', base_price_modifier decimal(15,4) NOT NULL DEFAULT '0', `status` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (id) diff --git a/catalog/templates/core.php b/catalog/templates/core.php index a9f81faa4..e555c57cb 100644 --- a/catalog/templates/core.php +++ b/catalog/templates/core.php @@ -54,8 +54,11 @@ '; + if (isset($_SESSION['localization']['alt']) && empty($_SESSION['localization']['alt']) === false) { + foreach($_SESSION['localization']['alt'] as $key => $value) { + $params = (stristr($_SERVER['REQUEST_URI'], '?')) ? $_SERVER['REQUEST_URI'] : null; + echo '' . "\n"; + } } ?> From 64ccedde66873c1e9617b1ec26457b051d13cff0 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Tue, 12 May 2015 16:43:17 -0400 Subject: [PATCH 28/50] Added default for value and value2 in products attributes shcema --- catalog/install/loadedcommerce.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 829cf24f5..482340c87 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -784,8 +784,8 @@ CREATE TABLE lc_product_attributes ( id int(10) unsigned NOT NULL, products_id int(10) unsigned NOT NULL, languages_id int(10) unsigned NOT NULL, - `value` text NOT NULL, - `value2` text NOT NULL, + `value` text NOT NULL DEFAULT '', + `value2` text NOT NULL DEFAULT '', KEY idx_pa_id_products_id (id,products_id), KEY idx_pa_languages_id (languages_id), KEY idx_pa_products_id (products_id) From c7246820dfd3bb2bb8c68e4506b03f64f62fb01a Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Tue, 12 May 2015 16:44:06 -0400 Subject: [PATCH 29/50] Added default for value and value2 in products attributes shcema --- catalog/install/loadedcommerce_innodb.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 4c600f623..73aa149dd 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -783,8 +783,8 @@ CREATE TABLE lc_product_attributes ( id int(10) unsigned NOT NULL, products_id int(10) unsigned NOT NULL, languages_id int(10) unsigned NOT NULL, - `value` text NOT NULL, - `value2` text NOT NULL, + `value` text NOT NULL DEFAULT '', + `value2` text NOT NULL DEFAULT '', KEY idx_pa_id_products_id (id,products_id), KEY idx_pa_languages_id (languages_id), KEY idx_pa_products_id (products_id) From 1fe7ed95dade56efdf85a9d8d94aaea9a81fae15 Mon Sep 17 00:00:00 2001 From: datazen Date: Tue, 12 May 2015 16:44:20 -0400 Subject: [PATCH 30/50] repaired sort by --- catalog/includes/classes/product.php | 8 ++++++-- catalog/includes/classes/products.php | 8 ++++++-- catalog/includes/content/index/index.php | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/catalog/includes/classes/product.php b/catalog/includes/classes/product.php index dc64e1caf..feffd7bc6 100644 --- a/catalog/includes/classes/product.php +++ b/catalog/includes/classes/product.php @@ -15,7 +15,7 @@ public function __construct($id) { if ( !empty($id) ) { if ( is_numeric($id) ) { - $Qproduct = $lC_Database->query('select products_id as id, parent_id, products_quantity as quantity, products_price as price, products_msrp as msrp, products_model as model, products_tax_class_id as tax_class_id, products_weight as weight, products_weight_class as weight_class_id, products_date_added as date_added, manufacturers_id, has_children, is_subproduct, access_levels from :table_products where products_id = :products_id and products_status = :products_status'); + $Qproduct = $lC_Database->query('select products_id as id, parent_id, products_quantity as quantity, products_price as price, products_msrp as msrp, products_model as model, products_tax_class_id as tax_class_id, products_weight as weight, products_weight_class as weight_class_id, products_date_added as date_added, manufacturers_id, has_children, is_subproduct, access_levels, products_sort_order as sort_order from :table_products where products_id = :products_id and products_status = :products_status'); $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); $Qproduct->bindInt(':products_id', $id); $Qproduct->bindInt(':products_status', 1); @@ -77,7 +77,7 @@ public function __construct($id) { } } } else { - $Qproduct = $lC_Database->query('select p.products_id as id, p.parent_id, p.products_quantity as quantity, p.products_price as price, p.products_model as model, p.products_tax_class_id as tax_class_id, p.products_weight as weight, p.products_weight_class as weight_class_id, p.products_date_added as date_added, p.manufacturers_id, p.has_children, pd.products_name as name, pd.products_blurb as blurb, pd.products_description as description, pd.products_keyword as keyword, pd.products_tags as tags, pd.products_url as url from :table_products p, :table_products_description pd where pd.products_keyword = :products_keyword and pd.language_id = :language_id and pd.products_id = p.products_id and p.products_status = :products_status'); + $Qproduct = $lC_Database->query('select p.products_id as id, p.parent_id, p.products_quantity as quantity, p.products_price as price, p.products_model as model, p.products_tax_class_id as tax_class_id, p.products_weight as weight, p.products_weight_class as weight_class_id, p.products_date_added as date_added, p.manufacturers_id, p.has_children, pd.products_name as name, pd.products_blurb as blurb, pd.products_description as description, pd.products_keyword as keyword, pd.products_tags as tags, pd.products_url as url, p.products_sort_order as sort_order from :table_products p, :table_products_description pd where pd.products_keyword = :products_keyword and pd.language_id = :language_id and pd.products_id = p.products_id and p.products_status = :products_status'); $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); $Qproduct->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); $Qproduct->bindValue(':products_keyword', $id); @@ -288,6 +288,10 @@ public function getModel() { return $this->_data['model']; } + public function getSortOrder() { + return $this->_data['sort_order']; + } + public function getMSRP() { return $this->_data['msrp']; } diff --git a/catalog/includes/classes/products.php b/catalog/includes/classes/products.php index 9e6b4fba4..fc1f9706f 100644 --- a/catalog/includes/classes/products.php +++ b/catalog/includes/classes/products.php @@ -50,6 +50,9 @@ function setManufacturer($id) { function setSortBy($field, $direction = '+') { switch (strtolower($field)) { + case 'name': + $this->_sort_by = 'pd.products_name'; + break; case 'model': $this->_sort_by = 'p.products_model'; break; @@ -142,7 +145,7 @@ function &execute($max_entries = MAX_DISPLAY_SEARCH_RESULTS) { $Qlisting->appendQuery('order by'); if (isset($this->_sort_by)) { - $Qlisting->appendQuery(':order_by :order_by_direction, pd.products_name'); + $Qlisting->appendQuery(':order_by :order_by_direction'); $Qlisting->bindRaw(':order_by', $this->_sort_by); $Qlisting->bindRaw(':order_by_direction', (($this->_sort_by_direction == '-') ? 'desc' : '')); } else { @@ -150,7 +153,8 @@ function &execute($max_entries = MAX_DISPLAY_SEARCH_RESULTS) { $Qlisting->bindRaw(':order_by_direction', (($this->_sort_by_direction == '-') ? 'desc' : '')); } - $Qlisting->setBatchLimit((isset($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 1), $max_entries); + $Qlisting->setBatchLimit((isset($_GET['page']) && is_numeric($_GET['page']) ? $_GET['page'] : 1), $max_entries); + $Qlisting->execute(); return $Qlisting; diff --git a/catalog/includes/content/index/index.php b/catalog/includes/content/index/index.php index e332e9655..2f8c47e3f 100644 --- a/catalog/includes/content/index/index.php +++ b/catalog/includes/content/index/index.php @@ -164,7 +164,7 @@ protected function _process() { $lC_Products->setSortBy($_GET['sort']); } } else if (defined('PRODUCT_LISTING_DISPLAY_ORDER') && PRODUCT_LISTING_DISPLAY_ORDER != null) { - $lC_Products->setSortBy(PRODUCT_LISTING_DISPLAY_ORDER); + $lC_Products->setSortBy(strtolower(str_replace(' ', '_', PRODUCT_LISTING_DISPLAY_ORDER))); } } } From e6dd6b6aad8ff585b68257dfaa21f9a713254012 Mon Sep 17 00:00:00 2001 From: Devi Dash Date: Wed, 13 May 2015 21:36:38 +0530 Subject: [PATCH 31/50] Fixed the issue# 580 --- .../admin/includes/applications/products/classes/products.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php index 14baea3b9..3f1fcd203 100644 --- a/catalog/admin/includes/applications/products/classes/products.php +++ b/catalog/admin/includes/applications/products/classes/products.php @@ -1479,9 +1479,10 @@ public static function delete($id, $categories = null) { $Qcheck->execute(); // delete the simple options values while ( $Qcheck->next() ) { - $Qdel = $lC_Database->query('delete from :table_products_simple_options_values where options_id = :options_id'); + $Qdel = $lC_Database->query('delete from :table_products_simple_options_values where options_id = :options_id AND products_id = :products_id'); $Qdel->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); $Qdel->bindInt(':options_id', $Qcheck->valueInt('options_id')); + $Qdel->bindInt(':products_id', $id); $Qdel->setLogging($_SESSION['module'], $id); $Qdel->execute(); } From 8b7e4d731f3d043cb6082f8ebd528d2602c3c8ba Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 13 May 2015 18:31:33 -0400 Subject: [PATCH 32/50] removed set errors to all from template class file. "SCOTT" LOL --- catalog/includes/classes/template.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/catalog/includes/classes/template.php b/catalog/includes/classes/template.php index 574dd537f..ace2d62e8 100644 --- a/catalog/includes/classes/template.php +++ b/catalog/includes/classes/template.php @@ -153,9 +153,6 @@ class lC_Template { public function &setup($module) { global $lC_Vqmod; -ini_set('display_errors', 1); -error_reporting(E_ALL); - $group = basename($_SERVER['SCRIPT_FILENAME']); if (($pos = strrpos($group, '.')) !== false) { $group = substr($group, 0, $pos); From f19ebcd26447cc04be058b49df389efa75bf7eee Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 13 May 2015 22:55:18 -0400 Subject: [PATCH 33/50] featured products added, and categories function split into two parts --- catalog/install/includes/classes/upgrader.php | 223 +++++++++++- .../includes/languages/en_US/upgrade.php | 6 + catalog/install/rpc.php | 55 ++- catalog/install/templates/pages/upgrade_3.php | 326 ++++++++++-------- 4 files changed, 449 insertions(+), 161 deletions(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 0db9c8c77..e898e5540 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -632,6 +632,14 @@ public function __construct() { , 'last_modified' => 'last_modified' , 'date_added' => 'date_added' ) + , 'featured' => array( + 'id' => 'featured_id' + , 'products_id' => 'products_id' + , 'date_added' => 'featured_date_added' + , 'last_modified' => 'featured_last_modified' + , 'expires_date' => 'expires_date' + , 'status' => 'status' + ) ); } @@ -1813,7 +1821,7 @@ public function getcPath($_cid, $_path = null) { /* * function name : importCategories() * - * description : load categories and categories_description to loaded7 + * description : load categories to loaded7 * * returns : true or false * @@ -1865,12 +1873,6 @@ public function importCategories($switch = null) { $tQry = $target_db->query('truncate table ' . TABLE_CATEGORIES); $tQry->execute(); - $tQry = $target_db->query('truncate table ' . TABLE_CATEGORIES_DESCRIPTION); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_PERMALINKS); - $tQry->execute(); - // END TRUNCATE CATEGORIES TABLES IN TARGET DB // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 @@ -1954,9 +1956,82 @@ public function importCategories($switch = null) { } // END LOAD CATEGORIES FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET sql_mode = ""'); + $tQry->execute(); - // ########## + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importCategories + + /* + * function name : importCategoriesDescription() + * + * description : load categories_description & categories permalinks to loaded7 + * + * returns : true or false + * + */ + public function importCategoriesDescription($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + $map = $this->_data_mapping['categories']; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE CATEGORIES DESCRIPTION & PERMALINKS TABLES IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_CATEGORIES_DESCRIPTION); + $tQry->execute(); + + $tQry = $target_db->query('truncate table ' . TABLE_PERMALINKS); + $tQry->execute(); + + // END TRUNCATE CATEGORIES DESCRIPTION & PERMALINKS TABLES IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + // LOAD CATEGORIES DESCRIPTION FROM SOURCE DB $map = $this->_data_mapping['categories_desc']; @@ -2033,7 +2108,7 @@ public function importCategories($switch = null) { // ########## - // LOAD CATEGORY PERMALINKs TO TARGET DB + // LOAD CATEGORIES PERMALINKS TO TARGET DB $iCnt = 0; $sQry = $source_db->query('SELECT c.categories_id, c.parent_id, cd.language_id, cd.categories_name FROM categories as c, categories_description AS cd WHERE c.categories_id = cd.categories_id'); @@ -2092,7 +2167,7 @@ public function importCategories($switch = null) { $sQry->freeResult(); } - // END LOAD PERMALINK TO TARGET DB + // END LOAD CATEGORIES PERMALINKS TO TARGET DB // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 $tQry = $target_db->query('SET sql_mode = ""'); @@ -4968,8 +5043,7 @@ public function importAttributes($switch = null) { return true; } // end importAttributes - - + /* * function name : importAdministrators() * @@ -6862,6 +6936,131 @@ public function importCurrencies($switch = null) { return true; } // end importCurrencies + + /* + * function name : importFeatured() + * + * description : load featured products to loaded7 + * + * returns : true or false + * + */ + public function importFeatured($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + $map = $this->_data_mapping['featured']; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE FEATURED TABLES IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_FEATURED_PRODUCTS); + $tQry->execute(); + + // END TRUNCATE FEATURED TABLES IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // LOAD FEATURED FROM SOURCE DB + + $sQry = $source_db->query('SELECT * FROM featured'); + $sQry->execute(); + + $numrows = $sQry->numberOfRows(); + if ($numrows > 0) { + $cnt = 0; + while ($sQry->next()) { + $featured = array( + 'id' => $sQry->value('featured_id') + , 'products_id' => $sQry->value('products_id') + , 'date_added' => $sQry->value('featured_date_added') + , 'last_modified' => $sQry->value('featured_last_modified') + , 'expires_date' => $sQry->value('expires_date') + , 'status' => $sQry->value('status') + ); + + $tQry = $target_db->query('INSERT INTO :table_featured (id, + products_id, + date_added, + last_modified, + expires_date, + status) + VALUES (:id, + :products_id, + :date_added, + :last_modified, + :expires_date, + :status)'); + + $tQry->bindTable(':table_featured', TABLE_FEATURED_PRODUCTS); + $tQry->bindInt (':id' , $featured['id']); + $tQry->bindInt (':products_id' , $featured['products_id']); + $tQry->bindDate (':date_added' , $featured['date_added']); + $tQry->bindDate (':last_modified' , $featured['last_modified']); + $tQry->bindDate (':expires_date' , $featured['expires_date']); + $tQry->bindInt (':status' , $featured['status']); + $tQry->execute(); + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + $cnt++; + } + + $sQry->freeResult(); + } + + // END LOAD FEATURED FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET sql_mode = ""'); + $tQry->execute(); + + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importFeatured public function generateCleanPermalink($p) { $p = preg_replace("/&.{0,}?;/", '', $p); diff --git a/catalog/install/includes/languages/en_US/upgrade.php b/catalog/install/includes/languages/en_US/upgrade.php index 9716a6eb0..9d7dd3bc4 100644 --- a/catalog/install/includes/languages/en_US/upgrade.php +++ b/catalog/install/includes/languages/en_US/upgrade.php @@ -108,9 +108,15 @@ param_import_categories = CATEGORIES param_import_categories_description = importing Category data +param_import_categories_description = CATEGORIES DESCRIPTION +param_import_categories_description_description = importing Category Description data + param_import_products = PRODUCTS param_import_products_description = importing Product data +param_import_featured = FEATURED PRODUCTS +param_import_featured_description = importing Featured Products data + param_import_attributes = ATTRIBUTES param_import_attributes_description = importing Product Attributes data diff --git a/catalog/install/rpc.php b/catalog/install/rpc.php index 10b1fe730..d9a3186a2 100644 --- a/catalog/install/rpc.php +++ b/catalog/install/rpc.php @@ -372,6 +372,24 @@ exit; break; + case 'import_categories_description': + { + + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importCategoriesDescription($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return false; + } + exit; + break; + case 'import_customers': { @@ -429,17 +447,34 @@ case 'import_attributes': { - $upgrader = UpgraderFactory::create($_POST['upgrade_method']); - $upgrader->setConnectDetails($_POST); - $rslt = $upgrader->importAttributes($_POST['db_switch']); - - if ($rslt == false) { - echo '[[0|'.$upgrader->displayMessage().']]'; - return false; - } + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importAttributes($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } - echo '[[1]]'; - return true; + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_featured': + { + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importFeatured($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; } exit; break; diff --git a/catalog/install/templates/pages/upgrade_3.php b/catalog/install/templates/pages/upgrade_3.php index a942eaffa..3f738b433 100644 --- a/catalog/install/templates/pages/upgrade_3.php +++ b/catalog/install/templates/pages/upgrade_3.php @@ -164,18 +164,33 @@ function prepareWork() {
    -
    -

    - - - -

    -
    - +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    +
    @@ -237,6 +252,21 @@ function prepareWork() {

    +
    + +
    + +
    + +
    @@ -505,195 +535,213 @@ function prepareWork() { $('#eBoxContents_categories').html(_rslt); $('#eBox_categories').show(); } - - $('#img_copy_progress_customers').show(); + + $('#img_copy_progress_categories_description').show(); setTimeout(function() { - _rslt = doImport('_customers'); + _rslt = doImport('_categories_description'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_customers').html(_rslt); - $('#eBox_customers').show(); + $('#eBoxContents_categories_description').html(_rslt); + $('#eBox_categories_description').show(); } - - $('#img_copy_progress_customer_groups').show(); + + $('#img_copy_progress_customers').show(); setTimeout(function() { - _rslt = doImport('_customer_groups'); + _rslt = doImport('_customers'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_customer_groups').html(_rslt); - $('#eBox_customer_groups').show(); + $('#eBoxContents_customers').html(_rslt); + $('#eBox_customers').show(); } - - $('#img_copy_progress_products').show(); + + $('#img_copy_progress_customer_groups').show(); setTimeout(function() { - _rslt = doImport('_products'); + _rslt = doImport('_customer_groups'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_products').html(_rslt); - $('#eBox_products').show(); + $('#eBoxContents_customer_groups').html(_rslt); + $('#eBox_customer_groups').show(); } - - $('#img_copy_progress_attributes').show(); + + $('#img_copy_progress_products').show(); setTimeout(function() { - _rslt = doImport('_attributes'); + _rslt = doImport('_products'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_attributes').html(_rslt); - $('#eBox_attributes').show(); + $('#eBoxContents_products').html(_rslt); + $('#eBox_products').show(); } - - $('#img_copy_progress_orders').show(); + + $('#img_copy_progress_attributes').show(); setTimeout(function() { - _rslt = doImport('_orders'); + _rslt = doImport('_attributes'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders').html(_rslt); - $('#eBox_customer_orders').show(); - } - - $('#img_copy_progress_orders_products').show(); + $('#eBoxContents_attributes').html(_rslt); + $('#eBox_attributes').show(); + } + + $('#img_copy_progress_featured').show(); setTimeout(function() { - _rslt = doImport('_orders_products'); + _rslt = doImport('_featured'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_products').html(_rslt); - $('#eBox_customer_orders_products').show(); + $('#eBoxContents_featured').html(_rslt); + $('#eBox_featured').show(); } - - $('#img_copy_progress_orders_products_download').show(); + + $('#img_copy_progress_orders').show(); setTimeout(function() { - _rslt = doImport('_orders_products_download'); + _rslt = doImport('_orders'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_products_download').html(_rslt); - $('#eBox_customer_orders_products_download').show(); - } - - $('#img_copy_progress_orders_status').show(); + $('#eBoxContents_orders').html(_rslt); + $('#eBox_customer_orders').show(); + } + + $('#img_copy_progress_orders_products').show(); setTimeout(function() { - _rslt = doImport('_orders_status'); + _rslt = doImport('_orders_products'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_status').html(_rslt); - $('#eBox_customer_orders_status').show(); + $('#eBoxContents_orders_products').html(_rslt); + $('#eBox_customer_orders_products').show(); } - - $('#img_copy_progress_orders_status_history').show(); + + $('#img_copy_progress_orders_products_download').show(); setTimeout(function() { - _rslt = doImport('_orders_status_history'); + _rslt = doImport('_orders_products_download'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_status_history').html(_rslt); - $('#eBox_customer_orders_status_history').show(); + $('#eBoxContents_orders_products_download').html(_rslt); + $('#eBox_customer_orders_products_download').show(); } - - $('#img_copy_progress_orders_total').show(); + + $('#img_copy_progress_orders_status').show(); setTimeout(function() { - _rslt = doImport('_orders_total'); + _rslt = doImport('_orders_status'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_total').html(_rslt); - $('#eBox_customer_orders_total').show(); + $('#eBoxContents_orders_status').html(_rslt); + $('#eBox_customer_orders_status').show(); } - - $('#img_copy_progress_cds').show(); + + $('#img_copy_progress_orders_status_history').show(); setTimeout(function() { - _rslt = doImport('_cds'); + _rslt = doImport('_orders_status_history'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_cds').html(_rslt); - $('#eBox_customer_cds').show(); + $('#eBoxContents_orders_status_history').html(_rslt); + $('#eBox_customer_orders_status_history').show(); } - - $('#img_copy_progress_administrators').show(); + + $('#img_copy_progress_orders_total').show(); setTimeout(function() { - _rslt = doImport('_administrators'); + _rslt = doImport('_orders_total'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_administrators').html(_rslt); - $('#eBox_customer_administrators').show(); + $('#eBoxContents_orders_total').html(_rslt); + $('#eBox_customer_orders_total').show(); } - - $('#img_copy_progress_newsletter').show(); + + $('#img_copy_progress_cds').show(); setTimeout(function() { - _rslt = doImport('_newsletter'); + _rslt = doImport('_cds'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_newsletter').html(_rslt); - $('#eBox_customer_newsletter').show(); + $('#eBoxContents_cds').html(_rslt); + $('#eBox_customer_cds').show(); } - - $('#img_copy_progress_banners').show(); + + $('#img_copy_progress_administrators').show(); setTimeout(function() { - _rslt = doImport('_banners'); + _rslt = doImport('_administrators'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_banners').html(_rslt); - $('#eBox_customer_banners').show(); + $('#eBoxContents_administrators').html(_rslt); + $('#eBox_customer_administrators').show(); } - - $('#img_copy_progress_configuration').show(); + + $('#img_copy_progress_newsletter').show(); setTimeout(function() { - _rslt = doImport('_configuration'); + _rslt = doImport('_newsletter'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_configuration').html(_rslt); - $('#eBox_customer_configuration').show(); + $('#eBoxContents_newsletter').html(_rslt); + $('#eBox_customer_newsletter').show(); } - $('#img_copy_progress_coupons').show(); + $('#img_copy_progress_banners').show(); setTimeout(function() { - _rslt = doImport('_coupons'); + _rslt = doImport('_banners'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_coupons').html(_rslt); - $('#eBox_customer_coupons').show(); + $('#eBoxContents_banners').html(_rslt); + $('#eBox_customer_banners').show(); } - - $('#img_copy_progress_taxclasses').show(); + + $('#img_copy_progress_configuration').show(); setTimeout(function() { - _rslt = doImport('_taxclasses'); + _rslt = doImport('_configuration'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_taxclasses').html(_rslt); - $('#eBox_customer_taxclasses').show(); + $('#eBoxContents_configuration').html(_rslt); + $('#eBox_customer_configuration').show(); } - $('#img_copy_progress_languages').show(); + $('#img_copy_progress_coupons').show(); setTimeout(function() { - _rslt = doImport('_languages'); + _rslt = doImport('_coupons'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_languages').html(_rslt); - $('#eBox_languages').show(); + $('#eBoxContents_coupons').html(_rslt); + $('#eBox_customer_coupons').show(); } - $('#img_copy_progress_currencies').show(); + $('#img_copy_progress_taxclasses').show(); setTimeout(function() { - _rslt = doImport('_currencies'); + _rslt = doImport('_taxclasses'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_currencies').html(_rslt); - $('#eBox_currencies').show(); + $('#eBoxContents_taxclasses').html(_rslt); + $('#eBox_customer_taxclasses').show(); } - - // DONE - $('#pBox').hide(); - if (_err === false) { - $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); - $('#mBoxSuccess').show(); + $('#img_copy_progress_languages').show(); + setTimeout(function() { + _rslt = doImport('_languages'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_languages').html(_rslt); + $('#eBox_languages').show(); + } + + $('#img_copy_progress_currencies').show(); + setTimeout(function() { + _rslt = doImport('_currencies'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_currencies').html(_rslt); + $('#eBox_currencies').show(); + } + + // DONE + $('#pBox').hide(); + + if (_err === false) { + $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); + $('#mBoxSuccess').show(); - $("#upgradeForm").attr("action", "upgrade.php?step=4"); - $('#btn_continue').show(); - $('#btn_retry').hide(); - } else { - $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); - $('#mBox').show(); + $("#upgradeForm").attr("action", "upgrade.php?step=4"); + $('#btn_continue').show(); + $('#btn_retry').hide(); + } else { + $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); + $('#mBox').show(); - $("#upgradeForm").attr("action", "upgrade.php?step=3"); - $('#btn_continue').hide(); - $('#btn_retry').show(); - } - - $('#buttonContainer').show(); - - }, 3000); - }, 3000); - }, 3000); - }, 3000); + $("#upgradeForm").attr("action", "upgrade.php?step=3"); + $('#btn_continue').hide(); + $('#btn_retry').show(); + } + + $('#buttonContainer').show(); + + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); }, 3000); }, 3000); }, 3000); From e7d665ce011b63db214ac419a79e81db7c59f591 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Thu, 14 May 2015 00:28:44 -0400 Subject: [PATCH 34/50] split products function into 8 parts --- catalog/install/includes/classes/upgrader.php | 906 ++++++++++++++---- .../includes/languages/en_US/upgrade.php | 32 +- catalog/install/rpc.php | 173 +++- catalog/install/templates/pages/upgrade_3.php | 484 +++++++--- 4 files changed, 1253 insertions(+), 342 deletions(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index e898e5540..30a020f3d 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -678,7 +678,7 @@ public function showConnectInfo() { /* * function name : importProducts() * - * description : load products, products_description, products_to_categories, products_notifications, manufacturers, reviews and specials from the source database to loaded7 + * description : load products from the source database to loaded7 * * returns : true or false * @@ -730,29 +730,8 @@ public function importProducts($switch = null) { $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS); $tQry->execute(); - $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_DESCRIPTION); - $tQry->execute(); - $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_PRICING); $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_NOTIFICATIONS); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_TO_CATEGORIES); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_MANUFACTURERS); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_MANUFACTURERS_INFO); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_REVIEWS); - $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_SPECIALS); - $tQry->execute(); // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); @@ -1159,14 +1138,89 @@ public function importProducts($switch = null) { // END LOAD PRODUCTS FROM SOURCE DB + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importProducts + + /* + * function name : importProductsDescription() + * + * description : load products_description and permalink from the source database to loaded7 + * + * returns : true or false + * + */ + public function importProductsDescription($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE PRODUCTS DESCRIPTION TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_DESCRIPTION); + $tQry->execute(); + + // END TRUNCATE PRODUCTS DESCRIPTION TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + // LOAD PRODUCTS DESCRIPTION FROM SOURCE DB $map = $this->_data_mapping['products_desc']; - $products_desc = array(); - $sQry = $source_db->query('SELECT * FROM products_description'); $sQry->execute(); + + $products_desc = array(); if ($sQry->numberOfRows() > 0) { $cnt = 0; @@ -1184,8 +1238,8 @@ public function importProducts($switch = null) { , 'products_url' => ($sQry->value($map['products_url']) != '' || $sQry->value($map['products_url']) != NULL) ? $sQry->value($map['products_url']) : "" , 'products_viewed' => ($sQry->value($map['products_viewed']) != '' || $sQry->value($map['products_viewed']) != NULL) ? $sQry->value($map['products_viewed']) : "" ); - - $products_desc[] = $product; + + $products_desc[] = $product; $cnt++; } @@ -1217,40 +1271,40 @@ public function importProducts($switch = null) { $tQry = $target_db->query('INSERT INTO :table_products_description (products_id, - language_id, - products_name, - products_description, - products_keyword, - products_tags, - products_meta_title, - products_meta_keywords, - products_meta_description, - products_url, - products_viewed) - VALUES (:products_id, - :language_id, - :products_name, - :products_description, - :products_keyword, - :products_tags, - :products_meta_title, - :products_meta_keywords, - :products_meta_description, - :products_url, - :products_viewed)'); + language_id, + products_name, + products_description, + products_keyword, + products_tags, + products_meta_title, + products_meta_keywords, + products_meta_description, + products_url, + products_viewed) + VALUES (:products_id, + :language_id, + :products_name, + :products_description, + :products_keyword, + :products_tags, + :products_meta_title, + :products_meta_keywords, + :products_meta_description, + :products_url, + :products_viewed)'); $tQry->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); - $tQry->bindInt (':products_id' , $product['products_id']); - $tQry->bindInt (':language_id' , $product['language_id']); - $tQry->bindValue(':products_name' , $product['products_name']); - $tQry->bindValue(':products_description' , $product['products_description']); - $tQry->bindValue(':products_keyword' , $permalink); - $tQry->bindValue(':products_tags' , $product['products_tags']); - $tQry->bindValue(':products_meta_title' , $product['products_meta_title']); - $tQry->bindValue(':products_meta_keywords' , $product['products_meta_keywords']); - $tQry->bindValue(':products_meta_description', $product['products_meta_description']); - $tQry->bindValue(':products_url' , $product['products_url']); - $tQry->bindInt (':products_viewed' , $product['products_viewed']); + $tQry->bindInt (':products_id' , $product['products_id']); + $tQry->bindInt (':language_id' , $product['language_id']); + $tQry->bindValue(':products_name' , $product['products_name']); + $tQry->bindValue(':products_description' , $product['products_description']); + $tQry->bindValue(':products_keyword' , $permalink); + $tQry->bindValue(':products_tags' , $product['products_tags']); + $tQry->bindValue(':products_meta_title' , $product['products_meta_title']); + $tQry->bindValue(':products_meta_keywords' , $product['products_meta_keywords']); + $tQry->bindValue(':products_meta_description' , $product['products_meta_description']); + $tQry->bindValue(':products_url' , $product['products_url']); + $tQry->bindInt (':products_viewed' , $product['products_viewed']); $tQry->execute(); if ($target_db->isError()) { @@ -1263,114 +1317,23 @@ public function importProducts($switch = null) { // END LOAD PRODUCTS DESCRIPTION TO TARGET DB - // ########## - - // LOAD PRODUCTS NOTIFICATIONS FROM SOURCE DB - - $map = $this->_data_mapping['products_notif']; - - $products_notifs = array(); - - $sQry = $source_db->query('SELECT * FROM products_notifications'); - $sQry->execute(); - - if ($sQry->numberOfRows() > 0) { - $cnt = 0; - while ($sQry->next()) { - $product = array( - 'products_id' => $sQry->value($map['products_id']) - , 'customers_id' => $sQry->value($map['customers_id']) - , 'date_added' => ($sQry->value($map['date_added']) != '' || $sQry->value($map['date_added']) != NULL) ? $sQry->value($map['date_added']) : "" - ); - - $products_notifs[] = $product; - - - $tQry = $target_db->query('INSERT INTO :table_products_notifs (products_id, - customers_id, - date_added) - VALUES (:products_id, - :customers_id, - :date_added)'); - - $tQry->bindTable(':table_products_notifs', TABLE_PRODUCTS_NOTIFICATIONS); - $tQry->bindInt (':products_id' , $product['products_id']); - $tQry->bindInt (':customers_id', $product['customers_id']); - $tQry->bindDate (':date_added' , $product['date_added']); - $tQry->execute(); - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - - $cnt++; - } - - $sQry->freeResult(); - } - - // END LOAD PRODUCTS DESCRIPTION FROM SOURCE DB - - // ########## - - // LOAD PRODUCTS TO CATEGORIES FROM SOURCE DB - - $map = $this->_data_mapping['products_to_categs']; - - $products_to_categs = array(); - - $sQry = $source_db->query('SELECT * FROM products_to_categories'); - $sQry->execute(); - - if ($sQry->numberOfRows() > 0) { - $cnt = 0; - while ($sQry->next()) { - $product = array( - 'products_id' => $sQry->value('products_id') - , 'categories_id' => $sQry->value('categories_id') - ); - - $tQry = $target_db->query('INSERT INTO :table_products_to_categs (products_id, - categories_id) - VALUES (:products_id, - :categories_id)'); - - $tQry->bindTable(':table_products_to_categs', TABLE_PRODUCTS_TO_CATEGORIES); - $tQry->bindInt (':products_id' , $product['products_id']); - $tQry->bindInt (':categories_id', $product['categories_id']); - $tQry->execute(); - - if ($target_db->isError()) { - $this->_msg = $target_db->getError(); - return false; - } - - $cnt++; - } - - $sQry->freeResult(); - } - - // END LOAD PRODUCTS TO CATEGORIES FROM SOURCE DB - - // ########## - // LOAD PRODUCTS PERMALINK FROM SOURCE DB $map = $this->_data_mapping['permalink']; - $permalink_array = array(); - $sQry = $source_db->query('SELECT p.products_id, language_id, products_name, categories_id FROM products as p, products_description AS pd, products_to_categories p2c WHERE p.products_id = pd.products_id AND p.products_id = p2c.products_id ORDER BY p.products_id, pd.language_id'); $sQry->execute(); + + // END LOAD PRODUCTS PERMALINK FROM SOURCE DB + + // LOAD PERMALINK TO TARGET DB if ($sQry->numberOfRows() > 0) { $cnt = 0; while ($sQry->next()) { $cID = $sQry->value('categories_id') ; - // getCPATH CODE + // getCPATH CODE $cat_list = $cID; $catID = $cID; @@ -1453,18 +1416,317 @@ public function importProducts($switch = null) { $sQry->freeResult(); } - - // END LOAD PRODUCTS PERMALINK FROM SOURCE DB // END LOAD PERMALINK TO TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); - // ########## + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importProductsDescription + + /* + * function name : importProductsNotifications() + * + * description : load products_notifications from the source database to loaded7 + * + * returns : true or false + * + */ + public function importProductsNotifications($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE PRODUCTS NOTIFICATIONS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_NOTIFICATIONS); + $tQry->execute(); + + // END TRUNCATE PRODUCTS NOTIFICATIONS TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // LOAD PRODUCTS NOTIFICATIONS FROM SOURCE DB + + $map = $this->_data_mapping['products_notif']; + + $sQry = $source_db->query('SELECT * FROM products_notifications'); + $sQry->execute(); + + if ($sQry->numberOfRows() > 0) { + $cnt = 0; + while ($sQry->next()) { + $product = array( + 'products_id' => $sQry->value($map['products_id']) + , 'customers_id' => $sQry->value($map['customers_id']) + , 'date_added' => ($sQry->value($map['date_added']) != '' || $sQry->value($map['date_added']) != NULL) ? $sQry->value($map['date_added']) : "" + ); + + $tQry = $target_db->query('INSERT INTO :table_products_notifs (products_id, + customers_id, + date_added) + VALUES (:products_id, + :customers_id, + :date_added)'); + + $tQry->bindTable(':table_products_notifs', TABLE_PRODUCTS_NOTIFICATIONS); + $tQry->bindInt (':products_id' , $product['products_id']); + $tQry->bindInt (':customers_id' , $product['customers_id']); + $tQry->bindDate (':date_added' , $product['date_added']); + $tQry->execute(); + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + $cnt++; + } + + $sQry->freeResult(); + } + + // END LOAD PRODUCTS DESCRIPTION FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importProductsNotifications + + /* + * function name : importProductsToCategories() + * + * description : load products_to_categories, manufacturers, reviews and specials from the source database to loaded7 + * + * returns : true or false + * + */ + public function importProductsToCategories($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE PRODUCTS TO CATEGORIES TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_PRODUCTS_TO_CATEGORIES); + $tQry->execute(); + + // END TRUNCATE PRODUCTS TO CATEGORIES TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); + + // LOAD PRODUCTS TO CATEGORIES FROM SOURCE DB + + $map = $this->_data_mapping['products_to_categs']; + + $sQry = $source_db->query('SELECT * FROM products_to_categories'); + $sQry->execute(); + + if ($sQry->numberOfRows() > 0) { + $cnt = 0; + while ($sQry->next()) { + $product = array( + 'products_id' => $sQry->value('products_id') + , 'categories_id' => $sQry->value('categories_id') + ); + + $tQry = $target_db->query('INSERT INTO :table_products_to_categs (products_id, + categories_id) + VALUES (:products_id, + :categories_id)'); + + $tQry->bindTable(':table_products_to_categs', TABLE_PRODUCTS_TO_CATEGORIES); + $tQry->bindInt (':products_id' , $product['products_id']); + $tQry->bindInt (':categories_id' , $product['categories_id']); + $tQry->execute(); + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + $cnt++; + } + + $sQry->freeResult(); + } + + // END LOAD PRODUCTS TO CATEGORIES FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importProductsToCategories + + /* + * function name : importManufacturers() + * + * description : load manufacturers from the source database to loaded7 + * + * returns : true or false + * + */ + public function importManufacturers($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE MANUFACTURERS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_MANUFACTURERS); + $tQry->execute(); + + // END TRUNCATE MANUFACTURERS TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); // LOAD MANUFACTURERS FROM SOURCE DB $map = $this->_data_mapping['manufacturers']; - $manufacturers = array(); - $sQry = $source_db->query('select * from manufacturers'); $sQry->execute(); @@ -1503,15 +1765,88 @@ public function importProducts($switch = null) { return false; } - $cnt++; - } - - $sQry->freeResult(); + $cnt++; + } + + $sQry->freeResult(); + } + + // END LOAD MANUFACTURERS FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importManufacturers + + /* + * function name : importManufacturersInfo() + * + * description : load manufacturers info from the source database to loaded7 + * + * returns : true or false + * + */ + public function importManufacturersInfo($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); } - // END LOAD MANUFACTURERS FROM SOURCE DB + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB - // ############# + // TRUNCATE MANUFACTURERS INFO TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_MANUFACTURERS_INFO); + $tQry->execute(); + + // END TRUNCATE MANUFACTURERS INFO TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); // LOAD MANUFACTURERS INFO FROM SOURCE DB $map = $this->_data_mapping['manufacturers_info']; @@ -1572,9 +1907,82 @@ public function importProducts($switch = null) { $iCnt++; } - // END LOAD MANUFACTURERS INFO TO TARGET DB + // END LOAD MANUFACTURERS INFO TO TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs + + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs - // ########## + return true; + + } // end importManufacturersInfo + + /* + * function name : importReviews() + * + * description : load reviews from the source database to loaded7 + * + * returns : true or false + * + */ + public function importReviews($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE REVIEWS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_REVIEWS); + $tQry->execute(); + + // END TRUNCATE REVIEWS TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); // LOAD REVIEWS FROM SOURCE DB @@ -1615,7 +2023,7 @@ public function importProducts($switch = null) { $iCnt = 0; foreach ($reviews as $review) { - + $tQry = $target_db->query('INSERT INTO :table_reviews (reviews_id, products_id, customers_id, @@ -1663,8 +2071,81 @@ public function importProducts($switch = null) { $tQry->freeResult(); // END LOAD REVIEWS FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); + + // DISCONNECT FROM SOURCE AND TARGET DBs - // ########## + $source_db->disconnect(); + $target_db->disconnect(); + + // END DISCONNECT FROM SOURCE AND TARGET DBs + + return true; + + } // end importReviews + + /* + * function name : importSpecials() + * + * description : load specials from the source database to loaded7 + * + * returns : true or false + * + */ + public function importSpecials($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE SPECIALS TABLE IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_SPECIALS); + $tQry->execute(); + + // END TRUNCATE SPECIALS TABLE IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); // LOAD SPECIALS FROM SOURCE DB @@ -1703,7 +2184,7 @@ public function importProducts($switch = null) { $iCnt = 0; foreach ($specials as $special) { - + $tQry = $target_db->query('INSERT INTO :table_reviews (specials_id, products_id, specials_new_products_price, @@ -1751,15 +2232,14 @@ public function importProducts($switch = null) { // DISCONNECT FROM SOURCE AND TARGET DBs - $source_db->disconnect(); - + $source_db->disconnect(); $target_db->disconnect(); // END DISCONNECT FROM SOURCE AND TARGET DBs return true; - } // end importProducts + } // end importSpecials /* * function name : getcPath() @@ -2702,7 +3182,7 @@ public function importPages($switch = null) { /* * function name : importCustomers() * - * description : load customers and address book data from the source database to loaded7 + * description : load customers data from the source database to loaded7 * * returns : true or false * @@ -2753,9 +3233,6 @@ public function importCustomers($switch = null) { $tQry = $target_db->query('truncate table ' . TABLE_CUSTOMERS); $tQry->execute(); - - $tQry = $target_db->query('truncate table ' . TABLE_ADDRESS_BOOK); - $tQry->execute(); // END TRUNCATE CUSTOMERS TABLES IN TARGET DB @@ -2867,8 +3344,77 @@ public function importCustomers($switch = null) { } // END LOAD CUSTOMERS FROM SOURCE DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); + $tQry->execute(); - // ########## + $source_db->disconnect(); + $target_db->disconnect(); + + return true; + + } // end importCustomers + + /* + * function name : importAddressBook() + * + * description : load address book data from the source database to loaded7 + * + * returns : true or false + * + */ + public function importAddressBook($switch = null) { + + $s_db = $this->_sDB; + $t_db = $this->_tDB; + + if (!defined('DB_TABLE_PREFIX')) define('DB_TABLE_PREFIX', $t_db['DB_PREFIX']); + + // CONNNECT TO SOURCE DB + + require_once('../includes/database_tables.php'); + + require_once('../includes/classes/database/mysqli.php'); + $class = 'lC_Database_mysqli'; // . $s_db['DB_DATABASE_CLASS']; + $source_db = new $class($s_db['DB_SERVER'], $s_db['DB_SERVER_USERNAME'], $s_db['DB_SERVER_PASSWORD']); + + if ($source_db->isError() === false) { + $source_db->selectDatabase($s_db['DB_DATABASE']); + } + + if ($source_db->isError()) { + $this->_msg = $source_db->getError(); + return false; + } + // END CONNNECT TO SOURCE DB + + // CONNNECT TO TARGET DB + + $class = 'lC_Database_' . $t_db['DB_CLASS']; + $target_db = new $class($t_db['DB_SERVER'], $t_db['DB_SERVER_USERNAME'], $t_db['DB_SERVER_PASSWORD']); + + if ($target_db->isError() === false) { + $target_db->selectDatabase($t_db['DB_DATABASE']); + } + + if ($target_db->isError()) { + $this->_msg = $target_db->getError(); + return false; + } + + // END CONNNECT TO TARGET DB + + // TRUNCATE ADDRESS BOOK TABLES IN TARGET DB + + $tQry = $target_db->query('truncate table ' . TABLE_ADDRESS_BOOK); + $tQry->execute(); + + // END TRUNCATE ADDRESS BOOK TABLES IN TARGET DB + + // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 + $tQry = $target_db->query('SET GLOBAL sql_mode = "NO_AUTO_VALUE_ON_ZERO"'); + $tQry->execute(); // LOAD ADDRESS BOOK FROM SOURCE DB @@ -2973,8 +3519,6 @@ public function importCustomers($switch = null) { } // END LOAD ADDRESS BOOK FROM SOURCE DB - - // ########## // DISABLE AUTO INCREMENT WHEN PRIMARY KEY = 0 $tQry = $target_db->query('SET GLOBAL sql_mode = ""'); @@ -2985,7 +3529,7 @@ public function importCustomers($switch = null) { return true; - } // end importCustomers + } // end importAddressBook /* * function name : importImages() diff --git a/catalog/install/includes/languages/en_US/upgrade.php b/catalog/install/includes/languages/en_US/upgrade.php index 9d7dd3bc4..77639259d 100644 --- a/catalog/install/includes/languages/en_US/upgrade.php +++ b/catalog/install/includes/languages/en_US/upgrade.php @@ -106,23 +106,47 @@ rpc_sqlfile_error = Cannot locate source configuration file param_import_categories = CATEGORIES -param_import_categories_description = importing Category data +param_import_categories_description = importing Categories data param_import_categories_description = CATEGORIES DESCRIPTION -param_import_categories_description_description = importing Category Description data +param_import_categories_description_description = importing Categories Description data param_import_products = PRODUCTS -param_import_products_description = importing Product data +param_import_products_description = importing Products data + +param_import_products_description = PRODUCTS DESCRIPTION +param_import_products_description_description = importing Products Description data + +param_import_products_to_categories = PRODUCTS TO CATEGORIES +param_import_products_to_categories_description = importing Products to Categories data + +param_import_products_notifications = PRODUCTS NOTIFICATIONS +param_import_products_notifications_description = importing Products Notifications data param_import_featured = FEATURED PRODUCTS param_import_featured_description = importing Featured Products data param_import_attributes = ATTRIBUTES -param_import_attributes_description = importing Product Attributes data +param_import_attributes_description = importing Attributes data + +param_import_manufacturers = MANUFACTURERS +param_import_manufacturers_description = importing Manufacturers data + +param_import_manufacturers_info = MANUFACTURERS INFO +param_import_manufacturers_info_description = importing Manufacturers Info data + +param_import_reviews = REVIEWS +param_import_reviews_description = importing Reviews data + +param_import_specials = SPECIALS +param_import_specials_description = importing Specials data param_import_customers = CUSTOMERS param_import_customers_description = importing Customer data +param_import_address_book = ADDRESS BOOK +param_import_address_book_description = importing Address Book data + param_import_customer_groups = CUSTOMER GROUPS param_import_customer_groups_description = importing Customer Groups data diff --git a/catalog/install/rpc.php b/catalog/install/rpc.php index d9a3186a2..1c2f46bf6 100644 --- a/catalog/install/rpc.php +++ b/catalog/install/rpc.php @@ -408,6 +408,24 @@ exit; break; + case 'import_address_book': + { + + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importAddressBook($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + case 'import_customer_groups': { require_once("includes/classes/upgrader.php"); @@ -429,18 +447,151 @@ case 'import_products': { - require_once("includes/classes/upgrader.php"); - $upgrader = UpgraderFactory::create($_POST['upgrade_method']); - $upgrader->setConnectDetails($_POST); - $rslt = $upgrader->importProducts($_POST['db_switch']); - - if ($rslt == false) { - echo '[[0|'.$upgrader->displayMessage().']]'; - return false; - } + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importProducts($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } - echo '[[1]]'; - return true; + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_products_description': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importProductsDescription($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_products_notifications': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importProductsNotifications($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_products_to_categories': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importProductsToCategories($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_manufacturers': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importManufacturers($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_manufacturers_info': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importManufacturersInfo($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_reviews': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importReviews($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; + } + exit; + break; + + case 'import_specials': + { + + require_once("includes/classes/upgrader.php"); + $upgrader = UpgraderFactory::create($_POST['upgrade_method']); + $upgrader->setConnectDetails($_POST); + $rslt = $upgrader->importSpecials($_POST['db_switch']); + + if ($rslt == false) { + echo '[[0|'.$upgrader->displayMessage().']]'; + return false; + } + + echo '[[1]]'; + return true; } exit; break; diff --git a/catalog/install/templates/pages/upgrade_3.php b/catalog/install/templates/pages/upgrade_3.php index 3f738b433..911c0cd78 100644 --- a/catalog/install/templates/pages/upgrade_3.php +++ b/catalog/install/templates/pages/upgrade_3.php @@ -194,18 +194,33 @@ function prepareWork() {

    -
    -

    - - - -

    -
    - +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    +
    @@ -236,7 +251,112 @@ function prepareWork() {

    -
    +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    +
    + +
    +

    + + + +

    +
    + +
    @@ -551,198 +671,270 @@ function prepareWork() { $('#eBoxContents_customers').html(_rslt); $('#eBox_customers').show(); } - - $('#img_copy_progress_customer_groups').show(); + + $('#img_copy_progress_address_book').show(); setTimeout(function() { - _rslt = doImport('_customer_groups'); + _rslt = doImport('_address_book'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_customer_groups').html(_rslt); - $('#eBox_customer_groups').show(); + $('#eBoxContents_address_book').html(_rslt); + $('#eBox_address_book').show(); } - - $('#img_copy_progress_products').show(); + + $('#img_copy_progress_customer_groups').show(); setTimeout(function() { - _rslt = doImport('_products'); + _rslt = doImport('_customer_groups'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_products').html(_rslt); - $('#eBox_products').show(); + $('#eBoxContents_customer_groups').html(_rslt); + $('#eBox_customer_groups').show(); } - - $('#img_copy_progress_attributes').show(); + + $('#img_copy_progress_products').show(); setTimeout(function() { - _rslt = doImport('_attributes'); + _rslt = doImport('_products'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_attributes').html(_rslt); - $('#eBox_attributes').show(); + $('#eBoxContents_products').html(_rslt); + $('#eBox_products').show(); } - - $('#img_copy_progress_featured').show(); + + $('#img_copy_progress_products_description').show(); setTimeout(function() { - _rslt = doImport('_featured'); + _rslt = doImport('_products_description'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_featured').html(_rslt); - $('#eBox_featured').show(); + $('#eBoxContents_products_description').html(_rslt); + $('#eBox_products_description').show(); } - - $('#img_copy_progress_orders').show(); + + $('#img_copy_progress_products_notifications').show(); setTimeout(function() { - _rslt = doImport('_orders'); + _rslt = doImport('_products_notifications'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders').html(_rslt); - $('#eBox_customer_orders').show(); - } - - $('#img_copy_progress_orders_products').show(); + $('#eBoxContents_products_notifications').html(_rslt); + $('#eBox_products_notifications').show(); + } + + $('#img_copy_progress_products_to_categories').show(); setTimeout(function() { - _rslt = doImport('_orders_products'); + _rslt = doImport('_products_to_categories'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_products').html(_rslt); - $('#eBox_customer_orders_products').show(); + $('#eBoxContents_products_to_categories').html(_rslt); + $('#eBox_products_to_categories').show(); } - - $('#img_copy_progress_orders_products_download').show(); + + $('#img_copy_progress_manufacturers').show(); setTimeout(function() { - _rslt = doImport('_orders_products_download'); + _rslt = doImport('_manufacturers'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_products_download').html(_rslt); - $('#eBox_customer_orders_products_download').show(); + $('#eBoxContents_manufacturers').html(_rslt); + $('#eBox_manufacturers').show(); } - - $('#img_copy_progress_orders_status').show(); + + $('#img_copy_progress_manufacturers_info').show(); setTimeout(function() { - _rslt = doImport('_orders_status'); + _rslt = doImport('_manufacturers_info'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_status').html(_rslt); - $('#eBox_customer_orders_status').show(); + $('#eBoxContents_manufacturers_info').html(_rslt); + $('#eBox_manufacturers_info').show(); } - - $('#img_copy_progress_orders_status_history').show(); + + $('#img_copy_progress_reviews').show(); setTimeout(function() { - _rslt = doImport('_orders_status_history'); + _rslt = doImport('_reviews'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_status_history').html(_rslt); - $('#eBox_customer_orders_status_history').show(); + $('#eBoxContents_reviews').html(_rslt); + $('#eBox_reviews').show(); } - - $('#img_copy_progress_orders_total').show(); + + $('#img_copy_progress_specials').show(); setTimeout(function() { - _rslt = doImport('_orders_total'); + _rslt = doImport('_specials'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_orders_total').html(_rslt); - $('#eBox_customer_orders_total').show(); + $('#eBoxContents_specials').html(_rslt); + $('#eBox_specials').show(); } - - $('#img_copy_progress_cds').show(); + + $('#img_copy_progress_attributes').show(); setTimeout(function() { - _rslt = doImport('_cds'); + _rslt = doImport('_attributes'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_cds').html(_rslt); - $('#eBox_customer_cds').show(); + $('#eBoxContents_attributes').html(_rslt); + $('#eBox_attributes').show(); } - - $('#img_copy_progress_administrators').show(); + + $('#img_copy_progress_featured').show(); setTimeout(function() { - _rslt = doImport('_administrators'); + _rslt = doImport('_featured'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_administrators').html(_rslt); - $('#eBox_customer_administrators').show(); + $('#eBoxContents_featured').html(_rslt); + $('#eBox_featured').show(); } - $('#img_copy_progress_newsletter').show(); + $('#img_copy_progress_orders').show(); setTimeout(function() { - _rslt = doImport('_newsletter'); + _rslt = doImport('_orders'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_newsletter').html(_rslt); - $('#eBox_customer_newsletter').show(); - } - - $('#img_copy_progress_banners').show(); + $('#eBoxContents_orders').html(_rslt); + $('#eBox_customer_orders').show(); + } + + $('#img_copy_progress_orders_products').show(); setTimeout(function() { - _rslt = doImport('_banners'); + _rslt = doImport('_orders_products'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_banners').html(_rslt); - $('#eBox_customer_banners').show(); + $('#eBoxContents_orders_products').html(_rslt); + $('#eBox_customer_orders_products').show(); } - - $('#img_copy_progress_configuration').show(); + + $('#img_copy_progress_orders_products_download').show(); setTimeout(function() { - _rslt = doImport('_configuration'); + _rslt = doImport('_orders_products_download'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_configuration').html(_rslt); - $('#eBox_customer_configuration').show(); + $('#eBoxContents_orders_products_download').html(_rslt); + $('#eBox_customer_orders_products_download').show(); } - - $('#img_copy_progress_coupons').show(); + + $('#img_copy_progress_orders_status').show(); setTimeout(function() { - _rslt = doImport('_coupons'); + _rslt = doImport('_orders_status'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_coupons').html(_rslt); - $('#eBox_customer_coupons').show(); + $('#eBoxContents_orders_status').html(_rslt); + $('#eBox_customer_orders_status').show(); } - - $('#img_copy_progress_taxclasses').show(); + + $('#img_copy_progress_orders_status_history').show(); setTimeout(function() { - _rslt = doImport('_taxclasses'); + _rslt = doImport('_orders_status_history'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_taxclasses').html(_rslt); - $('#eBox_customer_taxclasses').show(); + $('#eBoxContents_orders_status_history').html(_rslt); + $('#eBox_customer_orders_status_history').show(); } - - $('#img_copy_progress_languages').show(); + + $('#img_copy_progress_orders_total').show(); setTimeout(function() { - _rslt = doImport('_languages'); + _rslt = doImport('_orders_total'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_languages').html(_rslt); - $('#eBox_languages').show(); + $('#eBoxContents_orders_total').html(_rslt); + $('#eBox_customer_orders_total').show(); } - - $('#img_copy_progress_currencies').show(); + + $('#img_copy_progress_cds').show(); setTimeout(function() { - _rslt = doImport('_currencies'); + _rslt = doImport('_cds'); if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; - $('#eBoxContents_currencies').html(_rslt); - $('#eBox_currencies').show(); + $('#eBoxContents_cds').html(_rslt); + $('#eBox_customer_cds').show(); } - - // DONE - $('#pBox').hide(); - - if (_err === false) { - $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); - $('#mBoxSuccess').show(); - $("#upgradeForm").attr("action", "upgrade.php?step=4"); - $('#btn_continue').show(); - $('#btn_retry').hide(); - } else { - $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); - $('#mBox').show(); + $('#img_copy_progress_administrators').show(); + setTimeout(function() { + _rslt = doImport('_administrators'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_administrators').html(_rslt); + $('#eBox_customer_administrators').show(); + } + + $('#img_copy_progress_newsletter').show(); + setTimeout(function() { + _rslt = doImport('_newsletter'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_newsletter').html(_rslt); + $('#eBox_customer_newsletter').show(); + } + + $('#img_copy_progress_banners').show(); + setTimeout(function() { + _rslt = doImport('_banners'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_banners').html(_rslt); + $('#eBox_customer_banners').show(); + } - $("#upgradeForm").attr("action", "upgrade.php?step=3"); - $('#btn_continue').hide(); - $('#btn_retry').show(); - } - - $('#buttonContainer').show(); - - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); - }, 3000); + $('#img_copy_progress_configuration').show(); + setTimeout(function() { + _rslt = doImport('_configuration'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_configuration').html(_rslt); + $('#eBox_customer_configuration').show(); + } + + $('#img_copy_progress_coupons').show(); + setTimeout(function() { + _rslt = doImport('_coupons'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_coupons').html(_rslt); + $('#eBox_customer_coupons').show(); + } + + $('#img_copy_progress_taxclasses').show(); + setTimeout(function() { + _rslt = doImport('_taxclasses'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_taxclasses').html(_rslt); + $('#eBox_customer_taxclasses').show(); + } + + $('#img_copy_progress_languages').show(); + setTimeout(function() { + _rslt = doImport('_languages'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_languages').html(_rslt); + $('#eBox_languages').show(); + } + + $('#img_copy_progress_currencies').show(); + setTimeout(function() { + _rslt = doImport('_currencies'); + if (_rslt === "") { } else { _err = true; _errmsg = _errmsg + '

    ' + _rslt; + $('#eBoxContents_currencies').html(_rslt); + $('#eBox_currencies').show(); + } + + // DONE + $('#pBox').hide(); + + if (_err === false) { + $('#mBoxSuccessContents').html('UPGRADE COMPLETE'); + $('#mBoxSuccess').show(); + + $("#upgradeForm").attr("action", "upgrade.php?step=4"); + $('#btn_continue').show(); + $('#btn_retry').hide(); + } else { + $('#mBoxContents').html('get('upgrade_step3_page_errfound'); ?>'); + $('#mBox').show(); + + $("#upgradeForm").attr("action", "upgrade.php?step=3"); + $('#btn_continue').hide(); + $('#btn_retry').show(); + } + + $('#buttonContainer').show(); + + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); + }, 3000); }, 3000); - }, 3000); + }, 3000); }, 3000); }, 3000); }, 3000); From 5ea155206dd892293205e7a27147fde86f4ea1db Mon Sep 17 00:00:00 2001 From: datazen Date: Thu, 14 May 2015 10:02:52 -0400 Subject: [PATCH 35/50] [IC] fixes for simple options --- .../products/classes/products.php | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php index 3f1fcd203..4a5664520 100644 --- a/catalog/admin/includes/applications/products/classes/products.php +++ b/catalog/admin/includes/applications/products/classes/products.php @@ -606,21 +606,25 @@ public static function get($id) { $Qoptions->bindInt(':languages_id', $lC_Language->getID()); $Qoptions->execute(); + $cnt = 0; while ($Qoptions->next()) { - $data['simple_options'][] = $Qoptions->toArray(); + $data['simple_options'][$cnt] = $Qoptions->toArray(); - $Qvalues = $lC_Database->query('select sov.products_id, sov.options_id, sov.values_id, sov.price_modifier, sov.customers_group_id, vv.title from :table_products_simple_options_values sov left join :table_products_variants_values vv on (sov.values_id = vv.id) where sov.options_id = :options_id and vv.languages_id = :languages_id'); + $Qvalues = $lC_Database->query('select sov.products_id, sov.options_id, sov.values_id, sov.price_modifier, sov.customers_group_id, vv.title from :table_products_simple_options_values sov left join :table_products_variants_values vv on (sov.values_id = vv.id) where sov.options_id = :options_id and sov.products_id = :products_id and vv.languages_id = :languages_id'); $Qvalues->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); $Qvalues->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); - $Qvalues->bindInt(':options_id', $Qoptions->valueInt('options_id')); + $Qvalues->bindInt(':options_id', $Qoptions->valueInt('options_id')); + $Qvalues->bindInt(':products_id', $id); $Qvalues->bindInt(':languages_id', $lC_Language->getID()); $Qvalues->execute(); - + while ($Qvalues->next()) { - $data['simple_options']['values'][] = $Qvalues->toArray(); - } + $data['simple_options'][$cnt]['values'][] = $Qvalues->toArray(); + } $Qvalues->freeResult(); + $cnt++; } + $Qoptions->freeResult(); if (DISPLAY_PRICE_WITH_TAX == 1 || $_SESSION['localization']['show_tax'] == 1) { @@ -889,7 +893,6 @@ public static function save($id = null, $data) { } } - // simple options if ( $error === false ) { @@ -907,6 +910,7 @@ public static function save($id = null, $data) { $Qdel->setLogging($_SESSION['module'], $products_id); $Qdel->execute(); + // if values are set, save them if ( isset($data['simple_options_group_name']) && !empty($data['simple_options_group_name']) ) { foreach ( $data['simple_options_group_name'] as $group_id => $value ) { @@ -931,7 +935,7 @@ public static function save($id = null, $data) { foreach ( $data['simple_options_entry_price_modifier'] as $customers_group_id => $options ) { foreach ( $options as $options_id => $option_value ) { if ($options_id == $group_id) { - foreach ( $option_value as $values_id => $price_modifier ) { + foreach ( $option_value as $values_id => $price_modifier ) { $Qoptval = $lC_Database->query('insert into :table_products_simple_options_values (products_id, values_id, options_id, customers_group_id, price_modifier) values (:products_id, :values_id, :options_id, :customers_group_id, :price_modifier)'); $Qoptval->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); $Qoptval->bindInt(':products_id', $products_id); @@ -1782,7 +1786,7 @@ public static function getOptionsPricingContent() { global $lC_Language, $pInfo; $content = ''; - $groups = lC_Customer_groups_Admin::getAll(); + $groups = lC_Customer_groups_Admin::getAll(); foreach($groups['entries'] as $key => $value) { $content .= '

    ' . $value['customers_group_name'] . '
    ' . '
    ' . @@ -1844,28 +1848,30 @@ public static function getSimpleOptionsPricingTbody($options, $customers_group_i $gData = lC_Customer_groups_Admin::getData($customers_group_id); $baselineDiscount = (float)$gData['baseline_discount']; $basePrice = (isset($pInfo)) ? (float)$pInfo->get('products_price') : 0.00; - $tbody = ''; if (isset($options) && !empty($options)) { foreach ($options as $key => $so) { if ((isset($so['title']) && $so['title'] != NULL)) { $items = ''; - if (is_array($options['values'])) { - foreach ($options['values'] as $k => $v) { - if ($v['options_id'] == $so['options_id'] && $v['products_id'] == $pInfo->get('products_id') && $customers_group_id == $v['customers_group_id']) { - if ($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID) { + if (is_array($so['values'])) { + + foreach ($so['values'] as $k => $v) { + + if ($v['options_id'] == $so['options_id'] && $v['products_id'] == $pInfo->get('products_id') && $customers_group_id == $v['customers_group_id']) { +// if ($customers_group_id == DEFAULT_CUSTOMERS_GROUP_ID || (utility::isPro() === true && utility::isB2B() === true)) { $mod = (isset($v['price_modifier']) && !empty($v['price_modifier'])) ? number_format($v['price_modifier'], DECIMAL_PLACES) : '0.00'; - } else { - $mod = number_format(round(($basePrice * $baselineDiscount) * .01, DECIMAL_PLACES), DECIMAL_PLACES); - } +// } else { +// $mod = number_format(round(($basePrice * $baselineDiscount) * .01, DECIMAL_PLACES), DECIMAL_PLACES); +// } + $items .= '' . ' ' . $v['title'] . '' . ' ' . '
    ' . - '
    ' . + '
    ' . ' ' . $lC_Currencies->getSymbolLeft() . '' . - ' ' . + ' ' . '
    ' . '
    ' . ' ' . From 4ca6ba13edf4a5f26dac0150f6e3792e79f023f9 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Fri, 15 May 2015 04:12:32 -0400 Subject: [PATCH 36/50] added products_sort_order to sql files, updated install css for upgrade input fields display. --- catalog/install/loadedcommerce.sql | 1 + catalog/install/loadedcommerce_innodb.sql | 1 + catalog/install/templates/pages/upgrade_1.php | 24 +++++++++---------- catalog/install/templates/pages/upgrade_2.php | 12 +++++----- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index 482340c87..f62058a89 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -642,6 +642,7 @@ CREATE TABLE lc_products ( groups_pricing_enable tinyint(1) NOT NULL DEFAULT '0', qpb_pricing_enable tinyint(1) NOT NULL DEFAULT '0', specials_pricing_enable tinyint(1) NOT NULL DEFAULT '0', + products_sort_order int(11) NOT NULL DEFAULT '0', PRIMARY KEY (products_id), KEY idx_products_date_added (products_date_added) ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index 73aa149dd..e3e5b8c4e 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -641,6 +641,7 @@ CREATE TABLE lc_products ( groups_pricing_enable tinyint(1) NOT NULL DEFAULT '0', qpb_pricing_enable tinyint(1) NOT NULL DEFAULT '0', specials_pricing_enable tinyint(1) NOT NULL DEFAULT '0', + products_sort_order int(11) NOT NULL DEFAULT '0', PRIMARY KEY (products_id), KEY idx_products_date_added (products_date_added) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/catalog/install/templates/pages/upgrade_1.php b/catalog/install/templates/pages/upgrade_1.php index 8246fef0d..b1fcb4266 100644 --- a/catalog/install/templates/pages/upgrade_1.php +++ b/catalog/install/templates/pages/upgrade_1.php @@ -190,7 +190,7 @@
    - +
    @@ -229,27 +229,27 @@
    - +
    +
    - +
    - +
    - +
    - +
    @@ -294,7 +294,7 @@
    - +

    get('upgrade_step1_method_title'); ?>

    @@ -319,19 +319,19 @@
    - +
    - +
    - +
    - +
    diff --git a/catalog/install/templates/pages/upgrade_2.php b/catalog/install/templates/pages/upgrade_2.php index 4f8b0ff78..d61ae1a6d 100644 --- a/catalog/install/templates/pages/upgrade_2.php +++ b/catalog/install/templates/pages/upgrade_2.php @@ -306,27 +306,27 @@ function formValid(){
    - +
    - +
    - +
    - +
    - +
    - +
    Date: Fri, 15 May 2015 17:21:15 -0400 Subject: [PATCH 37/50] added equalheight for featured products listing .thumbnail class --- catalog/templates/core/javascript/general.js.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/catalog/templates/core/javascript/general.js.php b/catalog/templates/core/javascript/general.js.php index 9baaa1635..a213f609f 100644 --- a/catalog/templates/core/javascript/general.js.php +++ b/catalog/templates/core/javascript/general.js.php @@ -93,6 +93,7 @@ $(window).load(function() { equalheight('.content-new-products-container .thumbnail'); + equalheight('.content-featured-products-listing-container .thumbnail'); equalheight('.content-specials-container .thumbnail'); equalheight('.content-specials-listing-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); @@ -106,6 +107,7 @@ $(window).resize(function(){ equalheight('.content-new-products-container .thumbnail'); + equalheight('.content-featured-products-listing-container .thumbnail'); equalheight('.content-specials-container .thumbnail'); equalheight('.content-specials-listing-container .thumbnail'); equalheight('.product-listing-module-container .thumbnail'); From 13fea8f4030dcadec9d453bb7ae3daf98d75e634 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Tue, 19 May 2015 14:40:58 -0400 Subject: [PATCH 38/50] added fix for default values in products attributes table --- catalog/install/includes/classes/upgrader.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 30a020f3d..057c11dbb 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -1095,6 +1095,16 @@ public function importProducts($switch = null) { $mQry = $target_db->query('SELECT id FROM :table_templates_boxes WHERE code = "manufacturers"'); $mQry->bindTable(':table_templates_boxes', TABLE_TEMPLATES_BOXES); $mQry->execute(); + + // Added for default values fix during upgrade - START + $dvQry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value SET DEFAULT ""'); + $dvQry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); + $dvQry->execute(); + + $dv2Qry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value2 SET DEFAULT ""'); + $dv2Qry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); + $dv2Qry->execute(); + // Added for default values fix during upgrade - end $aQry = $target_db->query('INSERT INTO :table_product_attributes (id, products_id, From c4e88ca2790bed1b14bea5f69294be65f10b1da0 Mon Sep 17 00:00:00 2001 From: Gerald Bullard Jr Date: Tue, 19 May 2015 14:42:35 -0400 Subject: [PATCH 39/50] added fix for default values in products attributes table --- catalog/install/includes/classes/upgrader.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 30a020f3d..4a0787ae7 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -1096,6 +1096,16 @@ public function importProducts($switch = null) { $mQry->bindTable(':table_templates_boxes', TABLE_TEMPLATES_BOXES); $mQry->execute(); + // Added for default values fix during upgrade - START + $dvQry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value SET DEFAULT ""'); + $dvQry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); + $dvQry->execute(); + + $dv2Qry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value2 SET DEFAULT ""'); + $dv2Qry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); + $dv2Qry->execute(); + // Added for default values fix during upgrade - end + $aQry = $target_db->query('INSERT INTO :table_product_attributes (id, products_id, languages_id, From c4671668035f3bec20333ef60794072b61461cee Mon Sep 17 00:00:00 2001 From: Kiran Date: Wed, 20 May 2015 02:10:35 +0530 Subject: [PATCH 40/50] [#583] - Corrected html. --- catalog/includes/modules/product_listing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/modules/product_listing.php b/catalog/includes/modules/product_listing.php index a03110219..f1ed625d6 100644 --- a/catalog/includes/modules/product_listing.php +++ b/catalog/includes/modules/product_listing.php @@ -61,7 +61,7 @@ case 'PRODUCT_LIST_MANUFACTURER': if ( $lC_Product->hasManufacturer() ) { - $output .= '
    ' . "\n"; } else { $output .= '
    ' . "\n"; } From cce6e1757cc7e54acd33ec1000a58062c217602d Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 27 May 2015 01:24:46 -0400 Subject: [PATCH 41/50] removed defaults that cause fresh install to hang, added defults to upgrader for non default value issues. --- catalog/install/loadedcommerce.sql | 4 ++-- catalog/install/loadedcommerce_innodb.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/catalog/install/loadedcommerce.sql b/catalog/install/loadedcommerce.sql index f62058a89..a8a756282 100644 --- a/catalog/install/loadedcommerce.sql +++ b/catalog/install/loadedcommerce.sql @@ -785,8 +785,8 @@ CREATE TABLE lc_product_attributes ( id int(10) unsigned NOT NULL, products_id int(10) unsigned NOT NULL, languages_id int(10) unsigned NOT NULL, - `value` text NOT NULL DEFAULT '', - `value2` text NOT NULL DEFAULT '', + `value` text NOT NULL, + `value2` text NOT NULL, KEY idx_pa_id_products_id (id,products_id), KEY idx_pa_languages_id (languages_id), KEY idx_pa_products_id (products_id) diff --git a/catalog/install/loadedcommerce_innodb.sql b/catalog/install/loadedcommerce_innodb.sql index e3e5b8c4e..6e8087c61 100644 --- a/catalog/install/loadedcommerce_innodb.sql +++ b/catalog/install/loadedcommerce_innodb.sql @@ -784,8 +784,8 @@ CREATE TABLE lc_product_attributes ( id int(10) unsigned NOT NULL, products_id int(10) unsigned NOT NULL, languages_id int(10) unsigned NOT NULL, - `value` text NOT NULL DEFAULT '', - `value2` text NOT NULL DEFAULT '', + `value` text NOT NULL, + `value2` text NOT NULL, KEY idx_pa_id_products_id (id,products_id), KEY idx_pa_languages_id (languages_id), KEY idx_pa_products_id (products_id) From bb5eec807113ff6f4c68a272f59c33a3d30d7945 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 27 May 2015 01:28:31 -0400 Subject: [PATCH 42/50] adding status in listing for specials, clickable status change coming later --- .../specials/classes/specials.php | 5 +- .../applications/specials/js/specials.js.php | 1 + .../applications/specials/pages/main.php | 4 +- catalog/admin/includes/languages/en_US.php | 58 ++++++++----------- .../includes/languages/en_US/specials.php | 1 + 5 files changed, 31 insertions(+), 38 deletions(-) diff --git a/catalog/admin/includes/applications/specials/classes/specials.php b/catalog/admin/includes/applications/specials/classes/specials.php index 869bc036a..a26920202 100644 --- a/catalog/admin/includes/applications/specials/classes/specials.php +++ b/catalog/admin/includes/applications/specials/classes/specials.php @@ -31,7 +31,8 @@ public static function getAll() { while ( $Qspecials->next() ) { $check = ''; $product = '' . $Qspecials->value('products_name') . ''; - $price = '' . $lC_Currencies->format($Qspecials->value('products_price')) . ' ' . $lC_Currencies->format($Qspecials->value('specials_new_products_price')) . ''; + //$status = '' . (($Qspecials->valueInt('specials_status') == 1) ? '' : '') . ''; + $status = '' . (($Qspecials->valueInt('status') == 1) ? '' : '') . ''; $action = '     ' . (($media === 'mobile-portrait' || $media === 'mobile-landscape') ? NULL : $lC_Language->get('icon_edit')) . ' @@ -40,7 +41,7 @@ public static function getAll() { '; - $result['aaData'][] = array("$check", "$product", "$price", "$action"); + $result['aaData'][] = array("$check", "$product", "$price", "$status", "$action"); } $Qspecials->freeResult; diff --git a/catalog/admin/includes/applications/specials/js/specials.js.php b/catalog/admin/includes/applications/specials/js/specials.js.php index 2160c94d0..deca4d4d2 100644 --- a/catalog/admin/includes/applications/specials/js/specials.js.php +++ b/catalog/admin/includes/applications/specials/js/specials.js.php @@ -24,6 +24,7 @@ "aoColumns": [{ "sWidth": "10px", "bSortable": false, "sClass": "dataColCheck hide-on-mobile" }, { "sWidth": "60%", "bSortable": true, "sClass": "dataColProducts" }, { "sWidth": "20%", "bSortable": true, "sClass": "dataColPrice hide-on-mobile-portrait" }, + { "sWidth": "10%", "bSortable": true, "sClass": "dataColStatus hide-on-mobile-portrait" }, { "sWidth": "20%", "bSortable": false, "sClass": "dataColAction" }] }); $('#dataTable').responsiveTable(); diff --git a/catalog/admin/includes/applications/specials/pages/main.php b/catalog/admin/includes/applications/specials/pages/main.php index 21a53f1c5..130bfaaba 100644 --- a/catalog/admin/includes/applications/specials/pages/main.php +++ b/catalog/admin/includes/applications/specials/pages/main.php @@ -19,6 +19,7 @@ .dataColCheck { text-align: center; } .dataColProducts { text-align: left; } .dataColPrice { text-align: left; } + .dataColStatus { text-align: center; } .dataColAction { text-align: right; } .dataTables_info { position:absolute; bottom: 42px; color:#4c4c4c; } .selectContainer { position:absolute; bottom:29px; left:30px } @@ -31,6 +32,7 @@ get('table_heading_products'); ?> get('table_heading_price'); ?> + get('table_heading_status'); ?> @@ -44,7 +46,7 @@ -   +   diff --git a/catalog/admin/includes/languages/en_US.php b/catalog/admin/includes/languages/en_US.php index 2f7d5e947..f326e9a87 100644 --- a/catalog/admin/includes/languages/en_US.php +++ b/catalog/admin/includes/languages/en_US.php @@ -9,7 +9,6 @@ header_title_help = Help batch_results_number_of_entries = Displaying %d to %d (of %d entries) - button_active = Active button_add = Add button_add_new = Add New @@ -63,17 +62,18 @@ button_yes = Yes button_no = No button_info = Info +button_understood = I Understand customer_view_details = View details for content_view_details = View details for content_title = Content customers_title = Customers -products_title = Products -orders_titls = Orders default = Default default_entry = default +error_specials_date = Error: The specials expire date cannot be before the start date. + field_admin_language = Admin Language: field_username = Email: field_first_name = First Name: @@ -148,32 +148,26 @@ icon_user_male = Male icon_view = View icon_view_in_catalog = View in catalog -icon_processing = Processing ... - +icon_processing = Processing ... introduction_profile_pass_change = Please make the necessary changes for this administrator. introduction_edit_administrator = Please make the necessary changes for this administrator. invalid_current_password = The current password you entered is not correct. Please re-enter it and try again. invalid_new_password_match = The new password and confirmation does not match. Please try again. -maximum_file_upload_size = Max: %s - +maximum_file_upload_size = Max: %s menu_title_addons = Add Ons menu_title_app_store = Add Ons menu_title_license_management = License Management menu_title_core_update = Core Update menu_title_report_issues = Report Issues -menu_title_get_help = Get Help - +menu_title_get_help = Get Help modal_heading_profile_edit = Edit Profile modal_heading_profile_pass_change = Change Profile Password modal_heading_system_message = System Message - ms_success_action_performed = Success: The action was successfully performed. -ms_success_upload_file_saved = Success: The file uploaded has been saved successfully. - +ms_success_upload_file_saved = Success: The file uploaded has been saved successfully. ms_warning_upload_no_file = Warning: No file uploaded. -ms_warning_uploads_disabled = Warning: File uploads are disabled in the php.ini configuration file. - +ms_warning_uploads_disabled = Warning: File uploads are disabled in the php.ini configuration file. ms_error_action_not_performed = Error: There was a problem performing the action. ms_error_retrieving_data = Error: There was a problem retrieving the data. ms_error_no_default_currency = Error: There is currently no default currency defined. @@ -193,12 +187,13 @@ ms_error_javascript_not_enabled_warning = Your browser does not support JavaScript! Some features won't work as expected. ms_warning_resize_images = We have detected that your images need to be resized. If you have a large amount of images, this process will take some time and can timeout depending on server settings and the number of images to process.

    For stores with more than 1000 images, we recommend choosing Never at this point and going to the Admin > Products > Settings > Image Groups area where you can resize individual groups one at a time.

    YESAttempt to process my images now.

    NONot now, remind me next session.

    NEVERDo nothing and do not remind me. +orders_titls = Orders + password_change_success = You have successfully updated your password. parameter_true = Yes parameter_false = No parameter_optional = Optional -parameter_none = -- None -- - +parameter_none = -- None -- profile_slate_edit_logout = edit or logout profile_slate_edit_profile = edit
    profile profile_slate_change_password = change
    password @@ -211,10 +206,10 @@ profile_password_confirm = Confirm Password profile_image = Profile Image: profile_new_image = New Image +products_title = Products qrcode = QR Code -qrcode_current_url = Current URL - +qrcode_current_url = Current URL quick_add_order = Order quick_add_customer = Customer quick_add_category = Category @@ -223,8 +218,7 @@ quick_add_coupon = Coupon quick_add_manufacturer = Manufacturer quick_add_banner = Banner -quick_add_newsletter = Newsletter - +quick_add_newsletter = Newsletter quick_add_order_title = Add new Order quick_add_customer_title = Add new Customer quick_add_category_title = Add new Category @@ -234,7 +228,6 @@ quick_add_manufacturer_title = Add new Manufacturer quick_add_banner_title = Add new Banner quick_add_newsletter_title = Add new Newsletter - quick_add_new_order = Typing lowercase o while the Quick Add menu is active will redirect you to the New Order page quick_add_new_customer = Typing lowercase c while the Quick Add menu is active will redirect you to the New Customer page quick_add_new_category = Typing lowercase g while the Quick Add menu is active will redirect you to the New Category page @@ -244,7 +237,6 @@ quick_add_new_manufacturer = Typing lowercase t while the Quick Add menu is active will redirect you to the New Manufacturer page quick_add_new_banner = Typing lowercase b while the Quick Add menu is active will redirect you to the New Banner page quick_add_new_newsletter = Typing lowercase n while the Quick Add menu is active will redirect you to the New Newsletter page - quick_add_order_trigger = o quick_add_customer_trigger = c quick_add_category_trigger = g @@ -266,14 +258,14 @@ order_view_details = View details for order number product_view_details = View details for +product_search_placeholder = Product Search +product_attributes_product_classes_title = Product Classes result_set_current_page = Page %s of %d search_placeholder = Search -product_search_placeholder = Product Search site_maintenance_message_title = Maintenance Mode -site_maintenance_message_text = Site is in Maintenance Mode. Click here to disable it. - +site_maintenance_message_text = Site is in Maintenance Mode. Click here to disable it. slider_switch_enabled = ENABLED slider_switch_disabled = DISABLED slider_switch_preview = PREVIEW text_status = Statustext_select_product = Select Product @@ -284,6 +276,8 @@ tooltip_messages = Messages (m) tooltip_settings = Settings (s) / Main Menu (escape) top_category = Top Category +text_active = Active +text_inactive = Inactive text_top = Top text_hello = Hello text_with_selected = With Selected @@ -297,7 +291,6 @@ text_confirm_delete = Confirm Delete? text_sort = Sort text_mode = Mode - text_model = Model text_mode_info_category = Information Category text_mode_faq_category = FAQ Category @@ -329,13 +322,6 @@ text_product = Product text_special_enabled = Has Special Price (Enabled) text_special_disabled = Has Special Price (Disabled) - -update_message_title = Updates are Available! -update_message_text1 = New version -update_message_text2 = released. - -product_attributes_product_classes_title = Product Classes - text_coming_soon = Pro Feature Coming Soon text_click_for_info =  Click for Info  text_pro = Pro @@ -381,7 +367,9 @@ text_featured_product_no_expiration = No Expiration text_available_with_pro = This feature available with the PRO edition text_free_with_pro_edition = PRO Free with Pro Edition -error_specials_date = Error: The specials expire date cannot be before the start date. -button_understood = I Understand text_api_com_issue = API Communication text_api_com_issue_warnings = There was an issue communicating with the API and
    because of this some functionality such as Core
    Updates and Addon delivery will not function properly.

    Please refer to the error log located at
    catalog/includes/works/logs/api_errors.txt for more
    detailed information. + +update_message_title = Updates are Available! +update_message_text1 = New version +update_message_text2 = released. \ No newline at end of file diff --git a/catalog/admin/includes/languages/en_US/specials.php b/catalog/admin/includes/languages/en_US/specials.php index 40016bf94..04e4fc287 100644 --- a/catalog/admin/includes/languages/en_US/specials.php +++ b/catalog/admin/includes/languages/en_US/specials.php @@ -11,6 +11,7 @@ table_heading_products = Products table_heading_price = Price +table_heading_status = Status table_heading_action = Action modal_heading_new_special = New Special From b6975c299a0beb34c4646721aeadcdf692aa7a2b Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 27 May 2015 01:33:03 -0400 Subject: [PATCH 43/50] added sort order to upgrader class. --- catalog/install/includes/classes/upgrader.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/catalog/install/includes/classes/upgrader.php b/catalog/install/includes/classes/upgrader.php index 9e6874014..5ada84c77 100644 --- a/catalog/install/includes/classes/upgrader.php +++ b/catalog/install/includes/classes/upgrader.php @@ -510,6 +510,7 @@ public function __construct() { , 'manufacturers_id' => 'manufacturers_id' , 'products_ordered' => 'products_ordered' , 'has_children' => 'has_children' + , 'products_sort_order' => 'sort_order' ) , 'products_desc' => array( 'products_id' => 'products_id' @@ -789,6 +790,7 @@ public function importProducts($switch = null) { , 'products_price10_qty' => $sQry->value('products_price10_qty') , 'products_price11_qty' => $sQry->value('products_price11_qty') , 'has_children' => 0 + , 'products_sort_order' => $sQry->value($map['products_sort_order']) ); $tQry = $target_db->query('INSERT INTO :table_products (products_id, @@ -808,6 +810,7 @@ public function importProducts($switch = null) { manufacturers_id, products_ordered, has_children, + products_sort_order, is_subproduct) VALUES (:products_id, :parent_id, @@ -826,6 +829,7 @@ public function importProducts($switch = null) { :manufacturers_id, :products_ordered, :has_children, + :products_sort_order, :is_subproduct)'); $tQry->bindTable(':table_products', TABLE_PRODUCTS); @@ -846,6 +850,7 @@ public function importProducts($switch = null) { $tQry->bindInt (':manufacturers_id' , $product['manufacturers_id']); $tQry->bindInt (':products_ordered' , $product['products_ordered']); $tQry->bindInt (':has_children' , $product['has_children']); + $tQry->bindInt (':products_sort_order' , $product['products_sort_order']); $tQry->bindInt (':is_subproduct' , ($product['parent_id'] != 0) ? 1 : 0); $tQry->execute(); @@ -1104,17 +1109,7 @@ public function importProducts($switch = null) { $dv2Qry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value2 SET DEFAULT ""'); $dv2Qry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); $dv2Qry->execute(); - // Added for default values fix during upgrade - end - - // Added for default values fix during upgrade - START - $dvQry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value SET DEFAULT ""'); - $dvQry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); - $dvQry->execute(); - - $dv2Qry = $target_db->query('ALTER TABLE :table_product_attributes ALTER COLUMN value2 SET DEFAULT ""'); - $dv2Qry->bindTable(':table_product_attributes', TABLE_PRODUCT_ATTRIBUTES); - $dv2Qry->execute(); - // Added for default values fix during upgrade - end + // Added for default values fix during upgrade - end $aQry = $target_db->query('INSERT INTO :table_product_attributes (id, products_id, From f9044e5095dec3737d417ae78d5cc456d7c93aa5 Mon Sep 17 00:00:00 2001 From: datazen Date: Sun, 31 May 2015 11:58:25 -0400 Subject: [PATCH 44/50] updated for rounding rules --- catalog/includes/classes/currencies.php | 62 ++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/catalog/includes/classes/currencies.php b/catalog/includes/classes/currencies.php index aaeb13617..7465c84d2 100644 --- a/catalog/includes/classes/currencies.php +++ b/catalog/includes/classes/currencies.php @@ -30,6 +30,8 @@ public function lC_Currencies() { $Qcurrencies->freeResult(); } + + // class methods public function format($number, $currency_code = '', $currency_value = '') { @@ -42,8 +44,64 @@ public function format($number, $currency_code = '', $currency_value = '') { if (empty($currency_value) || (is_numeric($currency_value) == false)) { $currency_value = $this->currencies[$currency_code]['value']; } + + // rounding rule + if ((utility::isPro() === true || utility::isB2B() === true) && defined('PRO_SETTINGS_ROUNDING_RULES') && PRO_SETTINGS_ROUNDING_RULES != '') { + // determine the current price parts + $currentPriceValue = lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']); + $priceParts = explode('.', $currentPriceValue); + $dollarPrice = $priceParts[0]; + $centsPrice = $priceParts[1]; + + $number_value = number_format(lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']), $this->currencies[$currency_code]['decimal_places'], $lC_Language->getNumericDecimalSeparator(), $lC_Language->getNumericThousandsSeparator()); + + // get the rounding rules + $rules = unserialize(PRO_SETTINGS_ROUNDING_RULES); + + if (is_array($rules[$this->getCode()])) { + if ($rules[$this->getCode()]['status'] == 'on' || $rules[$this->getCode()]['status'] == '1') { + + $roundto = $rules[$this->getCode()]['roundto']; + $level = $rules[$this->getCode()]['level']; + + switch ($level) { + case '0' : // ###.#0 + $number_value = number_format((float)(substr((string) $number_value, 0, -($level+1)) . str_replace(array('.', '#'), '', $roundto)), DECIMAL_PLACES); + break; + case '1' : // ###.00 + $number_value = number_format((float)(substr((string) $number_value, 0, -($level+1)) . str_replace(array('.', '#'), '', $roundto)), DECIMAL_PLACES); + break; + case '2' : // ##0.00 + if (strstr($roundto, '.')) { + $parts = explode('.', $roundto); + $rDollar = (string)$parts[0]; + $rCents = (string)$parts[1]; + $number_value = (float)(substr($dollarPrice, 0, -1) . $rDollar . '.' . $rCents); + } + break; + case '3' : // #00.00 + if (strstr($roundto, '.')) { + $parts = explode('.', $roundto); + $rDollar = (string)$parts[0]; + $rCents = (string)$parts[1]; + $number_value = (float)(substr($dollarPrice, 0, -2) . $rDollar . '.' . $rCents); + } + break; + case '4' : // 000.00 + if (strstr($roundto, '.')) { + $parts = explode('.', $roundto); + $rDollar = (string)$parts[0]; + $rCents = (string)$parts[1]; + $number_value = (float)(substr($dollarPrice, 0, -3) . $rDollar . '.' . $rCents); + } + break; + } - return $this->currencies[$currency_code]['symbol_left'] . number_format(lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']), $this->currencies[$currency_code]['decimal_places'], $lC_Language->getNumericDecimalSeparator(), $lC_Language->getNumericThousandsSeparator()) . $this->currencies[$currency_code]['symbol_right']; + } + } + } + + return $this->currencies[$currency_code]['symbol_left'] . $number_value . $this->currencies[$currency_code]['symbol_right']; } public function formatRaw($number, $currency_code = '', $currency_value = '') { @@ -177,4 +235,4 @@ public function getSessionSymbolRight() { } } } -?> +?> \ No newline at end of file From 41b5dc4eec9797e74b35b8da877a0d04de373f32 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 10 Jun 2015 11:20:38 -0400 Subject: [PATCH 45/50] [IC] some reformatting --- catalog/includes/classes/shopping_cart.php | 184 ++++++++++----------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/catalog/includes/classes/shopping_cart.php b/catalog/includes/classes/shopping_cart.php index c0b074fcb..60f1539e7 100644 --- a/catalog/includes/classes/shopping_cart.php +++ b/catalog/includes/classes/shopping_cart.php @@ -57,7 +57,7 @@ public function __construct() { $this->_billing_address =& $_SESSION['lC_ShoppingCart_data']['billing_address']; $this->_billing_method =& $_SESSION['lC_ShoppingCart_data']['billing_method']; $this->_shipping_quotes =& $_SESSION['lC_ShoppingCart_data']['shipping_quotes']; - $this->_order_totals =& $_SESSION['lC_ShoppingCart_data']['order_totals']; + $this->_order_totals =& $_SESSION['lC_ShoppingCart_data']['order_totals']; } public function refresh($recalc = false) { @@ -79,7 +79,7 @@ public function synchronizeWithDatabase() { if ( !$lC_Customer->isLoggedOn() ) { return false; - } + } foreach ( $this->_contents as $item_id => $data ) { $db_action = 'check'; @@ -92,14 +92,14 @@ public function synchronizeWithDatabase() { } } } - + if ( $db_action == 'check' ) { $Qproduct = $lC_Database->query('select item_id, meta_data, quantity from :table_shopping_carts where customers_id = :customers_id and products_id = :products_id'); $Qproduct->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); $Qproduct->bindInt(':customers_id', $lC_Customer->getID()); $Qproduct->bindInt(':products_id', $data['id']); $Qproduct->execute(); - + if ( $Qproduct->numberOfRows() > 0 && $data['meta_data'] == $Qproduct->value('meta_data')) { $Qupdate = $lC_Database->query('update :table_shopping_carts set quantity = :quantity where customers_id = :customers_id and item_id = :item_id'); $Qupdate->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); @@ -119,9 +119,9 @@ public function synchronizeWithDatabase() { $Qid->execute(); $db_item_id = $Qid->valueInt('item_id') + 1; - + $meta_data = (is_array($data['simple_options']) && empty($data['simple_options']) === false) ? $data['simple_options'] : array(); - + $Qnew = $lC_Database->query('insert into :table_shopping_carts (customers_id, item_id, products_id, quantity, meta_data, date_added) values (:customers_id, :item_id, :products_id, :quantity, :meta_data, :date_added)'); $Qnew->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); $Qnew->bindInt(':customers_id', $lC_Customer->getID()); @@ -148,7 +148,7 @@ public function synchronizeWithDatabase() { } } } - + // store simple options foreach ( $this->_contents as $item_id => $data ) { $simple_options = array(); @@ -157,8 +157,8 @@ public function synchronizeWithDatabase() { $simple_options[$item_id][] = $option; } } - } - + } + // reset per-session cart contents, but not the database contents $this->reset(); @@ -190,7 +190,7 @@ public function synchronizeWithDatabase() { if ( $new_price = $lC_Specials->getPrice($Qproducts->valueInt('products_id')) ) { $price = $new_price; } - } + } $this->_contents[$Qproducts->valueInt('item_id')] = array('item_id' => $Qproducts->valueInt('item_id'), 'id' => $Qproducts->valueInt('products_id'), @@ -271,7 +271,7 @@ public function synchronizeWithDatabase() { foreach ( $_delete_array as $id ) { unset($this->_contents[$id]); } - + $Qdelete = $lC_Database->query('delete from :table_shopping_carts where customers_id = :customers_id and item_id in (":item_id")'); $Qdelete->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); $Qdelete->bindInt(':customers_id', $lC_Customer->getID()); @@ -327,15 +327,15 @@ public function add($product_id, $quantity = null) { if ( !is_numeric($product_id) ) { return false; - } - + } + $Qproduct = $lC_Database->query('select p.*, i.image from :table_products p left join :table_products_images i on (p.products_id = i.products_id and i.default_flag = :default_flag) where p.products_id = :products_id'); $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); $Qproduct->bindTable(':table_products_images', TABLE_PRODUCTS_IMAGES); $Qproduct->bindInt(':default_flag', 1); $Qproduct->bindInt(':products_id', $product_id); $Qproduct->execute(); - + if ( $Qproduct->value('image') == null ) { // check for parent image $Qimage = $lC_Database->query('select image from :table_products_images where products_id = :parent_id'); @@ -367,26 +367,26 @@ public function add($product_id, $quantity = null) { $Qupdate->execute(); } } else { - + if ( !is_numeric($quantity) ) { $quantity = 1; - } - + } + $Qdescription = $lC_Database->query('select products_name, products_keyword, products_description, products_tags, products_url from :table_products_description where products_id = :products_id and language_id = :language_id'); $Qdescription->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); $Qdescription->bindInt(':products_id', $product_id); $Qdescription->bindInt(':language_id', $lC_Language->getID()); - $Qdescription->execute(); - + $Qdescription->execute(); + $desc = $Qdescription->toArray(); - + if ($Qproduct->valueInt('parent_id') > 0) { $Qmaster = $lC_Database->query('select products_name as parent_name, products_description as description, products_keyword as keyword, products_tags as tags, products_url as url from :table_products_description where products_id = :products_id and language_id = :language_id limit 1'); $Qmaster->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION); $Qmaster->bindInt(':products_id', $Qproduct->valueInt('parent_id')); $Qmaster->bindInt(':language_id', $lC_Language->getID()); - $Qmaster->execute(); - + $Qmaster->execute(); + if ($Qproduct->valueInt('is_subproduct') > 0) { $desc['products_name'] = $Qmaster->value('parent_name') . ' - ' . $desc['products_name']; } else { @@ -400,8 +400,8 @@ public function add($product_id, $quantity = null) { // we get the product price from the product class - price already includes options, etc. if (!isset($lC_Product)) $lC_Product = new lC_Product($product_id); - $price = $lC_Product->getPrice($product_id, $lC_Customer->getCustomerGroup(), $_POST); - + $price = $lC_Product->getPrice($product_id, $lC_Customer->getCustomerGroup(), $_POST); + if ( $lC_Customer->isLoggedOn() ) { $Qid = $lC_Database->query('select max(item_id) as item_id from :table_shopping_carts where customers_id = :customers_id'); $Qid->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); @@ -433,24 +433,24 @@ public function add($product_id, $quantity = null) { 'weight' => $Qproduct->value('products_weight'), 'tax_class_id' => $Qproduct->valueInt('products_tax_class_id'), 'date_added' => lC_DateTime::getShort(lC_DateTime::getNow()), - 'weight_class_id' => $Qproduct->valueInt('products_weight_class')); + 'weight_class_id' => $Qproduct->valueInt('products_weight_class')); // simple options if (isset($_POST['simple_options']) && empty($_POST['simple_options']) === false) { foreach($_POST['simple_options'] as $options_id => $values_id) { - + if (is_array($values_id)) { $text_value = current($values_id); // for text fields - $values_id = key($values_id); + $values_id = key($values_id); } - + $QsimpleOptionsValues = $lC_Database->query('select price_modifier from :table_products_simple_options_values where options_id = :options_id and values_id = :values_id and customers_group_id = :customers_group_id'); $QsimpleOptionsValues->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); $QsimpleOptionsValues->bindInt(':options_id', $options_id); $QsimpleOptionsValues->bindInt(':values_id', $values_id); $QsimpleOptionsValues->bindInt(':customers_group_id', '1'); - $QsimpleOptionsValues->execute(); - + $QsimpleOptionsValues->execute(); + $Qvariants = $lC_Database->query('select pvg.title as group_title, pvg.module, pvv.title as value_title from :table_products_variants_groups pvg, :table_products_variants_values pvv where pvg.id = :options_id and pvv.id = :values_id and pvv.languages_id = :languages_id and pvv.products_variants_groups_id = pvg.id and pvg.languages_id = :languages_id limit 1'); $Qvariants->bindTable(':table_products_variants_groups', TABLE_PRODUCTS_VARIANTS_GROUPS); $Qvariants->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); @@ -459,15 +459,15 @@ public function add($product_id, $quantity = null) { $Qvariants->bindInt(':languages_id', $lC_Language->getID()); $Qvariants->bindInt(':languages_id', $lC_Language->getID()); $Qvariants->execute(); - + if (strstr($Qvariants->value('module'), 'file_upload')) { - + $group_title = (is_array($_FILES['simple_options_upload']['name']) && count($_FILES['simple_options_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); $value_title = (is_array($_FILES['simple_options_upload']['name'])) ? implode(', ', $_FILES['simple_options_upload']['name']) : $_FILES['simple_options_upload']['name']; - if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); - $value_title = str_replace(', ,', ', ', $value_title); - - if ($value_title == '') $group_title = ''; + if (substr($value_title, -2) == ', ') $value_title = substr($value_title, 0, -2); + $value_title = str_replace(', ,', ', ', $value_title); + + if ($value_title == '') $group_title = ''; if (is_array($_FILES['simple_options_upload']['name'])) { $filesArr = $_FILES; @@ -486,28 +486,28 @@ public function add($product_id, $quantity = null) { if ( $image->parse() && $image->save() ) { // success } - } - } + } + } } - + } else if ($Qvariants->value('module') == 'text_field') { $group_title = $Qvariants->value('group_title'); - $value_title = $text_value; + $value_title = $text_value; } else { $group_title = $Qvariants->value('group_title'); $value_title = $Qvariants->value('value_title'); - } - + } + $this->_contents[$item_id]['simple_options'][] = array('value_id' => $values_id, 'group_id' => $options_id, 'group_title' => $group_title, 'value_title' => $value_title, 'price_modifier' => $QsimpleOptionsValues->valueDecimal('price_modifier')); - $QsimpleOptionsValues->freeResult(); - $Qvariants->freeResult(); + $QsimpleOptionsValues->freeResult(); + $Qvariants->freeResult(); } - } - + } + if ( $lC_Customer->isLoggedOn() ) { $Qnew = $lC_Database->query('insert into :table_shopping_carts (customers_id, item_id, products_id, quantity, meta_data, date_added) values (:customers_id, :item_id, :products_id, :quantity, :meta_data, :date_added)'); $Qnew->bindTable(':table_shopping_carts', TABLE_SHOPPING_CARTS); @@ -534,7 +534,7 @@ public function add($product_id, $quantity = null) { $group_title = lC_Variants::getGroupTitle($Qvariant->value('module'), $Qvariant->toArray()); $value_title = lC_Variants::getValueTitle($Qvariant->value('module'), $Qvariant->toArray()); $has_custom_value = lC_Variants::hasCustomValue($Qvariant->value('module')); - + if (strstr($Qvariant->value('module'), 'file_upload')) { $group_title = (is_array($_FILES['variants_upload']['name']) && count($_FILES['variants_upload']['name']) > 2) ? $lC_Language->get('text_label_files') : $lC_Language->get('text_label_file'); $value_title = (is_array($_FILES['variants_upload']['name'])) ? implode(', ', $_FILES['variants_upload']['name']) : $_FILES['variants_upload']['name']; @@ -556,16 +556,16 @@ public function add($product_id, $quantity = null) { if ( $image->parse() && $image->save() ) { // success } - } - } + } + } } - + } else if ($Qvariant->value('module') == 'text_field') { $group_title = $Qvariant->value('group_title'); } else { $group_title = $Qvariant->value('group_title'); $value_title = $Qvariant->value('value_title'); - } + } $this->_contents[$item_id]['variants'][] = array('group_id' => $Qvariant->valueInt('group_id'), 'value_id' => $Qvariant->valueInt('value_id'), @@ -586,7 +586,7 @@ public function add($product_id, $quantity = null) { } } } - + $this->_cleanUp(); $this->_calculate(); } @@ -623,8 +623,8 @@ public function exists($product_id) { return false; } } - } else if ( isset($product['simple_options']) ) { - foreach ( $product['simple_options'] as $simple_options ) { + } else if ( isset($product['simple_options']) ) { + foreach ( $product['simple_options'] as $simple_options ) { $group_id = $simple_options['group_id']; if(array_key_exists ( $group_id , $_POST['simple_options'] )) { if($simple_options['value_id'] != $_POST['simple_options'][$group_id]) { @@ -658,7 +658,7 @@ public function update($item_id, $quantity) { $Qupdate->bindInt(':item_id', $item_id); $Qupdate->execute(); } - + // get default tax_class_id $Qproduct = $lC_Database->query('select products_tax_class_id as tax_class_id from :table_products where products_id = :products_id and products_status = :products_status'); $Qproduct->bindTable(':table_products', TABLE_PRODUCTS); @@ -669,23 +669,23 @@ public function update($item_id, $quantity) { if ( $Qproduct->numberOfRows() === 1 ) { $this->_contents[$item_id]['tax_class_id'] = $Qproduct->valueInt('tax_class_id'); } - + $simple_options = array(); if (isset($this->_contents[$item_id]['simple_options'])) { foreach($this->_contents[$item_id]['simple_options'] as $key => $val) { $simple_options[$val['group_id']] = $val['value_id']; - } + } } // we get the product price from the product class - price already includes options, etc. if (!isset($lC_Product)) $lC_Product = new lC_Product($this->_contents[$item_id]['id']); $this->_contents[$item_id]['price_data'] = $lC_Product->getPriceInfo($this->_contents[$item_id]['id'], $lC_Customer->getCustomerGroup(), array('quantity' => $quantity, 'simple_options' => $simple_options)); $this->_contents[$item_id]['price'] = $this->_contents[$item_id]['price_data']['price']; - + $this->_cleanUp(); - $this->_calculate(); - - return $this->_contents[$item_id]['price_data']; + $this->_calculate(); + + return $this->_contents[$item_id]['price_data']; } public function remove($item_id) { @@ -732,12 +732,12 @@ public function getTotal() { public function getWeight() { return $this->_weight; - } + } public function getShippingCost() { return $this->_shipping_method['cost']; } - + public function generateCartID($length = 5) { return lc_create_random_string($length, 'digits'); } @@ -806,7 +806,7 @@ public function getContentType() { return $this->_content_type; } - + public function hasSimpleOptions($item_id) { return isset($this->_contents[$item_id]['simple_options']) && !empty($this->_contents[$item_id]['simple_options']); } @@ -815,7 +815,7 @@ public function getSimpleOptions($item_id) { if ( isset($this->_contents[$item_id]['simple_options']) && !empty($this->_contents[$item_id]['simple_options']) ) { return $this->_contents[$item_id]['simple_options']; } - } + } public function isVariant($item_id) { return isset($this->_contents[$item_id]['variants']) && !empty($this->_contents[$item_id]['variants']); @@ -913,7 +913,7 @@ public function resetShippingAddress() { } } - public function setShippingMethod($shipping_array, $calculate_total = true) { + public function setShippingMethod($shipping_array, $calculate_total = true) { $this->_shipping_method = $shipping_array; if ( $calculate_total === true ) { @@ -938,7 +938,7 @@ public function resetShippingMethod() { public function hasShippingMethod() { return !empty($this->_shipping_method); } - + public function hasBillingAddress() { return isset($this->_billing_address['id']); } @@ -978,7 +978,7 @@ public function setBillingAddress($address_id) { 'country_iso_code_3' => $Qaddress->value('countries_iso_code_3'), 'format' => $Qaddress->value('address_format'), 'telephone_number' => $Qaddress->value('entry_telephone')); - + if ( is_array($previous_address) && ( ($previous_address['id'] != $this->_billing_address['id']) || ($previous_address['country_id'] != $this->_billing_address['country_id']) || ($previous_address['zone_id'] != $this->_billing_address['zone_id']) || ($previous_address['state'] != $this->_billing_address['state']) || ($previous_address['postcode'] != $this->_billing_address['postcode']) ) ) { $this->_calculate(false); } @@ -1035,15 +1035,15 @@ public function getTaxingAddress($id = null) { return $this->getShippingAddress($id); } - + public function getTaxAmount() { return $this->_tax; - } + } public function addTaxAmount($amount) { $this->_tax += $amount; } - + public function numberOfTaxGroups() { return sizeof($this->_tax_groups); } @@ -1063,10 +1063,10 @@ public function getTaxGroups() { public function addToTotal($amount) { $this->_total += $amount; } - + public function subtractFromTotal($amount) { $this->_total -= $amount; - } + } public function getOrderTotals() { return $this->_order_totals; @@ -1079,12 +1079,12 @@ public function getShippingBoxesWeight() { public function numberOfShippingBoxes() { return $this->_shipping_boxes; } - + private function _cleanUp() { global $lC_Database, $lC_Customer; foreach ( $this->_contents as $item_id => $data ) { - + if ( $data['quantity'] < 1 ) { unset($this->_contents[$item_id]); @@ -1143,7 +1143,7 @@ private function _calculate($set_shipping = true, $generate_id = true) { $this->_total += $tax_amount; } - + $this->_tax += $tax_amount; if ( isset($this->_tax_groups[$tax_description]) ) { @@ -1152,7 +1152,7 @@ private function _calculate($set_shipping = true, $generate_id = true) { $this->_tax_groups[$tax_description] = $tax_amount; } } - + // coupons if (defined('MODULE_SERVICES_INSTALLED') && in_array('coupons', explode(';', MODULE_SERVICES_INSTALLED)) && isset($lC_Coupons)) { if ($lC_Coupons->hasContents()) { @@ -1160,7 +1160,7 @@ private function _calculate($set_shipping = true, $generate_id = true) { $this->_total -= $discount; } } - + $this->_shipping_boxes_weight = $this->_weight; $this->_shipping_boxes = 1; @@ -1186,35 +1186,35 @@ private function _calculate($set_shipping = true, $generate_id = true) { } else { $lC_Shipping = new lC_Shipping($this->getShippingMethod('id')); $this->setShippingMethod($lC_Shipping->getQuote(), false); - } + } } if ( !class_exists('lC_OrderTotal') ) { include($lC_Vqmod->modCheck('includes/classes/order_total.php')); - } + } $lC_OrderTotal = new lC_OrderTotal(); $this->_order_totals = $lC_OrderTotal->getResult(); - + // sanity recalc total $tkey = ''; $ot_total = 0; foreach ($this->_order_totals as $key => $ot) { if ($ot['code'] != 'total') { $ot_total = ($ot_total + $ot['value']); - $_SESSION['lC_ShoppingCart_data']['order_totals'][$key]['text'] = $lC_Currencies->format($ot['value']); + $_SESSION['lC_ShoppingCart_data']['order_totals'][$key]['text'] = $lC_Currencies->format($ot['value']); } else { - $tkey = $key; + $tkey = $key; } } $_SESSION['lC_ShoppingCart_data']['order_totals'][$tkey]['text'] = $lC_Currencies->format($ot_total); $_SESSION['lC_ShoppingCart_data']['order_totals'][$tkey]['value'] = $ot_total; - + // coupons if (defined('MODULE_SERVICES_INSTALLED') && in_array('coupons', explode(';', MODULE_SERVICES_INSTALLED)) && isset($lC_Coupons)) { $lC_Coupons->displayCouponInOrderTotal(); } - } + } } static private function _uasortProductsByDateAdded($a, $b) { @@ -1224,20 +1224,20 @@ static private function _uasortProductsByDateAdded($a, $b) { return ($a['date_added'] > $b['date_added']) ? -1 : 1; } - + public function getBillingTermsName($terms_id) { global $lC_Database; - + $Qterms = $lC_Database->query('select name from :table_payment_terms where id = :id limit 1'); $Qterms->bindTable(':table_payment_terms', TABLE_PAYMENT_TERMS); $Qterms->bindInt(':id', $terms_id); - $Qterms->execute(); - + $Qterms->execute(); + $name = $Qterms->value('name'); - + $Qterms->freeResult(); - - return $name; + + return $name; } } ?> From c6d14bdda8a763066400ff4a76145b24b53af3fb Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Wed, 10 Jun 2015 11:25:06 -0400 Subject: [PATCH 46/50] Update for missing prices store side due to rounding rule addition. Thanks Scott. --- catalog/includes/classes/currencies.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/catalog/includes/classes/currencies.php b/catalog/includes/classes/currencies.php index 7465c84d2..85fbf9642 100644 --- a/catalog/includes/classes/currencies.php +++ b/catalog/includes/classes/currencies.php @@ -44,8 +44,10 @@ public function format($number, $currency_code = '', $currency_value = '') { if (empty($currency_value) || (is_numeric($currency_value) == false)) { $currency_value = $this->currencies[$currency_code]['value']; } - - // rounding rule + + $number_value = number_format(lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']), $this->currencies[$currency_code]['decimal_places'], $lC_Language->getNumericDecimalSeparator(), $lC_Language->getNumericThousandsSeparator()); + + // rounding rule if ((utility::isPro() === true || utility::isB2B() === true) && defined('PRO_SETTINGS_ROUNDING_RULES') && PRO_SETTINGS_ROUNDING_RULES != '') { // determine the current price parts $currentPriceValue = lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']); @@ -53,8 +55,6 @@ public function format($number, $currency_code = '', $currency_value = '') { $dollarPrice = $priceParts[0]; $centsPrice = $priceParts[1]; - $number_value = number_format(lc_round($number * $currency_value, $this->currencies[$currency_code]['decimal_places']), $this->currencies[$currency_code]['decimal_places'], $lC_Language->getNumericDecimalSeparator(), $lC_Language->getNumericThousandsSeparator()); - // get the rounding rules $rules = unserialize(PRO_SETTINGS_ROUNDING_RULES); From ddc0a44870000d1212f2ebacae881b62efc26d4e Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Fri, 12 Jun 2015 00:17:55 -0400 Subject: [PATCH 47/50] fix for checkout success $NaN js issue --- catalog/templates/core/content/checkout/checkout_success.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/templates/core/content/checkout/checkout_success.php b/catalog/templates/core/content/checkout/checkout_success.php index 29707e54d..250499c39 100644 --- a/catalog/templates/core/content/checkout/checkout_success.php +++ b/catalog/templates/core/content/checkout/checkout_success.php @@ -181,7 +181,7 @@ var symbol = $('.ot-total-text').text().substr(0, 1); var ot_total = $('.ot-total-text').text().replace('$',''); var ot_handling = $('.ot-terms-handling-text').text().replace('$',''); - if (ot_handling != null) { + if (ot_handling != '') { var new_total = (parseFloat(ot_total) + parseFloat(ot_handling)).toFixed(decimals); $('.ot-total-text').text(symbol + new_total); } From 73da1d9315c10c462e89b08fafae5c27450e6cc8 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Sat, 13 Jun 2015 01:18:59 -0400 Subject: [PATCH 48/50] added sort order to simple options values save routine, based on variants values globally --- .../applications/products/classes/products.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php index 4a5664520..d33ef6278 100644 --- a/catalog/admin/includes/applications/products/classes/products.php +++ b/catalog/admin/includes/applications/products/classes/products.php @@ -936,12 +936,20 @@ public static function save($id = null, $data) { foreach ( $options as $options_id => $option_value ) { if ($options_id == $group_id) { foreach ( $option_value as $values_id => $price_modifier ) { - $Qoptval = $lC_Database->query('insert into :table_products_simple_options_values (products_id, values_id, options_id, customers_group_id, price_modifier) values (:products_id, :values_id, :options_id, :customers_group_id, :price_modifier)'); + // Added for simple options values sort order + // based for now on variants values sort order globally across all products + $Qsortorder = $lC_Database->query('select sort_order FROM :table_products_variants_values where id = :id'); + $Qsortorder->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); + $Qsortorder->bindInt(':id', $values_id); + $Qsortorder->execute(); + + $Qoptval = $lC_Database->query('insert into :table_products_simple_options_values (products_id, values_id, options_id, customers_group_id, price_modifier, sort_order) values (:products_id, :values_id, :options_id, :customers_group_id, :price_modifier, :sort_order)'); $Qoptval->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); - $Qoptval->bindInt(':products_id', $products_id); + $Qoptval->bindInt(':products_id', $products_id); $Qoptval->bindInt(':values_id', $values_id); $Qoptval->bindInt(':options_id', $options_id); $Qoptval->bindInt(':customers_group_id', $customers_group_id); + $Qoptval->bindInt(':sort_order', $Qsortorder->valueInt('sort_order')); $Qoptval->bindFloat(':price_modifier', (float)$price_modifier); $Qoptval->setLogging($_SESSION['module'], $products_id); $Qoptval->execute(); From 53d303aab5e5dde7da747f99fd0517f0bdecab20 Mon Sep 17 00:00:00 2001 From: geraldbullard Date: Sat, 13 Jun 2015 01:22:14 -0400 Subject: [PATCH 49/50] added simple options values sort order by to get for product edit --- .../admin/includes/applications/products/classes/products.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/admin/includes/applications/products/classes/products.php b/catalog/admin/includes/applications/products/classes/products.php index d33ef6278..e59fc084f 100644 --- a/catalog/admin/includes/applications/products/classes/products.php +++ b/catalog/admin/includes/applications/products/classes/products.php @@ -610,7 +610,7 @@ public static function get($id) { while ($Qoptions->next()) { $data['simple_options'][$cnt] = $Qoptions->toArray(); - $Qvalues = $lC_Database->query('select sov.products_id, sov.options_id, sov.values_id, sov.price_modifier, sov.customers_group_id, vv.title from :table_products_simple_options_values sov left join :table_products_variants_values vv on (sov.values_id = vv.id) where sov.options_id = :options_id and sov.products_id = :products_id and vv.languages_id = :languages_id'); + $Qvalues = $lC_Database->query('select sov.products_id, sov.options_id, sov.values_id, sov.price_modifier, sov.customers_group_id, vv.title from :table_products_simple_options_values sov left join :table_products_variants_values vv on (sov.values_id = vv.id) where sov.options_id = :options_id and vv.languages_id = :languages_id order by sov.sort_order'); $Qvalues->bindTable(':table_products_simple_options_values', TABLE_PRODUCTS_SIMPLE_OPTIONS_VALUES); $Qvalues->bindTable(':table_products_variants_values', TABLE_PRODUCTS_VARIANTS_VALUES); $Qvalues->bindInt(':options_id', $Qoptions->valueInt('options_id')); From 46b0d1c1988fd8ea293d589edc301f5ec82679ac Mon Sep 17 00:00:00 2001 From: datazen Date: Mon, 15 Jun 2015 08:52:07 -0400 Subject: [PATCH 50/50] updated version.txt --- catalog/includes/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/includes/version.txt b/catalog/includes/version.txt index e5024eca0..4f027cdc9 100644 --- a/catalog/includes/version.txt +++ b/catalog/includes/version.txt @@ -1 +1 @@ -7.003.3.3|04/21/2015 +7.003.4.0|06/15/2015