diff options
Diffstat (limited to 'packages/freenas/pkg')
| -rw-r--r-- | packages/freenas/pkg/freenas_disks.inc | 3 | ||||
| -rw-r--r-- | packages/freenas/pkg/freenas_guiconfig.inc | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/packages/freenas/pkg/freenas_disks.inc b/packages/freenas/pkg/freenas_disks.inc index 8ac8eb72..3ccc4f24 100644 --- a/packages/freenas/pkg/freenas_disks.inc +++ b/packages/freenas/pkg/freenas_disks.inc @@ -42,6 +42,7 @@ /* include all configuration functions */ require_once("functions.inc"); +require_once("freenas_functions.inc"); $freenas_config =& $config['installedpackages']['freenas']['config'][0]; @@ -295,7 +296,7 @@ function disks_check_mount_fullname($fullname) { //print_r($detmount); foreach ($detmount as $detmountk => $detmountv) { - if (strcmp($detmountv['fullname'],$fullname) == 0) { + if (strpos($detmountv['fullname'],$fullname) !== false) { $status=1; break; } diff --git a/packages/freenas/pkg/freenas_guiconfig.inc b/packages/freenas/pkg/freenas_guiconfig.inc index 18f936a4..c049659a 100644 --- a/packages/freenas/pkg/freenas_guiconfig.inc +++ b/packages/freenas/pkg/freenas_guiconfig.inc @@ -40,6 +40,24 @@ $d_upnpconfdirty_path = $g['varrun_path'] . "/upnp.conf.dirty"; $freenas_config =& $config['installedpackages']['freenas']['config'][0]; +function print_error_box_np($msg) { + global $g; + + echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">\n"; + echo "<tr><td bgcolor=\"#A12A2A\" width=\"36\" align=\"center\" valign=\"top\"><img src=\"/themes/{$g['theme']}/images/icons/icon_error.gif\" width=\"28\" height=\"32\"></td>\n"; + echo "<td bgcolor=\"#FFD9D1\" style=\"padding-left: 8px; padding-top: 6px\">"; + echo "<span class=\"errmsg\">"; + echo $msg; + echo "</span>"; + echo "</td></tr></table>"; +} + +function print_error_box($msg) { + echo "<p>"; + print_error_box_np($msg); + echo "</p>"; +} + function mount_sort() { global $g, $freenas_config; |