nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-27 16:08:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1166 from SaaldjorMike/truncate-location

Browse Source 
Fixed issue when truncating UTF-8 strings, fallback to old way if ext…
This commit is contained in:
Neil Lathwood
2015-05-30 15:56:48 +01:00
parent e4849e259f f8331ce8dd
commit f7a10e60f8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/devices.inc.php
+6 -1
View File
@@ -155,7 +155,12 @@ foreach (dbFetchRows($sql, $param) as $device) {
$hostname = generate_device_link($device);
$platform = $device['hardware'] . '<br />' . $device['features'];
$os = $device['os_text'] . '<br />' . $device['version'];
$uptime = formatUptime($device['uptime'], 'short') . '<br />' . truncate($device['location'],32, '');
if (extension_loaded('mbstring')) {
$location = mb_substr($device['location'], 0, 32, 'utf8');
} else {
$location = truncate($device['location'], 32, '');
}
$uptime = formatUptime($device['uptime'], 'short') . '<br />' . $location;
if ($subformat == "detail") {
$hostname .= '<br />' . $device['sysName'];
if ($port_count) {