Changeset 138

Timestamp:

05/09/06 17:15:26 (3 years ago)

Author:

ludo

Message:

v 2.6.4: base to local feature, static dhcp fixes (from r3364)

Files:

• trunk/webmin/lbs/cron/edit_cron.cgi (modified) (1 diff)
• trunk/webmin/lbs/cron/index.cgi (modified) (1 diff)
• trunk/webmin/lbs/cron/save_cron.cgi (modified) (1 diff)
• trunk/webmin/lbs/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs/delete.cgi (modified) (1 diff)
• trunk/webmin/lbs/help/imgbase.fr.html (modified) (1 diff)
• trunk/webmin/lbs/help/imgbase.html (modified) (2 diffs)
• trunk/webmin/lbs/help/index.html (modified) (1 diff)
• trunk/webmin/lbs/imgbase.cgi (modified) (2 diffs)
• trunk/webmin/lbs/lang/en (modified) (1 diff)
• trunk/webmin/lbs/lang/fr (modified) (1 diff)
• trunk/webmin/lbs/lbs.pl (modified) (6 diffs)
• trunk/webmin/lbs/log.cgi (modified) (3 diffs)
• trunk/webmin/lbs/lrs-admin (added)
• trunk/webmin/lbs/module.info (modified) (1 diff)
• trunk/webmin/lbs/rename.cgi (modified) (2 diffs)
• trunk/webmin/lbs/tmpl/en/basetolocal.tpl (added)
• trunk/webmin/lbs/tmpl/fr/basetolocal.tpl (added)

trunk/webmin/lbs/cron/edit_cron.cgi

