".
+ if( open( my $fh, '-|', $smart_cups_lpstat_path, '-p' ) )
{
- if( open( my $fh, '-|', $lpstat, '-p' ) )
+ while( my $line = <$fh> )
{
- while( my $line = <$fh> )
+ chomp( $line );
+
+ if( $line =~ /^(?:printer|Drucker)\s+(\S+)/i )
{
- chomp( $line );
-
- my $printer = '';
- if( $line =~ /^printer\s+(\S+)/i )
- {
- $printer = $1;
- }
- elsif( $line =~ /^drucker\s+(\S+)/i )
- {
- $printer = $1;
- }
-
- $printer = sanitize_cups_printer_name( $printer );
- $printers{$printer} = 1 if $printer ne '';
+ cups_add_printer( \@printers, \%seen, $1 );
}
- close( $fh );
}
+
+ close( $fh );
}
- return sort( keys( %printers ) );
+ return @printers;
}
sub cups_import_rows()
@@ -340,12 +462,13 @@ sub cups_import_rows()
foreach my $printer ( @printers )
{
- my $queue = cups_queue_name( $printer );
- my $cmd = cups_print_command( $printer );
- my $href = '/settings/queues/add_new?cups_printer=' . url_escape( $printer );
+ my $name = ref( $printer ) eq 'HASH' ? $printer->{name} : $printer;
+ my $queue = ref( $printer ) eq 'HASH' ? $printer->{queue} : cups_queue_name( $printer );
+ my $cmd = ref( $printer ) eq 'HASH' ? $printer->{command} : cups_print_command( $printer );
+ my $href = '/settings/queues/add_new?cups_printer=' . url_escape( $name );
$html .= "\t\n";
- $html .= "\t\t" . html_escape( $printer ) . "
Queue: " . html_escape( $queue ) . " Command: " . html_escape( $cmd ) . " | \n";
+ $html .= "\t\t" . html_escape( $name ) . "
Queue: " . html_escape( $queue ) . " Command: " . html_escape( $cmd ) . " | \n";
$html .= "\t\tAdd as print queue | \n";
$html .= "\t
\n";
}
@@ -367,10 +490,14 @@ sub cups_select_html( $ )
foreach my $printer ( @printers )
{
- my $sel = ( $printer eq $current ) ? ' SELECTED' : '';
- $html .= qq|\t\t\t\t\n|;
- $js .= "smartCupsCommands['" . js_escape( $printer ) . "'] = '" . js_escape( cups_print_command( $printer ) ) . "';\n";
- $js .= "smartCupsQueues['" . js_escape( $printer ) . "'] = '" . js_escape( cups_queue_name( $printer ) ) . "';\n";
+ my $name = ref( $printer ) eq 'HASH' ? $printer->{name} : $printer;
+ my $queue = ref( $printer ) eq 'HASH' ? $printer->{queue} : cups_queue_name( $printer );
+ my $cmd = ref( $printer ) eq 'HASH' ? $printer->{command} : cups_print_command( $printer );
+ my $sel = ( $name eq $current ) ? ' SELECTED' : '';
+
+ $html .= qq|\t\t\t\t\n|;
+ $js .= "smartCupsCommands['" . js_escape( $name ) . "'] = '" . js_escape( $cmd ) . "';\n";
+ $js .= "smartCupsQueues['" . js_escape( $name ) . "'] = '" . js_escape( $queue ) . "';\n";
}
$html .= qq|\t\t\t|;
@@ -378,12 +505,359 @@ sub cups_select_html( $ )
return ( $html, $js );
}
+sub ipx_interface_info( $ )
+{
+ my $want = $_[0];
+ my %info = ();
+
+ return %info if ! defined( $want ) || $want eq '';
+
+ if( open( my $fh, '<', '/proc/net/ipx/interface' ) )
+ {
+ while( my $line = <$fh> )
+ {
+ chomp( $line );
+ $line =~ s/^\s+//;
+ $line =~ s/\s+$//;
+
+ next if $line eq '';
+ next if $line =~ /^Network\s+Node_Address\s+Primary\s+Device\s+Frame_Type/i;
+
+ my @fields = split( /\s+/, $line );
+ next if scalar( @fields ) < 5;
+
+ my $network = $fields[0];
+ my $dev = $fields[3];
+ my $frame = $fields[4];
+
+ next if ! defined( $dev ) || $dev ne $want;
+ next if lc( $dev ) eq 'internal';
+
+ $info{network} = $network;
+ $info{frame} = $frame;
+ last;
+ }
+
+ close( $fh );
+ }
+
+ return %info;
+}
+
+sub ipx_device_import_rows()
+{
+ my $html = '';
+ my @ifaces = ipx_enabled_interfaces();
+
+ if( scalar( @ifaces ) == 0 )
+ {
+ return qq|\t\n\t\t| IPX interfaces detected on host | \n\t
\n\t\n\t\t| No active IPX interfaces were found in /proc/net/ipx/interface. | \n\t
\n|;
+ }
+
+ $html .= qq|\t\n\t\t| IPX interfaces detected on host | \n\t
\n|;
+
+ foreach my $iface ( @ifaces )
+ {
+ my %info = ipx_interface_info( $iface );
+ my $net = $info{network};
+ my $frame = $info{frame};
+ my $delay = 1;
+
+ $net = '0x0' if ! defined( $net ) || $net eq '';
+ $frame = '802.2' if ! defined( $frame ) || $frame eq '' || lc( $frame ) eq 'none';
+
+ my $href = '/settings/devices/add_new?ipx_iface=' . url_escape( $iface );
+
+ $html .= "\t\n";
+ $html .= "\t\t" . html_escape( $iface ) . "
Config line: 4 " . html_escape( $net ) . " " . html_escape( $iface ) . " " . html_escape( $frame ) . " " . html_escape( $delay ) . " | \n";
+ $html .= "\t\tAdd as device | \n";
+ $html .= "\t
\n";
+ }
+
+ return $html;
+}
+
+sub ipx_device_defaults_from_query()
+{
+ my %defaults = ();
+
+ $defaults{number} = '';
+ $defaults{interface} = '';
+ $defaults{frametype} = '802.2';
+ $defaults{delay} = 1;
+
+ if( defined( $p{ipx_iface} ) && $p{ipx_iface} ne '' )
+ {
+ my $iface = $p{ipx_iface};
+ $iface =~ s/[^-_\.A-Za-z0-9]//g;
+
+ my %info = ipx_interface_info( $iface );
+
+ $defaults{interface} = $iface;
+ $defaults{number} = defined( $info{network} ) && $info{network} ne '' ? $info{network} : '0x0';
+ $defaults{frametype} = defined( $info{frame} ) && $info{frame} ne '' && lc( $info{frame} ) ne 'none' ? $info{frame} : '802.2';
+ $defaults{delay} = 1;
+ }
+
+ return %defaults;
+}
+
+
+sub smart_bindery_values()
+{
+ my( $bind_server, $bind_user, $bind_pass ) = ( '', '', '' );
+
+ if( open( my $fh, '<' . $smart_nwclient_path ) )
+ {
+ my $line = <$fh>;
+ close( $fh );
+
+ chomp( $line ) if defined( $line );
+ ( $bind_server, $bind_user, $bind_pass ) = split( '[/ ]', $line ) if defined( $line );
+ }
+
+ $bind_server = '' unless defined( $bind_server );
+ $bind_user = '' unless defined( $bind_user );
+ $bind_pass = '' unless defined( $bind_pass );
+
+ return( $bind_server, $bind_user, $bind_pass );
+}
+
+sub sync_server_hint_row( $$$$ )
+{
+ my( $checkbox_name, $current_name, $other_name, $direction ) = @_;
+
+ $current_name = '' unless defined( $current_name );
+ $other_name = '' unless defined( $other_name );
+
+ my $msg = '';
+
+ if( $direction eq 'general_to_smart' )
+ {
+ $msg = 'Also update the SMArT bindery server when saving. Current SMArT bindery server: ';
+ $msg .= $other_name ne '' ? '' . html_escape( $other_name ) . '' : 'not set';
+ }
+ else
+ {
+ $msg = 'Also update the MARS_NWE server name when saving. Current MARS_NWE server name: ';
+ $msg .= $other_name ne '' ? '' . html_escape( $other_name ) . '' : 'not set';
+ }
+
+ return qq|\t\n\t\tKeep server names in sync:
$msg | \n\t\tYes | \n\t
\n|;
+}
+
+
+sub unix_user_import_rows()
+{
+ my $html = '';
+ my @users = unix_userlist_effective();
+ my %existing = ();
+ my @candidates = ();
+
+ foreach my $line ( getconfig( 13 ) )
+ {
+ my @f = split( ' ', $line );
+ $existing{lc( $f[1] )} = 1 if defined( $f[1] ) && $f[1] ne '';
+ }
+
+ foreach my $u ( @users )
+ {
+ next if ! defined( $u->{name} ) || $u->{name} eq '';
+ next if defined( $u->{uid} ) && $u->{uid} < 1000;
+ next if lc( $u->{name} ) eq 'nobody';
+ next if lc( $u->{name} ) eq 'root';
+ next if $existing{lc( $u->{name} )};
+
+ push( @candidates, $u );
+ }
+
+ if( scalar( @candidates ) == 0 )
+ {
+ return qq|\t\n\t\t| Unix users detected on host | \n\t
\n\t\n\t\t| No additional local Unix users were found for import. | \n\t
\n|;
+ }
+
+ $html .= qq|\t\n\t\t| Unix users detected on host | \n\t
\n|;
+
+ foreach my $u ( @candidates )
+ {
+ my $name = $u->{name};
+ my $uid = $u->{uid};
+ my $gecos = defined( $u->{gecos} ) ? $u->{gecos} : '';
+ $gecos =~ s/,.*$//;
+
+ my $href = '/settings/users_import/' . url_escape( $name );
+
+ $html .= "\t\n";
+ $html .= "\t\t" . html_escape( $name ) . "
UID: " . html_escape( $uid ) . "";
+ $html .= " " . html_escape( $gecos ) if $gecos ne '';
+ $html .= " | \n";
+ $html .= "\t\tAdd as MARS_NWE user | \n";
+ $html .= "\t
\n";
+ }
+
+ return $html;
+}
+
+sub unix_user_defaults_from_query()
+{
+ my %defaults = ();
+
+ $defaults{name} = '';
+ $defaults{unix_user} = '';
+ $defaults{fullname} = '';
+
+ my $want = '';
+
+ if( defined( $p{unix_user} ) && $p{unix_user} ne '' )
+ {
+ $want = $p{unix_user};
+ }
+ elsif( defined( $c[1] ) && $c[1] eq 'users_import' && defined( $c[2] ) && $c[2] ne '' )
+ {
+ $want = $c[2];
+ }
+ elsif( defined( $c[3] ) && $c[3] ne '' )
+ {
+ $want = $c[3];
+ }
+
+ if( $want ne '' )
+ {
+ $want =~ s/[^-_\.A-Za-z0-9]//g;
+
+ foreach my $u ( unix_userlist_effective() )
+ {
+ next if ! defined( $u->{name} ) || $u->{name} ne $want;
+
+ my $gecos = defined( $u->{gecos} ) ? $u->{gecos} : '';
+ $gecos =~ s/,.*$//;
+
+ $defaults{name} = uc( $u->{name} );
+ $defaults{name} =~ s/[^-_\.A-Za-z0-9]//g;
+ $defaults{unix_user} = $u->{name};
+ $defaults{fullname} = $gecos;
+ last;
+ }
+ }
+
+ return %defaults;
+}
+
+
+sub selected_attr( $$ )
+{
+ my( $a, $b ) = @_;
+
+ $a = '' unless defined( $a );
+ $b = '' unless defined( $b );
+
+ return $a eq $b ? ' SELECTED' : '';
+}
+
+
+sub smart_group_checkbox_rows( $ )
+{
+ my $server = $_[0];
+ my $html = '';
+
+ my @groups = ();
+ my $cmd = 'nwbols -t 2 -S ' . $server;
+
+ @groups = sort( split( "\n", `$cmd` ) );
+
+ foreach my $g ( @groups )
+ {
+ my @f = split( ' ', $g );
+ my $group = $f[0];
+
+ next if ! defined( $group ) || $group eq '';
+ next if $group =~ /[^-_\.A-Za-z0-9]/;
+
+ $html .= html_escape( $group ) . '
' . "\n";
+ }
+
+ if( $html eq '' )
+ {
+ $html = 'No bindery groups found. Save the user first, then add groups later.
' . "\n";
+ }
+
+ return $html;
+}
+
+
+sub smart_debug_user_import_row()
+{
+ my $p_unix = defined( $p{unix_user} ) ? $p{unix_user} : '';
+ my $line = '';
+
+ $line .= 'c0=' . html_escape( defined( $c[0] ) ? $c[0] : '' ) . ' ';
+ $line .= 'c1=' . html_escape( defined( $c[1] ) ? $c[1] : '' ) . ' ';
+ $line .= 'c2=' . html_escape( defined( $c[2] ) ? $c[2] : '' ) . ' ';
+ $line .= 'c3=' . html_escape( defined( $c[3] ) ? $c[3] : '' ) . ' ';
+ $line .= 'c4=' . html_escape( defined( $c[4] ) ? $c[4] : '' ) . ' ';
+ $line .= 'p_unix_user=' . html_escape( $p_unix );
+
+ return qq|\t\n\t\t| Debug user import: | \n\t\t$line | \n\t
\n|;
+}
+
+
+sub unix_userlist_effective()
+{
+ my @users = ();
+
+ if( defined( $smart_userlist_path ) && $smart_userlist_path ne '' && -x $smart_userlist_path )
+ {
+ my @cmd = ( $smart_userlist_path );
+
+ if( defined( $smart_userlist_pam_check ) && $smart_userlist_pam_check )
+ {
+ push( @cmd, '--pam-check' );
+ push( @cmd, '--pam-service', 'smart' );
+ }
+
+ if( open( my $fh, '-|', @cmd ) )
+ {
+ while( my $line = <$fh> )
+ {
+ chomp( $line );
+
+ my( $name, $uid, $gid, $gecos, $home, $shell ) = split( /\t/, $line, 6 );
+
+ next if ! defined( $name ) || $name eq '';
+ next if $name =~ /[^-_\.A-Za-z0-9]/;
+
+ push( @users, {
+ name => $name,
+ uid => $uid,
+ gid => $gid,
+ gecos => defined( $gecos ) ? $gecos : '',
+ home => defined( $home ) ? $home : '',
+ shell => defined( $shell ) ? $shell : '',
+ } );
+ }
+
+ close( $fh );
+ }
+ }
+
+ # Last-resort compatibility fallback: old SMArT unix_userlist() implementation.
+ if( scalar( @users ) == 0 )
+ {
+ @users = unix_userlist();
+ }
+
+ return @users;
+}
+
+
sub handle_request()
{
if( $c[1] eq 'general' )
{
$server_name = getconfigline( 2 );
$internal_net = getconfigline( 3 );
+ my( $smart_bind_server_for_general, $smart_bind_user_for_general, $smart_bind_pass_for_general ) = smart_bindery_values();
+ my $general_sync_server_row = sync_server_hint_row( 'sync_smart_bind_server', $server_name, $smart_bind_server_for_general, 'general_to_smart' );
( $burst_read, $burst_write ) = split( ' ', getconfigline( 30 ) );
$timing_down = getconfigline( 210 );
$timing_warn = getconfigline( 211 );
@@ -532,6 +1006,7 @@ $settings_nav_bar
+$general_sync_server_row
@@ -795,6 +1270,9 @@ $settings_nav_bar
|
+
+ | Advanced precompiled / path settings |
+
@@ -892,6 +1370,9 @@ $settings_nav_bar
Disallow encryption
|
+
+ | Advanced security settings |
+
@@ -913,7 +1394,7 @@ EOF
( $root_name, $root, $root_password ) = split( ' ', getconfigline( 12 ) );
$guest_user_list = '';
$root_list = '';
- foreach $u ( unix_userlist() )
+ foreach $u ( unix_userlist_effective() )
{
if( $u->{uid} eq $guest )
{ $guest_user_list .= "\t\t\t" . '' . "\n"; }
@@ -1063,6 +1544,9 @@ $root_list
|
+
+ | Advanced user / bindery settings |
+
@@ -1320,6 +1804,9 @@ $settings_nav_bar
Write to separate files (.1, .2, etc)
|
+
+ | Advanced network watchdog settings |
+
@@ -1634,6 +2121,8 @@ EOF
{
if( $c[2] eq '' )
{
+ my $ipx_device_import_rows = ipx_device_import_rows();
+
print <
- Add new device
+ Add new device manually
+ Advanced device settings
|
|
@@ -1712,13 +2203,42 @@ EOF
}
else
{
- $c = getconfigline( '4 ' . $c[2] );
- @c = split( ' ', $c );
- $interface_options = network_interface_options( $c[1] );
-
- $c[2] =~ s/\.//g;
- eval( '$frametype_' . $c[2] . ' = " SELECTED";' );
-
+ my $title = $c[2];
+ my $number = '';
+ my $interface = '';
+ my $frametype = '802.2';
+ my $delay = 1;
+
+ if( $c[2] eq 'add_new' )
+ {
+ my %defaults = ipx_device_defaults_from_query();
+ $number = $defaults{number};
+ $interface = $defaults{interface};
+ $frametype = $defaults{frametype};
+ $delay = $defaults{delay};
+ }
+ else
+ {
+ my $line = getconfigline( '4 ' . $c[2] );
+ my @dev = split( ' ', $line );
+
+ $number = $dev[0];
+ $interface = $dev[1];
+ $frametype = $dev[2];
+ $delay = $dev[3];
+
+ $title = $number;
+ }
+
+ $number = '' unless defined $number;
+ $interface = '' unless defined $interface;
+ $frametype = '802.2' unless defined $frametype && $frametype ne '';
+ $delay = 1 unless defined $delay && $delay ne '';
+
+ my $frametype_key = $frametype;
+ $frametype_key =~ s/\.//g;
+ eval( '$frametype_' . $frametype_key . ' = " SELECTED";' );
+
print <
$settings_nav_bar
-