Changeset 131

Timestamp:

03/01/06 15:17:43 (3 years ago)

Author:

ludo

Message:

v 1.4.8: fixed some problems when profile=all (from r3097)

Files:

• trunk/webmin/lbs_common/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs_common/lang/en (modified) (1 diff)
• trunk/webmin/lbs_common/lang/fr (modified) (1 diff)
• trunk/webmin/lbs_common/lbs_common.pl (modified) (8 diffs)
• trunk/webmin/lbs_common/lbs_common_priv.pl (modified) (2 diffs)
• trunk/webmin/lbs_common/module.info (modified) (1 diff)

trunk/webmin/lbs_common/debian/changelog

@@ -1 @@
-7
+8
-
-  * New release. See SVN logs for details

trunk/webmin/lbs_common/lang/en

@@ -147 +147 @@
-err_mac_used=MAC address already declared
-err_name_mandat=The name is mandatory.
-err_name_inval='$1': Invalid name.
-err_name_usedby=Name '$1' is already used by host '$2'.
-err_adminid_mandat=The admin ID is mandatory.
-err_ip_inval='$1': Invalid IP address.

trunk/webmin/lbs_common/lang/fr

@@ -145 +145 @@
-err_mac_used=Adresse MAC déjà déclarée
-err_name_mandat=Le nom est obligatoire.
-err_name_inval='$1': Format de nom invalide.
-err_name_usedby=Le nom '$1' est déjà utilisé par la machine '$2'.
-err_adminid_mandat=Le mot de passe d'identification est obligatoire.
-err_ip_inval='$1': Adresse IP invalide.

trunk/webmin/lbs_common/lbs_common.pl

@@ -308 +308 @@
-                                                $todisplay = 1 if ($toreplaces{'mac_with_dot'} && $mac && $mac ne "");
-                                                $todisplay = 1 if ($toreplaces{'mac_with_dot'} && $mac_with_dot && $mac_with_dot ne "");
- && $toreplaces{'group'} && ( $group ne "" || $profile ne "") 
+
-                                                $todisplay = 1 if (lc($menu{$onglet}{'DATAS'}{'dont_shade'}) eq "y");
-                                                
@@ -327 +327 @@
-                                                                if $url =~ m/%group%/;           
-                                                        $url =~ s/(.*)%profile%(.*)/$1$profile$2/                       # perhaps an "host" arg given ?
-           
+
-                                                        $template->assign('URL', $url);
-                                                        if ($label) {                                                   # shown only if there is a label
@@ -619 +619 @@
-                # first tab is selected
-                $template->assign('IS_SELECTED', "selected");
-all
+
-                $template->assign('PROFIL', text("lab_all"));
-                $template->parse('mainlist.profils.profil');
@@ -636 +636 @@
-                $template->parse('mainlist.profils.profil');
-                
-all
+
-                $profile_name = text("lab_all");
-        } elsif ( (lc($in{'profile'}) eq "none") ) {
@@ -654 +654 @@
-                # leading tabs are not selected
-                $template->assign('IS_SELECTED', "unselected");
-all
+
-                $template->assign('PROFIL', text("lab_all"));
-                $template->parse('mainlist.profils.profil');
@@ -687 +687 @@
-                
-                $template->assign('IS_SELECTED', "unselected");
-all
+
-                $template->assign('PROFIL', text("lab_all"));
-                $template->parse('mainlist.profils.profil');
@@ -1135 +1135 @@
-#
-sub checkforspace () {
-
+P
-    if ($run < 100)
-        {
@@ -1402 +1402 @@
-# return the available space
-sub get_server_free_space {
-
+P
-}
-

trunk/webmin/lbs_common/lbs_common_priv.pl

@@ -17 +17 @@
-    if ($in{group}) {
-      my $c = new CGI::Cookie(-name => 'group',
-$in{group}
+"$in{group}"
-                                  -expires => '+1M'
-                                 );
-      print "Set-Cookie: $c\n";
-    }
-
+
+
-      my $c = new CGI::Cookie(-name => 'profile',
-$in{profile}
+"$in{profile}"
-                                  -expires => '+1M'
-                                 );
@@ -39 +40 @@
-  my $in = %{$_[0]};
-
-group
+'group'
-    if ( defined($cookies{'group'}) ) {
-      $in{'group'} = $cookies{'group'}->value;
-    }
-  }
-$in{profile}
+ defined($in{'profile'}) 
-    if ( defined($cookies{'profile'}) ) {
-      $in{'profile'} = $cookies{'profile'}->value;

trunk/webmin/lbs_common/module.info

@@ -5 +5 @@
-name=lbs_common
-depends=0.94
-7
+8