From 37820b5b87e37ae7099990508f58a8cbcbc81615 Mon Sep 17 00:00:00 2001 From: gburton Date: Sat, 27 Feb 2021 19:27:29 +0000 Subject: [PATCH 1/7] Historical Anchors Remove OSCOM. Remove oscommerce.com links. --- README.md | 7 ++- admin/administrators.php | 6 +-- admin/backup.php | 4 +- admin/includes/application_top.php | 2 +- admin/includes/footer.php | 2 +- admin/includes/languages/english.php | 2 +- .../languages/english/administrators.php | 6 +-- .../modules/dashboard/d_security_checks.php | 2 +- .../modules/dashboard/d_version_check.php | 2 +- .../languages/english/version_check.php | 2 +- .../modules/dashboard/d_phoenix_addons.php | 4 +- admin/login.php | 2 +- admin/modules.php | 8 --- admin/modules_content.php | 8 --- admin/security_checks.php | 2 - admin/server_info.php | 54 +------------------ admin/version_check.php | 4 +- includes/apps/paypal/OSCOM_PayPal.php | 2 +- .../languages/english/admin/privacy.php | 2 +- includes/functions/general.php | 2 +- includes/hooks/admin/siteWide/hMenu.php | 4 +- .../cm_footer_extra_copyright.php | 2 +- .../modules/header_tags/ht_mailchimp_360.php | 2 +- .../english/modules/payment/braintree_cc.php | 2 +- .../modules/payment/paypal_pro_payflow_dp.php | 2 +- .../modules/payment/paypal_pro_payflow_ec.php | 2 +- .../english/modules/payment/pm2checkout.php | 2 +- .../modules/payment/rbsworldpay_hosted.php | 2 +- .../modules/payment/sage_pay_direct.php | 2 +- .../english/modules/payment/sage_pay_form.php | 2 +- .../modules/payment/sage_pay_server.php | 2 +- includes/modules/payment/paypal_pro_hs.php | 2 +- includes/modules/payment/paypal_standard.php | 2 +- .../segments/application/project_version.php | 2 +- install/phoenix.sql | 4 +- install/templates/main_page.php | 8 +-- install/templates/pages/index.php | 4 +- install/templates/pages/install_4.php | 8 +-- 38 files changed, 53 insertions(+), 124 deletions(-) diff --git a/README.md b/README.md index b7b7d53ff..3e2dc740e 100644 --- a/README.md +++ b/README.md @@ -90,13 +90,13 @@ Thank you to all shopowners, developers, consultants and business owners who are ## Join the Phoenix Club -If you wish to help steer the future direction of the software you need to join the [Phoenix Club](https://forums.oscommerce.com/clubs/1-phoenix/) +If you wish to help steer the future direction of the software you need to join the [Phoenix Club](https://phoenixcart.org/forum/) # Helpful Links Channel | URL ------------ | ------------- -Phoenix Club | https://forums.oscommerce.com/forum/117-topics/ +Phoenix Club | https://phoenixcart.org/forum/ Phoenix (Youtube) | https://www.youtube.com/channel/UCjJe0ZX3-nGzeJFEzcVUyIA/ Zipurman Coding (Youtube) | https://www.youtube.com/user/zipurman/videos Support (Discord) | https://discord.gg/3pzfrtMAX4 @@ -110,8 +110,7 @@ Images in the default installation are copyright their respective owners; Image | Owner | Usage ------------ | ------------- | ------------- -osCommerce Logo | osCommerce | https://www.oscommerce.com/Us&Legal#TrademarkPolicy -Phoenix Logo | G Burton | Phoenix Logo may not be used without prior written permission from the copyright owner. +Phoenix Logo | Phoenix Cart | https://phoenixcart.org Phoenix Logo may not be used without prior written permission from the copyright owner. Oranges, Lemons, Pears, Apples | Eelffica from Pixabay | https://pixabay.com/service/license/ Tomatoes | Rocky_H from Pixabay | https://pixabay.com/service/license/ Heart | Gerhard Gellinger from Pixabay | https://pixabay.com/service/license/ diff --git a/admin/administrators.php b/admin/administrators.php index 6c388bae8..e76a5d880 100644 --- a/admin/administrators.php +++ b/admin/administrators.php @@ -16,12 +16,12 @@ $htpasswd_array = null; $is_iis = stripos($_SERVER['SERVER_SOFTWARE'], 'iis'); - $authuserfile_array = ['##### OSCOM ADMIN PROTECTION - BEGIN #####', + $authuserfile_array = ['##### Phoenix ADMIN PROTECTION - BEGIN #####', 'AuthType Basic', - 'AuthName "OSCOM CE Phoenix Administration Tool"', + 'AuthName "CE Phoenix Administration Tool"', 'AuthUserFile ' . DIR_FS_ADMIN . '.htpasswd_oscommerce', 'Require valid-user', - '##### OSCOM ADMIN PROTECTION - END #####']; + '##### Phoenix ADMIN PROTECTION - END #####']; if (!$is_iis && file_exists(DIR_FS_ADMIN . '.htpasswd_oscommerce') && tep_is_writable(DIR_FS_ADMIN . '.htpasswd_oscommerce') && file_exists(DIR_FS_ADMIN . '.htaccess') && tep_is_writable(DIR_FS_ADMIN . '.htaccess')) { $htaccess_array = []; diff --git a/admin/backup.php b/admin/backup.php index 57ca26a05..790f40106 100644 --- a/admin/backup.php +++ b/admin/backup.php @@ -35,8 +35,8 @@ $fp = fopen(DIR_FS_BACKUP . $backup_file, 'w'); $schema = sprintf(<<<'EOSQL' -# osCommerce, Open Source E-Commerce Solutions -# http://www.oscommerce.com +# CE Phoenix, E-Commerce made Easy +# https://phoenixcart.org # # Database Backup For %s # Copyright (c) %d %s diff --git a/admin/includes/application_top.php b/admin/includes/application_top.php index eb811bd11..246e6e763 100644 --- a/admin/includes/application_top.php +++ b/admin/includes/application_top.php @@ -34,7 +34,7 @@ $OSCOM_Hooks->generate('system', 'startApplication'); // Define the project version --- obsolete, now retrieved with tep_get_version() - define('PROJECT_VERSION', 'OSCOM CE Phoenix'); + define('PROJECT_VERSION', 'CE Phoenix'); // set the type of request (secure or not) $request_type = (getenv('HTTPS') === 'on') ? 'SSL' : 'NONSSL'; diff --git a/admin/includes/footer.php b/admin/includes/footer.php index 0cc3f0327..5d7b7740c 100644 --- a/admin/includes/footer.php +++ b/admin/includes/footer.php @@ -14,6 +14,6 @@ diff --git a/admin/includes/languages/english.php b/admin/includes/languages/english.php index 4fe16762c..273028584 100644 --- a/admin/includes/languages/english.php +++ b/admin/includes/languages/english.php @@ -32,7 +32,7 @@ const CHARSET = 'utf-8'; // page title -const TITLE = 'OSCOM CE Phoenix Administration Tool'; +const TITLE = 'CE Phoenix Administration Tool'; // header text in includes/header.php const HEADER_TITLE_ONLINE_CATALOG = 'Your Shop'; diff --git a/admin/includes/languages/english/administrators.php b/admin/includes/languages/english/administrators.php index db82cb92a..8c794396a 100644 --- a/admin/includes/languages/english/administrators.php +++ b/admin/includes/languages/english/administrators.php @@ -27,8 +27,8 @@ define('ERROR_ADMINISTRATOR_EXISTS', 'Error: Administrator already exists.'); -define('HTPASSWD_INFO', 'Additional Protection With htaccess/htpasswd

