diff options
| author | Julius Haertl <jus@bitgrid.net> | 2016-08-25 22:58:07 +0300 |
|---|---|---|
| committer | Julius Haertl <jus@bitgrid.net> | 2016-08-25 22:58:07 +0300 |
| commit | 9fb22f051838042a56dba4f54e4cc68b04f6fc4f (patch) | |
| tree | ad34c8360fd1c2bdf7fa2972fbafe3ed0b64bc61 | |
| parent | 5fc78845aebeed48c095f3a59a417edc87e8c7e8 (diff) | |
Add more details on integrity, webserver, php, nc version
| -rw-r--r-- | lib/Settings/Admin.php | 15 | ||||
| -rw-r--r-- | templates/issuetemplate.php | 21 |
2 files changed, 22 insertions, 14 deletions
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index 386b3d3..30953ce 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -61,13 +61,13 @@ class Admin implements ISettings { public function getForm() { $data = array( - 'version' => $this->config->getSystemValue('version'), + 'version' => \OC_Util::getHumanVersion() . " - " . $this->config->getSystemValue('version'), 'os' => php_uname(), - 'php' => PHP_VERSION, + 'php' => PHP_VERSION . "\nModules loaded: " . implode(", ", get_loaded_extensions()), 'dbserver' => $this->config->getSystemValue('dbtype'), - 'webserver' => $_SERVER['software'] . " " . php_sapi_name(), + 'webserver' => $_SERVER['SERVER_SOFTWARE'] . " (" . php_sapi_name() . ")", 'installMethod' => $this->getInstallMethod(), - 'integrity' => $this->checker->verifyCoreSignature(), + 'integrity' => $this->getIntegrityResults(), 'apps' => $this->getAppList(), 'config' => $this->getConfig(), ); @@ -89,6 +89,13 @@ class Admin implements ISettings { return 10; } + private function getIntegrityResults() { + if(!$this->checker->isCodeCheckEnforced()) { + return 'Integrity checker has been disabled. Integrity cannot be verified.'; + } + return $this->checker->getResults(); + } + private function getInstallMethod() { $base = \OC::$SERVERROOT; if(file_exists($base . '/.git')) { diff --git a/templates/issuetemplate.php b/templates/issuetemplate.php index 1c162dc..2aec47a 100644 --- a/templates/issuetemplate.php +++ b/templates/issuetemplate.php @@ -23,28 +23,29 @@ <details> <summary>Signing status</summary> - ``` - <?php p(implode($_['integrity'],",")); ?> - ``` +``` +<?php print_unescaped(print_r(json_encode($_['integrity'], JSON_PRETTY_PRINT), true)); ?> + +``` + </details> **List of activated apps:** <details> <summary>App list</summary> - - ``` - Enabled: +``` +Enabled: <?php foreach ($_['apps']['enabled'] as $name => $version) { - p("\t - " . $name . ": " . $version . "\n"); + p(" - " . $name . ": " . $version . "\n"); } ?> - Disabled: +Disabled: <?php foreach ($_['apps']['disabled'] as $name => $version) { - p("\t - " . $name . "\n"); + p(" - " . $name . "\n"); } ?> - ``` +``` </details> **The content of config/config.php:** |