upload with perl5

diff --git a/.gitignore b/.gitignore
index 8f8c470..72ec938 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 backoffice/api/reports/*
 backoffice/api/tmp/*
+backoffice/api/lib/perl5/*
 backoffice/tmp/*
\ No newline at end of file

diff --git a/.htaccess b/.htaccess
index 07c817f..82289e5 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,12 +1,10 @@
-#RewriteEngine On 
-#RewriteCond %{SERVER_PORT} 80 
-#RewriteRule ^(.*)$ https://www.dks.lu/$1 [R,L]
+
 #AddType application/octet-stream .pdf
 RewriteEngine on
-#dev-mode begin
+
 DirectoryIndex  index.cgi  index.html
 AddHandler cgi-script .cgi
-#devmode end
+
 #RewriteBase /
 
 RewriteCond %{REQUEST_FILENAME} !-f

diff --git a/backoffice/api/lib/dksapp.pm b/backoffice/api/lib/dksapp.pm
index 4a691e6..ac1e3be 100644 (file)
--- a/backoffice/api/lib/dksapp.pm
+++ b/backoffice/api/lib/dksapp.pm
@@ -2,8 +2,9 @@ package dksapp;
 
 use strict;
 
-use lib ('.');
+use lib ('./lib/perl5');
 use lib ('./lib');
+use lib ('./');
 use File::Basename;
 use Getopt::Long;
 use dksdb;

diff --git a/backoffice/api/lib/dksconfig.pm b/backoffice/api/lib/dksconfig.pm
index a3b8cf1..13cbc67 100644 (file)
--- a/backoffice/api/lib/dksconfig.pm
+++ b/backoffice/api/lib/dksconfig.pm
@@ -1,6 +1,9 @@
 package dksconfig;
 
 use strict;
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
 use File::Basename;
 use Exporter 'import';
 our @EXPORT_OK = qw($sitecfg);
@@ -9,8 +12,8 @@ our @EXPORT_OK = qw($sitecfg);
 our $sitecfg ={
   cookiename => 'juridig',
   dbtype => 'PgPP',
-  #dsn => 'DBI:PgPP:dbname=juridiglu_db;host=sql629.your-server.de',
-  dsn => 'DBI:PgPP:dbname=juridiglu_db;host=localhost',
+  dsn => 'DBI:PgPP:dbname=juridiglu_db;host=sql629.your-server.de',
+  #dsn => 'DBI:PgPP:dbname=juridiglu_db;host=localhost',
   dbuser => 'juridiglu_user',
   dbpassword => 'hfdR2C9pK9rQV4cH',
   page => 'index.tt',

diff --git a/backoffice/api/lib/dksdb.pm b/backoffice/api/lib/dksdb.pm
index 52d5dbb..5ebf275 100644 (file)
--- a/backoffice/api/lib/dksdb.pm
+++ b/backoffice/api/lib/dksdb.pm
@@ -1,6 +1,10 @@
 package dksdb;
 
 use strict;
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
+BEGIN { $ENV{DBI_PUREPERL} = 2 }
 use DBI;
 use File::Basename;
 use Data::Dumper;

diff --git a/backoffice/api/lib/dksinvoice.pm b/backoffice/api/lib/dksinvoice.pm
index 4367235..fab7046 100644 (file)
--- a/backoffice/api/lib/dksinvoice.pm
+++ b/backoffice/api/lib/dksinvoice.pm
@@ -1,10 +1,12 @@
 package dksinvoice;
 
 use strict;
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
 use POSIX qw(strftime);
 use File::Basename;
-use lib ('./');
-use lib ('./lib');
+
 use dksdb;
 use dksreport;
 use dksapp;

diff --git a/backoffice/api/lib/dksreport.pm b/backoffice/api/lib/dksreport.pm
index 9394ae5..97da1f3 100644 (file)
--- a/backoffice/api/lib/dksreport.pm
+++ b/backoffice/api/lib/dksreport.pm
@@ -1,8 +1,9 @@
 package dksreport;
 
 use strict;
-use lib ('.');
+use lib ('./lib/perl5');
 use lib ('./lib');
+use lib ('./');
 use File::Basename;
 use Getopt::Long;
 use Data::Dumper;

diff --git a/backoffice/api/lib/dkssavefile.pm b/backoffice/api/lib/dkssavefile.pm
index 7bb20fd..55c260f 100644 (file)
--- a/backoffice/api/lib/dkssavefile.pm
+++ b/backoffice/api/lib/dkssavefile.pm
@@ -2,6 +2,9 @@ package dkssavefile;
 
 
 use strict;
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
 use MIME::Base64;
 use MIME::Types;
 use URI;

diff --git a/backoffice/api/lib/sendemail.pm b/backoffice/api/lib/sendemail.pm
index 004f5c0..2a23278 100644 (file)
--- a/backoffice/api/lib/sendemail.pm
+++ b/backoffice/api/lib/sendemail.pm
@@ -1,7 +1,9 @@
 package sendemail;
 
 use strict;
-
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
 use Data::Dumper;
 use File::Basename qw/dirname basename/;
 use dksdb;

diff --git a/backoffice/api/lib/session.pm b/backoffice/api/lib/session.pm
index a708940..5d2af22 100644 (file)
--- a/backoffice/api/lib/session.pm
+++ b/backoffice/api/lib/session.pm
@@ -1,8 +1,9 @@
 package session;
 
 use strict;
-use lib ('.');
-use lib ('./api/lib');
+use lib ('./lib/perl5');
+use lib ('./lib');
+use lib ('./');
 use File::Basename;
 use Digest::SHA::PurePerl qw(sha256_hex);
 

diff --git a/backoffice/api/process.cgi b/backoffice/api/process.cgi
index 9288ced..3a1f0f5 100644 (file)
--- a/backoffice/api/process.cgi
+++ b/backoffice/api/process.cgi
@@ -1,8 +1,8 @@
-#!/home/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl
+#!/usr/bin/perl
 
 use strict;
-# use lib ('/home/kilian/perl5/lib/perl5');
-#use lib ('./lib/perl5');
+
+use lib ('./lib/perl5');
 use lib ('./lib');
 use CGI;
 use CGI::Cookie;

diff --git a/backoffice/index.cgi b/backoffice/index.cgi
index 4497c41..2629267 100644 (file)
--- a/backoffice/index.cgi
+++ b/backoffice/index.cgi
@@ -1,11 +1,11 @@
-#!/home/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl
+#!/usr/bin/perl
 
 use strict;
+use lib ('api/lib/perl5');
 use lib ('api/lib');
-
 use File::Basename qw/dirname basename/;
 use Template;
-#use Template::Constants qw( :debug );
+# use Template::Constants qw( :debug );
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use CGI::Cookie;
@@ -119,9 +119,10 @@ if ($p->{sid} ne ""){
 # } 
 # #END - Browser Blocking
 print $cgi->header(-type=>'text/html', -charset=>"utf-8",-cookie => $cookie);
+# print dirname($ENV{"SCRIPT_FILENAME"});
 
 my $template = Template->new({INCLUDE_PATH => [dirname($ENV{"SCRIPT_FILENAME"}).'/tmpl']});
-#, DEBUG => DEBUG_PARSER | DEBUG_PROVIDER}
+#, DEBUG => DEBUG_ALL}
 
 my @lv = split(/\//,$vars->{filepath});
 my $absnum = scalar(@lv)-1;
@@ -159,9 +160,9 @@ $template->process($skl,$vars) || die "Template process failed: ", $template->er
 # }
 
 #  print Dumper($vars);
-print "/*";
+#print "/*";
 # print Dumper($p);
-print Dumper($vars);
+#§print Dumper($vars);
 # print Dumper($sess);
-print "*/";
+#print "*/";
 

