Merge pull request #1047 from gburton/1.0.7.18

1.0.7.18

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/

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 = [];

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

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';

admin/includes/footer.php

@@ -14,6 +14,6 @@
 
 <footer class="col mt-3 d-print-none">
   <div class="card bg-light p-0 pt-3 mb-3 card-body text-center">
-    <p>OSCOM CE Phoenix &copy; 2000-<?= date('Y') ?> <a href="http://www.oscommerce.com" target="_blank" rel="noreferrer">osCommerce</a> (<a href="http://www.oscommerce.com/Us&amp;Legal" target="_blank" rel="noreferrer">Copyright and Trademark Policy</a>)</p>
+    <p>CE Phoenix &copy; 2000-<?= date('Y') ?> <a href="https://www.phoenixcart.org" target="_blank" rel="noreferrer">Phoenix Cart</a></p>
   </div>
 </footer>

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 = '<i class="fas fa-shopping-cart mr-1 text-primary"></i><span class="border-bottom border-primary">Your Shop</span>';

admin/includes/languages/english/administrators.php

@@ -27,8 +27,8 @@
 
 define('ERROR_ADMINISTRATOR_EXISTS', '<strong>Error:</strong> Administrator already exists.');
 
-define('HTPASSWD_INFO', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This OSCOM CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.</p><p>Enabling the htaccess/htpasswd security layer will automatically store administrator username and passwords in a htpasswd file when updating administrator password records.</p><p><strong>Please note</strong>, 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:</p><p><u><strong>1. Edit this file:</strong></u><br /><br />' . DIR_FS_ADMIN . '.htaccess</p><p>Remove the following lines if they exist:</p><p><i>%s</i></p><p><u><strong>2. Delete this file:</strong></u><br /><br />' . DIR_FS_ADMIN . '.htpasswd_oscommerce</p>');
-define('HTPASSWD_SECURED', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This OSCOM CE Phoenix Administration Tool installation is additionally secured through htaccess/htpasswd means.</p>');
-define('HTPASSWD_PERMISSIONS', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This OSCOM CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.</p><p>The following files need to be writable by the web server to enable the htaccess/htpasswd security layer:</p><ul><li>' . DIR_FS_ADMIN . '.htaccess</li><li>' . DIR_FS_ADMIN . '.htpasswd_oscommerce</li></ul><p>Reload this page to confirm if the correct file permissions have been set.</p>');
+define('HTPASSWD_INFO', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.</p><p>Enabling the htaccess/htpasswd security layer will automatically store administrator username and passwords in a htpasswd file when updating administrator password records.</p><p><strong>Please note</strong>, 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:</p><p><u><strong>1. Edit this file:</strong></u><br /><br />' . DIR_FS_ADMIN . '.htaccess</p><p>Remove the following lines if they exist:</p><p><i>%s</i></p><p><u><strong>2. Delete this file:</strong></u><br /><br />' . DIR_FS_ADMIN . '.htpasswd_oscommerce</p>');
+define('HTPASSWD_SECURED', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This CE Phoenix Administration Tool installation is additionally secured through htaccess/htpasswd means.</p>');
+define('HTPASSWD_PERMISSIONS', '<strong>Additional Protection With htaccess/htpasswd</strong><p>This CE Phoenix Administration Tool installation is not additionally secured through htaccess/htpasswd means.</p><p>The following files need to be writable by the web server to enable the htaccess/htpasswd security layer:</p><ul><li>' . DIR_FS_ADMIN . '.htaccess</li><li>' . DIR_FS_ADMIN . '.htpasswd_oscommerce</li></ul><p>Reload this page to confirm if the correct file permissions have been set.</p>');
 
 define('IMAGE_INSERT_NEW_ADMIN', 'New Admin User');

admin/includes/languages/english/modules/cfg_modules/cfgm_currencies.php

@@ -1,17 +1,13 @@
 <?php
 /*
-  Copyright (c) 2018, G Burton
-  All rights reserved. 
+  $Id$
 
-  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
 
-  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  Copyright (c) 2021 Phoenix Cart
 
-  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Released under the GNU General Public License
 */
 
 define('MODULE_CFG_MODULE_CURRENCIES_TITLE', 'Update Currency');

admin/includes/languages/english/modules/currencies/c_ecb.php

@@ -1,17 +1,13 @@
 <?php
 /*
-  Copyright (c) 2019, G Burton
-  All rights reserved. 
+  $Id$
 
-  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
 
-  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  Copyright (c) 2021 Phoenix Cart
 
-  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Released under the GNU General Public License
 */
 
 define('MODULE_ADMIN_CURRENCIES_ECB_TITLE', 'ECB');

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!');

admin/includes/languages/english/modules/dashboard/d_version_check.php

@@ -2,18 +2,18 @@
 /*
   $Id$
 
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
 
-  Copyright (c) 2019 osCommerce
+  Copyright (c) 2021 Phoenix Cart
 
   Released under the GNU General Public License
 */
 
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_TITLE', 'Version Check');
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_DESCRIPTION', 'Show the version check results');
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_DATE', 'Last Checked On');
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_CHECK_NOW', 'Check Now');
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_NEVER', 'Never');
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_TITLE = 'Version Check';
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_DESCRIPTION = 'Show the version check results';
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_DATE = 'Last Checked On';
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_CHECK_NOW = 'Check Now';
 
-define('MODULE_ADMIN_DASHBOARD_VERSION_CHECK_UPDATE_AVAILABLE', '<i class="fas fa-exclamation-circle"></i> An update for OSCOM CE Phoenix is available!');
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_UPDATE_AVAILABLE = '<i class="fas fa-exclamation-circle"></i> An update for CE Phoenix is available!';
+const MODULE_ADMIN_DASHBOARD_VERSION_CHECK_IS_LATEST = '<i class="fas fa-thumbs-up"></i> You are using the latest CE Phoenix!';

admin/includes/languages/english/modules/security_check/extended/shopside_osc.php

@@ -1,19 +1,15 @@
 <?php
 /*
-  Copyright (c) 2019, G Burton
-  All rights reserved. 
+  $Id$
 
-  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
 
-  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  Copyright (c) 2021 Phoenix Cart
 
-  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Released under the GNU General Public License
 */
 
-define('MODULE_SECURITY_CHECK_EXTENDED_SHOPSIDE_OSC_TITLE', 'Versioning - osCommerce');
-define('MODULE_SECURITY_CHECK_EXTENDED_SHOPSIDE_OSC_MESSAGE', 'Your shop is based on OSCOM CE Phoenix v%s, see <a href="' . tep_href_link('version_check.php') . '"><u>Tools > Version Checker</u></a> 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 <a href="' . tep_href_link('version_check.php') . '"><u>Tools > Version Checker</u></a> for more detailed information.');
 

admin/includes/languages/english/modules/security_check/github_directory.php

@@ -1,17 +1,13 @@
 <?php
 /*
-  Copyright (c) 2019, G Burton
-  All rights reserved. 
+  $Id$
 
-  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  CE Phoenix, E-Commerce made Easy
+  https://phoenixcart.org
 
-  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  Copyright (c) 2021 Phoenix Cart
 
-  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Released under the GNU General Public License
 */
 
 define('MODULE_SECURITY_CHECK_GITHUB_TITLE', 'Github Directory');

admin/includes/languages/english/version_check.php

@@ -1,25 +1,22 @@
 <?php
 /*
   $Id$
-
-  osCommerce, Open Source E-Commerce Solutions
-  http://www.oscommerce.com
-
-  Copyright (c) 2020 osCommerce
-
+  
+  CE Phoenix, E-Commerce Made Easy
+  https://phoenixcart.org
+  
+  Copyright (c) 2021 Phoenix Cart
+  
   Released under the GNU General Public License
 */
 
-define('HEADING_TITLE', 'Version Checker');
-
-define('TABLE_HEADING_VERSION', 'Version');
-define('TABLE_HEADING_RELEASED', 'Release Date');
-define('TABLE_HEADING_ACTION', 'Action');
+const HEADING_TITLE = 'Version Checker';
 
-define('TEXT_RELEASE_LINK', 'View Release Announcement');
+const TABLE_HEADING_VERSION = 'Version';
+const TABLE_HEADING_RELEASED = 'Release Date';
+const TABLE_HEADING_ACTION = 'Action';
 
-define('TITLE_INSTALLED_VERSION', 'Installed Version:');
+const TITLE_INSTALLED_VERSION = 'Installed Version: <strong>CE Phoenix v%s</strong>';
 
-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)<hr><a class="alert-link" target="_blank" rel="noreferrer" href="https://forums.oscommerce.com/topic/494774-certified-service-providers-development-hosting-themes-and-more/">Certified Developers</a> and detailed "<a class="alert-link" target="_blank" rel="noreferrer" href="https://forums.oscommerce.com/tags/phoenix%%20update/">Do It Yourself</a>" 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', '<strong>CE Phoenix %s</strong> is the latest version available for you!<hr><a class="alert-link" target="_blank" href="https://phoenixcart.org/forum/viewtopic.php?f=26&t=309">Certified Developers</a> and detailed "<a class="alert-link" target="_blank" href="https://phoenixcart.org/forum/app.php/tag/phoenix-update">Do It Yourself</a>" instructions are available in the Phoenix Club.');