diff --git a/ui/nG6/class.tx_nG6_eid.php b/ui/nG6/class.tx_nG6_eid.php
index ceee5788571abe536b17e67ccca4bdda5bd46f76..19023f34573d4a3ab7fc4efb4b63911187fff4cb 100644
--- a/ui/nG6/class.tx_nG6_eid.php
+++ b/ui/nG6/class.tx_nG6_eid.php
@@ -542,6 +542,7 @@ class tx_nG6_eid {
$password = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('password'));
$cruser_id = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('creator'));
$from_email = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('from_email'));
+ $envelope_sender_address = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('envelope_sender_address'));
$pid = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('pid'));
$project_url = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('project_url'));
$send_an_email = filter_var(trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('send_an_email')), FILTER_VALIDATE_BOOLEAN);
@@ -582,7 +583,7 @@ class tx_nG6_eid {
$message = str_replace("###PROJECT_LINK###", $project_url, $message);
$msg_table = explode('\n', $message);
$message = implode("\n", $msg_table);
- mail($email, $create_user_title, $message, "From: <".$from_email.">");
+ mail($email, $create_user_title, $message, "From: <".$from_email.">",'-f '.$envelope_sender_address);
}
print '2'; // ok
} elseif ($res_code == 1) {
@@ -615,7 +616,7 @@ class tx_nG6_eid {
$message = str_replace("###PROJECT_LINK###", $project_url, $message);
$msg_table = explode('\n', $message);
$message = implode("\n", $msg_table);
- mail($email, $add_user_title, $message, "From: <".$from_email.">");
+ mail($email, $add_user_title, $message, "From: <".$from_email.">",'-f '.$envelope_sender_address);
}
print '0';
@@ -703,6 +704,7 @@ class tx_nG6_eid {
$cruser_id = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('creator'));
$send_an_email = filter_var(trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('send_an_email')), FILTER_VALIDATE_BOOLEAN);
$from_email = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('from_email'));
+ $envelope_sender_address = trim(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('envelope_sender_address'));
$updated = tx_nG6_db::update_user($user_id, $first_name, $last_name, $email, $group_name, $organism, $location, tx_nG6_utils::hash_password($password)) ;
@@ -733,7 +735,7 @@ class tx_nG6_eid {
}
}
$mail_content .= "\nThe NG6 team";
- mail($email, $mail_title, $mail_content, "From: <".$from_email.">");
+ mail($email, $mail_title, $mail_content, "From: <".$from_email.">",'-f '.$envelope_sender_address);
}
}
diff --git a/ui/nG6/ext_emconf.php b/ui/nG6/ext_emconf.php
index 2158508eadd0b2961272ee922a0aadd9eb4440e4..f457142936a71a3c847f20ec97819853996cc262 100644
--- a/ui/nG6/ext_emconf.php
+++ b/ui/nG6/ext_emconf.php
@@ -10,7 +10,7 @@
# "version" and "dependencies" must not be touched!
########################################################################
-$EM_CONF[$_EXTKEY] = array(
+$EM_CONF['nG6'] = array(
'title' => 'nG6',
'description' => 'Next Generation Sequencing Information System',
'category' => 'plugin',
diff --git a/ui/nG6/ext_localconf.php b/ui/nG6/ext_localconf.php
index 144795b3a75996346df993a0e9a81d30766b23b6..d3d3b7cdd5f27045371c64e942eccd101e1a113d 100644
--- a/ui/nG6/ext_localconf.php
+++ b/ui/nG6/ext_localconf.php
@@ -6,52 +6,52 @@ exec('chmod 777 '.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('n
exec('chmod 777 '.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'res/smarty/templates_c');
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi1 = < plugin.tx_nG6_pi1.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi1/class.tx_nG6_pi1.php','_pi1','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi1/class.tx_nG6_pi1.php','_pi1','list_type',1);
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi2 = < plugin.tx_nG6_pi2.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi2/class.tx_nG6_pi2.php','_pi2','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi2/class.tx_nG6_pi2.php','_pi2','list_type',1);
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi3 = < plugin.tx_nG6_pi3.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi3/class.tx_nG6_pi3.php','_pi3','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi3/class.tx_nG6_pi3.php','_pi3','list_type',1);
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi4 = < plugin.tx_nG6_pi4.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi4/class.tx_nG6_pi4.php','_pi4','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi4/class.tx_nG6_pi4.php','_pi4','list_type',1);
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi5 = < plugin.tx_nG6_pi5.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi5/class.tx_nG6_pi5.php','_pi5','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi5/class.tx_nG6_pi5.php','_pi5','list_type',1);
## Extending TypoScript from static template uid=43 to set up userdefined tag:
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($_EXTKEY,'setup','
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('nG6','setup','
tt_content.CSS_editor.ch.tx_nG6_pi6 = < plugin.tx_nG6_pi6.CSS_editor
',43);
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY,'pi6/class.tx_nG6_pi6.php','_pi6','list_type',1);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43('nG6','pi6/class.tx_nG6_pi6.php','_pi6','list_type',1);
## Added to do some ajax
diff --git a/ui/nG6/ext_tables.php b/ui/nG6/ext_tables.php
index da81a29d7041ba31d57f688d315df68489157d3c..ab3d1406801c7f8c22a64a37dc04e0e59b7794f8 100644
--- a/ui/nG6/ext_tables.php
+++ b/ui/nG6/ext_tables.php
@@ -1,4 +1,5 @@
<?php
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
if (!defined ('TYPO3_MODE')) die ('Access denied.');
$TCA["fe_rights_levels"] = Array(
@@ -7,7 +8,7 @@ $TCA["fe_rights_levels"] = Array(
'label' => 'right_level_id',
"default_sortby" => "ORDER BY right_level_id",
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php"
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6')."tca.php"
),
"feInterface" => Array (
"fe_admin_fieldList" => "right_level_id, right_level_label",
@@ -20,7 +21,7 @@ $TCA["fe_rights"] = Array(
'label' => 'right_id, project_id, fe_user_id',
"default_sortby" => "ORDER BY right_id",
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php"
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6')."tca.php"
),
"feInterface" => Array (
"fe_admin_fieldList" => "fe_user_id, right_id, project_id",
@@ -46,8 +47,8 @@ $TCA["tx_nG6_run"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_run.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_run.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, name, date, directory, species, data_nature, type, nb_sequences, full_seq_size, description, sequencer",
@@ -69,8 +70,8 @@ $TCA["tx_nG6_analyze"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_analyze.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_analyze.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, parent_uid, class, name, description, date, directory, software, version, params",
@@ -92,8 +93,8 @@ $TCA["tx_nG6_sample"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_sample.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_sample.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, run_id, mid, description",
@@ -115,8 +116,8 @@ $TCA["tx_nG6_result"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_result.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_result.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "analyze_id, file, rkey, rvalue, rgroup",
@@ -138,8 +139,8 @@ $TCA["tx_nG6_project_run"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_project_run.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_project_run.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, project_id, run_id",
@@ -161,8 +162,8 @@ $TCA["tx_nG6_project_analyze"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_project_analyze.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_project_analyze.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, project_id, analyze_id",
@@ -184,8 +185,8 @@ $TCA["tx_nG6_run_analyze"] = Array (
"enablecolumns" => Array (
"disabled" => "hidden",
),
- "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY)."tca.php",
- "iconfile" => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($_EXTKEY)."icon_tx_nG6_run_analyze.gif",
+ "dynamicConfigFile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."tca.php",
+ "iconfile" => \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('nG6'))."icon_tx_nG6_run_analyze.gif",
),
"feInterface" => Array (
"fe_admin_fieldList" => "hidden, run_id, analyze_id",
@@ -195,32 +196,32 @@ $TCA["tx_nG6_run_analyze"] = Array (
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi1']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi1', $_EXTKEY.'_pi1'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi1_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi1/class.tx_nG6_pi1_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi1']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi1', 'nG6'.'_pi1'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi1_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi1/class.tx_nG6_pi1_wizicon.php';
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi2']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi2', $_EXTKEY.'_pi2'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi2_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi2/class.tx_nG6_pi2_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi2']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi2', 'nG6'.'_pi2'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi2_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi2/class.tx_nG6_pi2_wizicon.php';
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi3']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi3', $_EXTKEY.'_pi3'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi3_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi3/class.tx_nG6_pi3_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi3']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi3', 'nG6'.'_pi3'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi3_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi3/class.tx_nG6_pi3_wizicon.php';
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi4']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi4', $_EXTKEY.'_pi4'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi4_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi4/class.tx_nG6_pi4_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi4']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi4', 'nG6'.'_pi4'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi4_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi4/class.tx_nG6_pi4_wizicon.php';
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi5']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi5', $_EXTKEY.'_pi5'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi5_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi5/class.tx_nG6_pi5_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi5']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi5', 'nG6'.'_pi5'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi5_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi5/class.tx_nG6_pi5_wizicon.php';
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('tt_content');
-$TCA['tt_content']['types']['list']['subtypes_excludelist'][$_EXTKEY.'_pi6']='layout,select_key';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi6', $_EXTKEY.'_pi6'),'list_type', $_EXTKEY);
-if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi6_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'pi6/class.tx_nG6_pi6_wizicon.php';
+$TCA['tt_content']['types']['list']['subtypes_excludelist']['nG6'.'_pi6']='layout,select_key';
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(Array('LLL:EXT:nG6/locallang_db.xml:tt_content.list_type_pi6', 'nG6'.'_pi6'),'list_type', 'nG6');
+if (TYPO3_MODE=="BE") $TBE_MODULES_EXT["xMOD_db_new_content_el"]["addElClasses"]["tx_nG6_pi6_wizicon"] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'pi6/class.tx_nG6_pi6_wizicon.php';
?>
diff --git a/ui/nG6/ext_tables.sql b/ui/nG6/ext_tables.sql
index 6f31aa17915a83521ed57ebebc862f79ccf6b62c..eb57d990f8bce1a62d376809c6a7ea17652eaf0e 100644
--- a/ui/nG6/ext_tables.sql
+++ b/ui/nG6/ext_tables.sql
@@ -6,7 +6,7 @@ CREATE TABLE fe_rights_levels (
right_level_id int(11) NOT NULL,
right_level_label varchar(20) NOT NULL,
PRIMARY KEY (right_level_id),
-) CHARSET=utf8 ;
+);
/*
@@ -17,7 +17,7 @@ CREATE TABLE fe_rights (
project_id int(11) NOT NULL,
right_id int(11) NOT NULL,
PRIMARY KEY (fe_user_id, project_id, right_id)
-) CHARSET=utf8 ;
+) ;
/*
@@ -37,7 +37,7 @@ CREATE TABLE tx_nG6_project (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
@@ -65,7 +65,7 @@ CREATE TABLE tx_nG6_run (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
/*
@@ -92,7 +92,7 @@ CREATE TABLE tx_nG6_analyze (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
@@ -114,7 +114,7 @@ CREATE TABLE tx_nG6_sample (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
/*
@@ -137,7 +137,7 @@ CREATE TABLE tx_nG6_result (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
/*
@@ -157,7 +157,7 @@ CREATE TABLE tx_nG6_project_run (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
/*
@@ -177,7 +177,7 @@ CREATE TABLE tx_nG6_project_analyze (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
+) ;
/*
@@ -197,4 +197,4 @@ CREATE TABLE tx_nG6_run_analyze (
PRIMARY KEY (uid),
KEY parent (pid)
-) CHARSET=utf8 ;
\ No newline at end of file
+) ;
\ No newline at end of file
diff --git a/ui/nG6/lib/class.tx_nG6_utils.php b/ui/nG6/lib/class.tx_nG6_utils.php
index 4d0d903b04c74bbb6ef3db00d4ecc9bb67534bb2..806cb1033b22e367605230788a54fd69268b9b4a 100644
--- a/ui/nG6/lib/class.tx_nG6_utils.php
+++ b/ui/nG6/lib/class.tx_nG6_utils.php
@@ -234,7 +234,7 @@ class tx_nG6_utils {
}
$template_mail.='The nG6 purge process is undergoing an important overhaul.</br>
-You can visit our FAQ at the following address : https://ng6.toulouse.inra.fr/index.php?id=57 .</br>
+You can visit our FAQ at the following address : https://ng6.toulouse.inra.fr/faq .</br>
If you have any question or demand, do not hesitate to contact our support team at ng6-support@groupes.renater.fr.</br>';
$template_mail.='<p>Yours sincerely</p>
@@ -298,12 +298,15 @@ $template_mail.='<p>Yours sincerely</p>
* @return hashed password
*/
static function hash_password($password){
- if (\TYPO3\CMS\Crypto\PasswordHashing\SaltedPasswordsUtility::isUsageEnabled('FE')) {
- $objSalt = \TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory::getSaltingInstance(NULL);
- if (is_object($objSalt)) {
- $saltedPassword = $objSalt->getHashedPassword($password);
- }
- }
+ $hashInstance = GeneralUtility::makeInstance(PasswordHashFactory::class)->getDefaultHashInstance('FE');
+ $hashedPassword = $hashInstance->getHashedPassword($password);
+// if (\TYPO3\CMS\Crypto\PasswordHashing\SaltedPasswordsUtility::isUsageEnabled('FE')) {
+// $objSalt = \TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory::getSaltingInstance(NULL);
+// if (is_object($objSalt)) {
+// $saltedPassword = $objSalt->getHashedPassword($password);
+// }
+// }
+
return $saltedPassword;
}
diff --git a/ui/nG6/pi1/class.tx_nG6_pi1.php b/ui/nG6/pi1/class.tx_nG6_pi1.php
index b62ffedf3859f5b069e14baa51c7738cfa12bb3f..3ad4d62857e59277f7b01e4847b71c1c76cc64ee 100644
--- a/ui/nG6/pi1/class.tx_nG6_pi1.php
+++ b/ui/nG6/pi1/class.tx_nG6_pi1.php
@@ -200,6 +200,7 @@ class tx_nG6_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
$smarty->assign('user_login', $GLOBALS['TSFE']->fe_user->user['username']);
$smarty->assign('data_folder', $this->conf["data"]);
$smarty->assign('from_email', $this->conf["FromEmail"]);
+ $smarty->assign('envelope_sender_address', $this->conf["envelope_sender_address"]);
$smarty->assign('server_name', $this->conf["server_name"]);
$smarty->assign('project_ids', substr($project_ids,0,-1));
$smarty->assign('pid', $this->conf['userpidList']);
diff --git a/ui/nG6/pi1/class.tx_nG6_pi1_wizicon.php b/ui/nG6/pi1/class.tx_nG6_pi1_wizicon.php
index b95fd8e1c4295b78a6fff9c90ecb0353b5078eaa..3e23cdde21ab794b1989f4677a5618cd2abbec9c 100644
--- a/ui/nG6/pi1/class.tx_nG6_pi1_wizicon.php
+++ b/ui/nG6/pi1/class.tx_nG6_pi1_wizicon.php
@@ -28,7 +28,7 @@
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi1_wizicon {
/**
diff --git a/ui/nG6/pi1/project_view.tpl b/ui/nG6/pi1/project_view.tpl
index 580a3df561cc6216e8f9b114acd785ca86cfb057..3dbd257a8e8bb905fb51a31e0336c99ba5f85b7e 100644
--- a/ui/nG6/pi1/project_view.tpl
+++ b/ui/nG6/pi1/project_view.tpl
@@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<input type="hidden" id="server_name" value="{$server_name}" />
<input type="hidden" id="from_email" value="{$from_email}" />
+<input type="hidden" id="envelope_sender_address" value="{$envelope_sender_address}" />
<input type="hidden" id="user_id" value="{$user_id}" />
<input type="hidden" id="user_login" value="{$user_login}" />
<input type="hidden" id="pid" value="{$pid}" />
diff --git a/ui/nG6/pi2/class.tx_nG6_pi2_wizicon.php b/ui/nG6/pi2/class.tx_nG6_pi2_wizicon.php
index 31edf23d10f9056a096aaf16f1098e78849e696c..28d2a57ffce207c184617c5e8109fb1ed454e613 100644
--- a/ui/nG6/pi2/class.tx_nG6_pi2_wizicon.php
+++ b/ui/nG6/pi2/class.tx_nG6_pi2_wizicon.php
@@ -26,7 +26,7 @@
*
* @author PF bioinformatique de Toulouse <>
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi2_wizicon {
/**
diff --git a/ui/nG6/pi3/class.tx_nG6_pi3_wizicon.php b/ui/nG6/pi3/class.tx_nG6_pi3_wizicon.php
index 1539d98abff3acea6917b4213e5d5809f9020a72..3ee916f72826907682c891d01684de6dd06cf1cb 100644
--- a/ui/nG6/pi3/class.tx_nG6_pi3_wizicon.php
+++ b/ui/nG6/pi3/class.tx_nG6_pi3_wizicon.php
@@ -26,7 +26,7 @@
*
* @author PF bioinformatique de Toulouse <>
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi3_wizicon {
/**
diff --git a/ui/nG6/pi4/class.tx_nG6_pi4_wizicon.php b/ui/nG6/pi4/class.tx_nG6_pi4_wizicon.php
index 1fa47d923e612caba3bd2fac9eb92bc1c12c83db..2cb5547e3f1d7a4ed14d90fa27eee29b9581e1e4 100644
--- a/ui/nG6/pi4/class.tx_nG6_pi4_wizicon.php
+++ b/ui/nG6/pi4/class.tx_nG6_pi4_wizicon.php
@@ -26,7 +26,7 @@
*
* @author PF bioinformatique de Toulouse <>
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi4_wizicon {
/**
diff --git a/ui/nG6/pi5/class.tx_nG6_pi5_wizicon.php b/ui/nG6/pi5/class.tx_nG6_pi5_wizicon.php
index c6f087f9e337b9df6a62e26d9ec633b331b0a995..09e34c9a1e2921d9584ce77e5e495b7bef9a8bc2 100755
--- a/ui/nG6/pi5/class.tx_nG6_pi5_wizicon.php
+++ b/ui/nG6/pi5/class.tx_nG6_pi5_wizicon.php
@@ -27,7 +27,7 @@
* @author PF bioinformatique de Toulouse <>
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi5_wizicon {
/**
diff --git a/ui/nG6/pi6/class.tx_nG6_pi6.php b/ui/nG6/pi6/class.tx_nG6_pi6.php
index 0d5e93fc7c5afa4f8e4c9b40cdaafd6b02212afb..8bb1eb32984276fb2580a9b0c022169acdc0cb2f 100755
--- a/ui/nG6/pi6/class.tx_nG6_pi6.php
+++ b/ui/nG6/pi6/class.tx_nG6_pi6.php
@@ -239,7 +239,7 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
$headers[] = 'MIME-Version: 1.0';
$headers[] = 'Content-type: text/html; charset=utf-8';
$headers[] = 'Cc: '.$GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["email_copy"];
- mail($to, $subject, $mail, implode("\r\n", $headers));
+ mail($to, $subject, $mail, implode("\r\n", $headers), '-f '. $GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["envelope_sender_address"]);
//TODO check return function mail ok
}else{
//If the demand could not be inserted because another one already exists for the given project, we send a mail to the nG6 admins
@@ -255,7 +255,7 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
$headers[] = 'Content-type: text/html; charset=utf-8';
$headers[] = 'Cc: '.$GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["email_copy"];
- mail($to, $subject, $mail, implode("\r\n", $headers));
+ mail($to, $subject, $mail, implode("\r\n", $headers), '-f '. $GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["envelope_sender_address"]);
}
}
return "Mail sent";
@@ -319,7 +319,7 @@ class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
$headers[] = 'Cc: '.$GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["email_copy"];
$to= join(",",$res_demand["emails"]);
- mail($to, $subject, $mail, implode("\r\n", $headers));
+ mail($to, $subject, $mail, implode("\r\n", $headers), '-f '. $GLOBALS['TSFE']->tmpl->setup["plugin."]["tx_nG6_pi6."]["envelope_sender_address"]);
}
}
}
diff --git a/ui/nG6/pi6/class.tx_nG6_pi6_wizicon.php b/ui/nG6/pi6/class.tx_nG6_pi6_wizicon.php
index 7421f474707876b642360f2dd7d59b00f8c8bf14..3d0a550a5e5237e1270c3df2b069c7f3e26a008b 100755
--- a/ui/nG6/pi6/class.tx_nG6_pi6_wizicon.php
+++ b/ui/nG6/pi6/class.tx_nG6_pi6_wizicon.php
@@ -26,7 +26,7 @@
*
* @author PF bioinformatique de Toulouse <>
*/
-
+use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
class tx_nG6_pi6_wizicon {
/**
diff --git a/ui/nG6/res/js/tx_nG6_pi1.js b/ui/nG6/res/js/tx_nG6_pi1.js
index 699f4e6a38864377a6c3f097ca0437c1cf554d98..bcf57fbb088fa936167f2ee71fd6367c4e2fbb64 100644
--- a/ui/nG6/res/js/tx_nG6_pi1.js
+++ b/ui/nG6/res/js/tx_nG6_pi1.js
@@ -580,6 +580,7 @@ $(function () {
val_url += "&user_id=" + user_id ;
val_url += "&send_an_email=" + $("#send_email_chk")[0].checked;
val_url += "&from_email=" + $("#from_email").val();
+ val_url += "&envelope_sender_address=" + $("#envelope_sender_address").val();
$.ajax({
url: val_url,
@@ -893,6 +894,7 @@ $(function () {
val_url += "&create_user_email=" + escape("Dear ###USER_FIRST_NAME### ###USER_LAST_NAME###,\nPlease find bellow your login/password required to log into the NG6 system (###PROJECT_LINK###): \n - login: ###USER_LOGIN###\n - password: ###USER_PASSWORD###\nThe NG6 team\nPS: this is an automatic e-mail message generated by the NG6 system. Please DO NOT RESPOND to this e-mail because the mail box is unattended.");
val_url += "&create_user_title=[NG6] Account creation";
val_url += "&from_email=" + $("#from_email").val();
+ val_url += "&envelope_sender_address=" + $("#envelope_sender_address").val();
val_url += "&project_url=" + escape(location.href);
val_url += "&send_an_email=" + $("#send_email_chk")[0].checked;
diff --git a/ui/nG6/template/index.html b/ui/nG6/template/Resources/Private/Templates/NG6.html
similarity index 66%
rename from ui/nG6/template/index.html
rename to ui/nG6/template/Resources/Private/Templates/NG6.html
index 5ccf7981b868cff1fe042bb4b0a203843f6647f2..d308e752394ad89da4ddfa93ac840d07f2b72d62 100755
--- a/ui/nG6/template/index.html
+++ b/ui/nG6/template/Resources/Private/Templates/NG6.html
@@ -1,26 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xml:lang="fr" xmlns="http://www.w3.org/1999/xhtml" lang="fr">
-<head>
- <title>nG6 - next Generation Sequencing Information System</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <!-- <link rel="stylesheet" type="text/css" href="styles.css"/> -->
- <!--[if lte IE 6]><link type="text/css" rel="stylesheet" href="http://www.alsacreations.com/css/ie6.css" media="all" /><![endif]-->
- <!--[if IE 7]><link type="text/css" rel="stylesheet" href="http://www.alsacreations.com/css/ie7.css" media="all" /><![endif]-->
-
- <script type="text/javascript">
- $(document).ready(function() {
- $('[class^=tooltip]').poshytip({
- className: 'tip-twitter',
- showTimeout: 1,
- alignTo: 'target',
- alignX: 'center',
- offsetY: 5,
- allowTipHover: false
- });
- });
- </script>
-</head>
-<body>
+
<!-- ###DOCUMENT### -->
<!-- bloc header, content header, header-inside, evitement, logo, menu, sous-menu, recherche -->
<div id="ng6-header">
@@ -33,27 +11,26 @@
<div id="sous-menu">
<!-- ###SEARCHBOX### -->
- <!-- ###SEARCHBOX### -->
- <!-- ###MENU### -->
+ <f:format.htmlentitiesDecode>{SEARCHBOX}</f:format.htmlentitiesDecode>
<!-- ###MENU### -->
+ <f:format.htmlentitiesDecode>{MENU}</f:format.htmlentitiesDecode>
</div>
</div>
</div> <!-- fin de header -->
- <!-- Header-sep, designe la bande graphique entre l'entête et le bloc central -->
+ <!-- Header-sep, designe la bande graphique entre l'entête et le bloc central -->
<div id="ng6-header-sep" class="ng6-sep">
<div class="ng6-sep-inside">
- <!-- ###BROWSER### -->
- <!-- ###BROWSER### -->
+ <f:format.htmlentitiesDecode>{BROWSER}</f:format.htmlentitiesDecode>
+
</div>
</div>
-
+
<div id="global">
<!-- Bloc Center, contient center, content, sidebar et center-sep -->
<div id="page">
<div id="content">
- <!-- ###CONTENT### -->
- <!-- ###CONTENT### -->
+ <f:format.htmlentitiesDecode>{CONTENT}</f:format.htmlentitiesDecode>
</div> <!-- content -->
</div> <!-- fin de page -->
</div> <!-- fin de global -->
@@ -94,7 +71,7 @@
<div class="ng6-bottom">
<div class="ng6-bottom2">
- Copyright © 2013, INRA | Designed by <a class="ng6-footer-link" href="http://bioinfo.genotoul.fr/" target="_blank">GenoToul Bioinfo</a>,
+ Copyright © 2013, INRAe | Designed by <a class="ng6-footer-link" href="http://bioinfo.genotoul.fr/" target="_blank">GenoToul Bioinfo</a>,
<a class="ng6-footer-link" href="http://genomique.genotoul.fr/" target="_blank">GenoToul Genomic</a>
and <a class="ng6-footer-link" href="http://www.sigenae.org/" target="_blank">Sigenae</a> teams | Optimized for
<a class="tooltip-firefox firefox" href="http://www.mozilla.org/firefox" target="_blank" title="Mozilla Firefox"> </a>
@@ -102,5 +79,3 @@
</div>
</div>
<!-- ###DOCUMENT### -->
-</body>
-</html>
\ No newline at end of file
diff --git a/ui/nG6/template/css/ie6.css b/ui/nG6/template/Resources/Public/Css/ie6.css
similarity index 100%
rename from ui/nG6/template/css/ie6.css
rename to ui/nG6/template/Resources/Public/Css/ie6.css
diff --git a/ui/nG6/template/css/style.css b/ui/nG6/template/Resources/Public/Css/style.css
similarity index 90%
rename from ui/nG6/template/css/style.css
rename to ui/nG6/template/Resources/Public/Css/style.css
index ad08a0f95c70f9f7be0f67d061844ee21beec003..b10561751a8853e33110943856a2efdbd8527a76 100755
--- a/ui/nG6/template/css/style.css
+++ b/ui/nG6/template/Resources/Public/Css/style.css
@@ -102,7 +102,7 @@ a img { border: 0; }
*
********************************/
-#ng6-header { background: url(../images/bando-logo2.png) 50% 35px no-repeat #222426; border-bottom: 1px solid black;}
+#ng6-header { background: url(../Images/bando-logo2.png) 50% 35px no-repeat #222426; border-bottom: 1px solid black;}
#ng6-header h1 { margin: 15px 0 0 0; padding: 0; height: 66px; font-size: 15px; line-height: 1; }
#ng6-header-inside { position: relative; width: 1200px; margin: 0 auto; }
@@ -111,7 +111,7 @@ a img { border: 0; }
#evitement li a { color : #F1F1F1; text-decoration: none; font-weight: bold; }
#evitement li a:hover, #evitement li a:focus { color : #567f87; }
-#sous-menu { width: 1200px; height: 66px; margin: 0 auto; background: url(../images/menu-bg.png) left top no-repeat; margin-top:-7px; }
+#sous-menu { width: 1200px; height: 66px; margin: 0 auto; background: url(../Images/menu-bg.png) left top no-repeat; margin-top:-7px; }
#sous-menu ul { padding: 21px 0 0 10px; list-style: none; margin-left: 0px;}
#sous-menu ul li { margin-right: 15px; display: inline; }
#sous-menu li a { text-decoration: none; color: #fff; font-size: 1.5em; font-weight: bold; font-variant: small-caps; }
@@ -134,7 +134,7 @@ a img { border: 0; }
********************************/
#ng6-footer {
- background: url("../images/footer-glow.png") no-repeat scroll center top #2A2D30;
+ background: url("../Images/footer-glow.png") no-repeat scroll center top #2A2D30;
color: #FFFFFF;
/* position: relative; */
border-top: solid 1px #141414;
@@ -196,9 +196,9 @@ a img { border: 0; }
transition: padding-left .5s ease-in-out;
background-size: 25px 75px;
}
-.gbp { background: url('../images/genotoul-bioinfo-logo-small.png') no-repeat scroll 0 3px transparent; }
-.ggp { background: url('../images/genotoul-genomic-logo-small.png') no-repeat scroll 0 3px transparent; }
-.sp { background: url('../images/logo_sigenae_cercle_thumb.png') no-repeat scroll 0 3px transparent; }
+.gbp { background: url('../Images/genotoul-bioinfo-logo-small.png') no-repeat scroll 0 3px transparent; }
+.ggp { background: url('../Images/genotoul-genomic-logo-small.png') no-repeat scroll 0 3px transparent; }
+.sp { background: url('../Images/logo_sigenae_cercle_thumb.png') no-repeat scroll 0 3px transparent; }
#ng6-footer-cols li.ng6-col ul li.ng6-page_item:hover {
padding-left: 36px;
background-position: 0 -36px;
@@ -218,7 +218,7 @@ a img { border: 0; }
color: #567f87;
}
.ng6-bottom {
- background: url("../images/bottom-shadow.png") repeat-x scroll 0 0 #222426;
+ background: url("../Images/bottom-shadow.png") repeat-x scroll 0 0 #222426;
color: #868686;
font-size: 12px;
line-height: 60px;
@@ -238,7 +238,7 @@ a img { border: 0; }
margin-left: 45px;
width: 36px;
height: 36px;
- background: url("../images/chrome.png");
+ background: url("../Images/chrome.png");
}
.ng6-bottom2 .firefox {
position: absolute;
@@ -246,7 +246,7 @@ a img { border: 0; }
margin-left: 5px;
width: 36px;
height: 36px;
- background: url("../images/firefox.png");
+ background: url("../Images/firefox.png");
}
.ng6-bottom2 a {
color: #F1F1F1;
diff --git a/ui/nG6/template/images/Crystal_128_error.png b/ui/nG6/template/Resources/Public/Images/Crystal_128_error.png
similarity index 100%
rename from ui/nG6/template/images/Crystal_128_error.png
rename to ui/nG6/template/Resources/Public/Images/Crystal_128_error.png
diff --git a/ui/nG6/template/images/access.png b/ui/nG6/template/Resources/Public/Images/access.png
similarity index 100%
rename from ui/nG6/template/images/access.png
rename to ui/nG6/template/Resources/Public/Images/access.png
diff --git a/ui/nG6/template/images/bando-logo1.png b/ui/nG6/template/Resources/Public/Images/bando-logo1.png
similarity index 100%
rename from ui/nG6/template/images/bando-logo1.png
rename to ui/nG6/template/Resources/Public/Images/bando-logo1.png
diff --git a/ui/nG6/template/images/bando-logo1.xcf b/ui/nG6/template/Resources/Public/Images/bando-logo1.xcf
similarity index 100%
rename from ui/nG6/template/images/bando-logo1.xcf
rename to ui/nG6/template/Resources/Public/Images/bando-logo1.xcf
diff --git a/ui/nG6/template/images/bando-logo2.png b/ui/nG6/template/Resources/Public/Images/bando-logo2.png
similarity index 100%
rename from ui/nG6/template/images/bando-logo2.png
rename to ui/nG6/template/Resources/Public/Images/bando-logo2.png
diff --git a/ui/nG6/template/images/bando-logo2.xcf b/ui/nG6/template/Resources/Public/Images/bando-logo2.xcf
similarity index 100%
rename from ui/nG6/template/images/bando-logo2.xcf
rename to ui/nG6/template/Resources/Public/Images/bando-logo2.xcf
diff --git a/ui/nG6/template/images/bando2-1.png b/ui/nG6/template/Resources/Public/Images/bando2-1.png
similarity index 100%
rename from ui/nG6/template/images/bando2-1.png
rename to ui/nG6/template/Resources/Public/Images/bando2-1.png
diff --git a/ui/nG6/template/images/bottom-shadow.png b/ui/nG6/template/Resources/Public/Images/bottom-shadow.png
similarity index 100%
rename from ui/nG6/template/images/bottom-shadow.png
rename to ui/nG6/template/Resources/Public/Images/bottom-shadow.png
diff --git a/ui/nG6/template/images/btn-ok.png b/ui/nG6/template/Resources/Public/Images/btn-ok.png
similarity index 100%
rename from ui/nG6/template/images/btn-ok.png
rename to ui/nG6/template/Resources/Public/Images/btn-ok.png
diff --git a/ui/nG6/template/images/center-bg.png b/ui/nG6/template/Resources/Public/Images/center-bg.png
similarity index 100%
rename from ui/nG6/template/images/center-bg.png
rename to ui/nG6/template/Resources/Public/Images/center-bg.png
diff --git a/ui/nG6/template/images/chrome.png b/ui/nG6/template/Resources/Public/Images/chrome.png
similarity index 100%
rename from ui/nG6/template/images/chrome.png
rename to ui/nG6/template/Resources/Public/Images/chrome.png
diff --git a/ui/nG6/template/images/favicon.png b/ui/nG6/template/Resources/Public/Images/favicon.png
similarity index 100%
rename from ui/nG6/template/images/favicon.png
rename to ui/nG6/template/Resources/Public/Images/favicon.png
diff --git a/ui/nG6/template/images/firefox.png b/ui/nG6/template/Resources/Public/Images/firefox.png
similarity index 100%
rename from ui/nG6/template/images/firefox.png
rename to ui/nG6/template/Resources/Public/Images/firefox.png
diff --git a/ui/nG6/template/images/footer-end.png b/ui/nG6/template/Resources/Public/Images/footer-end.png
similarity index 100%
rename from ui/nG6/template/images/footer-end.png
rename to ui/nG6/template/Resources/Public/Images/footer-end.png
diff --git a/ui/nG6/template/images/footer-glow.png b/ui/nG6/template/Resources/Public/Images/footer-glow.png
similarity index 100%
rename from ui/nG6/template/images/footer-glow.png
rename to ui/nG6/template/Resources/Public/Images/footer-glow.png
diff --git a/ui/nG6/template/images/footer-logo.gif b/ui/nG6/template/Resources/Public/Images/footer-logo.gif
similarity index 100%
rename from ui/nG6/template/images/footer-logo.gif
rename to ui/nG6/template/Resources/Public/Images/footer-logo.gif
diff --git a/ui/nG6/template/images/footer-menu.png b/ui/nG6/template/Resources/Public/Images/footer-menu.png
similarity index 100%
rename from ui/nG6/template/images/footer-menu.png
rename to ui/nG6/template/Resources/Public/Images/footer-menu.png
diff --git a/ui/nG6/template/images/footer.jpg b/ui/nG6/template/Resources/Public/Images/footer.jpg
similarity index 100%
rename from ui/nG6/template/images/footer.jpg
rename to ui/nG6/template/Resources/Public/Images/footer.jpg
diff --git a/ui/nG6/template/images/genotoul-bioinfo-logo-small.png b/ui/nG6/template/Resources/Public/Images/genotoul-bioinfo-logo-small.png
similarity index 100%
rename from ui/nG6/template/images/genotoul-bioinfo-logo-small.png
rename to ui/nG6/template/Resources/Public/Images/genotoul-bioinfo-logo-small.png
diff --git a/ui/nG6/template/images/genotoul-bioinfo-logo.png b/ui/nG6/template/Resources/Public/Images/genotoul-bioinfo-logo.png
similarity index 100%
rename from ui/nG6/template/images/genotoul-bioinfo-logo.png
rename to ui/nG6/template/Resources/Public/Images/genotoul-bioinfo-logo.png
diff --git a/ui/nG6/template/images/genotoul-genomic-logo-small.png b/ui/nG6/template/Resources/Public/Images/genotoul-genomic-logo-small.png
similarity index 100%
rename from ui/nG6/template/images/genotoul-genomic-logo-small.png
rename to ui/nG6/template/Resources/Public/Images/genotoul-genomic-logo-small.png
diff --git a/ui/nG6/template/images/genotoul-genomic-logo.png b/ui/nG6/template/Resources/Public/Images/genotoul-genomic-logo.png
similarity index 100%
rename from ui/nG6/template/images/genotoul-genomic-logo.png
rename to ui/nG6/template/Resources/Public/Images/genotoul-genomic-logo.png
diff --git a/ui/nG6/template/images/graphicon.png b/ui/nG6/template/Resources/Public/Images/graphicon.png
similarity index 100%
rename from ui/nG6/template/images/graphicon.png
rename to ui/nG6/template/Resources/Public/Images/graphicon.png
diff --git a/ui/nG6/template/images/header-bg-blue.jpg b/ui/nG6/template/Resources/Public/Images/header-bg-blue.jpg
similarity index 100%
rename from ui/nG6/template/images/header-bg-blue.jpg
rename to ui/nG6/template/Resources/Public/Images/header-bg-blue.jpg
diff --git a/ui/nG6/template/images/header-sep.png b/ui/nG6/template/Resources/Public/Images/header-sep.png
similarity index 100%
rename from ui/nG6/template/images/header-sep.png
rename to ui/nG6/template/Resources/Public/Images/header-sep.png
diff --git a/ui/nG6/template/images/ico-fleche.png b/ui/nG6/template/Resources/Public/Images/ico-fleche.png
similarity index 100%
rename from ui/nG6/template/images/ico-fleche.png
rename to ui/nG6/template/Resources/Public/Images/ico-fleche.png
diff --git a/ui/nG6/template/images/ie6-btn-ok.png b/ui/nG6/template/Resources/Public/Images/ie6-btn-ok.png
similarity index 100%
rename from ui/nG6/template/images/ie6-btn-ok.png
rename to ui/nG6/template/Resources/Public/Images/ie6-btn-ok.png
diff --git a/ui/nG6/template/images/ie6-input-search.png b/ui/nG6/template/Resources/Public/Images/ie6-input-search.png
similarity index 100%
rename from ui/nG6/template/images/ie6-input-search.png
rename to ui/nG6/template/Resources/Public/Images/ie6-input-search.png
diff --git a/ui/nG6/template/images/ie6-menu-bg.png b/ui/nG6/template/Resources/Public/Images/ie6-menu-bg.png
similarity index 100%
rename from ui/nG6/template/images/ie6-menu-bg.png
rename to ui/nG6/template/Resources/Public/Images/ie6-menu-bg.png
diff --git a/ui/nG6/template/images/input-search.png b/ui/nG6/template/Resources/Public/Images/input-search.png
similarity index 100%
rename from ui/nG6/template/images/input-search.png
rename to ui/nG6/template/Resources/Public/Images/input-search.png
diff --git a/ui/nG6/template/images/logo_sigenae_cercle_thumb.png b/ui/nG6/template/Resources/Public/Images/logo_sigenae_cercle_thumb.png
similarity index 100%
rename from ui/nG6/template/images/logo_sigenae_cercle_thumb.png
rename to ui/nG6/template/Resources/Public/Images/logo_sigenae_cercle_thumb.png
diff --git a/ui/nG6/template/images/menu-bg.png b/ui/nG6/template/Resources/Public/Images/menu-bg.png
similarity index 100%
rename from ui/nG6/template/images/menu-bg.png
rename to ui/nG6/template/Resources/Public/Images/menu-bg.png
diff --git a/ui/nG6/template/images/picto-home.png b/ui/nG6/template/Resources/Public/Images/picto-home.png
similarity index 100%
rename from ui/nG6/template/images/picto-home.png
rename to ui/nG6/template/Resources/Public/Images/picto-home.png