Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629

This commit is contained in:
Ronald Quenta
2017-08-10 22:01:13 -04:00
19 changed files with 2959 additions and 496 deletions

View File

@@ -321,10 +321,12 @@ class Installer extends Controller
if ($info->pathShared->result) {
$info->pathShared->message = G::LoadTranslation('ID_WRITEABLE');
} else {
//Verify and create the shared path
G::verifyPath( $_REQUEST['pathShared'], true );
$info->pathShared->result = G::is_writable_r( $_REQUEST['pathShared'], $noWritableFiles );
if ($info->pathShared->result) {
$info->pathShared->message = G::LoadTranslation('ID_WRITEABLE');
$info->success = $this->verifySharedFrameworkPaths($_REQUEST['pathShared']);
} else {
$info->success = false;
}
@@ -1739,4 +1741,25 @@ class Installer extends Controller
}
}
}
/**
* Verify/create framework shared directory structure
*
*/
private function verifySharedFrameworkPaths($sharedPath)
{
$paths = [
$sharedPath . 'framework' => 0770,
$sharedPath . 'framework' . DIRECTORY_SEPARATOR . 'cache' => 0770,
];
foreach ($paths as $path => $permission) {
if (!file_exists($path)) {
G::mk_dir($path, $permission);
}
if (!file_exists($path)) {
return false;
}
}
return true;
}
}