Added CGI args parser

samba/ask_epass.cgi

@@ -4,7 +4,7 @@
 
 require './samba-lib.pl';
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmpass'}")
         unless $access{'maint_makepass'};

samba/cgi_args.pl

@@ -0,0 +1,40 @@
+
+do 'samba-lib.pl';
+
+sub cgi_args
+{
+my ($cgi) = @_;
+my @shares = &list_shares();
+if ($cgi eq 'edit_pshare.cgi' || $cgi eq 'edit_popts.cgi') {
+	# First printer share
+	foreach my $s (@shares) {
+		next if (!&can('r', \%access, $s) || $s eq 'global');
+		local %share;
+		&get_share($s);
+		if (&istrue("printable")) {
+			return 'share='.&urlize($s);
+			}
+		}
+	return $access{'c_ps'} ? '' : 'none';	# Create if allowed
+	}
+elsif ($cgi eq 'edit_fshare.cgi' || $cgi eq 'edit_sec.cgi' ||
+       $cgi eq 'edit_fperm.cgi' || $cgi eq 'edit_fname.cgi' ||
+       $cgi eq 'edit_fmisc.cgi') {
+	# First non-printer share
+	foreach my $s (@shares) {
+		next if (!&can('r', \%access, $s) || $s eq 'global');
+		local %share;
+		&get_share($s);
+		if (!&istrue("printable")) {
+			return 'share='.&urlize($s);
+			}
+		}
+	return $access{'c_fs'} ? '' : 'none';	# Create if allowed
+	}
+elsif ($cgi eq 'edit_euser.cgi') {
+	# First user, if any
+	my @ulist = &list_users();
+	return @ulist ? 'idx='.$ulist[0]->{'index'} : 'none';
+	}
+return undef;
+}

samba/conf_bind.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcm'}") unless $access{'conf_bind'};
 

samba/conf_misc.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcm'}") unless $access{'conf_misc'};
 

samba/conf_net.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcn'}") unless $access{'conf_net'};
 

samba/conf_pass.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcp'}") unless $access{'conf_pass'};
 

samba/conf_print.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcprint'}") unless $access{'conf_print'};
  

samba/conf_smb.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcs'}") unless $access{'conf_smb'};
 

samba/create_copy.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcopy'}") unless $access{'copy'};
  

samba/delete_euser.cgi

@@ -3,7 +3,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmusers'}")
         unless $access{'maint_users'} && $access{'view_users'};

samba/delete_share.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pds'}") 
 	unless &can('rw', \%access, $in{share});

samba/delete_shares.cgi

@@ -4,7 +4,7 @@
 require './samba-lib.pl';
 &ReadParse();
 &error_setup($text{'delete_err'});
-%access = &get_module_acl();
+
 
 @d = split(/\0/, $in{'d'});
 @d || &error($text{'delete_enone'});

samba/edit_epass.cgi

@@ -4,7 +4,7 @@
 
 require './samba-lib.pl';
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvusers'}")
         unless $access{'view_users'};

samba/edit_euser.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvusers'}")
         unless $access{'view_users'};

samba/edit_fmisc.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvfmisc'}")
 		unless &can('ro', \%access, $in{'share'});

samba/edit_fname.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvfname'}")
         unless &can('rn', \%access, $in{'share'});

samba/edit_fperm.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvperm'}")
         unless &can('rp', \%access, $in{'share'});

samba/edit_fshare.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 $s = $in{'share'};
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if(!$s) {
     &error("$text{'eacl_np'} $text{'eacl_pcfs'}")

samba/edit_group.cgi

@@ -3,7 +3,7 @@
 # Show a form for editing an existing groups
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'maint_groups'} || &error($text{'groups_ecannot'});
 &ReadParse();
 if ($in{'new'}) {

samba/edit_gsync.cgi

@@ -3,7 +3,7 @@
 # Allow the user to edit auto updating of Samba groups by useradmin
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'maint_gsync'} || &error($text{'gsync_ecannot'});
 &ui_print_header(undef, $text{'gsync_title'}, "");
 

samba/edit_popts.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvpopt'}")
         unless &can('ro', \%access, $in{'share'});

samba/edit_pshare.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 $s = $in{'share'};
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if(!$s) {
 	&error("$text{'eacl_np'} $text{'eacl_pcps'}")

samba/edit_sec.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pvsec'}")
         unless &can('rs', \%access, $in{'share'});

samba/edit_sync.cgi

@@ -4,7 +4,7 @@
 
 require './samba-lib.pl';
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmsync'}")
         unless $access{'maint_sync'};

samba/edit_winbind.cgi

@@ -3,7 +3,7 @@
 # Show form for binding to a domain
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'winbind'} || &error($text{'winbind_ecannot'});
 &ui_print_header(undef, $text{'winbind_title'}, "");
 

