Changeset 130

Timestamp:

03/01/06 15:14:08 (3 years ago)

Author:

ludo

Message:

v 2.6.3: fixed some problems when profile=all (from r3096)

Files:

• trunk/webmin/lbs/bootmenu.cgi (modified) (7 diffs)
• trunk/webmin/lbs/bootoptions.cgi (modified) (8 diffs)
• trunk/webmin/lbs/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs/lbs.pl (modified) (2 diffs)
• trunk/webmin/lbs/module.info (modified) (1 diff)
• trunk/webmin/lbs/move.cgi (modified) (5 diffs)
• trunk/webmin/lbs/wol.cgi (modified) (2 diffs)

trunk/webmin/lbs/bootmenu.cgi

@@ -55 +55 @@
-
-etherLoad( $etherfile, \%einfo ) or error( lbsGetError() );
+
+# make sure to use the 'all' directory when any profile is requested
+my $oprofile = $in{'profile'};
+if (exists($in{'profile'}) && ($in{'profile'} eq "")) {
+    $in{'profile'} = "all";
+}
-
-# On effectue une modif si presence du param cgi 'apply' (on ignore sa valeur). 
@@ -102 +108 @@
-
-        # Mode Selection
+        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        $mode = "MONO"  if (($in{'mac'}));
-        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        
-        # Get the computer (One Computer Mode)
@@ -179 +185 @@
-                my $group   = $in{'group'}   or "";
-                
+                if ($profile eq "all") { $profile = ""; } # filter_machines_names does not like profile=all
+
-                lbs_common::etherLoad("$home/etc/ether", \%ether);
-in{'profile'}
+profile
-                
-                foreach my $name (etherGetNames(\%ether)) {
@@ -240 +248 @@
-        } else {
-                $mesg = text( "msg_bootmenu_groupwriteok", "$in{'profile'}:$in{'group'}");
-in{'profile'}
+oprofile
-                print "<p>$mesg</p>\n";
-in{'profile'}
+oprofile
-        }
-        print "<p>&nbsp;</p>\n";
@@ -256 +264 @@
-        
-        # Mode Selection
+        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        $mode = "MONO"  if (($in{'mac'}));
-        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-
-        # grab the path of our menu
@@ -287 +295 @@
-        } else {
-                $mesg = text( "msg_bootmenu_groupwriteok", "$in{'profile'}:$in{'group'}");
-in{'profile'}
+oprofile
-                print "<p>$mesg</p>\n";
-in{'profile'}
+oprofile
-        }
-        print "<p>&nbsp;</p>\n";
@@ -321 +329 @@
-        lbsClearError();
-
+        $mode = "MULTI" if (($in{'group'}) or exists($in{'profile'}));
-        $mode = "MONO"  if (($in{'mac'}) or ( $in{'name'}));
-        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        $mode = "SKEL" if ($in{'skel'});
-        

trunk/webmin/lbs/bootoptions.cgi

@@ -151 +151 @@
-etherLoad( $etherfile, \%einfo ) or error( lbsGetError() );
-
+# make sure to use the 'all' directory when any profile is requested
+my $oprofile = $in{'profile'};
+if (exists($in{'profile'}) && ($in{'profile'} eq "")) {
+    $in{'profile'} = "all";
+}
+
-# On effectue une modif si presence du param cgi 'apply' (on ignore sa valeur). 
-# Ou on redirige sur index.cgi si presence du param cgi 'cancel'.
@@ -170 +176 @@
-
-        if ( exists( $in{'form2'} ) ) {
+                $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-                $mode = "MONO"  if (($in{'mac'}));
-                $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-
-                # get the computer (One Computer Mode)
@@ -202 +208 @@
-
-                        lbs_common::etherLoad("$home/etc/ether", \%ether);
-in{'profile'}
+oprofile
-
-                        foreach my $name (etherGetNames(\%ether)) {
@@ -259 +265 @@
-                        redirect("bootoptions.cgi?mac=$umac") ;
-                } elsif ($mode eq "MULTI") {
-in{'profile'}
+oprofile
-                }
-                exit;
@@ -269 +275 @@
-        # Must define a default menu:
-        error( $text{'err_bootmenu_mustdef'} ) if ( not exists( $in{'default'} ) );
+
+        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        $mode = "MONO"  if (($in{'mac'}));
-        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        
-        # get the computer (One Computer Mode)
@@ -346 +353 @@
-        } elsif ($mode eq "MULTI") {
-                print "<p>$mesg</p>\n";
-in{'profile'}
+oprofile
-                print "<p>&nbsp;</p>\n";
-        }
@@ -378 +385 @@
-        lbsClearError();
-
+        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        $mode = "MONO"  if (($in{'mac'}) or ( $in{'name'}));
-        $mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-        
-        # get the computer (One Computer Mode)
@@ -581 +588 @@
-        } elsif ($mode eq "MULTI") {
-                print "<input type=hidden name=group value=\"$in{'group'}\">\n";
-in{'profile'}
+oprofile
-        }
-

