From df813eb7bba11d27bdfab23d5af95413adc8f7ec Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 10 Mar 2022 09:55:32 +0100 Subject: [PATCH 1/2] Do not capitalize first character of device name To avoid naming confusion, keep names in lowercase --- plugins/dynamix/include/Helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/Helpers.php b/plugins/dynamix/include/Helpers.php index 92670f01e..611c98ea4 100644 --- a/plugins/dynamix/include/Helpers.php +++ b/plugins/dynamix/include/Helpers.php @@ -55,7 +55,7 @@ function my_temp($value) { } function my_disk($name,$raw=false) { global $display; - return $display['raw']||$raw ? $name : ucfirst(preg_replace('/(\d+)$/',' $1',$name)); + return $display['raw']||$raw ? $name : preg_replace('/(\d+)$/',' $1',$name); } function my_disks($disk) { return strpos($disk['status'],'_NP')===false; From abc962f465f35d203ec95c36ed18e6f2da9fa3dd Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 10 Mar 2022 10:49:25 +0100 Subject: [PATCH 2/2] Do not capitalize first character of device name --- plugins/dynamix/include/PageBuilder.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix/include/PageBuilder.php b/plugins/dynamix/include/PageBuilder.php index 3b2e3daff..64a9e218d 100644 --- a/plugins/dynamix/include/PageBuilder.php +++ b/plugins/dynamix/include/PageBuilder.php @@ -67,10 +67,11 @@ function find_pages($item) { } function tab_title($title,$path,$tag) { - global $docroot; - if (preg_match('/^(disk|parity)/',$title)) { + global $docroot,$pools; + $names = implode('|',array_merge(['disk','parity'],$pools)); + if (preg_match("/^($names)/",$title)) { $device = strtok($title,' '); - $title = str_replace($device,_(my_disk($device),3),$title); + $title = str_replace($device,_(ucfirst(my_disk($device)),3),$title); } $title = _(parse_text($title)); if (!$tag || substr($tag,-4)=='.png') {