From 35bbe00e17de89b4e4cf31472151c9741757e0e7 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Tue, 25 Sep 2018 14:50:35 +0300
Subject: [PATCH] Minor changes for a system requirements

---
 .../templates/admin/system-requirements/index.tpl  | 14 +++++++-------
 install/core/SystemHelper.php                      |  6 +++---
 install/core/actions/checkPermission.php           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/res/templates/admin/system-requirements/index.tpl b/client/res/templates/admin/system-requirements/index.tpl
index 1b13e4340a..606b2d3425 100644
--- a/client/res/templates/admin/system-requirements/index.tpl
+++ b/client/res/templates/admin/system-requirements/index.tpl
@@ -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>
diff --git a/install/core/SystemHelper.php b/install/core/SystemHelper.php
index 1758919c60..1cab4e8d2a 100644
--- a/install/core/SystemHelper.php
+++ b/install/core/SystemHelper.php
@@ -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);
diff --git a/install/core/actions/checkPermission.php b/install/core/actions/checkPermission.php
index 101c1c3f0f..4324acabb8 100644
--- a/install/core/actions/checkPermission.php
+++ b/install/core/actions/checkPermission.php
@@ -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;
         }