espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes for a system requirements

Browse Source
This commit is contained in:
Taras Machyshyn
2018-09-25 14:50:35 +03:00
parent 673c18a5ce
commit 35bbe00e17
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/res/templates/admin/system-requirements/index.tpl
+7 -7
View File
@@ -10,10 +10,10 @@
<tbody>
{{#each phpRequirementList}}
<tr class="list-row">
<td class="cell col-md-4">
<td class="cell col-md-5">
{{translate @key scope='Admin' category='systemRequirements'}}
</td>
<td class="cell col-md-4">{{actual}}</td>
<td class="cell col-md-3">{{actual}}</td>
<td class="cell col-md-4">
{{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}
{{#ifEqual type 'lib'}} ({{translate 'extension is missing' scope='Admin'}}) {{/ifEqual}}
@@ -36,11 +36,11 @@
<tbody>
{{#each databaseRequirementList}}
<tr class="list-row">
<td class="cell col-md-4">
<td class="cell col-md-5">
{{translate @key scope='Admin' category='systemRequirements'}}
</td>
<td class="cell col-md-4">{{actual}}</td>
<td class="cell col-md-4">
<td class="cell col-md-3">{{actual}}</td>
<td class="cell col-md-5">
{{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}
{{#ifEqual type 'param'}} ({{required}} {{translate 'is recommended' scope='Admin'}}) {{/ifEqual}}
</span> {{/if}}
@@ -61,10 +61,10 @@
<tbody>
{{#each permissionRequirementList}}
<tr class="list-row">
<td class="cell col-md-4">
<td class="cell col-md-5">
{{translate @key scope='Admin' category='systemRequirements'}}
</td>
<td class="cell col-md-4">{{translate type scope='Admin' category='systemRequirements'}}</td>
<td class="cell col-md-3">{{translate type scope='Admin' category='systemRequirements'}}</td>
<td class="cell col-md-4">
{{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}</span> {{/if}}
</td>
install/core/SystemHelper.php
+3 -3
View File
@@ -140,7 +140,7 @@ class SystemHelper extends \Espo\Core\Utils\System
}
if (!isset($isFile) && count($permissions) == 1) {
return $cd.'find '.$path.' -type d -exec ' . $sudoStr . 'chmod '.$permissions[0].' {} +';
return $cd. $sudoStr . 'find '.$path.' -type d -exec ' . $sudoStr . 'chmod '.$permissions[0].' {} +';
}
$bufPerm = (count($permissions) == 1) ? array_fill(0, 2, $permissions[0]) : $permissions;
@@ -151,8 +151,8 @@ class SystemHelper extends \Espo\Core\Utils\System
$commands[] = $this->getCd();
}
$commands[] = 'find '.$path.' -type f -exec ' .$sudoStr.'chmod '.$bufPerm[0].' {} +';//.'chmod '.$bufPerm[0].' $(find '.$path.' -type f)';
$commands[] = 'find '.$path.' -type d -exec ' .$sudoStr. 'chmod '.$bufPerm[1].' {} +';//.'chmod '.$bufPerm[1].' $(find '.$path.' -type d)';
$commands[] = $sudoStr. 'find '.$path.' -type f -exec ' .$sudoStr.'chmod '.$bufPerm[0].' {} +';//.'chmod '.$bufPerm[0].' $(find '.$path.' -type f)';
$commands[] = $sudoStr . 'find '.$path.' -type d -exec ' .$sudoStr. 'chmod '.$bufPerm[1].' {} +';//.'chmod '.$bufPerm[1].' $(find '.$path.' -type d)';
if (count($permissions) >= 2) {
return implode(' ' . $this->combineOperator . ' ', $commands);
install/core/actions/checkPermission.php
+1 -1
View File
@@ -45,7 +45,7 @@ if (!$installer->checkPermission()) {
foreach($group as $permission => $folders) {
if ($permission == '0644-0755') $folders = '';
$instruction .= $systemHelper->getPermissionCommands(array($folders, ''), explode('-', $permission), false, null, $changeOwner) . "<br>";
$instructionSU .= "&nbsp;&nbsp;" . $systemHelper->getPermissionCommands(array($folders, ''), explode('-', $permission), true, null, $changeOwner) . "<br>";
$instructionSU .= $systemHelper->getPermissionCommands(array($folders, ''), explode('-', $permission), true, null, $changeOwner) . "<br>";
if ($changeOwner) {
$changeOwner = false;
}