projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master', remote branch 'origin'
[kivitendo-erp.git]
/
scripts
/
spawn_oo.pl
diff --git
a/scripts/spawn_oo.pl
b/scripts/spawn_oo.pl
index
387961e
..
d0e8f78
100755
(executable)
--- a/
scripts/spawn_oo.pl
+++ b/
scripts/spawn_oo.pl
@@
-1,5
+1,10
@@
#!/usr/bin/perl
#!/usr/bin/perl
+BEGIN {
+ unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML).
+ push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version.
+}
+
use DBI;
use Data::Dumper;
use DBI;
use Data::Dumper;
@@
-8,25
+13,18
@@
use SL::LXDebug;
use SL::Form;
use SL::Template;
use SL::Form;
use SL::Template;
-$userspath = "users";
-$templates = "templates";
-$memberfile = "users/members";
$sendmail = "| /usr/sbin/sendmail -t";
$| = 1;
$lxdebug = LXDebug->new();
$sendmail = "| /usr/sbin/sendmail -t";
$| = 1;
$lxdebug = LXDebug->new();
-require "lx-erp.conf";
-
$form = new Form;
$form->{"script"} = "oe.pl";
$form = new Form;
$form->{"script"} = "oe.pl";
-$form->{"path"} = "bin/mozilla";
-
$ENV{'HOME'} = getcwd() . "/$userspath";
$ENV{'HOME'} = getcwd() . "/$userspath";
-my $template =
OpenDocumentTemplate->new("", $form, \%myconfig,
$userspath);
+my $template =
SL::Template::create(type => 'OpenDocument', file_name => '', form => $form, myconfig => \%myconfig, userspath =>
$userspath);
if (@ARGV && ($ARGV[0] eq "-r")) {
system("ps auxww | " .
if (@ARGV && ($ARGV[0] eq "-r")) {
system("ps auxww | " .