Commit e00a6f7d authored by Xavier Guimard's avatar Xavier Guimard

LEMONLDAP::NG : new release 0.802 : bug in File.pm (Closes: #306760)


git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/trunk@67 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 76801064
......@@ -116,6 +116,7 @@ sub setConf {
$cfgNum++;
$args->{_n_conf} = $cfgNum;
$refLocalStorage->set( "conf", $args, $EXPIRES_NEVER );
$class->lmLog( "$class: store configuration " . $args->{cfgNum}, 'debug' );
$class->globalInit($args);
}
......@@ -126,6 +127,7 @@ sub getConf {
$class->lmLog( "$class: Unable to load configuration", 'error' );
return SERVER_ERROR;
}
$class->lmLog( "$class: get configuration " . $tmp->{cfgNum}, 'debug' );
return $tmp;
}
......@@ -134,6 +136,7 @@ sub refresh($$) {
$class->lmLog( "$class: request for configuration reload", 'info' );
$r->handler("perl-script");
if ( $class->globalConfUpdate($r) == OK ) {
# $r->push_handlers( PerlHandler => sub { $r = shift; $r->send_http_headers; $r->print("OK"); OK } );
$r->push_handlers( PerlHandler => sub { OK } );
}
else {
......
Revision history for Perl extension Lemonldap::NG::Manager.
0.511 Sun Mar 11 8:24:32
- Bug correction: lock does not work with File.pm
(Closes: #306760 / forge.objectweb.org)
0.51 Fri Mar 9 7:16:42
- Bug corrections issued from test in real life.
- More help in english
......
Changes
example/apply.conf
example/imgs/_customers.gif
example/imgs/blank.gif
example/imgs/book.gif
......
......@@ -9,6 +9,7 @@ my $h = new Lemonldap::NG::Manager(
dirName => "__DIR__/conf/",
},
dhtmlXTreeImageLocation => "/imgs/",
applyConfFile => '__DIR__/manager/apply.conf',
# jsFile => /path/to/lemonldap-ng-manager.js,
}
......
......@@ -13,7 +13,7 @@ use LWP::UserAgent;
our @ISA = qw(Lemonldap::NG::Manager::Base);
our $VERSION = '0.51';
our $VERSION = '0.511';
sub new {
my ( $class, $args ) = @_;
......
......@@ -3,7 +3,7 @@ package Lemonldap::NG::Manager::Conf::File;
use strict;
use Lemonldap::NG::Manager::Conf::Constants;
our $VERSION = 0.2;
our $VERSION = 0.21;
sub prereq {
my $self = shift;
......@@ -41,8 +41,8 @@ sub lock {
sleep 2;
return 0 if( $self->isLocked );
}
unless( open F, $self->{dirName} . "/lmConf.lock" ) {
print STDERR "Unable to lock\n";
unless( open F, ">".$self->{dirName} . "/lmConf.lock" ) {
print STDERR "Unable to lock (".$self->{dirName}."/lmConf.lock)\n";
return 0;
}
print F $$;
......
......@@ -91,7 +91,7 @@ d&eacute;but ou fin de mot).</p>
<p>La variable export&eacute;e \$groups est une cha&icirc;ne de caract&egrave;res compos&eacute;s de tous les
noms de groupes auquel l'utilisateur connect&eacute; appartient (c'est &agrave; dire les
noms de groupe pour lesquels l'expression est vraie.</p>
noms de groupe pour lesquels l'expression est vraie).</p>
EOT
}
......
......@@ -183,7 +183,7 @@ function onNodeSelect(nodeId) {
}
}
if(tree.getUserData(nodeId,"modif")=='both') but+=button('$text{deleteNode}','deleteNode',nodeId);
but+=button('$text{saveConf}','saveConf',nodeId);
but+=button('$text{saveConf}','saveConf',nodeId);
if(nodeId == 'root') but+=button('$text{prevConf}','prevConf',nodeId)
+button('$text{nextConf}','nextConf',nodeId)
+button('$text{lastConf}','lastConf',nodeId);
......
......@@ -80,7 +80,7 @@ sub fr {
invalidLine => 'Ligne invalide',
error => 'Erreur',
result => 'R&eacute;sultat',
changesAppliedLater => "Changements seront actif d'ici 10 minutes'",
changesAppliedLater => "Les changements seront effectifs d'ici 10 minutes",
prevConf => 'Pr&eacute;c&eacute;dente',
nextConf => 'Suivante',
lastConf => 'Derni&egrave;re',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment