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:
' . DIR_FS_ADMIN . '.htaccess
' . DIR_FS_ADMIN . '.htpasswd_oscommerce
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:
' . DIR_FS_ADMIN . '.htaccess
' . DIR_FS_ADMIN . '.htpasswd_oscommerce
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/cfg_modules/cfgm_currencies.php b/admin/includes/languages/english/modules/cfg_modules/cfgm_currencies.php
index c41134fda..3c95d650b 100644
--- a/admin/includes/languages/english/modules/cfg_modules/cfgm_currencies.php
+++ b/admin/includes/languages/english/modules/cfg_modules/cfgm_currencies.php
@@ -1,17 +1,13 @@
An update for OSCOM CE Phoenix is available!');
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_UPDATE_AVAILABLE = ' An update for CE Phoenix is available!';
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_IS_LATEST = ' You are using the latest CE Phoenix!';
diff --git a/admin/includes/languages/english/modules/security_check/extended/shopside_osc.php b/admin/includes/languages/english/modules/security_check/extended/shopside_osc.php
index 5e559d0ef..ad0b6bf81 100644
--- a/admin/includes/languages/english/modules/security_check/extended/shopside_osc.php
+++ b/admin/includes/languages/english/modules/security_check/extended/shopside_osc.php
@@ -1,19 +1,15 @@
Tools > Version Checker for more detailed information.');
+define('MODULE_SECURITY_CHECK_EXTENDED_SHOPSIDE_OSC_TITLE', 'Versioning - Phoenix');
+define('MODULE_SECURITY_CHECK_EXTENDED_SHOPSIDE_OSC_MESSAGE', 'Your shop is based on CE Phoenix v%s, see Tools > Version Checker for more detailed information.');
diff --git a/admin/includes/languages/english/modules/security_check/github_directory.php b/admin/includes/languages/english/modules/security_check/github_directory.php
index 0fe62368c..b8e0123af 100644
--- a/admin/includes/languages/english/modules/security_check/github_directory.php
+++ b/admin/includes/languages/english/modules/security_check/github_directory.php
@@ -1,17 +1,13 @@
CE Phoenix v%s';
-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('ERROR_COULD_NOT_CONNECT', 'Could not connect to the CE Phoenix website to check for new versions.');
+const VERSION_RUNNING_LATEST = 'You are running the latest version of CE Phoenix.';
+define('VERSION_UPGRADES_AVAILABLE', 'CE Phoenix %s is the latest version available for you!Certified Developers and detailed "Do It Yourself" instructions are available in the Phoenix Club.');
diff --git a/admin/includes/modules/dashboard/d_latest_news.php b/admin/includes/modules/dashboard/d_latest_news.php
deleted file mode 100644
index 59d2b8775..000000000
--- a/admin/includes/modules/dashboard/d_latest_news.php
+++ /dev/null
@@ -1,94 +0,0 @@
-enabled ) {
- $this->content_width = (int)MODULE_ADMIN_DASHBOARD_LATEST_NEWS_CONTENT_WIDTH;
- }
- }
-
- function getOutput() {
- $feed = Web::load_xml('https://feeds.feedburner.com/osCommerceNewsAndBlogs');
-
- $output = '
+?>
\ No newline at end of file
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 .= '