Merge pull request #897 from gburton/1.0.4.4

1.0.4.4

README.md

@@ -19,12 +19,11 @@ https://template.me.uk/phoenix/index.php | https://template.me.uk/supporters/ind
 Name | URL | Services Offered
 ------------ | ------------- | ------------- 
 Rainer | https://www.oscaddons.com/index.php/en | Providing all kinds of support for CE Phoenix online stores. You will find Add-Ons which add functionality and features to your store.  Completely free Add-Ons and a selection of commercial Add-Ons at very affordable prices exclusive to my website.  On the other hand you can count on installation and programming services at very competitive prices.  Visit my website and feel free to contact me - English, Deutsch and Español.
+John | https://sewebsites.net/ | Custom jobs, big or small, including adapting existing addons to CE Phoenix. Integration of stock systems and new payment methods. Addons both free and great value, soon to be added to the site.
 
 ### Support the Project
 
-If you or your employer is commercially dependent on Phoenix (or a previous incarnation), please help to sponsor continual forward movement in the code-base. Phoenix needs you as much as you need Phoenix! I am hopeful that all shopowners, developers, consultants and businesses will support the Project ... allowing two professional developers to work on the code on an ad-hoc basis. 
-
-A Supporter's subscription includes access to the current season of Supporters code as seen at the Supporters Demo shop; https://template.me.uk/supporters/index.php 
+If you or your employer is commercially dependent on Phoenix (or a previous incarnation), please help to sponsor continual forward movement in the code-base. Phoenix needs you as much as you need Phoenix! I am hopeful that all shopowners, developers, consultants and businesses will support the Project ... allowing two professional developers to work on the code on an ad-hoc basis.  A Supporters subscription includes access to the current season of Supporters code as seen at the Supporters Demo shop; https://template.me.uk/supporters/index.php 
 
 ### Join the Phoenix Club
 
@@ -72,8 +71,6 @@ Language | URL | Credit & Thanks
 ------------ | ------------- | -------------
 German | https://github.com/cupidare/OsCommerce-CE-Phoenix-German-language-Deutsches-Sprachpaket | @cupidare
 Spanish | https://github.com/raiwa/OSCOM-CE-Phoenix-Spanish-language-idioma-espanol | @raiwa
-Russian | https://github.com/Agrosheriff/CE-Phoenix-1.0.0.4_RU | @Fredi
-Dutch | https://github.com/Denkster/OSCOM-CE-Phoenix_Dutch_language_Nederlandse_taal | @Denkster
 
 ### Image Credits
 

admin/action_recorder.php

@@ -36,7 +36,7 @@
     include(DIR_FS_CATALOG_MODULES . 'action_recorder/' . $file);
 
     $class = substr($file, 0, strrpos($file, '.'));
-    if (tep_class_exists($class)) {
+    if (class_exists($class)) {
       ${$class} = new $class;
     }
   }

admin/certified_addons.php

@@ -14,7 +14,8 @@
 
   require('includes/template_top.php');
 
-  $feed = simplexml_load_file('https://template.me.uk/addon_feed.xml'); $num = 0;
+  $feed = simplexml_load_file('http://feeds.feedburner.com/PhoenixAddons'); 
+  $num = 0;
 ?>
 
   <div class="row">
@@ -31,6 +32,7 @@
           <th><?php echo TABLE_CERTIFIED_ADDONS_TITLE; ?></th>
           <th><?php echo TABLE_CERTIFIED_ADDONS_OWNER; ?></th>
           <th><?php echo TABLE_CERTIFIED_ADDONS_RATING; ?></th>
+          <th><?php echo TABLE_CERTIFIED_ADDONS_REMARKS; ?></th>
           <th class="text-right d-none d-md-table-cell"><?php echo TABLE_CERTIFIED_ADDONS_DATE; ?></th>
         </tr>
       </thead>
@@ -44,7 +46,8 @@
             echo '<td class="w-50"><a href="' . $item->link . '" target="_blank"><i class="fas fa-external-link-alt mr-2"></i>' . $item->title . '</a></td>';
             echo '<td>' . $item->owner . '</td>';
             echo '<td>' . tep_draw_stars($item->rating) . '</td>';
-            echo '<td class="text-right d-none d-md-table-cell">' . date("F j, Y", strtotime($item->pubDate)) . '</td>';
+            echo '<td>' . $item->remarks ?? '&nbsp;' . '</td>';
+            echo '<td class="text-right d-none d-md-table-cell">' . date("j M Y", strtotime($item->pubDate)) . '</td>';
           echo '</tr>';
         }
         ?>

admin/includes/languages/english/certified_addons.php

@@ -15,6 +15,7 @@
 define('TABLE_CERTIFIED_ADDONS_TITLE', 'Addon');
 define('TABLE_CERTIFIED_ADDONS_OWNER', 'Created By');
 define('TABLE_CERTIFIED_ADDONS_RATING', 'Rating');
