From 0090d2c5710e98fa699e90304d9e8e46cf3df3c7 Mon Sep 17 00:00:00 2001 From: bergware Date: Sat, 8 Jul 2017 16:49:18 +0200 Subject: [PATCH] Add date and warranty fields to disk identity information --- plugins/dynamix/DeviceIdentify.page | 12 +++++++++-- plugins/dynamix/include/DiskLog.php | 27 ++++++++++++++++++++++++ plugins/dynamix/include/SmartInfo.php | 18 ++++++++++++++-- plugins/dynamix/styles/default-azure.css | 2 +- plugins/dynamix/styles/default-black.css | 2 +- plugins/dynamix/styles/default-gray.css | 2 +- plugins/dynamix/styles/default-white.css | 2 +- 7 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 plugins/dynamix/include/DiskLog.php diff --git a/plugins/dynamix/DeviceIdentify.page b/plugins/dynamix/DeviceIdentify.page index db31cc616..7ced02e65 100644 --- a/plugins/dynamix/DeviceIdentify.page +++ b/plugins/dynamix/DeviceIdentify.page @@ -3,8 +3,8 @@ Title="Identity" Cond="strpos($disks[$name]['status'],'_NP')===false" --- + + diff --git a/plugins/dynamix/include/DiskLog.php b/plugins/dynamix/include/DiskLog.php new file mode 100644 index 000000000..29176ad0d --- /dev/null +++ b/plugins/dynamix/include/DiskLog.php @@ -0,0 +1,27 @@ + + $block) { + $text .= "[$disk]\n"; + foreach ($block as $key => $value) $text .= "$key=\"$value\"\n"; +} +file_put_contents($file,$text); +?> \ No newline at end of file diff --git a/plugins/dynamix/include/SmartInfo.php b/plugins/dynamix/include/SmartInfo.php index ea6ce12b5..977d9c0ec 100644 --- a/plugins/dynamix/include/SmartInfo.php +++ b/plugins/dynamix/include/SmartInfo.php @@ -11,7 +11,7 @@ */ ?> ".normalize(preg_replace('/ is:$/',':',"$title:"),' ').""; $empty = false; } - if ($empty) echo ""; + if ($empty) { + echo ""; + } else { + $file = '/boot/config/disk.log'; + $disks = parse_ini_file('state/disks.ini',true); + $extra = file_exists($file) ? parse_ini_file($file,true) : []; + $disk = $disks[$name]['id']; + $info = &$extra[$disk]; + $periods = ['6','12','18','24','36','48','60']; + echo ""; + echo ""; + echo ""; + } break; case "save": exec("smartctl -a $type ".escapeshellarg("/dev/$port")." >".escapeshellarg("$docroot/{$_POST['file']}")); diff --git a/plugins/dynamix/styles/default-azure.css b/plugins/dynamix/styles/default-azure.css index 855db63a2..2834c0520 100644 --- a/plugins/dynamix/styles/default-azure.css +++ b/plugins/dynamix/styles/default-azure.css @@ -19,7 +19,7 @@ pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px} pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px} big{font-size:15px;font-weight:bold;text-transform:uppercase} hr{border-color:#EDEAEF} -input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} +input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:13px;border:1px solid #9F9180;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#9F9180;background:#EDEAEF} input[type=checkbox]{vertical-align:middle;margin-right:6px} input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance:none} diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css index 28761c3b0..52e9c6d48 100644 --- a/plugins/dynamix/styles/default-black.css +++ b/plugins/dynamix/styles/default-black.css @@ -16,7 +16,7 @@ a.nohand{cursor:default} i.spacing{margin-left:-6px} i.icon{margin-right:4px} hr{border-color:rgba(255,255,255,0.25)} -input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],textarea,.textarea{font-family:arimo;font-size:12px;color:#808080;background-color:#000000;border:1px solid #404040;border-radius:4px;padding:2px 8px;min-height:20px;line-height:20px;outline:none;width:301px;margin:0 10px 0 0;box-shadow:inset 1px 1px 5px #404040} +input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],textarea,.textarea{font-family:arimo;font-size:12px;color:#808080;background-color:#000000;border:1px solid #404040;border-radius:4px;padding:2px 8px;min-height:20px;line-height:20px;outline:none;width:301px;margin:0 10px 0 0;box-shadow:inset 1px 1px 5px #404040} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:12px;border:1px solid #303030;border-radius:6px;margin:7px 14px 0 0;padding:8px 12px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;color:#808080;background:-webkit-radial-gradient(#505050,#181818);background:linear-gradient(#505050,#181818)} input[type=checkbox]{vertical-align:middle;margin-right:6px} input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance: none} diff --git a/plugins/dynamix/styles/default-gray.css b/plugins/dynamix/styles/default-gray.css index 0c521daba..751a3925b 100644 --- a/plugins/dynamix/styles/default-gray.css +++ b/plugins/dynamix/styles/default-gray.css @@ -19,7 +19,7 @@ pre ul{margin:0;padding-top:0;padding-bottom:0;padding-left:28px} pre li{margin:0;padding-top:0;padding-bottom:0;padding-left:18px} big{font-size:15px;font-weight:bold;text-transform:uppercase} hr{border-color:#121510} -input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} +input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],textarea,.textarea{font-family:arimo;font-size:13px;background:transparent;border:1px solid #606E7F;padding:5px 10px;min-height:20px;line-height:20px;outline:none;width:304px;margin:0 20px 0 0;box-shadow:none;color:#606E7F} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:13px;border:1px solid #606E7F;border-radius:5px;margin:10px 20px 10px 0;padding:8px 12px;cursor:pointer;outline:none;color:#606E7F;background:#121510} input[type=checkbox]{vertical-align:middle;margin-right:6px} input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance:none} diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css index b5ca7ca5f..c6c87e0c0 100644 --- a/plugins/dynamix/styles/default-white.css +++ b/plugins/dynamix/styles/default-white.css @@ -16,7 +16,7 @@ a.nohand{cursor:default} i.spacing{margin-left:-6px} i.icon{margin-right:4px} hr{border-color:rgba(255,255,255,0.25)} -input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],textarea,.textarea{font-family:arimo;font-size:12px;color:#303030;background-color:#FFFFFF;border:1px solid #E0E0E0;border-radius:4px;padding:2px 8px;min-height:20px;line-height:20px;outline:none;width:301px;margin:0 10px 0 0;box-shadow:inset 1px 1px 5px #F0F0F0} +input[type=text],input[type=password],input[type=number],input[type=url],input[type=email],input[type=date],textarea,.textarea{font-family:arimo;font-size:12px;color:#303030;background-color:#FFFFFF;border:1px solid #E0E0E0;border-radius:4px;padding:2px 8px;min-height:20px;line-height:20px;outline:none;width:301px;margin:0 10px 0 0;box-shadow:inset 1px 1px 5px #F0F0F0} input[type=button],input[type=reset],input[type=submit],button,a.button{font-family:arimo;font-size:12px;border:1px solid #E8E8E8;border-radius:6px;margin:7px 14px 0 0;padding:8px 12px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;color:#303030;background:-webkit-radial-gradient(#F0F0F0,#C8C8C8);background:linear-gradient(#F0F0F0,#C8C8C8)} input[type=checkbox]{vertical-align:middle;margin-right:6px} input[type=number]::-webkit-outer-spin-button,input[type=number]::-webkit-inner-spin-button{-webkit-appearance: none}
TitleInformation
 Please wait... retrieving S.M.A.R.T. information!
$info
Can not read identification
Can not read identification
Manufacturing date:
Date of purchase:
Warranty period: