Merge pull request #984 from gburton/1.0.7.3

1.0.7.3

README.md

@@ -1,78 +1,99 @@
-# CE Phoenix
+<p align="center">
+  <img src="https://raw.githubusercontent.com/gburton/Responsive-osCommerce/master/.github/ce-phoenix.png">
+</p>
 
-CE Phoenix is a powerful ecommerce shop ready to use out of the box, putting you online and in full control of your business right from the start.
+## Table of Contents
 
-Your customers will love the modern, responsive design that will not only make your website look great on all mobile viewing devices but also perform at speed whilst giving you the power to create an individual and unique look to your shop with just a few clicks!
+* [What is Phoenix](https://github.com/gburton/CE-Phoenix#phoenix)
+  - [Demo Site](https://github.com/gburton/CE-Phoenix#demo-site)
+* [Installation](https://github.com/gburton/CE-Phoenix#installation)
+  - [User Checklist](https://github.com/gburton/CE-Phoenix#user-checklist)
+  - [Softaculous](https://github.com/gburton/CE-Phoenix#softaculous)
+  - [Language Packs](https://github.com/gburton/CE-Phoenix#other-languages)
+* [Certified Service Providers](https://github.com/gburton/CE-Phoenix#certified-service-providers)
+* [Supporting the Project](https://github.com/gburton/CE-Phoenix#support-the-project)
+  - [Join the Phoenix Club](https://github.com/gburton/CE-Phoenix#join-the-phoenix-club)
+* [Credits](https://github.com/gburton/CE-Phoenix#image-credits)
 
-CE Phoenix is packed with many first class utilities as standard but its modular software design lets you add many more with no programming skills required. The full suite of product, shipping and payment options included will let you sell thousands of products in any number of categories worldwide in any currency or language providing a seamless customer experience.
+# Phoenix
 
-![Phoenix Logo](https://raw.githubusercontent.com/gburton/Responsive-osCommerce/master/.github/ce-phoenix.png)
+Phoenix is a powerful ecommerce shop ready to use out of the box, putting you online and in full control of your business right from the start.  Your customers will love the modern, responsive design that will not only make your website look great on all mobile viewing devices but also perform at speed whilst giving you the power to create an individual and unique look to your shop with just a few clicks!
 
-CE Phoenix is the official Community Version of osCommerce.  Check out what you can do with CE Phoenix at the demo site; 
+Phoenix is packed with many first class utilities as standard but its modular software design lets you add many more with no programming skills required. The full suite of product, shipping and payment options included will let you sell thousands of products in any number of categories worldwide in any currency or language providing a seamless customer experience.
 
-# Demo Sites
+Phoenix is the official Community Version of osCommerce. 
 
-https://template.me.uk/index.php
+## Demo Site
 
-# Certified Service Providers
+https://template.me.uk/phoenix/index.php
 
-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.
+# 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.
+
+## User Checklist
+
+- [x] read this README document
+- [ ] download Phoenix & perform installation
+- [ ] check security page in administrative area;  
+      admin > tools > security checks
+- [ ] join Phoenix club
+- [ ] install modules;  
+      admin > modules > navbar
+      admin > modules > content
+      admin > modules > boxes
+      admin > modules > shipping
+      admin > modules > payment
+- [ ] perform a test checkout
+- [ ] load your categories and products
 
-### Support the Project
+## Softaculous
 
-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 
+<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>
 
-### Join the Phoenix Club
+## Language Packs
 
-If you wish to help steer the future direction of the software please join the Phoenix Club
-https://forums.oscommerce.com/clubs/1-phoenix/
+Language | URL | Credit & Thanks | Comments
+------------ | ------------- | ------------- | -------------
+DE | https://apps.oscommerce.com/zXxXN&german-language-deutsches-sprachpaket&v=cephoenix10 | cupidare |
+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 |
+NO | https://apps.oscommerce.com/ecntZ&norwegian-language-pack-phoenix | ra92 |
+PT (BR) | https://apps.oscommerce.com/yLxsO&oscom2ce-phoenix-pt-brasil-v1-0-5-0 | josmar | Brazilian Portuguese
+RU | https://apps.oscommerce.com/ub5yL&russian-for-phoenix | Fredi | Contains non-core files
 
-# Thank You
+Please be aware that language packs are maintained by volunteers so may not be up to date.
 
-To all shopowners, developers, consultants and business owners who are supporting the Project.
+# Certified Service Providers
+
+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.
 
-## External Libraries
+# External Libraries
 
 https://github.com/gburton/Responsive-osCommerce/wiki/External-Libraries
 
-### PHP Version
+# PHP Version
 
-Minimum | Maximum
+Minimum | Maximum (tested)
 ------------ | -------------
 7.0 | 7.3
 
-### User Checklist
+# Supporting the Project
 
-- [x] read this README document
-- [ ] download Phoenix & perform installation
-- [ ] check security page in administrative area;  
-      admin > tools > security checks
-- [ ] join osCommerce forum
-- [ ] join Phoenix club
-- [ ] install one or more navbar modules;  
-      admin > modules > navbar > {install}
-- [ ] install one or more footer modules;  
-      admin > modules > content > {install}
-- [ ] install one or more box modules;  
-      admin > modules > boxes > {install}
-- [ ] install shipping module(s);  
-      admin > modules > shipping
-- [ ] install payment module(s);  
-      admin > modules > payment
-- [ ] perform a test checkout
-- [ ] load your categories and products
+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... 
 
-### Other Languages
+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.
 
-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
+## 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/
 
-### Image Credits
+# Credits
 
 Images in the default installation are copyright their respective owners;
 

account_password.php

@@ -30,7 +30,7 @@
 
     $customer_details = $customer_data->process($page_fields);
 
-    if (!empty($customer_details)) {
+    if (tep_form_processing_is_valid()) {
       $check_customer_query = tep_db_query($customer_data->build_read(['password'], 'customers', ['id' => (int)$_SESSION['customer_id']]));
       $check_customer = tep_db_fetch_array($check_customer_query);
 

admin/administrators.php

@@ -219,7 +219,7 @@
           }
         }
 
-        $OSCOM_Hooks->call('administrators', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('administrators', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('administrators.php'));
         break;

admin/advert_manager.php

@@ -47,7 +47,7 @@
           $messageStack->add_session(SUCCESS_ADVERT_STATUS_UPDATED, 'success');
         }
 
-        $OSCOM_Hooks->call('advert_manager', 'setflagAction');
+        $OSCOM_Hooks->call('advert_manager', 'setFlagAction');
 
         tep_redirect(tep_href_link('advert_manager.php', 'page=' . (int)$_GET['page'] . '&cID=' . (int)$_GET['cID']));
         break;
@@ -124,7 +124,7 @@
             $messageStack->add_session(SUCCESS_IMAGE_UPDATED, 'success');
           }
 
-          $OSCOM_Hooks->call('advert_manager', 'insertupdateAction');
+          $OSCOM_Hooks->call('advert_manager', 'insertUpdateAction');
 
           tep_redirect(tep_href_link('advert_manager.php', (isset($_GET['page']) ? 'page=' . (int)$_GET['page'] . '&' : '') . 'cID=' . $advert_id));
         } else {
@@ -151,7 +151,7 @@
 
         tep_db_query("delete from advert where advert_id = '" . (int)$advert_id . "'");
 
-        $OSCOM_Hooks->call('advert_manager', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('advert_manager', 'deleteConfirmAction');
 
         $messageStack->add_session(SUCCESS_IMAGE_REMOVED, 'success');
 

admin/categories.php

@@ -33,7 +33,7 @@
       case 'setflag':
         tep_db_query("UPDATE products SET products_status = '" . (int)$_GET['flag'] . "', products_last_modified = NOW() WHERE products_id = " . (int)$_GET['pID']);
 
-        $OSCOM_Hooks->call('categories', 'setflagAction');
+        $OSCOM_Hooks->call('categories', 'setFlagAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $_GET['cPath'] . '&pID=' . (int)$_GET['pID']));
         break;
@@ -82,11 +82,11 @@
 
             $sql_data_array = array_merge($sql_data_array, $insert_sql_data);
 
-            $OSCOM_Hooks->call('categories', 'insertcategoryAction');
+            $OSCOM_Hooks->call('categories', 'insertCategoryAction');
 
             tep_db_perform('categories_description', $sql_data_array);
           } elseif ($action == 'update_category') {
-            $OSCOM_Hooks->call('categories', 'updatecategoryAction');
+            $OSCOM_Hooks->call('categories', 'updateCategoryAction');
 
             tep_db_perform('categories_description', $sql_data_array, 'update', "categories_id = '" . (int)$categories_id . "' and language_id = '" . (int)$languages[$i]['id'] . "'");
           }
@@ -99,7 +99,7 @@
           tep_db_query("update categories set categories_image = '" . tep_db_input($categories_image->filename) . "' where categories_id = '" . (int)$categories_id . "'");
         }
 
-        $OSCOM_Hooks->call('categories', 'insertcategoryupdatecategoryAction');
+        $OSCOM_Hooks->call('categories', 'insertCategoryUpdateCategoryAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath . '&cID=' . $categories_id));
         break;
@@ -145,7 +145,7 @@
           }
         }
 
-        $OSCOM_Hooks->call('categories', 'deletecategoryconfirmAction');
+        $OSCOM_Hooks->call('categories', 'deleteCategoryConfirmAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath));
         break;
@@ -166,7 +166,7 @@
           }
         }
 
-        $OSCOM_Hooks->call('categories', 'deleteproductconfirmAction');
+        $OSCOM_Hooks->call('categories', 'deleteProductConfirmAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $cPath));
         break;
@@ -184,7 +184,7 @@
           } else {
             tep_db_query("update categories set parent_id = '" . (int)$new_parent_id . "', last_modified = now() where categories_id = '" . (int)$categories_id . "'");
 
-            $OSCOM_Hooks->call('categories', 'movecategoryconfirmAction');
+            $OSCOM_Hooks->call('categories', 'moveCategoryConfirmAction');
 
             tep_redirect(tep_href_link('categories.php', 'cPath=' . $new_parent_id . '&cID=' . $categories_id));
           }
@@ -199,7 +199,7 @@
         $duplicate_check = tep_db_fetch_array($duplicate_check_query);
         if ($duplicate_check['total'] < 1) tep_db_query("update products_to_categories set categories_id = '" . (int)$new_parent_id . "' where products_id = '" . (int)$products_id . "' and categories_id = '" . (int)$current_category_id . "'");
 
-        $OSCOM_Hooks->call('categories', 'moveproductconfirmAction');
+        $OSCOM_Hooks->call('categories', 'moveProductConfirmAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $new_parent_id . '&pID=' . $products_id));
         break;
@@ -360,7 +360,7 @@
           }
         }
 
-        $OSCOM_Hooks->call('categories', 'copytoconfirmAction');
+        $OSCOM_Hooks->call('categories', 'copyToConfirmAction');
 
         tep_redirect(tep_href_link('categories.php', 'cPath=' . $categories_id . '&pID=' . $products_id));
         break;

admin/countries.php

@@ -48,7 +48,7 @@
 
         tep_db_query("delete from countries where countries_id = '" . (int)$countries_id . "'");
 
-        $OSCOM_Hooks->call('countries', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('countries', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('countries.php', 'page=' . (int)$_GET['page']));
         break;

admin/currencies.php

@@ -58,7 +58,7 @@
           tep_db_query("update configuration set configuration_value = '" . tep_db_input($code) . "' where configuration_key = 'DEFAULT_CURRENCY'");
         }
 
-        $OSCOM_Hooks->call('currencies', 'insertsaveAction');        
+        $OSCOM_Hooks->call('currencies', 'insertSaveAction');        
 
         tep_redirect(tep_href_link('currencies.php', 'page=' . (int)$_GET['page'] . '&cID=' . $currency_id));
         break;
@@ -74,7 +74,7 @@
 
         tep_db_query("delete from currencies where currencies_id = '" . (int)$currencies_id . "'");
 
-        $OSCOM_Hooks->call('currencies', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('currencies', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('currencies.php', 'page=' . (int)$_GET['page']));
         break;

admin/customer_data_groups.php

@@ -54,7 +54,7 @@
           }
         }
 
-        $OSCOM_Hooks->call('customer_data_groups', 'insertsaveAction');
+        $OSCOM_Hooks->call('customer_data_groups', 'insertSaveAction');
 
         if ('insert' == $action) {
           tep_redirect(tep_href_link('customer_data_groups.php'));
@@ -68,7 +68,7 @@
         tep_db_query("DELETE FROM customer_data_groups WHERE customer_data_groups_id = " . (int)$customer_data_groups_id);
         tep_db_query("DELETE FROM customer_data_groups_sequence WHERE customer_data_groups_id = " . (int)$customer_data_groups_id);
 
-        $OSCOM_Hooks->call('customer_data_groups', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('customer_data_groups', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('customer_data_groups.php', 'page=' . (int)$_GET['page']));
         break;

admin/customers.php

@@ -68,7 +68,7 @@
         tep_db_query("DELETE FROM customers_basket_attributes WHERE customers_id = " . (int)$customers_id);
         tep_db_query("DELETE FROM whos_online WHERE customer_id = " . (int)$customers_id);
 
-        $OSCOM_Hooks->call('customers', 'deleteconfirmAction');
+        $OSCOM_Hooks->call('customers', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('customers.php', tep_get_all_get_params(['cID', 'action'])));
         break;
@@ -109,10 +109,6 @@
 
   <?php
   if ($action == 'edit' || $action == 'update') {
-    ?>
-
-  <div class="contentContainer">
-    <?php
     $oscTemplate = new oscTemplate();
     echo tep_draw_form('customers', 'customers.php', tep_get_all_get_params(['action']) . 'action=update', 'post');
     echo tep_draw_hidden_field('default_address_id', $customer_data->get('address_id', $customer_details));
@@ -153,7 +149,7 @@
     ?>
 
   </form>
-</div>
+
 <?php
   } else {
 ?>