+define('TABLE_CERTIFIED_ADDONS_REMARKS', 'Remarks');
 define('TABLE_CERTIFIED_ADDONS_DATE', 'Release Date');
 
 define('TEXT_CERTIFIED_ADDONS', '<p class="m-0 lead">All Addons listed here have been <strong>certified</strong> by a Phoenix Core Team member.</p><hr class="my-2"><p class="m-0">If you would like to have your addon certified and added to this list please contact <a class="text-primary text-decoration-none" href="https://forums.oscommerce.com/profile/69-burt/" target="_blank"><span class="border-bottom border-primary">@burt</span></a> on the osCommerce forum.</p>');

admin/includes/languages/english/countries.php

@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
@@ -17,13 +17,12 @@
 define('TABLE_HEADING_ACTION', 'Action');
 
 define('TEXT_INFO_EDIT_INTRO', 'Please make any necessary changes');
-define('TEXT_INFO_COUNTRY_NAME', 'Name:');
-define('TEXT_INFO_COUNTRY_CODE_2', 'ISO Code (2):');
-define('TEXT_INFO_COUNTRY_CODE_3', 'ISO Code (3):');
-define('TEXT_INFO_ADDRESS_FORMAT', 'Address Format:');
+define('TEXT_INFO_COUNTRY_NAME', 'Name: %s');
+define('TEXT_INFO_COUNTRY_CODE_2', 'ISO Code (2): %s');
+define('TEXT_INFO_COUNTRY_CODE_3', 'ISO Code (3): %s');
+define('TEXT_INFO_ADDRESS_FORMAT', 'Address Format: %s');
 define('TEXT_INFO_INSERT_INTRO', 'Please enter the new country with its related data');
 define('TEXT_INFO_DELETE_INTRO', 'Are you sure you want to delete this country?');
 define('TEXT_INFO_HEADING_NEW_COUNTRY', 'New Country');
 define('TEXT_INFO_HEADING_EDIT_COUNTRY', 'Edit Country');
 define('TEXT_INFO_HEADING_DELETE_COUNTRY', 'Delete Country');
-?>

admin/includes/languages/english/invoice.php

@@ -5,12 +5,14 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
 
 define('TABLE_HEADING_COMMENTS', 'Comments');
+
+define('TABLE_HEADING_QTY', 'Qty');
 define('TABLE_HEADING_PRODUCTS_MODEL', 'Model');
 define('TABLE_HEADING_PRODUCTS', 'Products');
 define('TABLE_HEADING_TAX', 'Tax');
@@ -22,9 +24,11 @@
 
 define('ENTRY_SOLD_TO', 'SOLD TO:');
 define('ENTRY_SHIP_TO', 'SHIP TO:');
-define('ENTRY_PAYMENT_METHOD', 'Payment Method:');
+define('ENTRY_PAYMENT_METHOD', 'Payment Method: %s');
 define('ENTRY_SUB_TOTAL', 'Sub-Total:');
 define('ENTRY_TAX', 'Tax:');
 define('ENTRY_SHIPPING', 'Shipping:');
 define('ENTRY_TOTAL', 'Total:');
-?>
+
+define('ENTRY_INVOICE_NUMBER', 'Invoice: %s');
+define('ENTRY_INVOICE_DATE', 'Date: %s');

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

@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2019 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
@@ -15,7 +15,6 @@
 
 define('MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_OWNER', 'By');
 define('MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_RATING', 'Rating');
-define('MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_DATE', 'Date');
 
 define('MODULE_ADMIN_DASHBOARD_PHOENIX_JOIN_CLUB', 'Join the Club');
 define('MODULE_ADMIN_DASHBOARD_PHOENIX_VIEW_ALL', 'View full list of Certified Addons');

admin/includes/languages/english/modules/newsletters/newsletter.php

@@ -5,10 +5,9 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
 
 define('TEXT_COUNT_CUSTOMERS', 'Customers receiving newsletter: %s');
-?>

admin/includes/languages/english/modules/newsletters/product_notification.php

@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
@@ -21,4 +21,3 @@
 define('BUTTON_UNSELECT', '<<<');
 define('BUTTON_SUBMIT', 'Submit');
 define('BUTTON_CANCEL', 'Cancel');
-?>

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

@@ -0,0 +1,15 @@
+<?php
+/*
+  $Id$
+
+  osCommerce, Open Source E-Commerce Solutions
+  http://www.oscommerce.com
+
+  Copyright (c) 2020 osCommerce
+
+  Released under the GNU General Public License
+*/
+
+define('MODULE_SECURITY_CHECK_FOPEN_WRAPPER_TITLE', 'allow_url_fopen');
+define('MODULE_SECURITY_CHECK_FOPEN_WRAPPER_ERROR', 'allow_url_fopen must be enabled in php.ini<br>This is a hosting setting and may be able to be performed via your hosting control panel - if not, ask your host.');
+

