romm · DoYouRockBaby · Jul 27, 2017
diff --git a/Classes/Core/Core.php b/Classes/Core/Core.php
@@ -336,7 +336,7 @@ public static function loadJquery()
     {
         /** @var DocumentTemplate $documentTemplate */
         $documentTemplate = self::getDocumentTemplate();
-        $pageRenderer = $documentTemplate->getPageRenderer();
+        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
         $pageRenderer->loadJquery(PageRenderer::JQUERY_VERSION_LATEST, 'local', $pageRenderer::JQUERY_NAMESPACE_DEFAULT_NOCONFLICT);
     }
 

diff --git a/Classes/Duplication/AbstractDuplicationProcess.php b/Classes/Duplication/AbstractDuplicationProcess.php
@@ -274,6 +274,8 @@ public static function getCleanedDuplicationConfiguration($pageUid, $onlyUsedInS
         if (!self::$duplicationConfiguration[$pageUid][$siteModificationToken]) {
             $duplicationConfiguration = Core::sortArrayByPositionValue(TypoScriptUtility::getExtensionConfigurationFromPath('duplication', $pageUid));
 
+			ksort($duplicationConfiguration);
+
             $cleanedDuplicationConfiguration = [];
 
             // For HTML convention causes, we replace the lower-camel-case indexes with lower-case-underscored ones.

diff --git a/Classes/Utility/TypoScriptUtility.php b/Classes/Utility/TypoScriptUtility.php
@@ -17,9 +17,9 @@
 use Romm\SiteFactory\Core\Core;
 use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
 use TYPO3\CMS\Core\TypoScript\TemplateService;
+use TYPO3\CMS\Core\TypoScript\TypoScriptService;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Extbase\Service\TypoScriptService;
 use TYPO3\CMS\Frontend\Page\PageRepository;
 
 /**

diff --git a/Resources/Private/Language/FieldsLocallang.xlf b/Resources/Private/Language/FieldsLocallang.xlf
@@ -3,7 +3,6 @@
 	<file source-language="en" datatype="plaintext">
 		<header />
 		<body>
-
 			<trans-unit id="fields.validation.select.wrong_option_value">
 				<source>The value "%s" is not a correct.</source>
 			</trans-unit>
@@ -25,7 +24,12 @@
 			<trans-unit id="fields.validation.integer_value">
 				<source>This value must be an integer.</source>
 			</trans-unit>
-
+			<trans-unit id="fields.validation.domain_name_value">
+				<source>This value must match a domain name.</source>
+			</trans-unit>			
+			<trans-unit id="fields.validation.empty_select">
+				<source>You have to fill the select box.</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/Resources/Private/Layouts/Backend/Default.html b/Resources/Private/Layouts/Backend/Default.html
@@ -16,7 +16,7 @@
 
 	<script type="text/javascript">
 		var pathSite = '{pathSite}';
-		SiteFactory.ajaxUrl = "{f:uri.action(controller: 'Ajax', action: 'dispatch')}";
+		SiteFactory.ajaxUrl = "{f:uri.action(controller: 'Ajax', action: 'dispatch') -> f:format.htmlentitiesDecode()}";
 	</script>
 
 	<div class="typo3-fullDoc">

diff --git a/Resources/Private/Partials/New/FormStaticMenu.html b/Resources/Private/Partials/New/FormStaticMenu.html
@@ -57,7 +57,7 @@ <h4 class="panel-title">
 							<strong style="font-size: 1.35em;">&nbsp;<a href="#" class="alert-link easter-egg" onclick="beginEasterEgg(); return false;">&#12484;</a></strong>
 
 							<div id="collapse-menu-success" class="panel-collapse collapse in">
-								<f:translate key="form.static_menu.success_text" />&nbsp;<f:be.buttons.icon icon="actions-document-save" />
+								<f:translate key="form.static_menu.success_text" />&nbsp;<core:icon identifier="actions-document-save" />
 							</div>
 						</div>
 					</f:else>

diff --git a/Resources/Private/Templates/Administration/Help.html b/Resources/Private/Templates/Administration/Help.html
@@ -79,8 +79,8 @@ <h1>Modifier un site</h1>
 
 
 	<f:section name="headerButtons">
-		<f:be.buttons.icon uri="{f:uri.action(action: 'index')}" icon="actions-document-close" title="{f:translate(key: 'module.header_buttons.index')}" />
-		<f:be.buttons.icon uri="{f:uri.action(action: 'new')}" icon="actions-document-new" title="{f:translate(key: 'index.create_new_site')}" />
+		<f:link.action action="index" ><core:icon identifier="actions-document-close" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.index')}" /></f:link.action>
+		<f:link.action action="new" ><core:icon identifier="actions-document-new" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.new')}" /></f:link.action>
 	</f:section>
 
 </div>
diff --git a/Resources/Private/Templates/Administration/Index.html b/Resources/Private/Templates/Administration/Index.html
@@ -1,4 +1,5 @@
 {namespace sf=Romm\SiteFactory\ViewHelpers}
+{namespace core=TYPO3\CMS\Core\ViewHelpers}
 
 <f:layout name="Backend/Default" />
 
@@ -74,6 +75,5 @@ <h2><f:translate key="index.duplicated_sites_list" /></h2>
 Contains the buttons which will appear in the header menu.
 
 <f:section name="headerButtons">
-	<f:be.buttons.icon uri="{f:uri.action(action: 'new')}" icon="actions-document-new" title="{f:translate(key: 'index.create_new_site')}" />
-	<!--<f:be.buttons.icon uri="{f:uri.action(action: 'help')}" icon="actions-document-info" title="{f:translate(key: 'module.header_buttons.help')}" />-->
+	<f:link.action action="new" ><core:icon identifier="apps-pagetree-collapse" alternativeMarkupIdentifier="{f:translate(key: 'index.create_new_site')}" /></f:link.action>
 </f:section>
diff --git a/Resources/Private/Templates/Administration/New.html b/Resources/Private/Templates/Administration/New.html
@@ -96,14 +96,14 @@ <h1>
 Contains the buttons which will appear in the header menu.
 
 <f:section name="headerButtons">
-	<f:be.buttons.icon uri="{f:uri.action(action: 'index')}" icon="actions-document-close" title="{f:translate(key: 'module.header_buttons.index')}" />
-	<f:be.buttons.icon uri="{f:uri.action(action: 'new')}" icon="actions-document-new" title="{f:translate(key: 'module.header_buttons.new')}" />
-	<!--<f:be.buttons.icon uri="{f:uri.action(action: 'help')}" icon="actions-document-info" title="{f:translate(key: 'module.header_buttons.help')}" />-->
+	<f:link.action action="index" ><core:icon identifier="actions-document-close" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.index')}" /></f:link.action>
+	<f:link.action action="new" ><core:icon identifier="actions-document-new" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.new')}" /></f:link.action>
+
 	<f:if condition="{fieldsConfiguration}">
-		<f:be.buttons.icon uri="#" additionalAttributes="{onclick: 'window[\'{formId}\'].submit(\'new\');'}" icon="actions-document-save" title="{f:translate(key: 'module.header_buttons.save')}" />
+		<f:link.external uri="#" additionalAttributes="{onclick: 'window[\'{formId}\'].submit(\'new\');'}" ><core:icon identifier="actions-document-save" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.save')}" /></f:link.external>
 
 		<span class="static-site-name">
-			<f:be.buttons.icon icon="status-status-current" />
+			<core:icon identifier="actions-document-new" />
 			<span class="content"></span>
 		</span>
 	</f:if>

diff --git a/Resources/Private/Templates/Administration/ProcessCopy.html b/Resources/Private/Templates/Administration/ProcessCopy.html
@@ -30,12 +30,12 @@ <h3 class="title-error text-danger"><f:translate key="duplication_process.title_
 				<div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
 			</div>
 
-			<span class="dummy dummy-status-pending"><f:be.buttons.icon icon="actions-document-info" /></span>
+			<span class="dummy dummy-status-pending"><core:icon identifier="actions-document-info" /></span>
 			<span class="dummy dummy-status-processing"><f:image src="EXT:t3skin/images/spinner/big-f0f0f0.gif" class="loading" /></span>
-			<span class="dummy dummy-status-ok"><f:be.buttons.icon icon="status-status-checked" /></span>
-			<span class="dummy dummy-status-error"><f:be.buttons.icon icon="status-status-permission-denied" /></span>
-			<span class="dummy dummy-status-warning"><f:be.buttons.icon icon="status-dialog-warning" /></span>
-			<span class="dummy dummy-status-notice"><f:be.buttons.icon icon="actions-document-info" /></span>
+			<span class="dummy dummy-status-ok"><core:icon identifier="status-status-checked" /></span>
+			<span class="dummy dummy-status-error"><core:icon identifier="status-status-permission-denied" /></span>
+			<span class="dummy dummy-status-warning"><core:icon identifier="status-dialog-warning" /></span>
+			<span class="dummy dummy-status-notice"><core:icon identifier="actions-document-info" /></span>
 
 			<div class="row">
 				<ul class="site-duplication-process col-sm-6 col-sm-push-3 col-xs-12">
@@ -58,7 +58,7 @@ <h3 class="back-home">
 	<f:section name="processElement">
 		<li class="{name}">
 			<div class="result">
-				<span class="status"><f:be.buttons.icon icon="actions-system-help-open" /></span><f:translate key="{configuration.label}" />
+				<span class="status"><core:icon identifier="actions-system-help-open" /></span><f:translate key="{configuration.label}" />
 				<i class="time">[00:00]</i>
 				<div class="result-text-container">
 					<ul class="result-list"></ul>
@@ -72,9 +72,7 @@ <h3 class="back-home">
 
 	<!-- Header buttons. -->
 	<f:section name="headerButtons">
-		<f:be.buttons.icon uri="{f:uri.action(action: 'index')}" icon="actions-document-close" title="{f:translate(key: 'module.header_buttons.index')}" />
-		<f:be.buttons.icon uri="{f:uri.action(action: 'new')}" icon="actions-document-new" title="{f:translate(key: 'module.header_buttons.new')}" />
-		<!--<f:be.buttons.icon uri="{f:uri.action(action: 'help')}" icon="actions-document-info" title="{f:translate(key: 'module.header_buttons.help')}" />-->
-		<!--<f:be.buttons.icon uri="{f:uri.action(action: 'configure')}" icon="actions-system-extension-configure" title="{f:translate(key: 'module.header_buttons.help')}" />-->
+		<f:link.action action="index" ><core:icon identifier="actions-document-close" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.index')}" /></f:link.action>
+		<f:link.action action="new" ><core:icon identifier="actions-document-new" alternativeMarkupIdentifier="{f:translate(key: 'module.header_buttons.new')}" /></f:link.action>
 	</f:section>
 </div>
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -1,32 +1,43 @@
 <?php
-$EM_CONF[$_EXTKEY] = [
-    'title'       => 'Site Factory',
-    'state'       => 'beta',
-    'version'     => '0.2.0',
-    'description' => 'Replicate and modify an existing website model very easily with a flexible and lean design. Read the code examples to understand and master all the TypoScript configuration, or extend the existing duplication processes. Based on freesite (created by Kasper Skårhøj) this project was originaly conceived by Cyril Wolfangel and is developped and maintained by Romain Canon. Join the project on https://github.com/romaincanon/TYPO3-Site-Factory',
-    'category'    => 'module',
 
-    'constraints' => [
-        'depends'   => [
-            'php'     => '5.5.0',
-            'extbase' => '6.2',
-            'fluid'   => '6.2',
-            'typo3'   => '6.2.0-7.6.99'
-        ],
-        'conflicts' => [],
-        'suggests'  => []
-    ],
+/***************************************************************
+ * Extension Manager/Repository config file for ext "site_factory".
+ *
+ * Auto generated 14-11-2016 15:24
+ *
+ * Manual updates:
+ * Only the data in the array - everything else is removed by next
+ * writing. "version" and "dependencies" must not be touched!
+ ***************************************************************/
 
-    'author'         => 'Romain CANON',
-    'author_email'   => '[email protected]',
+$EM_CONF[$_EXTKEY] = array (
+  'title' => 'Site Factory',
+  'state' => 'beta',
+  'version' => '0.3.0',
+  'description' => 'Replicate and modify an existing website model very easily with a flexible and lean design. Read the code examples to understand and master all the TypoScript configuration, or extend the existing duplication processes. Based on freesite (created by Kasper Skårhøj) this project was originaly conceived by Cyril Wolfangel and is developped and maintained by Romain Canon. Join the project on https://github.com/romaincanon/TYPO3-Site-Factory',
+  'category' => 'module',
+  'constraints' => 
+  array (
+    'depends' => 
+    array (
+      'php' => '5.5.0',
+      'extbase' => '7.2',
+      'fluid' => '7.2',
+      'typo3' => '7.2.0-8.7.99',
+    ),
+    'conflicts' => 
+    array (
+    ),
+    'suggests' => 
+    array (
+    ),
+  ),
+  'author' => 'Romain CANON',
+  'author_email' => '[email protected]',
+  'uploadfolder' => true,
+  'createDirs' => 'uploads/tx_sitefactory/_processed_/',
+  'clearCacheOnLoad' => 1,
+  'clearcacheonload' => true,
+  'author_company' => NULL,
+);
 
-    'shy'              => '',
-    'priority'         => '',
-    'module'           => '',
-    'internal'         => '',
-    'uploadfolder'     => true,
-    'createDirs'       => 'uploads/tx_sitefactory/_processed_/',
-    'modify_tables'    => '',
-    'clearCacheOnLoad' => 1,
-    'lockType'         => ''
-];