diff options
| -rw-r--r-- | packages/freenas/www/disks_manage_tools.php | 12 | ||||
| -rw-r--r-- | packages/freenas/www/disks_mount_tools.php | 15 | ||||
| -rw-r--r-- | packages/freenas/www/services_rsyncd_client.php | 9 | ||||
| -rw-r--r-- | packages/freenas/www/services_rsyncd_local.php | 25 | ||||
| -rw-r--r-- | packages/freenas/www/services_samba.php | 6 | ||||
| -rw-r--r-- | packages/freenas/www/services_samba_share_edit.php | 6 | ||||
| -rw-r--r-- | packages/freenas/www/services_unison.php | 8 |
7 files changed, 35 insertions, 46 deletions
diff --git a/packages/freenas/www/disks_manage_tools.php b/packages/freenas/www/disks_manage_tools.php index 63ecc393..85de9ce8 100644 --- a/packages/freenas/www/disks_manage_tools.php +++ b/packages/freenas/www/disks_manage_tools.php @@ -54,7 +54,7 @@ if (!is_array($freenas_config['disks']['disk'])) disks_sort(); -$a_disk_conf = &$freenas_config['disks']['disk']; +$a_disk = &$freenas_config['disks']['disk']; if ($_POST) { unset($input_errors); @@ -140,11 +140,11 @@ function disk_change() { <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Disk");?></td> <td width="78%" class="vtable"> - <select name="disk" class="formfld" id="disk" onchange="disk_change()"> + <select name="disk" class="formselect" id="disk" onchange="disk_change()"> <?php foreach ($a_disk as $diskn): ?> <option value="<?=$diskn['name'];?>"<?php if ($diskn['name'] == $disk) echo "selected";?>> <?php echo htmlspecialchars($diskn['name'] . ": " .$diskn['size'] . " (" . $diskn['desc'] . ")");?> @@ -156,13 +156,13 @@ function disk_change() { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Partition");?></td> <td width="78%" class="vtable"> - <select name="partition" class="formfld" id="partition"></select> + <select name="partition" class="formselect" id="partition"></select> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Command");?></td> <td width="78%" class="vtable"> - <select name="action" class="formfld" id="action"> + <select name="action" class="formselect" id="action"> <option value="fsck" <?php if ($action == "fsck") echo "selected"; ?>>fsck</option> </select> </td> @@ -183,7 +183,7 @@ function disk_change() { <tr> <td width="22%" valign="top" class="vncellreq"> </td> <td width="78%" class="vtable"> - <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>"> + <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>" /> </td> </tr> <tr> diff --git a/packages/freenas/www/disks_mount_tools.php b/packages/freenas/www/disks_mount_tools.php index abd31b62..67006981 100644 --- a/packages/freenas/www/disks_mount_tools.php +++ b/packages/freenas/www/disks_mount_tools.php @@ -120,8 +120,7 @@ echo $pfSenseHead->getHTML(); <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> -<form id="iform" name="iform" action="disks_mount_tools.php" method="post"> - +<form action="disks_mount_tools.php" method="post" name="iform" id="iform"> <div id="inputerrors"></div> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td class="tabnavtbl"> @@ -136,12 +135,11 @@ echo $pfSenseHead->getHTML(); <td> <div id="mainarea"> <?php if ($input_errors) print_input_errors($input_errors); ?> - <form action="disks_mount_tools.php" method="post" name="iform" id="iform"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td valign="top" class="vncellreq"><?= gettext("Share Name"); ?></td> <td class="vtable"> - <select name="fullname" class="formfld" id="fullname"> + <select name="fullname" class="formselect" id="fullname"> <?php foreach ($a_mount as $mountv): ?> <option value="<?=$mountv['fullname'];?>"<?php if ($mountv['fullname'] == $fullname) echo "selected";?>> <?php echo htmlspecialchars($mountv['sharename'] . " (" . gettext("Disk") . ": " . $mountv['mdisk'] . " " . gettext("Partition") . ": " . $mountv['partition'] . ")");?> @@ -153,7 +151,7 @@ echo $pfSenseHead->getHTML(); <tr> <td valign="top" class="vncellreq"><?= gettext("Command"); ?></td> <td class="vtable"> - <select name="action" class="formfld" id="action"> + <select name="action" class="formselect" id="action"> <option value="mount" <?php if ($action == "mount") echo "selected"; ?>>mount</option> <option value="umount" <?php if ($action == "umount") echo "selected"; ?>>umount</option> </select> @@ -162,7 +160,7 @@ echo $pfSenseHead->getHTML(); <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>"> + <input name="Submit" type="submit" class="formbtn" value="<?= gettext("Send Command!"); ?>" /> </td> </tr> <tr> @@ -199,12 +197,11 @@ echo $pfSenseHead->getHTML(); </td> </tr> </table> - </form> </div> </td> </tr> </table> -</form> + </form> <?php include("fend.inc"); ?> <?= checkForInputErrors(); ?> </body> diff --git a/packages/freenas/www/services_rsyncd_client.php b/packages/freenas/www/services_rsyncd_client.php index d3304caf..4356ea94 100644 --- a/packages/freenas/www/services_rsyncd_client.php +++ b/packages/freenas/www/services_rsyncd_client.php @@ -235,7 +235,7 @@ $jscriptstr .= <<<EOD /* document.iform.hours2.disabled = endis; */ document.iform.days1.disabled = endis; document.iform.days2.disabled = endis; - document.iform.days3.disabled = endis; + /* document.iform.days3.disabled = endis; */ document.iform.months.disabled = endis; document.iform.weekdays.disabled = endis; document.iform.all_mins1.disabled = endis; @@ -258,7 +258,7 @@ $jscriptstr .= <<<EOD /* document.iform.hours2.style.backgroundColor = color; */ document.iform.days1.style.backgroundColor = color; document.iform.days2.style.backgroundColor = color; - document.iform.days3.style.backgroundColor = color; + /* document.iform.days3.style.backgroundColor = color; */ document.iform.months.style.backgroundColor = color; document.iform.weekdays.style.backgroundColor = color; document.iform.all_mins1.style.backgroundColor = color; @@ -333,12 +333,11 @@ echo $pfSenseHead->getHTML(); <td width="16%" valign="top" class="vncellreq"><?= gettext("Shares to be synchronized"); ?></td> <td width="84%" class="vtable"> <?php - $i=0; if (is_array($freenas_config['mounts']['mount'])) { + $i=0; foreach ($a_mount as $mountv) { echo "<input name=\"sharetosync[]\" id=\"share_" . $i . "\" type=\"checkbox\" value=\"" . $mountv['sharename'] . "\""; - - if (in_array($mountv['sharename'], $pconfig['sharetosync'])) + if ($mountv['sharename'] == $pconfig['sharetosync']) echo " checked=\"checked\""; echo" />"; echo $mountv['sharename'] . " (" . $mountv['desc'] . ")<br />\n"; diff --git a/packages/freenas/www/services_rsyncd_local.php b/packages/freenas/www/services_rsyncd_local.php index 5d975084..3838ac72 100644 --- a/packages/freenas/www/services_rsyncd_local.php +++ b/packages/freenas/www/services_rsyncd_local.php @@ -191,22 +191,13 @@ $jscriptstr = <<<EOD <script type="text/javascript"> <!-- function enable_change(enable_change) { - var endis; - - endis = !(document.iform.enable.checked || enable_change); + var endis; + + endis = !(document.iform.enable.checked || enable_change); endis ? color = '#D4D0C8' : color = '#FFFFFF'; EOD; -$i = 0; - -if (is_array($a_mount)) { - foreach ($a_mount as $mountv) { - $jscriptstr .= " document.iform.share_" . $i . ".disabled = endis;\n"; - $i++; - } -} - /* Note: In contrast to FreeNAS we are only using * three minutes and one hours field(s) */ @@ -221,7 +212,7 @@ $jscriptstr .= <<<EOD /* document.iform.hours2.disabled = endis; */ document.iform.days1.disabled = endis; document.iform.days2.disabled = endis; - document.iform.days3.disabled = endis; + /* document.iform.days3.disabled = endis; */ document.iform.months.disabled = endis; document.iform.weekdays.disabled = endis; document.iform.all_mins1.disabled = endis; @@ -245,7 +236,7 @@ $jscriptstr .= <<<EOD /* document.iform.hours2.style.backgroundColor = color; */ document.iform.days1.style.backgroundColor = color; document.iform.days2.style.backgroundColor = color; - document.iform.days3.style.backgroundColor = color; + /* document.iform.days3.style.backgroundColor = color; */ document.iform.months.style.backgroundColor = color; document.iform.weekdays.style.backgroundColor = color; document.iform.all_mins1.style.backgroundColor = color; @@ -304,10 +295,10 @@ echo $pfSenseHead->getHTML(); <tr> <td width="16%" valign="top" class="vncellreq"><?= gettext("Source"); ?></td> <td width="84%" class="vtable"> - <select name="source" class="formfld" id="source"> + <select name="source" class="formselect" id="source"> <?php if (is_array($freenas_config['mounts']['mount'])) { - foreach ($a_mount as $mountv) { + foreach ($a_mount as $mountv) { echo "<option value=\"{$mountv['sharename']}\""; if (strcmp($mountv['sharename'],$pconfig['source']) == 0) echo " selected"; @@ -327,7 +318,7 @@ echo $pfSenseHead->getHTML(); <tr> <td width="16%" valign="top" class="vncellreq"><?= gettext("Destination"); ?></td> <td width="84%" class="vtable"> - <select name="destination" class="formfld" id="destination"> + <select name="destination" class="formselect" id="destination"> <?php if (is_array($freenas_config['mounts']['mount'])) { foreach ($a_mount as $mountv) { diff --git a/packages/freenas/www/services_samba.php b/packages/freenas/www/services_samba.php index 928a6798..835814b2 100644 --- a/packages/freenas/www/services_samba.php +++ b/packages/freenas/www/services_samba.php @@ -212,6 +212,9 @@ echo $pfSenseHead->getHTML(); <?php include("fbegin.inc"); ?> <form id="iform" name="iform" action="services_samba.php" method="post"> +<?php if ($input_errors) print_input_errors($input_errors); ?> +<?php if ($savemsg) print_info_box($savemsg); ?> +<div id="inputerrors"></div> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> <td class="tabnavtbl"> @@ -226,10 +229,9 @@ echo $pfSenseHead->getHTML(); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> - <div id="inputerrors"></div> <tr> <td width="100%" valign="middle" class="listtopic" colspan="2"> <span style="vertical-align: middle; position: relative; left: 0px;"><?=gettext("CIFS share");?></span> diff --git a/packages/freenas/www/services_samba_share_edit.php b/packages/freenas/www/services_samba_share_edit.php index 7c89a4c5..02efc98d 100644 --- a/packages/freenas/www/services_samba_share_edit.php +++ b/packages/freenas/www/services_samba_share_edit.php @@ -114,19 +114,19 @@ echo $pfSenseHead->getHTML(); <tr> <td width="22%" valign="top" class="vncellreq"><?= gettext("Share Name"); ?></td> <td width="78%" class="vtable"> - <input type="text" class="formfld" size="30" value="<?=htmlspecialchars($freenas_config['mounts']['mount'][$id]['sharename']);?>" disabled="disabled" /> + <input type="text" class="formfld file" size="30" value="<?=htmlspecialchars($freenas_config['mounts']['mount'][$id]['sharename']);?>" disabled="disabled" /> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?= gettext("Description"); ?></td> <td width="78%" class="vtable"> - <input type="text" class="formfld" size="30" value="<?=htmlspecialchars($freenas_config['mounts']['mount'][$id]['desc']);?>" disabled="disabled"> + <input type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($freenas_config['mounts']['mount'][$id]['desc']);?>" disabled="disabled"> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?= gettext("Browseable"); ?></td> <td width="78%" class="vtable"> - <select name="browseable" class="formfld" id="browseable"> + <select name="browseable" class="formselect" id="browseable"> <?php $text = array(gettext("Yes"),gettext("No")); $vals = explode(" ","1 0"); $j = 0; diff --git a/packages/freenas/www/services_unison.php b/packages/freenas/www/services_unison.php index 50c3dd24..25425fdd 100644 --- a/packages/freenas/www/services_unison.php +++ b/packages/freenas/www/services_unison.php @@ -183,8 +183,8 @@ echo $pfSenseHead->getHTML(); <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> <td width="100%" valign="middle" class="listtopic" colspan="2"> - <span style="vertical-align: middle; position: relative; left: 0px;"><?=gettext("AFP Server");?></span> - <span style="vertical-align: middle; position: relative; left: 84%;"> + <span style="vertical-align: middle; position: relative; left: 0px;"><?=gettext("Unison File Synchronisation");?></span> + <span style="vertical-align: middle; position: relative; left: 72%;"> <input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onClick="enable_change(false)" /> <?= gettext("Enable"); ?> </span> </td> @@ -199,7 +199,7 @@ echo $pfSenseHead->getHTML(); <?php endforeach; ?> </select> <br /> - <?= gettext("You may need enough space to duplicate all files being synced."); ?>.</td> + <?= gettext("You may need enough space to duplicate all files being synced."); ?>. </td> </tr> <tr> @@ -229,7 +229,7 @@ echo $pfSenseHead->getHTML(); <strong><?= gettext("Note"); ?>:</strong> </span> <br /> - <?= gettext("<a href='/services_sshd.php'>SSHD</a> must be enabled for Unison to work, and the <a href='/access_users.php'>user</a> must have Full Shell enabled."); ?> + <?= gettext("<a href='/system_advanced.php'>SSHD</a> must be enabled for Unison to work, and the <a href='/system_usermanager.php'>user</a> must have Full Shell enabled."); ?> </td> </tr> </table> |