diff --git a/backoffice/tmpl/block/sidebar.tt b/backoffice/tmpl/block/sidebar.tt
index c29694d..8cfaf81 100644 (file)
--- a/backoffice/tmpl/block/sidebar.tt
+++ b/backoffice/tmpl/block/sidebar.tt
@@ -1,5 +1,5 @@
 
-[% viewapps = dksdb.prepare("select ap.id,ap.app,ap.description,ap.name,acc.publicenabled,acc.expiration, to_char(expiration,'dd.mm.yyyy') as dspexpiration from apps ap left join appaccess acc on (ap.id=acc.id_app) where acc.id_user=? and acc.expiration >= CURRENT_DATE;")%]
+[% viewapps = dksdb.prepare("select ap.id,ap.app,ap.description,ap.name,acc.publicenabled,acc.expiration, to_char(expiration,'dd.mm.yyyy') as dspexpiration from apps ap left join appaccess acc on (ap.id=acc.id_app) where acc.id_user=? and acc.expiration >= CURRENT_DATE and ap.activated=true;")%]
 <nav class="sidebar sidebar-offcanvas" id="sidebar">
         <ul class="nav">
           <!-- <li class="nav-item">

diff --git a/dev/lib.old/testfiledata.pl b/dev/lib.old/testfiledata.pl
index 7b8daae..87624b8 100644 (file)
--- a/dev/lib.old/testfiledata.pl
+++ b/dev/lib.old/testfiledata.pl
@@ -1,4 +1,4 @@
-#!/home/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl
+#!/usr/bin/perl
 
 use strict;
 # use lib ('/home/kilian/perl5/lib/perl5');

diff --git a/index.cgi b/index.cgi
index aca4787..c7621fb 100644 (file)
--- a/index.cgi
+++ b/index.cgi
@@ -1,16 +1,16 @@
-#!/home/kilian/perl5/perlbrew/perls/perl-5.24.1/bin/perl
+#!/usr/bin/perl
 
 use strict;
-
+use lib ('backoffice/api/lib/perl5');
 use lib ('backoffice/api/lib');
 use File::Basename qw/dirname basename/;
 
-use Data::Dumper;
+# use Data::Dumper;
 use Template;
+# use Template::Constants qw( :debug );
 use CGI;
 use CGI::Cookie;
 
-# use Data::Dumper;
 use JSON::PP;
 use dksconfig qw/$sitecfg/;
 
@@ -82,4 +82,5 @@ $vars->{pagename} =~ s/\.tt$//;
 #$vars->{requri} = $ENV{REQUEST_URI};
 $template->process($skl,$vars) || die "Template process failed: ", $template->error(), "\n";
 #print Dumper($skl);
+#print Dumper(@INC);
 # print "/*".Dumper($vars)."*/";