X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FInifile.pm;h=30afc66c1a4731030e63f8c259aee66ad21695d0;hb=991369b17d679e2855f4d5086d0b9769dc2ae1aa;hp=eae4f49e46ea62d8e26ed4600ca2ea6431274344;hpb=ba863fd67776403dcf9de6b1141509a48a4b7204;p=kivitendo-erp.git

diff --git a/SL/Inifile.pm b/SL/Inifile.pm
index eae4f49e4..30afc66c1 100644
--- a/SL/Inifile.pm
+++ b/SL/Inifile.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #=====================================================================
 #
 # routines to retrieve / manipulate win ini style files
@@ -35,63 +36,76 @@
 
 package Inifile;
 
+use IO::File;
+
+use strict;
+
 sub new {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
-  my ($type, $file, $level) = @_;
+  my ($type, $file, %options) = @_;
 
   my $id = "";
-  my $skip;
-
-  local *FH;
+  my $cur;
 
-  $type = ref($self) || $self;
+  my $self = { FILE => $file, ORDER => [] };
 
-  open FH, "$file" or Form->error("$file : $!");
+  open my $fh, "$file" or $::form->error("$file : $!");
 
-  while (<FH>) {
-    next if /^(#|;|\s)/;
-    last if /^\./;
+  for (<$fh>) {
+    chomp;
 
-    chop;
+    if (!$options{verbatim}) {
+      # strip comments
+      # remove any trailing whitespace
+      s/\s*#.*$//;
+      s/^\s*//;
+    } else {
+      next if m/^\s*#/;
+    }
 
-    # strip comments
-    s/\s*(#|;).*//g;
+    next unless $_;
 
-    # remove any trailing whitespace
-    s/^\s*(.*?)\s*$/$1/;
+    if (m/^\[(.*)\]$/) {
+      $id = $1;
+      $cur = $self->{$1} ||= { };
 
-    if (/^\[/) {
-      s/(\[|\])//g;
+      push @{ $self->{ORDER} }, $1;
+    } else {
+      # add key=value to $id
+      my ($key, $value) = split m/=/, $_, 2;
 
-      $id = $_;
+      $cur->{$key} = $value;
+    }
 
-      # if there is a level skip
-      if ($skip = ($id !~ /^$level/)) {
-        next;
-      }
+  }
+  close $fh;
 
-      push @{ $self->{ORDER} }, $_;
+  $main::lxdebug->leave_sub(2);
 
-      next;
+  return bless $self, $type;
+}
 
-    }
+sub write {
+  $main::lxdebug->enter_sub();
 
-    if (!$skip) {
+  my ($self) = @_;
 
-      # add key=value to $id
-      my ($key, $value) = split /=/, $_, 2;
+  my $file = $self->{FILE};
+  my $fh   = IO::File->new($file, "w") || $::form->error("$file : $!");
 
-      $self->{$id}{$key} = $value;
-    }
+  foreach my $section_name (sort keys %{ $self }) {
+    next if $section_name =~ m/^[A-Z]+$/;
 
+    my $section = $self->{$section_name};
+    print $fh "[${section_name}]\n";
+    map { print $fh "${_}=$section->{$_}\n" } sort keys %{ $section };
+    print $fh "\n";
   }
-  close FH;
 
-  $main::lxdebug->leave_sub();
+  $fh->close();
 
-  bless $self, $type;
+  $main::lxdebug->leave_sub();
 }
 
 1;
-