diff options
Diffstat (limited to 'src/usr/local/www')
| -rwxr-xr-x | src/usr/local/www/foot.inc | 1 | ||||
| -rw-r--r-- | src/usr/local/www/system_usermanager_addprivs.php | 5 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php | 17 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index be2ed15..081cfca 100755 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc @@ -24,7 +24,6 @@ <script src="/jquery/pfSense.js"></script> <script src="/jquery/pfSenseHelpers.js"></script> <script src="/sortable/sortable.js"></script> - <script type="text/javascript"> //<![CDATA[ // Un-hide the "Top of page" icons if the page is larger than the window diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index 69860ba..0aa8895 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -184,7 +184,9 @@ $section->addInput(new Form_Select( null, build_priv_list(), true -))->addClass('multiselect')->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items')->setAttribute('style', 'height:400px;'); +))->addClass('multiselect') + ->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items'); + // ->setAttribute('style', 'height:400px;'); if (isset($userid)) { $section->addInput(new Form_Input( @@ -232,6 +234,7 @@ events.push(function() { $('.multiselect').click(function() { $('#pdesc').html('<span style="color: green;">' + descs[$(this).children('option:selected').index()] + '</span>'); }); + }); //]]> </script> diff --git a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index a875526..fe501a5 100644 --- a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -77,7 +77,13 @@ if ($_REQUEST['getdyndnsstatus']) { echo "|"; } - $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache"; + if ($dyndns['type'] == "namecheap") { + $hostname = $dyndns['host'] . "." . $dyndns['domainname']; + } else { + $hostname = $dyndns['host']; + } + + $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($hostname) . "{$dyndns['id']}.cache"; if (file_exists($filename)) { $ipaddr = dyndnsCheckIP($dyndns['interface']); $cached_ip_s = explode(':', file_get_contents($filename)); @@ -108,7 +114,12 @@ if ($_REQUEST['getdyndnsstatus']) { </tr> </thead> <tbody> - <?php $dyndnsid = 0; foreach ($a_dyndns as $dyndns): ?> + <?php $dyndnsid = 0; foreach ($a_dyndns as $dyndns): + if ($dyndns['type'] == "namecheap") { + $hostname = $dyndns['host'] . "." . $dyndns['domainname']; + } else { + $hostname = $dyndns['host']; + } ?> <tr ondblclick="document.location='services_dyndns_edit.php?id=<?=$dyndnsid;?>'"<?=!isset($dyndns['enable'])?' class="disabled"':''?>> <td> <?php $iflist = get_configured_interface_with_descr(); @@ -141,7 +152,7 @@ if ($_REQUEST['getdyndnsstatus']) { </td> <td> <?php - print(htmlspecialchars($dyndns['host'])); + print(htmlspecialchars($hostname)); ?> </td> <td> |
