From 5febc9fdfaeb56c8db55795986db7dfa27470bab Mon Sep 17 00:00:00 2001 From: Matteo Pasotti Date: Sat, 25 Jan 2014 15:30:44 +0100 Subject: - fixed host aliases issue (undefined aliases where causing warnings and crashes) --- AdminPanel/Hosts/GHosts.pm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'AdminPanel') diff --git a/AdminPanel/Hosts/GHosts.pm b/AdminPanel/Hosts/GHosts.pm index fcf95982..97ad6b8a 100644 --- a/AdminPanel/Hosts/GHosts.pm +++ b/AdminPanel/Hosts/GHosts.pm @@ -148,10 +148,16 @@ sub _manipulateHostDialog { } elsif($widget == $okButton) { my $res = undef; + my @hosts_toadd; + push @hosts_toadd, $textHostName->value(); + if(trim($textHostAlias->value()) ne ""){ + push @hosts_toadd, $textHostAlias->value(); + } + print "@hosts_toadd\n"; if($boolEdit == 0){ - $res = $self->cfgHosts->_insertHost($textIPAddress->value(),[$textHostName->value(), $textHostAlias->value()]); + $res = $self->cfgHosts->_insertHost($textIPAddress->value(),[@hosts_toadd]); }else{ - $res = $self->cfgHosts->_modifyHost($textIPAddress->value(),[$textHostName->value(), $textHostAlias->value()]); + $res = $self->cfgHosts->_modifyHost($textIPAddress->value(),[@hosts_toadd]); } $res = $self->cfgHosts->_writeHosts(); print "Write result: $res\n"; @@ -289,7 +295,11 @@ sub manageHostsDialog { } elsif ($widget == $edtButton) { my $tblItem = yui::toYTableItem($self->table->selectedItem()); - $self->_edtHostDialog($tblItem->cell(0)->label(),$tblItem->cell(1)->label(),$tblItem->cell(2)->label()); + if($tblItem->cellCount() >= 3){ + $self->_edtHostDialog($tblItem->cell(0)->label(),$tblItem->cell(1)->label(),$tblItem->cell(2)->label()); + }else{ + $self->_edtHostDialog($tblItem->cell(0)->label(),$tblItem->cell(1)->label(),""); + } $self->setupTable(); } elsif ($widget == $remButton) { -- cgit v1.2.1