Merge branch 'typo3v10' into 'master'

update require and use for tx_nG6_db and utils

See merge request !130

ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php

@@ -27,9 +27,11 @@ namespace ng6\Controller;
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi6_purge {
 
  static function send_purge_demand_mail($project_ids, $extension_allowed = 1){

ui/nG6/Classes/Controller/tx_nG6_db.php

@@ -23,8 +23,8 @@ namespace ng6\Controller;
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+use nG6\Controller\tx_nG6_utils;
 /**
  * Class_nG6_db' for the 'nG6' extension.
  * This class is in charge of all communication with the database

ui/nG6/lib/class.tx_nG6_upgrade.php

@@ -22,8 +22,7 @@
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
-
+use nG6\Controller\tx_nG6_db;
 /**
  * Class_nG6_db' for the 'nG6' extension.
  * Allows to migrate usergroups system to (users) rights system.

ui/nG6/pi1/class.tx_nG6_pi1.php

@@ -27,13 +27,14 @@
  * @author	PF bioinformatique de Toulouse <>
  */
 
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_upgrade.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use TYPO3\CMS\Core\Context\Context;
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 
 class tx_nG6_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	

ui/nG6/pi3/class.tx_nG6_pi3.php

@@ -26,9 +26,10 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
 
 class tx_nG6_pi3 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi3';		// Same as class name

ui/nG6/pi4/class.tx_nG6_pi4.php

@@ -26,10 +26,11 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi4 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi1';		// Same as class name
 	var $scriptRelPath = 'pi4/class.tx_nG6_pi4.php';	// Path to this script relative to the extension dir.

ui/nG6/pi5/class.tx_nG6_pi5.php

@@ -26,12 +26,13 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use TYPO3\CMS\Core\Context\Context;
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 
 class tx_nG6_pi5 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi5';		// Same as class name

ui/nG6/pi6/class.tx_nG6_pi6.php

@@ -27,11 +27,13 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi6';		// Same as class name
 	var $scriptRelPath = 'pi6/class.tx_nG6_pi6.php';	// Path to this script relative to the extension dir.