Changes

From SME Server
Jump to navigationJump to search
Line 221: Line 221:  
     #
 
     #
 
     my $c = shift;
 
     my $c = shift;
     $ddc_data{"first"} = 'dhcp_DESCRIPTION';
+
     $dhcp_data{"first"} = 'dhcp_DESCRIPTION';
 
     do_display( $c, %dhcp_data );
 
     do_display( $c, %dhcp_data );
 
}
 
}
Line 230: Line 230:  
     #
 
     #
 
     my $c = shift;
 
     my $c = shift;
 +
    my $title = $c->l("dhcp_DHCPD_SETTINGS_TITLE");
 +
    my $modul = '';
 +
    my $trt  = "SETTINGS";
 +
    $dhcp_data{trt} = $trt;
 
     # Accumulate parameters for Configuration DB
 
     # Accumulate parameters for Configuration DB
 
     # .....
 
     # .....
Line 240: Line 244:  
#
 
#
 
my $c = shift;
 
my $c = shift;
     $ddc_data{"first"} = 'dhcp_LEASES';
+
     my $title = $c->l("dhcp_MANAGING_DHCP_CLIENT");
     $ddc_data{"leases") = get_leases_in_array();
+
    my $modul = '';
 +
    my $trt  = "LEASES";
 +
    $dhcp_data{trt} = $trt;
 +
    $dhcp_data{"first"} = '';
 +
     $dhcp_data{"leases") = get_leases_in_array();
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
 
     $c->render( template => 'dhcpman' );
 
     $c->render( template => 'dhcpman' );
Line 252: Line 260:  
#
 
#
 
my $c = shift;
 
my $c = shift;
 +
    my $title = $c->l("dhcp_GLOBAL_WINPOPUP");
 +
    my $modul = '';
 +
    my $trt  = "WINPOPUP";
 +
    $dhcp_data{trt} = $trt;
 +
    $dhcp_data{"first"} = '';
 
#..... get winpopup details
 
#..... get winpopup details
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
Line 262: Line 275:  
#
 
#
 
my $c = shift;
 
my $c = shift;
# ..... get scan results
+
    my $title = $c->l("dhcp_SCANNING_NETWORK_TITLE");
 +
    my $modul = '';
 +
    my $trt  = "NETSCAN";
 +
    $dhcp_data{trt} = $trt;
 +
    $dhcp_data{"first"} = '';
 +
# ..... get scan results into dhcp_data
 +
dhcp_data{scanresults} = get_scan_results($c);
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
 
     $c->stash( title => $title, modul => $modul, dhcp_data => \%dhcp_data );
 
     $c->render( template => 'dhcpman' );
 
     $c->render( template => 'dhcpman' );
Line 278: Line 297:  
# signal-event and ...return ok
 
# signal-event and ...return ok
 
my $ret = update_config($c);
 
my $ret = update_config($c);
if ($ret == 'ok') do_display($c);
+
if ($ret == 'ok') {
return  
+
dhcp_data{"success"}=dhcp_CONFIG_SAVED_OK
 +
do_display($c)
 +
else dhcp_data{"error"}=$ret
 +
    return  
 
}
 
}
   −
sub do_delete_lease {
+
sub do_delete_all_leases {
 +
#
 +
# Delete all the specified lease
 +
# Called from button at top of leases list panel
 +
#
 +
my $c = shift;
 +
    my $ret = delete_all_leases($c);
 +
if ($ret == 'ok') {
 +
dhcp_data{"success"}=dhcp_CONFIG_SAVED_OK
 +
do_leases($c)
 +
else dhcp_data{"error"}=$ret
 +
    return
 +
}
 +
 
 +
sub do_delete_one_lease {
 
#
 
#
 
# Delete the specified lease
 
# Delete the specified lease
Line 294: Line 330:  
     # else return "ok"
 
     # else return "ok"
 
     my $ret = delete_lease($c);
 
     my $ret = delete_lease($c);
    if ($ret == "ok") do_display($c);
+
if ($ret == 'ok') {
 +
dhcp_data{"sucess"}=dhcp_CONFIG_SAVED_OK
 +
do_leases($c)
 +
else dhcp_data{"error"}=$ret
 
     return  
 
     return  
 
}
 
}
Line 304: Line 343:  
}
 
}
   −
sub delete_lease {
+
sub delete_one_lease {
 +
my $c = shift;
 +
    # ...do it
 +
    return "ok";
 +
}
 +
 
 +
sub delete_all_leases {
 
my $c = shift;
 
my $c = shift;
 
     # ...do it
 
     # ...do it
Line 316: Line 361:  
     return @leases;
 
     return @leases;
 
}
 
}
+
 
 +
sub winpopup{
 +
my $c = shift;
 +
# Message in $c->param("winpopupmsg")
 +
    # .... do it
 +
    return "ok";
 +
}
 
</syntaxhighlight>
 
</syntaxhighlight>
   Line 329: Line 380:  
==Translation Strings files==
 
==Translation Strings files==
 
Here is a sed script and extra commands to take a formMagick strings file and make it into a lex file suitable for SM2.
 
Here is a sed script and extra commands to take a formMagick strings file and make it into a lex file suitable for SM2.
  −
      
Create a sed script file (cnv_lexi.vi):<syntaxhighlight lang="text">
 
Create a sed script file (cnv_lexi.vi):<syntaxhighlight lang="text">

Navigation menu