diff --git a/datamodels/.htaccess b/datamodels/.htaccess
index 782472c78..736fc7a95 100644
--- a/datamodels/.htaccess
+++ b/datamodels/.htaccess
@@ -1,13 +1,20 @@
# Apache 2.4
Require all denied
+
+ Require all granted
+
# Apache 2.2
deny from all
Satisfy All
+
+ Order Allow,Deny
+ Allow from all
+
# Apache 2.2 and 2.4
-IndexIgnore *
+IndexIgnore *
\ No newline at end of file
diff --git a/datamodels/web.config b/datamodels/web.config
index 599a5f260..dd0c16efc 100644
--- a/datamodels/web.config
+++ b/datamodels/web.config
@@ -1,8 +1,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/extensions/.htaccess b/extensions/.htaccess
index 782472c78..736fc7a95 100644
--- a/extensions/.htaccess
+++ b/extensions/.htaccess
@@ -1,13 +1,20 @@
# Apache 2.4
Require all denied
+
+ Require all granted
+
# Apache 2.2
deny from all
Satisfy All
+
+ Order Allow,Deny
+ Allow from all
+
# Apache 2.2 and 2.4
-IndexIgnore *
+IndexIgnore *
\ No newline at end of file
diff --git a/extensions/web.config b/extensions/web.config
index 599a5f260..dd0c16efc 100644
--- a/extensions/web.config
+++ b/extensions/web.config
@@ -1,8 +1,26 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 9eafe199c..68c415e50 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -225,48 +225,8 @@ class MFCompiler
$iStart = strlen(realpath(APPROOT));
$sRelFinalTargetDir = substr($sFinalTargetDir, strlen(APPROOT));
- $sModuleDesignDir = $sTempTargetDir.'/core/module_designs/';
- SetupUtils::builddir($sModuleDesignDir);
-
- $sModuleDesignHtaccessFileName = $sModuleDesignDir.'.htaccess';
- $sModuleDesignHtaccessFileContent = <<
-Require all denied
-
-
-# Apache 2.2
-
-deny from all
-Satisfy All
-
-
-# Apache 2.2 and 2.4
-IndexIgnore *
-
-
-EOF;
- $this->WriteFileIfNotExists($sModuleDesignHtaccessFileName, $sModuleDesignHtaccessFileContent);
- unset($sModuleDesignHtaccessFileContent, $sModuleDesignHtaccessFileName);
-
- $sModuleDesignHtaccessFileName = $sModuleDesignDir.'web.config';
- $sModuleDesignHtaccessFileContent = <<
-
-
-
-
-
-
-
-
-
-XML;
- $this->WriteFileIfNotExists($sModuleDesignHtaccessFileName, $sModuleDesignHtaccessFileContent);
- unset($sModuleDesignHtaccessFileContent, $sModuleDesignHtaccessFileName);
-
+ $this->WriteStaticOnlyHtaccess($sTempTargetDir);
+ $this->WriteStaticOnlyWebConfig($sTempTargetDir);
foreach($aModules as $foo => $oModule)
{
@@ -290,8 +250,6 @@ XML;
// Push the other module files
SetupUtils::copydir($sModuleRootDir, $sTempTargetDir.'/'.$sRelativeDir, $bUseSymbolicLinks);
- $this->WriteModuleHtaccess($sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $sModuleName, $sModuleVersion);
- $this->WriteModuleWebConfig($sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $sModuleName, $sModuleVersion);
}
@@ -2944,14 +2902,9 @@ EOF;
* @return bool|int
* @throws \Exception
*/
- protected function WriteFileIfNotExists($sFilename, $sContent)
+ protected function WriteFile($sFilename, $sContent, $flags = null)
{
- if (file_exists($sFilename))
- {
- return false;
- }
-
- $ret = file_put_contents($sFilename, $sContent);
+ $ret = file_put_contents($sFilename, $sContent, $flags);
if ($ret === false)
{
$iLen = strlen($sContent);
@@ -2961,7 +2914,7 @@ EOF;
}
return $ret;
-}
+ }
/**
* if no ".htaccess" is present, add a generic one prohibiting access to potentially sensible files (ie: even if it is quite a bad practice, it may happen that a developer put a secret into the xml)
@@ -2969,20 +2922,17 @@ EOF;
* @param $sTempTargetDir
* @param $sFinalTargetDir
* @param $sRelativeDir
- * @param $sModuleName
- * @param $sModuleVersion
*
* @throws \Exception
*/
- protected function WriteModuleHtaccess($sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $sModuleName, $sModuleVersion)
+ protected function WriteStaticOnlyHtaccess($sTempTargetDir)
{
$sContent = <<
Require all denied
-
+
Require all granted
@@ -2991,7 +2941,7 @@ Require all denied
deny from all
Satisfy All
-
+
Order Allow,Deny
Allow from all
@@ -3002,13 +2952,7 @@ IndexIgnore *
EOF;
- $sFilename = $sTempTargetDir.'/'.$sRelativeDir.'/.htaccess';
-
- $bWritten = $this->WriteFileIfNotExists($sFilename, $sContent);
- if ($bWritten)
- {
- SetupLog::Warning("Added a generic .htaccess into {$sFinalTargetDir}/{$sRelativeDir} during the compilation.");;
- }
+ $this->WriteFile("$sTempTargetDir/.htaccess", $sContent);
}
/**
@@ -3022,11 +2966,10 @@ EOF;
*
* @throws \Exception
*/
- protected function WriteModuleWebConfig($sTempTargetDir, $sFinalTargetDir, $sRelativeDir, $sModuleName, $sModuleVersion)
+ protected function WriteStaticOnlyWebConfig($sTempTargetDir)
{
$sContent = <<
-
@@ -3042,6 +2985,11 @@ EOF;
+
+
+
+
+
@@ -3050,12 +2998,6 @@ EOF;
EOF;
- $sFilename = $sTempTargetDir.'/'.$sRelativeDir.'/web.config';
-
- $bWritten = $this->WriteFileIfNotExists($sFilename, $sContent);
- if ($bWritten)
- {
- SetupLog::Warning("Added a generic web.config into {$sFinalTargetDir}/{$sRelativeDir} during the compilation.");;
- }
+ $this->WriteFile("$sTempTargetDir/web.config", $sContent);
}
}