oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 7.1.4 changes

Browse source
This commit is contained in:
JT Smith 2006-11-03 04:36:13 +00:00
parent 3d878c09c7
commit aeba6ec83c
18 changed files with 92 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Config.pm
View file

@ -132,9 +132,9 @@ sub delete {
my $self = shift;
my $param = shift;
delete $self->{_config}{$param};
open(FILE,">".$self->getWebguiRoot.'/etc/'.$self->getFilename);
print FILE "# config-file-type: JSON 1\n".objToJson($self->{_config}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1});
close(FILE);
open(my $FILE,">",$self->getWebguiRoot.'/etc/'.$self->getFilename);
print $FILE "# config-file-type: JSON 1\n".objToJson($self->{_config}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1});
close($FILE);
}
#-------------------------------------------------------------------
@ -334,11 +334,11 @@ sub new {
return $config{$filename};
} else {
my $json = "";
if (open(FILE,"<".$webguiPath.'/etc/'.$filename)) {
while (my $line = <FILE>) {
if (open(my $FILE,"<",$webguiPath.'/etc/'.$filename)) {
while (my $line = <$FILE>) {
$json .= $line unless ($line =~ /^\s*#/);
}
close(FILE);
close($FILE);
my $conf = jsonToObj($json);
my $self = {_webguiRoot=>$webguiPath, _configFile=>$filename, _config=>$conf};
bless $self, $class;
@ -403,9 +403,9 @@ sub set {
my $param = shift;
my $value = shift;
$self->{_config}{$param} = $value;
open(FILE,">".$self->getWebguiRoot.'/etc/'.$self->getFilename);
print FILE "# config-file-type: JSON 1\n".objToJson($self->{_config}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1});
close(FILE);
open(my $FILE,">",$self->getWebguiRoot.'/etc/'.$self->getFilename);
print $FILE "# config-file-type: JSON 1\n".objToJson($self->{_config}, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1});
close($FILE);
}
1;