admin/includes/languages/english/modules_hooks.php

@@ -5,11 +5,17 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2016 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
 
 define('HEADING_TITLE', 'Hooks');
 
+define('TABLE_HEADING_LOCATION', '<span class="text-uppercase">%s</span>');
+define('TABLE_HEADING_GROUP', 'Group');
+define('TABLE_HEADING_FILE', 'File');
+define('TABLE_HEADING_METHOD', 'Method');
+define('TABLE_HEADING_VERSION', 'Version');
+
 define('TEXT_HOOKS_DIRECTORY', 'Hooks Directory:');

admin/includes/languages/english/newsletters.php

@@ -5,16 +5,17 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
 
 define('HEADING_TITLE', 'Newsletter Manager');
 
-define('TABLE_HEADING_NEWSLETTERS', 'Newsletters');
+define('TABLE_HEADING_NEWSLETTERS', 'Name');
+define('TABLE_HEADING_DATE_ADDED', 'Date Added');
 define('TABLE_HEADING_SIZE', 'Size');
-define('TABLE_HEADING_MODULE', 'Module');
+define('TABLE_HEADING_MODULE', 'Type');
 define('TABLE_HEADING_SENT', 'Sent');
 define('TABLE_HEADING_STATUS', 'Status');
 define('TABLE_HEADING_ACTION', 'Action');
@@ -23,8 +24,8 @@
 define('TEXT_NEWSLETTER_TITLE', 'Newsletter Title:');
 define('TEXT_NEWSLETTER_CONTENT', 'Content:');
 
-define('TEXT_NEWSLETTER_DATE_ADDED', 'Date Added:');
-define('TEXT_NEWSLETTER_DATE_SENT', 'Date Sent:');
+define('TEXT_NEWSLETTER_DATE_ADDED', 'Date Added: %s');
+define('TEXT_NEWSLETTER_DATE_SENT', 'Date Sent: %s');
 
 define('TEXT_INFO_DELETE_INTRO', 'Are you sure you want to delete this newsletter?');
 
@@ -38,3 +39,6 @@
 define('ERROR_SEND_UNLOCKED_NEWSLETTER', 'Error: Please lock the newsletter before sending it.');
 
 define('ERROR_NEWSLETTER_MODULE_NOT_EXISTS', 'Error: Module does not exist');
+
+define('TEXT_TITLE', 'Title:');
+define('TEXT_CONTENT', 'Content:');

admin/includes/languages/english/packingslip.php

@@ -5,16 +5,19 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
 
 define('TABLE_HEADING_COMMENTS', 'Comments');
 define('TABLE_HEADING_PRODUCTS_MODEL', 'Model');
 define('TABLE_HEADING_PRODUCTS', 'Products');
+define('TABLE_HEADING_QTY', 'Qty');
 
 define('ENTRY_SOLD_TO', 'SOLD TO:');
 define('ENTRY_SHIP_TO', 'SHIP TO:');
-define('ENTRY_PAYMENT_METHOD', 'Payment Method:');
-?>
+define('ENTRY_PAYMENT_METHOD', 'Payment Method: %s');
+
+define('ENTRY_INVOICE_NUMBER', 'Invoice: %s');
+define('ENTRY_INVOICE_DATE', 'Date: %s');

admin/includes/modules/dashboard/d_phoenix_addons.php