This OSCOM CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.

Enabling the htaccess/htpasswd security layer will automatically store administrator username and passwords in a htpasswd file when updating administrator password records.

Please note, if this additional security layer is enabled and you can no longer access the Administration Tool, please make the following changes and consult your hosting provider to enable htaccess/htpasswd protection:

1. Edit this file:

' . DIR_FS_ADMIN . '.htaccess

Remove the following lines if they exist:

%s

2. Delete this file:

' . DIR_FS_ADMIN . '.htpasswd_oscommerce

'); -define('HTPASSWD_SECURED', 'Additional Protection With htaccess/htpasswd

This OSCOM CE Phoenix Administration Tool installation is additionally secured through htaccess/htpasswd means.

'); -define('HTPASSWD_PERMISSIONS', 'Additional Protection With htaccess/htpasswd

This OSCOM CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.

The following files need to be writable by the web server to enable the htaccess/htpasswd security layer:

Reload this page to confirm if the correct file permissions have been set.

'); +define('HTPASSWD_INFO', 'Additional Protection With htaccess/htpasswd

This CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.

Enabling the htaccess/htpasswd security layer will automatically store administrator username and passwords in a htpasswd file when updating administrator password records.

Please note, if this additional security layer is enabled and you can no longer access the Administration Tool, please make the following changes and consult your hosting provider to enable htaccess/htpasswd protection:

