Merge pull request #1015 from gburton/1.0.7.10

1.0.7.10
gburton · Oct 30, 2020 · b7bfcac · b7bfcac
2 parents 6bc7c69 + b139027
commit b7bfcac
Show file tree

Hide file tree

Showing 156 changed files with 3,253 additions and 3,263 deletions.
diff --git a/README.md b/README.md
@@ -11,8 +11,9 @@
   - [Softaculous](https://github.com/gburton/CE-Phoenix#softaculous)
   - [Language Packs](https://github.com/gburton/CE-Phoenix#language-packs)
 * [Certified Service Providers](https://github.com/gburton/CE-Phoenix#certified-service-providers)
-* [Supporting the Project](https://github.com/gburton/CE-Phoenix#supporting-the-project)
+* [Supporting the Project](https://github.com/gburton/CE-Phoenix#how-to-support-the-phoenix-project)
   - [Join the Phoenix Club](https://github.com/gburton/CE-Phoenix#join-the-phoenix-club)
+* [Links](https://github.com/gburton/CE-Phoenix#helpful-links)
 * [Credits](https://github.com/gburton/CE-Phoenix#credits)
 
 # Phoenix
@@ -25,12 +26,18 @@ Phoenix is the official Community Version of osCommerce.
 
 ## Demo Site
 
-https://template.me.uk/phoenix/index.php
+https://template.me.uk/index.php
 
 # Installation
 
 Installation of Phoenix takes no more than a few minutes - you will need a hosting account that supports PHP (programming language) and has at least one SQL database.  Phoenix can even be installed on your home computer for testing purposes.
 
+## PHP Version
+
+Minimum | Maximum (tested)
+------------ | -------------
+7.0 | 7.4
+
 ## User Checklist
 
 - [x] read this README document
@@ -47,7 +54,7 @@ Installation of Phoenix takes no more than a few minutes - you will need a hosti
 - [ ] perform a test checkout
 - [ ] load your categories and products
 
-## Softaculous
+## Installation via Softaculous
 
 <img align="left" src="http://www.softaculous.com/website/images/softac_products.gif"><br>CE Phoenix can now be installed easily with just one click via [Softaculous](http://www.softaculous.com/apps/ecommerce/CE_Phoenix)<br><br>
 
@@ -56,6 +63,7 @@ Installation of Phoenix takes no more than a few minutes - you will need a hosti
 Language | URL | Credit & Thanks | Comments
 ------------ | ------------- | ------------- | -------------
 DE | https://apps.oscommerce.com/zXxXN&german-language-deutsches-sprachpaket&v=cephoenix10 | cupidare |
+DK | https://apps.oscommerce.com/n6qft&danish-dansk-for-phoenix-1-0-7-9 | Kofod | Shop Side only
 ES | https://github.com/raiwa/OSCOM-CE-Phoenix-Spanish-language-idioma-espanol | raiwa | Certified Developer
 FR | https://apps.oscommerce.com/oqfJg&ce-phoenix-1-0-5-0-french-language-pack | artfulweb |
 NL | https://apps.oscommerce.com/NShzV&vertaling-nederlands | Fiber |
@@ -73,26 +81,26 @@ Rainer<br>[@raiwa](https://forums.oscommerce.com/profile/249059-raiwa/) | [oscad
 John<br>[@BrockleyJohn](https://forums.oscommerce.com/profile/220375-brockleyjohn/) | [sewebsites.net](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.
 Preston<br>[@zipurman](https://forums.oscommerce.com/profile/406830-zipurman/) | [phoenixaddons.com](https://phoenixaddons.com/) | Any need for programming in your CE Phoenix online store, or any PHP/JS/CSS/SQL, I am happy to help. We also offer hosting on our own VMWare servers and have been building web solutions and hosting for over 20 years. The website offers some free add-ons and more coming soon. Thanks for any consideration on your projects. (CST Canada)
 
-# External Libraries
-
-https://github.com/gburton/Responsive-osCommerce/wiki/External-Libraries
-
-# PHP Version
-
-Minimum | Maximum (tested)
------------- | -------------
-7.0 | 7.3
-
-# Supporting the Project
+# How to Support the Phoenix Project
 
 Help Phoenix fly high...if you or your employer is commercially dependent on Phoenix (or a previous incarnation), please help to sponsor forward movement in the code-base. Phoenix needs you as much as you need Phoenix... 
 
 Thank you to all shopowners, developers, consultants and business owners who are supporting the Project by volunteering their time and/or by supporting the project financially.
 
 ## Join the Phoenix Club
 
-If you wish to help steer the future direction of the software please 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://forums.oscommerce.com/clubs/1-phoenix/)
+
+# Helpful Links
+
+Channel | URL 
+------------ | -------------
+Phoenix Club | https://forums.oscommerce.com/forum/117-topics/
+Youtube | https://www.youtube.com/channel/UCjJe0ZX3-nGzeJFEzcVUyIA/
+Discord | https://discord.com/channels/769158803769655306/769158864523231252
+External Libraries | https://github.com/gburton/Responsive-osCommerce/wiki/External-Libraries
+Phoenix Cart Wiki | https://phoenixcart.org/phoenixcartwiki/index.php
+Phoenix Cart Forum | https://phoenixcart.org/forum/
 
 # Credits
 
@@ -106,4 +114,4 @@ Oranges, Lemons, Pears, Apples | Eelffica from Pixabay | https://pixabay.com/ser
 Tomatoes | Rocky_H from Pixabay | https://pixabay.com/service/license/
 Heart | Gerhard Gellinger from Pixabay | https://pixabay.com/service/license/
 
-Other fruit images are based on modified images from Eelffica, Rocky_H and Gerhard Gellinger
+Other fruit images are based on modified images from the named Owners.
diff --git a/admin/advert_manager.php b/admin/advert_manager.php
@@ -19,18 +19,31 @@
   if (tep_not_null($action)) {
     switch ($action) {
       case 'import':
+      $languages = tep_get_languages();
+
       $import_query = tep_db_query("select * from banners order by banners_id");
       while ($import = tep_db_fetch_array($import_query)) {
         $sql_data_array = ['advert_title'       => $import['banners_title'],
                            'advert_url'         => $import['banners_url'],
                            'advert_image'       => $import['banners_image'],
                            'advert_group'       => $import['banners_group'],
-                           'advert_html_text'   => $import['banners_html_text'],
                            'date_added'         => $import['date_added'],
                            'date_status_change' => $import['date_status_change'],
                            'status'             => $import['status']];
 
         tep_db_perform('advert', $sql_data_array);
+
+        $advert_id = tep_db_insert_id();
+
+        for ($i=0, $n=count($languages); $i<$n; $i++) {
+          $language_id = $languages[$i]['id'];
+
+          $lng_data_array = ['advert_id'        => $advert_id,
+                             'languages_id'     => $language_id,
+                             'advert_html_text' => $import['banners_html_text']];
+
+          tep_db_perform('advert_info', $lng_data_array);
+        }
       }
 
       $OSCOM_Hooks->call('advert_manager', 'importAction');
@@ -101,8 +114,7 @@
                              'advert_fragment'  => $advert_fragment,
                              'advert_image'     => $db_image_location,
                              'advert_group'     => $advert_group,
-                             'sort_order'       => $sort_order,
-                             'advert_html_text' => $advert_html_text];
+                             'sort_order'       => $sort_order];
 
           if ($action == 'insert') {
             $insert_sql_data = ['date_added' => 'now()', 'status' => '1'];
@@ -123,6 +135,25 @@
 
             $messageStack->add_session(SUCCESS_IMAGE_UPDATED, 'success');
           }
+
+          $languages = tep_get_languages();
+          for ($i=0, $n=count($languages); $i<$n; $i++) {
+            $advert_html_text_array = $_POST['advert_html_text'];
+
+            $language_id = $languages[$i]['id'];
+
+            $lng_data_array['advert_html_text'] = tep_db_prepare_input($advert_html_text_array[$language_id]);
+
+            if ($action == 'insert') {
+              $insert_sql_data = ['advert_id' => $advert_id, 'languages_id' => $language_id];
+
+              $lng_data_array = array_merge($lng_data_array, $insert_sql_data);
+
+              tep_db_perform('advert_info', $lng_data_array);
+            } elseif ($action == 'update') {
+              tep_db_perform('advert_info', $lng_data_array, 'update', "advert_id = '" . (int)$advert_id . "' and languages_id = '" . (int)$language_id . "'");
+            }
+          }
 
           $OSCOM_Hooks->call('advert_manager', 'insertUpdateAction');
 
@@ -150,6 +181,7 @@
         }
 
         tep_db_query("delete from advert where advert_id = '" . (int)$advert_id . "'");
+        tep_db_query("delete from advert_info where advert_id = '" . (int)$advert_id . "'");
 
         $OSCOM_Hooks->call('advert_manager', 'deleteConfirmAction');
 
@@ -182,6 +214,8 @@
 
 <?php
   if ($action == 'new') {
+    $languages = tep_get_languages();
+
     $form_action = 'insert';
 
     $parameters = ['advert_title' => '', 'advert_url' => '', 'advert_fragment' => '', 'advert_group' => '', 'advert_image' => '', 'sort_order' => '', 'advert_html_text' => ''];
@@ -281,12 +315,24 @@
       </div>
 
       <hr>
-
-      <div class="form-group row">
-        <label for="cText" class="col-form-label col-sm-3 text-left text-sm-right"><?php echo TEXT_ADVERT_HTML_TEXT; ?></label>
-        <div class="col-sm-9"><?php echo tep_draw_textarea_field('advert_html_text', 'soft', '60', '5', $cInfo->advert_html_text, 'class="form-control" id="cText"'); ?>
+
+      <?php
+      for ($i=0, $n=sizeof($languages); $i<$n; $i++) {
+        ?>
+        <div class="form-group row">
+          <label for="cText_<?= $languages[$i]['id']; ?>" class="col-form-label col-sm-3 text-left text-sm-right"><?php echo TEXT_ADVERT_HTML_TEXT; ?></label>
+          <div class="col-sm-9">
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><?= tep_image(tep_catalog_href_link('includes/languages/' . $languages[$i]['directory'] . '/images/' . $languages[$i]['image'], '', 'SSL'), $languages[$i]['name']); ?></span>
+              </div>
+              <?php echo tep_draw_textarea_field('advert_html_text[' . $languages[$i]['id'] . ']', 'soft', '60', '5', adverts::advert_get_html_text($cInfo->advert_id ?? 0, $languages[$i]['id']), 'class="form-control" id="cText_' . $languages[$i]['id'] . '"'); ?>
+            </div>
+          </div>
         </div>
-      </div>
+        <?php
+      }
+      ?>
 
       <div class="alert alert-info">
         <?php echo TEXT_ADVERT_NOTE . TEXT_INSERT_NOTE; ?>

diff --git a/admin/backup.php b/admin/backup.php
@@ -99,7 +99,7 @@
           foreach ($index as $kname => $info) {
             $schema .= ',' . "\n";
 
-            $columns = implode($info['columns'], ', ');
+            $columns = implode(', ', $info['columns']);
 
             if ($kname == 'PRIMARY') {
               $schema .= '  PRIMARY KEY (' . $columns . ')';

diff --git a/admin/certified_addons.php b/admin/certified_addons.php
@@ -10,37 +10,37 @@
   Released under the GNU General Public License
 */
 
-  require('includes/application_top.php');
+  require 'includes/application_top.php';
 
-  require('includes/template_top.php');
+  require 'includes/template_top.php';
 
-  $feed = simplexml_load_file('http://feeds.feedburner.com/PhoenixAddons'); 
+  $feed = Web::load_xml('https://feeds.feedburner.com/PhoenixAddons');
   $num = 0;
 ?>
 
   <div class="row">
-    <div class="col"><h1 class="display-4 mb-2"><?php echo HEADING_TITLE; ?></h1></div>
+    <div class="col"><h1 class="display-4 mb-2"><?= HEADING_TITLE ?></h1></div>
     <div class="col-sm-4 text-right align-self-center">
       <div class="input-group">
         <div class="input-group-prepend">
-          <span class="input-group-text"><?php echo TEXT_CERTIFIED_SEARCH_LABEL; ?></span>
+          <span class="input-group-text"><?= TEXT_CERTIFIED_SEARCH_LABEL ?></span>
         </div>
-        <?php echo tep_draw_input_field('filter', null, 'placeholder="' . TEXT_CERTIFIED_SEARCH_PLACEHOLDER . '" id="input-filter"'); ?>
+        <?= tep_draw_input_field('filter', null, 'placeholder="' . TEXT_CERTIFIED_SEARCH_PLACEHOLDER . '" id="input-filter"') ?>
       </div>
     </div>
   </div>
 
-  <div class="alert alert-warning"><?php echo sprintf(TEXT_CERTIFIED_ADDONS, $feed->channel->description); ?></div>
+  <div class="alert alert-warning"><?php printf(TEXT_CERTIFIED_ADDONS, $feed->channel->description) ?></div>
 
   <div class="table-responsive">
     <table class="table table-striped table-hover table-filter">
       <thead class="thead-dark">
         <tr>
-          <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>
+          <th><?= TABLE_CERTIFIED_ADDONS_TITLE ?></th>
+          <th><?= TABLE_CERTIFIED_ADDONS_OWNER ?></th>
+          <th><?= TABLE_CERTIFIED_ADDONS_RATING ?></th>
+          <th><?= TABLE_CERTIFIED_ADDONS_REMARKS ?></th>
+          <th class="text-right d-none d-md-table-cell"><?= TABLE_CERTIFIED_ADDONS_DATE ?></th>
         </tr>
       </thead>
       <tbody>
@@ -62,11 +62,11 @@
     </table>
   </div>
 
-  <p id="count"><?php echo sprintf(NUM_CERTIFIED_ADDONS, $num); ?></p>
+  <p id="count"><?php printf(NUM_CERTIFIED_ADDONS, $num) ?></p>
 
-  <script>var tr = $('.table-filter > tbody > tr:visible').length; i_empty();$('#input-filter').on('keyup', function() {i_empty();var keyword = $(this).val().toLowerCase(); $('.table-filter > tbody > tr').each( function() { $(this).toggle(keyword.length < 1 || $(this).attr('data-filter').indexOf(keyword) > -1 || $(this).attr('data-tags').indexOf(keyword) > -1 || $(this).attr('data-owner').indexOf(keyword) > -1); }); var tr_filtered = $('.table-filter > tbody > tr:visible').length; if (tr_filtered != tr) {i_empty(); var str = '<?php echo NUM_FILTERED_ADDONS; ?>'; var res = str.replace('{X}', tr_filtered); $('#count').append(res); } });function i_empty() {$('.filtered-result').detach();}</script>
+  <script>var tr = $('.table-filter > tbody > tr:visible').length; i_empty();$('#input-filter').on('keyup', function() {i_empty();var keyword = $(this).val().toLowerCase(); $('.table-filter > tbody > tr').each( function() { $(this).toggle(keyword.length < 1 || $(this).attr('data-filter').indexOf(keyword) > -1 || $(this).attr('data-tags').indexOf(keyword) > -1 || $(this).attr('data-owner').indexOf(keyword) > -1); }); var tr_filtered = $('.table-filter > tbody > tr:visible').length; if (tr_filtered != tr) {i_empty(); var str = '<?= NUM_FILTERED_ADDONS ?>'; var res = str.replace('{X}', tr_filtered); $('#count').append(res); } });function i_empty() {$('.filtered-result').detach();}</script>
 
 <?php
-  require('includes/template_bottom.php');
-  require('includes/application_bottom.php');
+  require 'includes/template_bottom.php';
+  require 'includes/application_bottom.php';
 ?>