@@ -30,7 +30,7 @@ function __construct() {
     }
 
     function getOutput() {
-      $feed = simplexml_load_file('https://template.me.uk/addon_feed.xml');
+      $feed = simplexml_load_file('http://feeds.feedburner.com/PhoenixAddons');
 
       $output = null;
 
@@ -40,8 +40,7 @@ function getOutput() {
             $output .= '<tr>';
               $output .= '<th>' . tep_image('images/icon_phoenix.png', 'Phoenix') . ' ' . MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_TITLE . '</th>';
               $output .= '<th>' . MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_OWNER . '</th>';
-              $output .= '<th>' . MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_RATING . '</th>';
-              $output .= '<th class="text-right">'. MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_DATE . '</th>';
+              $output .= '<th class="text-right">' . MODULE_ADMIN_DASHBOARD_PHOENIX_ADDONS_RATING . '</th>';
             $output .= '</tr>';
           $output .= '</thead>';
           $output .= '<tbody>';
@@ -51,8 +50,7 @@ function getOutput() {
               $output .= '<tr>';
                 $output .= '<td><a href="' . $item->link . '" target="_blank">' . $item->title . '</a></td>';
                 $output .= '<td>' . $item->owner . '</td>';
-                $output .= '<td>' . tep_draw_stars($item->rating) . '</td>';
-                $output .= '<td class="text-right">' . date("F j, Y", strtotime($item->pubDate)) . '</td>';
+                $output .= '<td class="text-right">' . tep_draw_stars($item->rating) . '</td>';
               $output .= '</tr>';
             }
           }

admin/includes/modules/dashboard/d_security_checks.php

@@ -55,7 +55,7 @@ function getOutput() {
         include(DIR_FS_ADMIN . 'includes/modules/security_check/' . $secmodule);
 
         $secclass = 'securityCheck_' . substr($secmodule, 0, strrpos($secmodule, '.'));
-        if (tep_class_exists($secclass)) {
+        if (class_exists($secclass)) {
           $secCheck = new $secclass;
 
           if ( !$secCheck->pass() ) {
@@ -123,4 +123,4 @@ function keys() {
       return array('MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_STATUS', 'MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_CONTENT_WIDTH', 'MODULE_ADMIN_DASHBOARD_SECURITY_CHECKS_SORT_ORDER');
     }
   }
-
+

admin/includes/modules/newsletters/newsletter.php

@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2002 osCommerce
+  Copyright (c) 2020 osCommerce
 
   Released under the GNU General Public License
 */
@@ -24,38 +24,32 @@ function choose_audience() {
     }
 
     function confirm() {
-      $mail_query = tep_db_query("select count(*) as count from " . TABLE_CUSTOMERS . " where customers_newsletter = '1'");
+      $mail_query = tep_db_query("select count(*) as count from customers where customers_newsletter = '1'");
       $mail = tep_db_fetch_array($mail_query);
-
-      $confirm_string = '<table border="0" cellspacing="0" cellpadding="2">' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td class="main"><font color="#ff0000"><strong>' . sprintf(TEXT_COUNT_CUSTOMERS, $mail['count']) . '</strong></font></td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td>' . tep_draw_separator('pixel_trans.gif', '1', '10') . '</td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td class="main"><strong>' . $this->title . '</strong></td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td>' . tep_draw_separator('pixel_trans.gif', '1', '10') . '</td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td class="main"><tt>' . nl2br($this->content) . '</tt></td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td>' . tep_draw_separator('pixel_trans.gif', '1', '10') . '</td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '  <tr>' . "\n" .
-                        '    <td class="smallText" align="right">' . tep_draw_button(IMAGE_SEND, 'mail-closed', tep_href_link('newsletters.php', 'page=' . $_GET['page'] . '&nID=' . $_GET['nID'] . '&action=confirm_send'), 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link('newsletters.php', 'page=' . $_GET['page'] . '&nID=' . $_GET['nID'])) . '</td>' . "\n" .
-                        '  </tr>' . "\n" .
-                        '</table>';
+
+      $confirm_string = null;
+
+      $confirm_string .= '<table class="table table-striped">';
+        $confirm_string .= '<tr>';
+          $confirm_string .= '<th>' . TEXT_TITLE . '</th>';
+          $confirm_string .= '<td>' . $this->title . '</td>';
+        $confirm_string .= '</tr>';
+        $confirm_string .= '<tr>';
+          $confirm_string .= '<th>' . TEXT_CONTENT . '</th>';
+          $confirm_string .= '<td>' . $this->content . '</td>';
+        $confirm_string .= '</tr>';
+      $confirm_string .= '</table>';
+
+      $confirm_string .= '<div class="buttonSet">';
+        $confirm_string .= tep_draw_bootstrap_button(IMAGE_SEND, 'fas fa-paper-plane', tep_href_link('newsletters.php', 'page=' . (int)$_GET['page'] . '&nID=' . (int)$_GET['nID'] . '&action=confirm_send'), 'primary', null, 'btn-success btn-block btn-lg xxx text-white');
+        $confirm_string .= tep_draw_bootstrap_button(IMAGE_CANCEL, 'fas fa-angle-left', tep_href_link('newsletters.php', 'page=' . (int)$_GET['page'] . '&nID=' . (int)$_GET['nID']), null, null, 'btn-light mt-2');
+      $confirm_string .= '</div>';
 
       return $confirm_string;
     }
 
     function send($newsletter_id) {
-      $mail_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_newsletter = '1'");
+      $mail_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from customers where customers_newsletter = '1'");
 
       $mimemessage = new email();
 
@@ -73,7 +67,7 @@ function send($newsletter_id) {
       }
 
       $newsletter_id = tep_db_prepare_input($newsletter_id);
-      tep_db_query("update " . TABLE_NEWSLETTERS . " set date_sent = now(), status = '1' where newsletters_id = '" . tep_db_input($newsletter_id) . "'");
+      tep_db_query("update newsletters set date_sent = now(), status = '1' where newsletters_id = '" . tep_db_input($newsletter_id) . "'");
     }
   }
-?>
+