samba/index.cgi

@@ -4,7 +4,6 @@
 # [printers]) are included as well.
 
 require './samba-lib.pl';
-%access = &get_module_acl();
 
 # Check for Samba executable
 if (!-x $config{'samba_server'}) {

samba/kill_user.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if ($in{share}) { # this may be cracked very easy, don't know how to do better :(
 	# per-share acls ...

samba/kill_users.cgi

@@ -7,7 +7,7 @@ require './samba-lib.pl';
 @d || &error($text{'viewu_enone'});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if ($in{share}) { # this may be cracked very easy, don't know how to do better :(
 	# per-share acls ...

samba/list_groups.cgi

@@ -3,7 +3,7 @@
 # List all existing Samba groups
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'maint_groups'} || &error($text{'groups_ecannot'});
 &ui_print_header(undef, $text{'groups_title'}, "");
 

samba/logout.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcswat'}") unless $access{'swat'};
  

samba/make_epass.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmpass'}")
 		unless $access{'maint_makepass'};

samba/restart.cgi

@@ -3,7 +3,7 @@
 # Kill all smbd and nmdb processes and re-start them
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_papply'}") unless $access{'apply'};
  

samba/samba-lib.pl

@@ -5,6 +5,7 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
+%access = &get_module_acl();
 
 # Get the samba version
 if (open(VERSION, "$module_config_directory/version")) {

samba/save_bind.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcm'}") unless $access{'conf_bind'};
  

samba/save_copy.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcopy'}") unless $access{'copy'};
  

samba/save_euser.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmusers'}")
         unless $access{'maint_users'} && $access{'view_users'};

samba/save_fmisc.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pufmisc'}")
             unless &can('rwoO', \%access, $in{old_name});

samba/save_fname.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pufname'}")
             unless &can('rwnN', \%access, $in{old_name});

samba/save_fperm.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pufperm'}")
             unless &can('rwpP', \%access, $in{old_name});

samba/save_fshare.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name}) if $in{old_name};
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if ($in{old_name}) {
     &error("$text{'eacl_np'} $text{'eacl_pus'}") 

samba/save_group.cgi

@@ -3,7 +3,7 @@
 # Update or delete a Samba group
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'maint_groups'} || &error($text{'groups_ecannot'});
 &ReadParse();
 @groups = &list_groups();

samba/save_gsync.cgi

@@ -3,7 +3,7 @@
 # Save unix-samba group synchronisation options
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'maint_gsync'} || &error($text{'gsync_ecannot'});
 &ReadParse();
 

samba/save_misc.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcm'}") unless $access{'conf_misc'};
  

samba/save_net.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcn'}") unless $access{'conf_net'};
 

samba/save_pass.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcp'}") unless $access{'conf_pass'};
 

samba/save_popts.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{'old_name'});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pupopt'}")
   		unless &can('rwoO', \%access, $in{old_name});

samba/save_print.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcprint'}") unless $access{'conf_print'};
  

samba/save_pshare.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name}) if $in{old_name};
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if ($in{old_name}) {
     &error("$text{'eacl_np'} $text{'eacl_pus'}") 

samba/save_sec.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 &get_share($in{old_name});
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pusec'}")
 	        unless &can('rwsS', \%access, $in{old_name});

samba/save_smb.cgi

@@ -8,7 +8,7 @@ require './samba-lib.pl';
 $global = &get_share("global");
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcs'}") unless $access{'conf_smb'};
 

samba/save_sync.cgi

@@ -5,7 +5,7 @@
 require './samba-lib.pl';
 &ReadParse();
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pmsync'}")
         unless $access{'maint_sync'};

samba/save_winbind.cgi

@@ -3,7 +3,7 @@
 # Bind to a domain
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 $access{'winbind'} || &error($text{'winbind_ecannot'});
 &ReadParse();
 

samba/start.cgi

@@ -3,7 +3,7 @@
 # Attempt to start the smbd and nmbd processes
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_papply'}") unless $access{'apply'};
  

samba/stop.cgi

@@ -3,7 +3,7 @@
 # Kill all smbd and nmdb processes and re-start them
 
 require './samba-lib.pl';
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_papply'}") unless $access{'apply'};
  

samba/swat.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcswat'}") unless $access{'swat'};
 

samba/swat_save.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 &error("$text{'eacl_np'} $text{'eacl_pcswat'}") unless $access{'swat'};
  

samba/view_users.cgi

@@ -6,7 +6,7 @@ require './samba-lib.pl';
 &ReadParse();
 
 # check acls
-%access = &get_module_acl();
+
 &error_setup("<blink><font color=red>$text{'eacl_aviol'}</font></blink>");
 if ($in{share}) { # this may be cracked very easy, don't know how to do better :    # per-share acls ...
     # per-share acls ...