From d735efaae0142607138ba5f70684060ac13e6faf Mon Sep 17 00:00:00 2001
From: gsalin <gerald.salin@inrae.fr>
Date: Tue, 12 Oct 2021 04:25:38 +0200
Subject: [PATCH] update require and use for tx_nG6_db and utils
---
ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php | 6 ++++--
ui/nG6/Classes/Controller/tx_nG6_db.php | 4 ++--
ui/nG6/lib/class.tx_nG6_upgrade.php | 3 +--
ui/nG6/pi1/class.tx_nG6_pi1.php | 7 ++++---
ui/nG6/pi3/class.tx_nG6_pi3.php | 3 ++-
ui/nG6/pi4/class.tx_nG6_pi4.php | 7 ++++---
ui/nG6/pi5/class.tx_nG6_pi5.php | 7 ++++---
ui/nG6/pi6/class.tx_nG6_pi6.php | 6 ++++--
8 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php b/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php
index d5dbcb342..dd8345eb0 100644
--- a/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php
+++ b/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){
diff --git a/ui/nG6/Classes/Controller/tx_nG6_db.php b/ui/nG6/Classes/Controller/tx_nG6_db.php
index 517305d53..8a0130aa7 100644
--- a/ui/nG6/Classes/Controller/tx_nG6_db.php
+++ b/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
diff --git a/ui/nG6/lib/class.tx_nG6_upgrade.php b/ui/nG6/lib/class.tx_nG6_upgrade.php
index 49943051c..a91a69a92 100644
--- a/ui/nG6/lib/class.tx_nG6_upgrade.php
+++ b/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.
diff --git a/ui/nG6/pi1/class.tx_nG6_pi1.php b/ui/nG6/pi1/class.tx_nG6_pi1.php
index 73c7062e1..c46221e11 100644
--- a/ui/nG6/pi1/class.tx_nG6_pi1.php
+++ b/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 {
diff --git a/ui/nG6/pi3/class.tx_nG6_pi3.php b/ui/nG6/pi3/class.tx_nG6_pi3.php
index 25f181e24..1e1e66635 100644
--- a/ui/nG6/pi3/class.tx_nG6_pi3.php
+++ b/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
diff --git a/ui/nG6/pi4/class.tx_nG6_pi4.php b/ui/nG6/pi4/class.tx_nG6_pi4.php
index 3a04e39c1..6af88468d 100644
--- a/ui/nG6/pi4/class.tx_nG6_pi4.php
+++ b/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.
diff --git a/ui/nG6/pi5/class.tx_nG6_pi5.php b/ui/nG6/pi5/class.tx_nG6_pi5.php
index 738b32c80..a5a593f57 100755
--- a/ui/nG6/pi5/class.tx_nG6_pi5.php
+++ b/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
diff --git a/ui/nG6/pi6/class.tx_nG6_pi6.php b/ui/nG6/pi6/class.tx_nG6_pi6.php
index 706e2693c..ab5a337e5 100755
--- a/ui/nG6/pi6/class.tx_nG6_pi6.php
+++ b/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.
--
GitLab