1. Edit this file:

' . DIR_FS_ADMIN . '.htaccess

Remove the following lines if they exist:

%s

2. Delete this file:

' . DIR_FS_ADMIN . '.htpasswd_oscommerce

'); +define('HTPASSWD_SECURED', 'Additional Protection With htaccess/htpasswd

This CE Phoenix Administration Tool installation is additionally secured through htaccess/htpasswd means.

'); +define('HTPASSWD_PERMISSIONS', 'Additional Protection With htaccess/htpasswd

This CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.

The following files need to be writable by the web server to enable the htaccess/htpasswd security layer:

Reload this page to confirm if the correct file permissions have been set.

'); define('IMAGE_INSERT_NEW_ADMIN', 'New Admin User'); diff --git a/admin/includes/languages/english/modules/dashboard/d_security_checks.php b/admin/includes/languages/english/modules/dashboard/d_security_checks.php index e86996ba2..ad8001f7d 100644 --- a/admin/includes/languages/english/modules/dashboard/d_security_checks.php +++ b/admin/includes/languages/english/modules/dashboard/d_security_checks.php @@ -12,4 +12,4 @@ define('MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_TITLE', 'Security Checks'); define('MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_DESCRIPTION', 'Run security checks'); -define('MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_SUCCESS', 'This is a properly configured installation of OSCOM CE Phoenix!'); +define('MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_SUCCESS', 'This is a properly configured installation of CE Phoenix!'); diff --git a/admin/includes/languages/english/modules/dashboard/d_version_check.php b/admin/includes/languages/english/modules/dashboard/d_version_check.php index 76d9e4b7f..84acba3b2 100644 --- a/admin/includes/languages/english/modules/dashboard/d_version_check.php +++ b/admin/includes/languages/english/modules/dashboard/d_version_check.php @@ -16,4 +16,4 @@ define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_CHECK_NOW', 'Check Now'); define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_NEVER', 'Never'); -define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_UPDATE_AVAILABLE', ' An update for OSCOM CE Phoenix is available!'); +define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_UPDATE_AVAILABLE', ' An update for CE Phoenix is available!'); diff --git a/admin/includes/languages/english/version_check.php b/admin/includes/languages/english/version_check.php index f5afa50d2..df14a6e70 100644 --- a/admin/includes/languages/english/version_check.php +++ b/admin/includes/languages/english/version_check.php @@ -21,5 +21,5 @@ define('TITLE_INSTALLED_VERSION', 'Installed Version:'); define('VERSION_RUNNING_LATEST', 'You are running the latest version of CE Phoenix.'); -define('VERSION_UPGRADES_AVAILABLE', 'A new version is available for download! (CE Phoenix v%s)
Certified Developers and detailed "Do It Yourself" instructions are available in the Phoenix Club.'); +define('VERSION_UPGRADES_AVAILABLE', 'A new version is available for download! (CE Phoenix v%s)
Certified Developers and detailed "Do It Yourself" instructions are available in the Phoenix Club.'); define('ERROR_COULD_NOT_CONNECT', 'Could not connect to the CE Phoenix website to check for new versions.'); diff --git a/admin/includes/modules/dashboard/d_phoenix_addons.php b/admin/includes/modules/dashboard/d_phoenix_addons.php index cbebdcd86..0312686fa 100644 --- a/admin/includes/modules/dashboard/d_phoenix_addons.php +++ b/admin/includes/modules/dashboard/d_phoenix_addons.php @@ -53,8 +53,8 @@ function getOutput() { $output .= ''; $output .= '
'; - $output .= '' . tep_image('images/icon_phoenix.png', 'Phoenix') . ' '; - $output .= '' . MODULE_ADMIN_DASHBOARD_PHOENIX_JOIN_CLUB . ''; + $output .= '' . tep_image('images/icon_phoenix.png', 'Phoenix') . ' '; + $output .= '' . MODULE_ADMIN_DASHBOARD_PHOENIX_JOIN_CLUB . ''; $output .= '
'; $output .= tep_draw_bootstrap_button(MODULE_ADMIN_DASHBOARD_PHOENIX_VIEW_ALL, 'far fa-list-alt', tep_href_link('certified_addons.php'), null, null, 'btn btn-success btn-block mb-2'); diff --git a/admin/login.php b/admin/login.php index 7fb59d87a..8199f1fd7 100644 --- a/admin/login.php +++ b/admin/login.php @@ -156,7 +156,7 @@
- +
diff --git a/admin/modules.php b/admin/modules.php index 8480a45df..b60a85406 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -331,10 +331,6 @@ $contents[] = ['class' => 'text-center', 'text' => tep_draw_bootstrap_button(IMAGE_EDIT, 'fas fa-plus', tep_href_link('modules.php', 'set=' . $set . '&module=' . $mInfo->code . '&action=edit'), null, null, 'btn-warning mr-2') . tep_draw_bootstrap_button(IMAGE_MODULE_REMOVE, 'fas fa-minus', tep_href_link('modules.php', 'set=' . $set . '&module=' . $mInfo->code . '&action=remove'), null, null, 'btn-warning')]; - if (isset($mInfo->signature) && (list($scode, $smodule, $sversion, $soscversion) = explode('|', $mInfo->signature))) { - $contents[] = ['text' => '' . TEXT_INFO_VERSION . ' ' . $sversion . ' (' . TEXT_INFO_ONLINE_STATUS . ')']; - } - if (isset($mInfo->api_version)) { $contents[] = ['text' => '' . TEXT_INFO_API_VERSION . ' ' . $mInfo->api_version]; } @@ -345,10 +341,6 @@ if (isset($mInfo)) { $contents[] = ['class' => 'text-center', 'text' => tep_draw_bootstrap_button(IMAGE_MODULE_INSTALL, 'fas fa-plus', tep_href_link('modules.php', 'set=' . $set . '&module=' . $mInfo->code . '&action=install'), null, null, 'btn-warning')]; - if (isset($mInfo->signature) && (list($scode, $smodule, $sversion, $soscversion) = explode('|', $mInfo->signature))) { - $contents[] = ['text' => '' . TEXT_INFO_VERSION . ' ' . $sversion . ' (' . TEXT_INFO_ONLINE_STATUS . ')']; - } - if (isset($mInfo->api_version)) { $contents[] = ['text' => '' . TEXT_INFO_API_VERSION . ' ' . $mInfo->api_version]; } diff --git a/admin/modules_content.php b/admin/modules_content.php index 3bca9888d..81d709655 100644 --- a/admin/modules_content.php +++ b/admin/modules_content.php @@ -357,10 +357,6 @@ function _sortContentModuleFiles($a, $b) { if ($action == 'list_new') { $contents[] = ['class' => 'text-center', 'text' => tep_draw_bootstrap_button(IMAGE_MODULE_INSTALL, 'fas fa-plus', tep_href_link('modules_content.php', 'module=' . $mInfo->code . '&action=install'), null, null, 'btn-warning')]; - if (isset($mInfo->signature) && (list($scode, $smodule, $sversion, $soscversion) = explode('|', $mInfo->signature))) { - $contents[] = ['text' => ' ' . TEXT_INFO_VERSION . ' ' . $sversion . ' (' . TEXT_INFO_ONLINE_STATUS . ')']; - } - if (isset($mInfo->api_version)) { $contents[] = ['text' => ' ' . TEXT_INFO_API_VERSION . ' ' . $mInfo->api_version]; } @@ -402,10 +398,6 @@ function _sortContentModuleFiles($a, $b) { $contents[] = ['class' => 'text-center', 'text' => tep_draw_bootstrap_button(IMAGE_EDIT, 'fas fa-plus', tep_href_link('modules_content.php', 'module=' . $mInfo->code . '&action=edit'), null, null, 'btn-warning mr-2') . tep_draw_bootstrap_button(IMAGE_MODULE_REMOVE, 'fas fa-minus', tep_href_link('modules_content.php', 'module=' . $mInfo->code . '&action=remove'), null, null, 'btn-warning')]; - if (isset($mInfo->signature) && (list($scode, $smodule, $sversion, $soscversion) = explode('|', $mInfo->signature))) { - $contents[] = ['text' => ' ' . TEXT_INFO_VERSION . ' ' . $sversion . ' (' . TEXT_INFO_ONLINE_STATUS . ')']; - } - if (isset($mInfo->api_version)) { $contents[] = ['text' => ' ' . TEXT_INFO_API_VERSION . ' ' . $mInfo->api_version]; } diff --git a/admin/security_checks.php b/admin/security_checks.php index 8565e3867..7e1bd3e8d 100644 --- a/admin/security_checks.php +++ b/admin/security_checks.php @@ -83,7 +83,6 @@ function tep_sort_secmodules($a, $b) { -   @@ -119,7 +118,6 @@ function tep_sort_secmodules($a, $b) { echo ' ' . htmlspecialchars($module['title']) . ''; echo '' . htmlspecialchars($module['code']) . ''; echo '' . $output . ''; - echo '' . (empty($secCheck->has_doc) ? '' : '') . ''; echo ''; } ?> diff --git a/admin/server_info.php b/admin/server_info.php index 39060d662..266d9b9e6 100644 --- a/admin/server_info.php +++ b/admin/server_info.php @@ -19,57 +19,7 @@ $info = tep_get_system_information(); break; - case 'submit': - $target_host = 'usage.oscommerce.com'; - $target_path = '/submit.php'; - - $encoded = base64_encode(serialize(tep_get_system_information())); - - $response = false; - - if (function_exists('curl_init')) { - $data = ['info' => $encoded]; - - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, 'http://' . $target_host . $target_path); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, $data); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - $response = trim(curl_exec($ch)); - curl_close($ch); - } else { - if ($fp = @fsockopen($target_host, 80, $errno, $errstr, 30)) { - $data = 'info=' . $encoded; - - fputs($fp, "POST " . $target_path . " HTTP/1.1\r\n"); - fputs($fp, "Host: " . $target_host . "\r\n"); - fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n"); - fputs($fp, "Content-length: " . strlen($data) . "\r\n"); - fputs($fp, "Connection: close\r\n\r\n"); - fputs($fp, $data."\r\n\r\n"); - - $response = ''; - - while (!feof($fp)) { - $response .= fgets($fp, 4096); - } - - fclose($fp); - - $response = trim(substr($response, strrpos($response, "\r\n\r\n"))); - } - } - - if ($response != 'OK') { - $messageStack->add_session(ERROR_INFO_SUBMIT, 'error'); - } else { - $messageStack->add_session(SUCCESS_INFO_SUBMIT, 'success'); - } - - tep_redirect(tep_href_link('server_info.php')); - break; - - case 'save': + case 'save': $info = tep_get_system_information(); $info_file = 'server_info-' . date('YmdHis') . '.txt'; header('Content-type: text/plain'); @@ -101,8 +51,6 @@ echo tep_draw_bootstrap_button(BUTTON_SAVE_TO_DISK, 'fas fa-save', tep_href_link('server_info.php', 'action=save'), 'primary', null, 'btn-success btn-block btn-lg my-2'); - echo tep_draw_bootstrap_button(BUTTON_SEND_TO_OSCOMMERCE, 'fas fa-file-upload', tep_href_link('server_info.php', 'action=submit'), 'primary', null, 'btn-light'); - } else { $server = parse_url(HTTP_SERVER); ?> diff --git a/admin/version_check.php b/admin/version_check.php index e7b5e0ae1..d5e63a5e8 100644 --- a/admin/version_check.php +++ b/admin/version_check.php @@ -90,7 +90,7 @@

-

OSCOM CE Phoenix v' . $current_version . '' ?>

+

CE Phoenix v' . $current_version . '' ?>

@@ -113,7 +113,7 @@ foreach ($new_versions as $version) { ?> - OSCOM CE Phoenix v' . $version[0] . '' ?> + CE Phoenix v' . $version[0] . '' ?> ' ?> diff --git a/includes/apps/paypal/OSCOM_PayPal.php b/includes/apps/paypal/OSCOM_PayPal.php index a8759a4fe..b313411cc 100644 --- a/includes/apps/paypal/OSCOM_PayPal.php +++ b/includes/apps/paypal/OSCOM_PayPal.php @@ -633,7 +633,7 @@ function getVersion() { if ( is_numeric($version) ) { $this->_version = $version; } else { - trigger_error('OSCOM APP [PAYPAL]: Could not read App version number.'); + trigger_error('APP [PAYPAL]: Could not read App version number.'); } } diff --git a/includes/apps/paypal/languages/english/admin/privacy.php b/includes/apps/paypal/languages/english/admin/privacy.php index 5bedb8a8d..70eb52be0 100644 --- a/includes/apps/paypal/languages/english/admin/privacy.php +++ b/includes/apps/paypal/languages/english/admin/privacy.php @@ -2,7 +2,7 @@ privacy_body =
API Credentials
-

The PayPal App for OSCOM CE Phoenix allows store owners to automatically setup and configure the App with their PayPal API credentials without the need to enter them manually. This is performed securely by granting osCommerce access to retrieve the API credentials from the store owners PayPal account.

+

The PayPal App for CE Phoenix allows store owners to automatically setup and configure the App with their PayPal API credentials without the need to enter them manually. This is performed securely by granting osCommerce access to retrieve the API credentials from the store owners PayPal account.

Granting osCommerce access allows the following limited information to be retrieved from the store owners PayPal account:

diff --git a/includes/functions/general.php b/includes/functions/general.php index 777e79f48..64f7860c0 100644 --- a/includes/functions/general.php +++ b/includes/functions/general.php @@ -692,7 +692,7 @@ function tep_get_prid($uprid) { // $email_text The text of the eMail, may contain HTML entities // $from_email_name The name of the sender, e.g. Shop Administration // $from_email_adress The eMail address of the sender, -// e.g. info@mytepshop.com +// e.g. test@example.com function tep_mail($to_name, $to_email_address, $email_subject, $email_text, $from_email_name, $from_email_address) { if (SEND_EMAILS !== 'true') { return false; diff --git a/includes/hooks/admin/siteWide/hMenu.php b/includes/hooks/admin/siteWide/hMenu.php index a17fe09c7..35f80b897 100644 --- a/includes/hooks/admin/siteWide/hMenu.php +++ b/includes/hooks/admin/siteWide/hMenu.php @@ -77,7 +77,7 @@ function tep_sort_h_boxes_links($a, $b) { } $output .= '