Merge pull request #22 from CE-PhoenixCart/1.0.8.9

1.0.8.9

admin/includes/actions/specials/infoboxes/delete.php

@@ -15,7 +15,7 @@
   $link = $GLOBALS['Admin']->link('specials.php')->retain_query_except(['action']);
   $contents = ['form' => new Form('specials', (clone $link)->set_parameter('action', 'delete_confirm'))];
   $contents[] = ['text' => TEXT_INFO_DELETE_INTRO];
-  $contents[] = ['text' => '<strong>' . $sInfo->products_name . '</strong>'];
+  $contents[] = ['text' => '<strong>' . $table_definition['info']->products_name . '</strong>'];
   $contents[] = [
     'class' => 'text-center',
     'text' => new Button(IMAGE_DELETE, 'fas fa-trash', 'btn-danger mr-2')

admin/includes/components/paginated_table.php

@@ -31,8 +31,14 @@
           <tbody>
 <?php
   foreach ($table_definition['split']->fetch() as $row) {
+    $row_attributes = $row['css'];
+    if (isset($row['onclick'])) {
+      $row_attributes .= <<<"EOJS"
+ onclick="document.location.href='{$row['onclick']}'"
+EOJS;
+    }
 ?>
-            <tr<?= $row['css'] ?> onclick="document.location.href='<?= $row['onclick'] ?>'">
+            <tr<?= $row_attributes ?>>
 <?php
     foreach ($table_definition['columns'] as $column) {
       if ($column['is_heading'] ?? false) {

admin/includes/languages/english.php

@@ -36,10 +36,10 @@
 
 // header text in includes/hooks/admin/siteWide/hMenu.php
 const HEADER_TITLE_ONLINE_CATALOG = '<i class="fas fa-shopping-cart mr-1 text-primary" aria-hidden="true"></i><span class="border-bottom border-primary">Your Shop</span>';
-const HEADER_TITLE_PHOENIX_CLUB = '<i class="fas fa-question-circle mr-1 text-primary" aria-hidden="true"></i></i><span class="border-bottom border-primary">Help</span>';
+const HEADER_TITLE_PHOENIX_CLUB = '<i class="fas fa-question-circle mr-1 text-primary" aria-hidden="true"></i><span class="border-bottom border-primary">Help</span>';
 const HEADER_TITLE_PHOENIX_WIKI = '<i class="fas fa-school mr-1 text-primary" aria-hidden="true"></i><span class="border-bottom border-primary">User Guide</span>';
 const HEADER_TITLE_CERTIFIED_DEVELOPERS = '<i class="fas fa-laptop-code mr-1 text-primary" aria-hidden="true"></i><span class="border-bottom border-primary">Certified Developers</span>';
-const HEADER_TITLE_CERTIFIED_ADDONS = '<i class="fas fa-folder-plus mr-1 text-primary" aria-hidden="true"></i></i><span class="border-bottom border-primary">Add-ons</span>';
+const HEADER_TITLE_CERTIFIED_ADDONS = '<i class="fas fa-folder-plus mr-1 text-primary" aria-hidden="true"></i><span class="border-bottom border-primary">Add-ons</span>';
 const HEADER_TITLE_LOGOFF = '<i class="fas fa-lock mr-1" aria-hidden="true"></i><span class="border-bottom border-danger">%s, securely log off</span>';
 
 // images

includes/classes/alert_block.php

@@ -9,29 +9,34 @@
 
   Released under the GNU General Public License
 */
-  class alertBlock {    
-	// class constructor
-  	function __construct() {
+
+  class alertBlock {
+
+  	public function __construct() {
   	}
 
-    function alertBlock($contents, $alert_output = false) {
+    public function alertBlock($alerts, $alert_output = false) {
 	  $alertBox_string = '';
-		  
-      for ($i=0, $n=sizeof($contents); $i<$n; $i++) {
+
+      foreach ($alerts as $alert) {
         $alertBox_string .= '  <div';
-
-        if (isset($contents[$i]['params']) && tep_not_null($contents[$i]['params']))
-		  $alertBox_string .= ' ' . $contents[$i]['params'];
-
-		  $alertBox_string .= '>' . "\n";
-          $alertBox_string .= '	<button type="button" class="close" data-dismiss="alert">&times;</button>' . "\n";
-          $alertBox_string .= $contents[$i]['text'];
-
-          $alertBox_string .= '  </div>' . "\n";
+
+        if (isset($alert['params']) && !Text::is_empty($alert['params'])) {
+          $alertBox_string .= ' ' . $alert['params'];
+        }
+
+        $alertBox_string .= '>' . "\n";
+        $alertBox_string .= '	<button type="button" class="close" data-dismiss="alert">&times;</button>' . "\n";
+        $alertBox_string .= $alert['text'];
+
+       $alertBox_string .= '  </div>' . "\n";
+      }
+
+      if ($alert_output) {
+        echo $alertBox_string;
       }
 
-      if ($alert_output == true) echo $alertBox_string;
-        return $alertBox_string;
-     }
+      return $alertBox_string;
+    }
+
   }
-?>

includes/classes/breadcrumb.php

@@ -35,4 +35,3 @@ public function trail($separator = null) {
     }
 
   }
-

includes/classes/manufacturer.php

@@ -1,38 +1,37 @@
 <?php
 /**
  * osCommerce Online Merchant
- * 
+ *
  * @copyright Copyright (c) 2018 osCommerce; http://www.oscommerce.com
  * @license GNU General Public License; http://www.oscommerce.com/gpllicense.txt
  */
 
 class manufacturer {
-  public $_data = array();
 
-  function __construct($mID) {
+  public $_data = [];
+
+  public function __construct($mID) {
     $this->buildManufacturer($mID);
   }
 
-  function buildManufacturer($mID) {
-    $manufacturer_query = tep_db_query("select m.*, mi.* from manufacturers m, manufacturers_info mi where m.manufacturers_id = " . (int)$mID . " and m.manufacturers_id = mi.manufacturers_id and mi.languages_id = " . (int)$_SESSION['languages_id']);
-
-    if ( tep_db_num_rows($manufacturer_query) === 1 ) {
-      $manufacturer = tep_db_fetch_array($manufacturer_query);
+  public function buildManufacturer($mID) {
+    $manufacturer_query = $GLOBALS['db']->query("select m.*, mi.* from manufacturers m, manufacturers_info mi where m.manufacturers_id = " . (int)$mID . " and m.manufacturers_id = mi.manufacturers_id and mi.languages_id = " . (int)$_SESSION['languages_id']);
 
-      $this->_data = $manufacturer;
+    if ( mysqli_num_rows($manufacturer_query) === 1 ) {
+      $this->_data = $manufacturer_query->fetch_assoc();
     }
   }
-  
-  function getData($key) {
+
+  public function getData($key) {
     return $this->_data[$key];
   }
 
-  function showImage() {
-    return tep_image('images/' . $this->_data['manufacturers_image'], $this->_data['manufacturers_name']);
+  public function showImage() {
+    return new Image('images/' . $this->_data['manufacturers_image'], [], $this->_data['manufacturers_name']);
   }
-  
-  function buildManufacturerArray() {
+
+  public function buildManufacturerArray() {
     return $this->_data;
   }
-  
+
 }

includes/languages/english/cookie_usage.php

@@ -10,11 +10,21 @@
   Released under the GNU General Public License
 */
 
-define('NAVBAR_TITLE', 'Cookie Usage');
-define('HEADING_TITLE', 'Cookie Usage');
+const NAVBAR_TITLE = 'Cookie Usage';
+const HEADING_TITLE = 'Cookie Usage';
 
-define('TEXT_INFORMATION', 'We have detected that your browser does not support cookies, or has set cookies to be disabled.<br><br>To continue shopping online, we encourage you to enable cookies on your browser.<br><br>For <strong>Internet Explorer</strong> browsers, please follow these instructions:<br><ol><li>Click on the Tools menubar, and select Internet Options</li><li>Select the Security tab, and reset the security level to Medium</li></ol>We have taken this measurement of security for your benefit, and apologize upfront if any inconveniences are caused.<br><br>Please <a class="btn btn-success btn-sm" role="button" href="' . tep_href_link('contact_us.php', '', 'SSL') . '">contact the store owner</a> if you have any questions relating to this requirement, or to continue purchasing products offline.');
-
-define('BOX_INFORMATION_HEADING', 'Cookie Privacy and Security');
-define('BOX_INFORMATION', 'Cookies must be enabled to purchase online on this store to embrace privacy and security related issues regarding your visit to this site.<br><br>By enabling cookie support on your browser, the communication between you and this site is strengthened to be certain it is you who are making transactions on your own behalf, and to prevent leakage of your privacy information.');
+const TEXT_INFORMATION = <<<'EOT'
+We have detected that your browser does not support cookies, or has set cookies to be disabled.<br><br>
+To continue shopping online, we encourage you to enable cookies on your browser.<br><br>
+For <strong>Internet Explorer</strong> browsers, please follow these instructions:<br>
+<ol><li>Click on the Tools menubar, and select Internet Options</li>
+<li>Select the Security tab, and reset the security level to Medium</li></ol>
+We have taken this measurement of security for your benefit, and apologize up front if any inconveniences are caused.<br><br>
+Please <a class="btn btn-success btn-sm" role="button" href="%s">contact the store owner</a> if you have any questions relating to this requirement, or to continue purchasing products offline.
+EOT;
 
+const BOX_INFORMATION_HEADING = 'Cookie Privacy and Security';
+const BOX_INFORMATION = <<<'EOT'
+Cookies must be enabled to purchase online on this store to embrace privacy and security related issues regarding your visit to this site.<br><br>
+By enabling cookie support on your browser, the communication between you and this site is strengthened to be certain it is you who are making transactions on your own behalf, and to prevent leakage of your privacy information.
+EOT;

includes/languages/english/hooks/shop/siteWide/MATC.php

@@ -12,7 +12,7 @@
 
 // for the page(s)
 const ENTRY_MATC = 'Legal agreements';
-const ENTRY_MATC_TEXT = 'By clicking this box you agree to our <a href="#" role="button" class="card-link ml-0 border-bottom border-primary" data-toggle="modal" data-target="#TCModal">T&C</a> and <a href="#" role="button" class="card-link ml-0 border-bottom border-primary" data-toggle="modal" data-target="#PModal">Privacy</a> policies.'; 
+const ENTRY_MATC_TEXT = 'By clicking this box you agree to our <a href="#" role="button" class="card-link ml-0 border-bottom border-primary" data-toggle="modal" data-target="#TCModal">T&C</a> and <a href="#" role="button" class="card-link ml-0 border-bottom border-primary" data-toggle="modal" data-target="#PModal">Privacy</a> policies.';
 
 // for the modal popup
 const MATC_BUTTON_CLOSE = 'Close';

includes/languages/english/modules/boxes/bm_information.php

@@ -10,14 +10,14 @@
   Released under the GNU General Public License
 */
 
-  define('MODULE_BOXES_INFORMATION_TITLE', 'Information');
-  define('MODULE_BOXES_INFORMATION_DESCRIPTION', 'Show information page links');
-  define('MODULE_BOXES_INFORMATION_BOX_TITLE', 'Information');
-  
-  const MODULE_BOXES_INFORMATION_BOX_DATA = array(
+  const MODULE_BOXES_INFORMATION_TITLE = 'Information';
+  const MODULE_BOXES_INFORMATION_DESCRIPTION = 'Show information page links';
+  const MODULE_BOXES_INFORMATION_BOX_TITLE = 'Information';
+
+  const MODULE_BOXES_INFORMATION_BOX_DATA = [
     'privacy.php' => 'Privacy Notice',
     'conditions.php' => 'Conditions of Use',
     'shipping.php' => 'Shipping & Returns',
-    'contact_us.php' => 'Contact Us'
-  );
-  
+    'contact_us.php' => 'Contact Us',
+  ];
+

includes/languages/english/modules/boxes/bm_product_notifications.php

@@ -15,5 +15,5 @@
   define('MODULE_BOXES_PRODUCT_NOTIFICATIONS_BOX_TITLE', 'Notifications');
   define('MODULE_BOXES_PRODUCT_NOTIFICATIONS_BOX_NOTIFY', 'Notify me of updates to <strong>%s</strong>');
   define('MODULE_BOXES_PRODUCT_NOTIFICATIONS_BOX_NOTIFY_REMOVE', 'Do not notify me of updates to <strong>%s</strong>');
-  
+
   define('MODULE_BOXES_PRODUCT_NOTIFICATIONS_VIEW', '<i class="fas fa-eye"></i> View All');

includes/languages/english/modules/boxes/bm_reviews.php

@@ -12,6 +12,5 @@
 
   define('MODULE_BOXES_REVIEWS_TITLE', 'Reviews');
   define('MODULE_BOXES_REVIEWS_DESCRIPTION', 'Show product reviews');
-  
+
   define('MODULE_BOXES_REVIEWS_BOX_TITLE', 'Reviews');
-

includes/languages/english/modules/boxes/bm_specials.php

@@ -12,5 +12,5 @@
 
   define('MODULE_BOXES_SPECIALS_TITLE', 'Specials');
   define('MODULE_BOXES_SPECIALS_DESCRIPTION', 'Show products on special');
-  
+
   define('MODULE_BOXES_SPECIALS_BOX_TITLE', '<a href="%s">Specials</a>');

includes/languages/english/modules/boxes/bm_whats_new.php

@@ -12,5 +12,5 @@
 
   define('MODULE_BOXES_WHATS_NEW_TITLE', 'What\'s New');
   define('MODULE_BOXES_WHATS_NEW_DESCRIPTION', 'Show the newest products');
-  
+
   define('MODULE_BOXES_WHATS_NEW_BOX_TITLE', '<a href="%s">What\'s New?</a>');

includes/languages/english/modules/content/account/cm_account_gdpr.php

@@ -15,4 +15,3 @@
 
   define('MODULE_CONTENT_ACCOUNT_GDPR_LINK_TITLE', 'General Data Protection Regulation (EU 2016/679)');
   define('MODULE_CONTENT_ACCOUNT_GDPR_SUB_TITLE', 'GDPR');
-

includes/languages/english/modules/content/account/cm_account_title.php

@@ -12,6 +12,5 @@
 
   const MODULE_CONTENT_ACCOUNT_TITLE_TITLE        = 'Page Heading';
   const MODULE_CONTENT_ACCOUNT_TITLE_DESCRIPTION  = 'Shows the Page Heading.';
-  
+
   const MODULE_CONTENT_ACCOUNT_TITLE_PUBLIC_TITLE = 'My Account Information';
-

includes/languages/english/modules/content/checkout_success/cm_cs_continue_button.php

@@ -12,5 +12,5 @@
 
   const MODULE_CONTENT_CS_CONTINUE_BUTTON_TITLE = 'Continue Button';
   const MODULE_CONTENT_CS_CONTINUE_BUTTON_DESCRIPTION = 'Shows the Continue Button.';
-  
+
   const MODULE_CONTENT_CS_CONTINUE_BUTTON_TEXT = 'Your Order is Complete!  Continue Shopping';

includes/languages/english/modules/content/checkout_success/cm_cs_product_notifications.php

@@ -12,8 +12,8 @@
 
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_PRODUCT_NOTIFICATIONS_TITLE', 'Product Notifications');
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_PRODUCT_NOTIFICATIONS_DESCRIPTION', 'Add product notification to checkout success page');
-  
+
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_PRODUCT_NOTIFICATIONS_TEXT_NOTIFY_PRODUCTS_TITLE', 'Product Notifications');
 
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_PRODUCT_NOTIFICATIONS_TEXT_NOTIFY_PRODUCTS', 'Subscribe to updates on...');
-  
+

includes/languages/english/modules/content/checkout_success/cm_cs_thank_you.php

@@ -14,11 +14,11 @@
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_THANK_YOU_DESCRIPTION', 'Show thank you block on the checkout success page.');
 
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_TEXT_THANKS_FOR_SHOPPING', 'Thank You!');
-  
+
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_TEXT_SUCCESS', '<p class="font-weight-lighter mb-0"><b>Your order has been sent to the Store Owner for picking and packing.  You will receive an email notification when your parcel is in the post.</b></p>');
-  
+
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_TEXT_SEE_ORDERS', '<a class="list-group-item list-group-item-action" href="%s"><span class="text-primary border-bottom border-primary">View the status</span> of this Order by accessing your personal order history.</a>');
-  
+
   define('MODULE_CONTENT_CHECKOUT_SUCCESS_TEXT_CONTACT_STORE_OWNER', '<a class="list-group-item list-group-item-action" href="%s"><span class="text-primary border-bottom border-primary">Contact us</span> at any time if you have questions about your Order.</a>');
-  
-  
+
+

includes/languages/english/modules/content/checkout_success/cm_cs_title.php

@@ -12,7 +12,6 @@
 
   const MODULE_CONTENT_CHECKOUT_SUCCESS_TITLE_TITLE        = 'Page Heading';
   const MODULE_CONTENT_CHECKOUT_SUCCESS_TITLE_DESCRIPTION  = 'Shows the Page Heading.';
-  
+
   const MODULE_CONTENT_CHECKOUT_SUCCESS_TITLE_PUBLIC_TITLE = 'Your Order is Complete';
 
-

includes/languages/english/modules/content/create_account_success/cm_cas_continue_button.php

@@ -12,5 +12,5 @@
 
   const MODULE_CONTENT_CAS_CONTINUE_BUTTON_TITLE       = 'Continue Button';
   const MODULE_CONTENT_CAS_CONTINUE_BUTTON_DESCRIPTION = 'Shows the Continue Button.';
-  
+
   const MODULE_CONTENT_CAS_CONTINUE_BUTTON_TEXT        = 'Continue';

includes/languages/english/modules/content/create_account_success/cm_cas_message.php

@@ -12,7 +12,7 @@
 
   const MODULE_CONTENT_CAS_MESSAGE_TITLE        = 'Thank You Message';
   const MODULE_CONTENT_CAS_MESSAGE_DESCRIPTION  = 'Shows a message to the customer thanking them for creating their profile.';
-  
+
   const MODULE_CONTENT_CAS_MESSAGE_PUBLIC_TITLE = <<<'EOT'
 <p class="lead">Congratulations! Your profile has been successfully created!</p>
 <p>You can now take advantage of member privileges to enhance your online shopping experience with us.  If you have any questions about the operation of this online shop, please <a class="alert-link" href="%1$s">contact us</a> or view your <a class="alert-link" href="%2$s">profile</a>.</p>

includes/languages/english/modules/content/create_account_success/cm_cas_title.php

@@ -12,7 +12,6 @@
 
   const MODULE_CONTENT_CAS_TITLE_TITLE        = 'Page Heading';
   const MODULE_CONTENT_CAS_TITLE_DESCRIPTION  = 'Shows the Page Heading.';
-  
+
   const MODULE_CONTENT_CAS_TITLE_PUBLIC_TITLE = 'Thanks for setting up your profile!';
 
-

includes/languages/english/modules/content/footer/cm_footer_contact_us.php

@@ -15,7 +15,6 @@
 
   define('MODULE_CONTENT_FOOTER_CONTACT_US_HEADING_TITLE', 'How To Contact Us');
   define('MODULE_CONTENT_FOOTER_CONTACT_US_EMAIL_LINK', 'Contact Us');
-  
+
   define('MODULE_CONTENT_FOOTER_CONTACT_US_PHONE', '<i class="fas fa-phone fa-fw mr-1" title="Telephone"></i>');
   define('MODULE_CONTENT_FOOTER_CONTACT_US_EMAIL', '<i class="fas fa-at fa-fw mr-1" title="Email"></i>');
-

includes/languages/english/modules/content/footer/cm_footer_information_links.php

@@ -10,15 +10,15 @@
   Released under the GNU General Public License
 */
 
-  define('MODULE_CONTENT_FOOTER_INFORMATION_TITLE', 'Information Links Block');
-  define('MODULE_CONTENT_FOOTER_INFORMATION_DESCRIPTION', 'Adds Information Links Block to the Footer Area of your site');
+  const MODULE_CONTENT_FOOTER_INFORMATION_TITLE = 'Information Links Block';
+  const MODULE_CONTENT_FOOTER_INFORMATION_DESCRIPTION = 'Adds Information Links Block to the Footer Area of your site';
 
-  define('MODULE_CONTENT_FOOTER_INFORMATION_HEADING_TITLE', 'Information');
+  const MODULE_CONTENT_FOOTER_INFORMATION_HEADING_TITLE = 'Information';
 
-  const MODULE_CONTENT_FOOTER_INFORMATION_DATA = array(
+  const MODULE_CONTENT_FOOTER_INFORMATION_DATA = [
     'privacy.php' => 'Privacy & Cookie Policy',
     'conditions.php' => 'Terms & Conditions',
     'shipping.php' => 'Shipping & Returns',
-    'contact_us.php' => 'Contact Us'
-  );
+    'contact_us.php' => 'Contact Us',
+  ];
 

includes/languages/english/modules/content/gdpr/cm_gdpr_contact_addresses.php

@@ -12,8 +12,7 @@
 
   const MODULE_CONTENT_GDPR_CONTACT_ADDRESSES_TITLE = 'GDPR Address Details';
   const MODULE_CONTENT_GDPR_CONTACT_ADDRESSES_DESCRIPTION = 'Show Customers *other* Addresses on the GDPR page.';
-  
+
   const MODULE_CONTENT_GDPR_CONTACT_ADDRESSES_PUBLIC_TITLE = 'More Addresses linked to your Account';
-  
+
   const MODULE_CONTENT_GDPR_CONTACT_ADDRESSES_NUM_ADDRESSES = 'We can find<br><span class="h1"><span class="num_addresses">%s</span></span><br> more Address(es)';
-

includes/languages/english/modules/content/gdpr/cm_gdpr_contact_details.php

@@ -12,13 +12,12 @@
 
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_TITLE = 'GDPR Contact Details';
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_DESCRIPTION = 'Show Customers Contact Details on the GDPR page.';
-  
+
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_PUBLIC_TITLE = 'Your Contact Details';
-  
+
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_EMAIL = 'Email';
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_PHONE = 'Telephone';
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_FAX = 'Fax';
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_MAIN_ADDRESS = 'Main Address';
-  
+
   const MODULE_CONTENT_GDPR_CONTACT_DETAILS_UNKNOWN = 'Unknown';
-

includes/languages/english/modules/content/gdpr/cm_gdpr_intro.php

@@ -12,6 +12,5 @@
 
   const MODULE_CONTENT_GDPR_INTRO_TITLE = 'GDPR Intro';
   const MODULE_CONTENT_GDPR_INTRO_DESCRIPTION = 'Explain to Customers what GDPR is...';
-  
+
   const MODULE_CONTENT_GDPR_INTRO_PUBLIC_TEXT = '<p>The <strong>General Data Protection Regulation (GDPR)</strong> (Regulation (EU) 2016/679) is a regulation by which the European Parliament, the Council of the European Union and the European Commission intend to strengthen and unify data protection for all individuals within the European Union (EU).</p><p>The GDPR states that you are able to review your personal information that we hold.  If you are a EU Citizen, you can request deletion of some of this data.</p>';
-