Remove permissions from Diagnostics panel when on Windows.

adrianbj · Feb 5, 2018 · 8c87c5f · 8c87c5f
1 parent 0c5e41b
commit 8c87c5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/TracyDebugger.module b/TracyDebugger.module
@@ -32,7 +32,7 @@ class TracyDebugger extends WireData implements Module, ConfigurableModule {
             'summary' => __('Tracy debugger from Nette with several PW specific custom tools.', __FILE__),
             'author' => 'Adrian Jones',
             'href' => 'https://processwire.com/talk/topic/12208-tracy-debugger/',
-            'version' => '4.9.12',
+            'version' => '4.9.13',
             'autoload' => true,
             'singular' => true,
             'requires'  => 'ProcessWire>=2.7.2, PHP>=5.4.4',

diff --git a/panels/DiagnosticsPanel.php b/panels/DiagnosticsPanel.php
@@ -61,12 +61,12 @@ protected function generateFilesystem() {
             'Sessions Directory'
         );
 
-        // posix_getpwuid doesn't exist on Windows so don't add Owner column
+        // posix_getpwuid doesn't exist on Windows so don't add Owner & Permission columns
         if(function_exists('posix_getpwuid')) {
             $this->filesystem = $this->sectionHeader(array('Attribute', 'Path', 'Exists', 'Readable', 'Writeable', 'Permissions', 'Owner (User:Group)', 'Status', 'Notes'));
         }
         else {
-            $this->filesystem = $this->sectionHeader(array('Attribute', 'Path', 'Exists', 'Readable', 'Writeable', 'Permissions', 'Status', 'Notes'));
+            $this->filesystem = $this->sectionHeader(array('Attribute', 'Path', 'Exists', 'Readable', 'Writeable', 'Status', 'Notes'));
         }
 
         foreach($attributes as $attribute) {
@@ -202,8 +202,11 @@ protected function buildAttrRow($attribute) {
             <td title='".$this->getPaths($attribute)."'>".$this->getPaths($attribute, true)."</td>
             <td>".$exists."</td>
             <td>".$readable."</td>
-            <td>".$writeable."</td>
-            <td>".$permission."</td>";
+            <td>".$writeable."</td>";
+            // posix_getpwuid doesn't exist on Windows so don't add Permission column
+            if(function_exists('posix_getpwuid')) {
+                $out .= "<td>".$permission."</td>";
+            }
             if(isset($owner)) {
                 $out .= "<td>".(!empty($owner) ? $owner['name'].":".$group['name'] : '')."</td>";
             }
@@ -220,7 +223,8 @@ protected function buildAttrRow($attribute) {
     * return an array with status and notes items
     */
     protected function getStatusNotes($attribute, $exists, $readable, $writeable, $permission) {
-        if($permission == '0777') {
+        // also check if NOT on Windows by using presence of posix_getpwuid
+        if($permission == '0777' && function_exists('posix_getpwuid')) {
             return array('Failure', '0777 is usually unsafe');
         }
         else {