5.0.0 beta

.gitignore

@@ -5,3 +5,4 @@
 /param/parmcom.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]
 /.project
 /nbproject/
+/.idea/

.htaccess

@@ -8,4 +8,4 @@ Deny from all
 </Files>
 <Files "*.pub.php">
 	Allow from all
-</Files>
+</Files>

README.md

@@ -1,6 +1,8 @@
-# TggAtos Module for Prestashop 1.5 and Prestashop 1.6
+# TggAtos Module *BETA VERSION* for Prestashop 1.7
 ## ATOS SIPS 600 payment gateway
 
+If you are looking for PrestaShop 1.4, 1.5 and 1.6 please see 4.x module versions
+
 ###### This module helped you earning money ?
 Please contribute back
 
@@ -10,14 +12,14 @@ Suggested donation: 25 € for basic user, 80 € for professionals which
 
 Donations help me to find time to develop and maintain the module and to answer support requests.
 
-### Release 3.4.0
+### BETA 5.0.0
 
 #### RELEASE-CANDIDATE feedback requests
 - Check that silent response works well (not yet checked due the use of a local virtual machine as server)
-- Production use feedbacks with:
-	- details about used functionnalities
+- Exploitation feedback with:
+	- details about used features
 	- details about production environment configuration:
-		- general public Web Hosting if relevant (exemple: "Mutualised Pro hosting from OVH company" or "Dedicated web server from OVH company", the last one is only relevant if you didn't change much of the configuration options that may affect module operation)
+		- general public Web Hosting if relevant (example: "Mutualised Pro hosting from OVH company" or "Dedicated web server from OVH company", the last one is only relevant if you didn't change much of the configuration options that may affect module operation)
 		- OS used with distribution and version
 		- HTTP server, and multi process module if relevant, with version
 		- PHP integration type and version
@@ -33,20 +35,21 @@ http://prestashop.blog.capillotracteur.fr/2013/02/10/debut-de-la-phase-release-c
 Sorry, it is a french blog, but they can be submitted in english as well.
 
 #### Environment used to test current version
-- Debian 7 x86_64
-- apache2-mpm-prefork (I prefer mpm-worker for production server but this is a dedicated local virtual machine with Eclipse project folder mounted from Windows host machine)
-- libapache2-mod-php5
-- PHP5
+- Debian 9 x86_64
+- Apache 2.4
+- PHP7.0-FPM
 
 #### Prerequisites
-- (hosting) PHP5 >= 5.3
+- (hosting) PHP5 >= 5.4
 - (hosting) safe_mode off
 - (hosting) exec() function not disabled, and able to execute ATOS SIPS binaries
-- (prestashop) version >= 1.5
+- (prestashop) version >= 1.7
 - (you) good web hosting configuration technical level and good knowledge of security issues
 - (you) basic undestanding of the way an ATOS SIPS gateway works and it's configuration
 
 #### Installation (differences with a simple PrestaShop module)
+
+##### Generic method
 - Make sure the module folder is named `tggatos`, the project content must be located in `modules/tggatos`.
 - Replace `tggatos/bin/` content with binaries compatible with your system provided by your SIPS service provider
 - Update `tggatos/param/parmcom.<sips_service_provider_codename>` with content of default parmcom provided by your SIPS service provider 
@@ -57,7 +60,23 @@ Sorry, it is a french blog, but they can be submitted in english as well.
 - Relocate `tggatos/param` somewhere safe from public access, outside HTTP document root, update module configuration in advanced panel.
 - Relocate `tggatos/log` folder, update module configuration in basic panel.
 - Check if access control policies match your environment and configuration, modify if needed.
-- If you experience any trouble please set PrestaShop constant `_PS_MODE_DEV_` to TRUE, enable PHP error logging and set error reporting to -1 (all) while troubleshooting 
+- If you experience any trouble please set PrestaShop constant `_PS_MODE_DEV_` to TRUE, enable PHP error logging and set error reporting to -1 (all) while troubleshooting
+
+##### Installation via a linux webserver shell using git (recommended method)
+
+```bash
+    shopuser@webserver:prestashop$ cd modules
+    shopuser@webserver:prestashop/modules$ git clone --depth 1 -b 5.0.0-beta https://github.com/TrogloGeek/prestashop-tggatos-module.git tggatos
+    shopuser@webserver:prestashop/modules$ cd tggatos
+    shopuser@webserver:prestashop/modules/tggatos$ git checkout -b local
+```
+
+`git clone` arguments explained:
+- (optional) `--depth 1` will reduce network and disk usage by truncating git history
+- `-b 5.0.0-beta` will checkout the selected branch or tag name, required if you use `--depth 1`
+- (required) `tggatos` will clone the module in this directory name instead of the GitHub project name `prestashop-tggatos-module`
+
+`git checkout -b local` will create a branch named `local` so you can later commit local changes if needed
 
 #### Release cycle
 I do not have enough feedback to manage a real release cycle, and I don't use it myself, I do run alpha tests on it but it is only a set of basic tests to try to check if I introduced side effects with last changes, never trust my checks, please run your owns.

autodispatch/init.php

@@ -11,18 +11,8 @@ function tggatos_registerRequestValue($name, $value)
 function tggatos_autodispatch($file)
 {
 	$controller = basename($file, '.pub.php');
-	if (version_compare(_PS_VERSION_, '1.5', '>=')) {
-		//PrestaShop 1.5+
-		eval('class TggAtosModuleFrontController extends ModuleFrontController {}');
-		foreach (array('controller' => $controller, 'fc' => 'module', 'module' => 'tggatos') as $name => $value)
-			tggatos_registerRequestValue($name, $value);
-		Dispatcher::getInstance()->dispatch();
-	} else {
-		//PrestaShop 1.4
-		require_once implode(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)), 'ps14', 'classes', 'TggAtosModuleFrontController.php'));
-		require_once implode(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)), 'controllers', 'front', $controller.'.php'));
-		$controller = 'TggAtos'.Tools::toCamelCase(str_replace('-', '_', $controller), true);
-		//require_once implode(DIRECTORY_SEPARATOR, array(dirname(dirname(__FILE__)), 'ps14', 'controllers', 'front', $controller.'.php'));
-		ControllerFactory::getController($controller.'ModuleFrontController')->run();
-	}
+    //PrestaShop 1.5+
+    foreach (array('controller' => $controller, 'fc' => 'module', 'module' => 'tggatos') as $name => $value)
+        tggatos_registerRequestValue($name, $value);
+    Dispatcher::getInstance()->dispatch();
 }

autodispatch/userreturn.pub.php

@@ -1,4 +1,4 @@
 <?php
 require_once 'init.php';
 //This controller does not use Prestashop Routing because ATOS/SIPS does not support GET parameters when using GET redirection form...
-tggatos_autodispatch(__FILE__);
+tggatos_autodispatch(__FILE__);