@@ -73 +73 @@
-        $job->{'command'} =~ s/\\%/\0/g;
-        $job->{'command'} =~ s/$config{'wake'}\s+//g;
+        $job->{'command'} =~ s/>\/dev\/null//g;
-        @lines = split(/%/ , $job->{'command'});
-        if ($in{ext_cmd} ne "") {

trunk/webmin/lbs/cron/index.cgi

@@ -78 +78 @@
-                        local $cmd = $job->{'command'};
-                        $cmd =~ s/$config{'wake'}/Wake On Lan, /;
+                        $cmd =~ s/>.dev.null//;
-                        $cmd =~ s/\\%/\0/g; $cmd =~ s/%.*$//;
-                        $cmd =~ s/\0/%/g;

trunk/webmin/lbs/cron/save_cron.cgi

@@ -38 +38 @@
-$in{cmd} =~ s/%/\\%/g;
-$in{cmd} =~ s/[\n\r ]+/ /g;
-
+." >/dev/null"
-$job->{'active'} = $in{'active'};
-$job->{'command'} = $in{'cmd'};

trunk/webmin/lbs/debian/changelog

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

trunk/webmin/lbs/delete.cgi

@@ -96 +96 @@
-                $mesg = text("msg_delete_ok",$name,$mac);
-                lbs_common::print_header( $text{'tit_delete'}, "index", $VERSION);
-
+
+
+
+
+
+
+
+
+
-
-                print "<h2>$mesg</h2>\n" ;

trunk/webmin/lbs/help/imgbase.fr.html

@@ -37 +37 @@
-    de configuration des machines utilisatrices.
-    </li>
+    <li><b>Conv en Locale</b><br>
+    Permet de convertir une image partagée en image locale, si elle n'est
+    pas utilisée par plus d'un client.
+    </li>
-</ul>
-

trunk/webmin/lbs/help/imgbase.html

@@ -19 +19 @@
-
-<p>
+The <b>Used by</b> column is useful to know which host(s) are currently
+using a particular image in its boot menu.
+Note that each host name (if any) in this column is a link to this host
+local images configuration.
+</p>
+
+<p>
-In the <b>Remove</b> column are links to completely erase one or more images.
-Note that you can't remove an image if it is currently used in a host's boot
@@ -26 +33 @@
-
-<p>
-
-
-
-
+
+
-</p>

trunk/webmin/lbs/help/index.html

@@ -12 +12 @@
-On <b>LRS</b> homepage, an array of <b>registered hosts</b> is displayed.
-It contains a list of all hosts which have been registered on the LRS server.
-
+<
-configuration.
-

trunk/webmin/lbs/imgbase.cgi

@@ -26 +26 @@
-
-# ... and vars
-
+ $current_lang
-lbs_common::init_lbs_conf() or exit(0) ;
-
@@ -85 +85 @@
-        footer("", $text{'index'}) ;
-
+} elsif (exists($in{'imgtolocal'}) and exists($in{'apply'}) and exists($in{'image'})) {
+
+        # move the data
+        my $from = $lbs_home . "/imgbase/". $in{'image'};
+        my $to = $lbs_home . "/images/". lbs_common::mac_remove_columns($in{'imgtolocal'});
+
+        # new name
+        my $lref = &read_file_lines($to."/COPYNUM");
+
+        my $nextref = $$lref[0];
+        $nextref =~ s/[^0-9]+//;
+        $$lref[0] = ($nextref + 1);     # increment COPYNUM
+        &flush_file_lines();
+
+        if ( -l $to."/".$in{'image'} ) {
+                # the shared image is in the menu 
+                unlink($to."/".$in{'image'});
+                system("mv $from $to ; cd $to ; mv ".$in{'image'}." Local-$nextref");
+                # modify header.lst*
+                foreach my $name ("/header.lst", "/header.lst.wol") {
+                        my $href = &read_file_lines($to.$name);
+                        for (@$href) {
+                                s/=$in{'image'}\//=Local-$nextref\//;
+                                s/=$in{'image'}$/=Local-$nextref/;
+                        }
+                        &flush_file_lines();
+                }
+                
+        } else {
+                # the shared image is not in any menu
+                system("mv $from $to ; cd $to ; mv ".$in{'image'}." Local-$nextref");
+        }
+
+        redirect("imgbase.cgi") ;
+        exit(0) ;
+        
+
+} elsif (exists($in{'imgtolocal'})) {
+    
+        my $options;
+        my %einfo;
+        
+        my $etherfile = $lbs_home . "/etc/ether" ;
+        etherLoad($etherfile, \%einfo) or error( lbsGetError() ) ;
+
+        # the header
+        lbs_common::print_header( $text{'tit_imgbase'}, "imgbase", $VERSION);
+        lbs_common::print_html_tabs(['list_of_machines', 'shared_images']);
+        
+        if (exists($in{'mac'})) {
+                my $name = etherGetNameByMac(\%einfo, $in{'mac'});
+                $options = "<option value=\"$in{mac}\">$name</option>";
+        } else {
+                my @all = etherGetNames(\%einfo);
+                foreach my $n (@all) {
+                        my $mac = etherGetMacByName(\%einfo, $n);
+                        $options .= "<option value=\"$mac\">$n</option>\n";
+                }
+        }
+        
+        # then the main part
+        my $t = new Qtpl("./tmpl/$current_lang/basetolocal.tpl");
+        $t->assign('IMAGE', $in{'imgtolocal'});
+        $t->assign('OPTIONS', $options);
+        $t->parse('all');
+        $t->out('all');
+        
+        # end of tabs                                                           
+        lbs_common::print_end_menu();                                           
+        lbs_common::print_end_menu();                                           
+        # footer                                                                
+        lbs_common::footer("", $text{'index'}) ;
+
-} else {                                                                # show images array
-        imgBaseUsage($lbs_home, \%busage) or error(lbsGetError()) ;

trunk/webmin/lbs/lang/en

@@ -68 +68 @@
-lab_commands=Commandss
-lab_comments=Comments
+lab_convtolocal=Conv. to Local
-lab_copyfile=Enter the name of the copy of $1
-lab_createfile=Enter the name of the file to create

trunk/webmin/lbs/lang/fr

@@ -68 +68 @@
-lab_commands=Commandes
-lab_comments=Commentaires
+lab_convtolocal=Conv. en Locale
-lab_copyfile=Indiquez le nom de la copie de $1
-lab_createfile=Indiquez le nom du fichier à créer

trunk/webmin/lbs/lbs.pl

@@ -58 +58 @@
-my $etherfile = $lbs_home . "/etc/ether" ;
-my $img_base = $lbs_home."/imgbase";
-$btitle,$bdesc,$bstat,
-@sizes,@burn,@details
+ $btitle, $bdesc, $bstat, 
+ @sizes, @burn, @details, @lsconv
-my %tabattr ;
-
@@ -65 +65 @@
-etherLoad($etherfile, \%einfo) or error( lbsGetError() ) ;
-
-
-
+
-my @toprow = (
-        $text{'lab_baseimg'},
@@ -74 +73 @@
-        $text{'lab_size'},
-        $text{'lab_rm'},
+        $text{'lab_convtolocal'},
-        $text{'lab_burn'},
-        $text{'lab_details'},
@@ -82 +82 @@
-                my $size = scalar(@ls);
-                my @uls=();
+                my $first = $ls[0];
-                
-                push @images, $k ;
-
-
+
+
+
-                        $delicon = "trash.gif";
+                        $mvicon = "up1.gif";
+                        $delref = "<a href=\"imgbase.cgi?imgbase=".urlize($k)."\">";
+                        $mvref = "<a href=\"imgbase.cgi?imgtolocal=".urlize($k)."\">";
-                        @uls = ( $text{"lab_none"} ) ;
-                } else {                                                # else we built an anchor list
-                        $delicon = "cross.gif";
+                        $mvicon = "cross.gif";
+                        $delref = "";
+                        $mvref = "";
-                        foreach my $i (@ls) 
-                          {
@@ -98 +106 @@
-                          }
-                }
+
+                if ($size == 1 && $k ne "Base-0") {
+                        my $sname = $first;
+                        $sname =~ s/.*\///;
+                        $mvicon = "up1.gif";
+                        $mvref = "<a href=\"imgbase.cgi?imgtolocal=".urlize($k).
+                                "&mac=".etherGetMacByName(\%einfo, $first)."\">";
+                }
-        
-                push @lsused, "<small>" . join("<br>", @uls) . "</small>" ;# which we attach with som "<br>" between each
-
-                push @lsdel,
-
-
-
-
-
+
-                        ."border=no alt=\""
-                        .$text{'lab_rm'}
+                        ." $k\"></a></center>" ;
+
+                push @lsconv,
+                        "<center>$mvref<img src=\"images/$mvicon\" "
+                        ."border=no alt=\""
+                        .$text{'lab_convtolocal'}
-                        ." $k\"></a></center>" ;
-
@@ -129 +147 @@
-        }
-
-
+lsconv], [@
-        lbs_common::lolRotate(\@lol) ;
-  

trunk/webmin/lbs/log.cgi

@@ -138 +138 @@
-              );
-
-E
+F
-    # add backup progress info
-    my $name = $2;
@@ -153 +153 @@
-  }
-
-E
+F
-    # add restoration progress info
-    my $name = $2;
@@ -165 +165 @@
-  }
-
-E
+F
-    # add restoration progress info
-    my $name = $2;

trunk/webmin/lbs/module.info

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

trunk/webmin/lbs/rename.cgi

@@ -84 +84 @@
-        $t =~ s|[^a-z0-9\.\-\+]|_|gi;   # translate unauthorized characters into underscores
-
+        if ($t eq "") { error($text{'err_name_mandat'}); }
+
-        # group parsing:
-        chomp($g);                      # remove leading and trailing spaces
@@ -109 +111 @@
-        # rename for other modules
-        # ...will be moved to lbs_common soon
-
+bs", "l
-                if (-x "../$mod/lrs-admin") {
-                        system("unset SERVER_SOFTWARE;unset SERVER_NAME;unset GATEWAY_INTERFACE;unset REQUEST_METHOD;unset SCRIPT_FILENAME;unset QUERY_STRING;../$mod/lrs-admin rename $mac $old $t >/dev/null");