trunk/webmin/lbs/debian/changelog

@@ -1 @@
-1
+3
-
-  * New release.

trunk/webmin/lbs/lbs.pl

@@ -536 +536 @@
-
-sub checkhostname {
-
+_
-        1;
-}
@@ -896 +896 @@
-                $arrow = "doubleup1.gif" if ($$flags[$i]);
-                
-$profile ne "") or ($group ne
+($profile ne "") or ($group ne "")) and ($mac eq
-                        push @tohdr, "<center><a href=\"move.cgi?profile=$profile&group=$group&img=$uitem&op=b2h\">" 
-                                      . "<img src=\"images/$arrow\" border=no "

trunk/webmin/lbs/module.info

@@ -7 +7 @@
-
-depends=0.94 lbs_common proc at
-1
+3

trunk/webmin/lbs/move.cgi

@@ -55 +55 @@
-ReadParse() ;
-
+# make sure to use the 'all' directory when any profile is requested
+my $oprofile = $in{'profile'};
+if (exists($in{'profile'}) && ($in{'profile'} eq "")) {
+    $in{'profile'} = "all";
+}
+
+$mode = "MULTI" if (($in{'group'}) or ( $in{'profile'}));
-$mode = "MONO"  if (($in{'mac'}) or ( $in{'name'}));
-
-
+
-if ($mode eq "MONO") {
-        if (not exists($in{'mac'})) {
@@ -112 +118 @@
-                        unlink("$lbs_home/images/$macfile/$img") if (-l "$lbs_home/images/$macfile/$img"); 
-                } elsif ($mode eq "MULTI") {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                }
-        } elsif ($op eq "l2h") {                                # from local to host
@@ -159 +129 @@
-                } elsif ($mode eq "MULTI") {
-                        moveBase2Hdr_Multi($lbs_home, $cfgpath, $img);
-
-                        # then save the checked values for every machine of our group / profile
-                        my $profile=$in{'profile'};
-                        my $group=$in{'group'};
-        
-                        # to do this, we need the entire mac list to be loaded
-                        my $home=$lbs_common::lbsconf{'basedir'};
-                        my %ether;
-
-                        # and normalized
-                        lbs_common::etherLoad("$home/etc/ether", \%ether);
-                        lbs_common::filter_machines_names($in{'profile'}, $in{'group'}, \%ether);
-
-                        foreach my $name (etherGetNames(\%ether)) {
-                                my $macaddr = etherGetMacByName (\%ether, $name);
-                                my $macfile = toMacFileName($macaddr);
-                                my $cfgpath = "$home/images/$macfile";
-                                if (opendir CFGPATH, $cfgpath) {
-                                        unlink map "$cfgpath/$_", grep { -l "$cfgpath/$_"} readdir(CFGPATH);
-                                        closedir CFGPATH;
-                                }
-                                my $origpath = "$lbs_home/imgprofiles/$in{'profile'}/$in{'group'}";
-                                if (opendir ORIGPATH, $origpath) {
-                                        my $cmd = "cp -a " . join " ", map "$origpath/$_", grep { -l "$origpath/$_" or $_ eq "header.lst" or $_ eq "header.lst.$WOL_EXTENSION" } readdir(ORIGPATH);
-                                        closedir CFGPATH;
-                                        $cmd .= " $cfgpath";
-                                        system($cmd);
-                                }
-                        }
-                        
-#                        foreach my $name (etherGetNames(\%ether)) {
-#                                moveBase2Hdr($lbs_home, etherGetMacByName (\%ether, $name), $img, undef, 1);
-#                        }
-                }
-        } elsif ($op eq "del") {                                # deletion
@@ -204 +141 @@
-                redirect("move.cgi?mac=$umac") ;
-        } elsif ($mode eq "MULTI") {
-in{'profile'}
+oprofile
-        }
-        
@@ -329 +266 @@
-                                addBackupProgressInfo($f, \$d);
-
-in{'profile'}
-in{'profile'}
+oprofile
+oprofile
-                        } else {
-                                push @basetitles, "(storage?)" ;

trunk/webmin/lbs/wol.cgi

@@ -64 +64 @@
-        #redirect($redir) ;
-}
-exists 
+
-        my $macs = "";
-
@@ -81 +81 @@
-        my $macs = "";
-
-
+
+
+
+
-            my $n = $einfo{$k}[1];
-            if ( $n =~ m|^([^:]+):| ) {
-group
+prof
-                if (index ($1,$in{'profile'}) != 0) { next; }
-                $macs .=  $k." ";
+            } elsif ( $filt eq "" ) {
+                $macs .=  $k." ";           
-            }
-        }