diff options
author | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-08 02:34:06 +0000 |
---|---|---|
committer | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-08 02:34:06 +0000 |
commit | 57a4bc69ba39d6f030ca97011aefb6bb617929ee (patch) | |
tree | e10ae4b9c4af50f8e51253d02ba50a9661ec31b8 /packages/freenas/www/disks_mount.php | |
parent | b851eccedef9ff677cd6d2ee0d193fd724e5591d (diff) | |
download | pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.tar.gz pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.tar.bz2 pfsense-packages-57a4bc69ba39d6f030ca97011aefb6bb617929ee.zip |
* fix: output an Ajax compliant error message if the disk is still mounted
Diffstat (limited to 'packages/freenas/www/disks_mount.php')
-rw-r--r-- | packages/freenas/www/disks_mount.php | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/packages/freenas/www/disks_mount.php b/packages/freenas/www/disks_mount.php index e8c7d4d5..c72b0d82 100644 --- a/packages/freenas/www/disks_mount.php +++ b/packages/freenas/www/disks_mount.php @@ -175,30 +175,29 @@ echo $pfSenseHead->getHTML(); <td valign="middle" class="listr"> <?=htmlspecialchars($mount['desc']);?> </td> - </td> - <td valign="middle" class="listbg" style="color: #FFFFFF;"> - <?php - if (file_exists($d_mountdirty_path)) { - $stat = gettext("configuring"); - } else { - $stat = disks_check_mount($mount); - if ($stat == 0) { - $stat = "ERROR - <a href=\"disks_mount.php?act=ret&id=$i\">retry</a>"; - } else { - $stat = gettext("OK"); - } - } - echo $stat; - ?> - </td> - <td valign="middle" class="list"> - <a href="disks_mount_edit.php?id=<?=$i;?>"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit mount");?>" width="17" height="17" border="0" alt="" /> - </a> - <a href="disks_mount.php?act=del&id=<?=$i;?>"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" onclick="return confirm('<?= gettext("Do you really want to delete this mount point? All elements that still use it will become invalid (e.g. share)!"); ?>');" title="<?=gettext("delete mount");?>" width="17" height="17" border="0" alt="" /> - </a> - </td> + <td valign="middle" class="listbg" style="color: #FFFFFF;"> + <?php + if (file_exists($d_mountdirty_path)) { + $stat = gettext("configuring"); + } else { + $stat = disks_check_mount($mount); + if ($stat == false) { + $stat = "ERROR - <a href=\"disks_mount.php?act=ret&id=$i\">retry</a>"; + } else { + $stat = gettext("OK"); + } + } + echo $stat; + ?> + </td> + <td valign="middle" class="list"> + <a href="disks_mount_edit.php?id=<?=$i;?>"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit mount");?>" width="17" height="17" border="0" alt="" /> + </a> + <a href="disks_mount.php?act=del&id=<?=$i;?>"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" onclick="return confirm('<?= gettext("Do you really want to delete this mount point? All elements that still use it will become invalid (e.g. share)!"); ?>');" title="<?=gettext("delete mount");?>" width="17" height="17" border="0" alt="" /> + </a> + </td> </tr> <?php $i++; endforeach; ?> <tr> |