From: kilian Date: Wed, 14 Oct 2020 13:57:02 +0000 (+0200) Subject: v20201014 cleaned X-Git-Tag: 0.7beta~4 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=f8481f8f1cbb01fcd28cf764d6a516c80f4278b9;p=invoicejournal.git v20201014 cleaned --- diff --git a/.gitignore b/.gitignore index c9aa1e7..d33db0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ -OLD/ -server/error.log -server/access.log -node_modules1/ -node_modules/ -server/data/invoices/* -server/data/statements/* -server/data/tmp/* \ No newline at end of file +OLD/* +release-builds/* +desktopapp/node_modules/* \ No newline at end of file diff --git a/data/dks.json b/data/dks.json new file mode 100644 index 0000000..3f48fcb --- /dev/null +++ b/data/dks.json @@ -0,0 +1,4 @@ +{ + "datapath":"//home-backup/mirror/invoicejournal/dks", + "database":"dks.sqlite" +} \ No newline at end of file diff --git a/data/invoicejournal.json b/data/invoicejournal.json new file mode 100644 index 0000000..d153d83 --- /dev/null +++ b/data/invoicejournal.json @@ -0,0 +1,6 @@ +{ + "host":"http://home-backup:8080/invoicejournal", + "type":"remote", + "mailapp":"C:\\Program Files (x86)\\Mozilla Thunderbird\\thunderbird.exe", + "dataset":"dks" +} \ No newline at end of file diff --git a/desktopapp/img/Euro.svg b/desktopapp/img/Euro.svg deleted file mode 100644 index 80d3d88..0000000 --- a/desktopapp/img/Euro.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/calendar.svg b/desktopapp/img/calendar.svg deleted file mode 100644 index 2e7a8a2..0000000 --- a/desktopapp/img/calendar.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/down.svg b/desktopapp/img/down.svg deleted file mode 100644 index f52b416..0000000 --- a/desktopapp/img/down.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/favicon.png b/desktopapp/img/favicon.png deleted file mode 100644 index 96d07ae..0000000 Binary files a/desktopapp/img/favicon.png and /dev/null differ diff --git a/desktopapp/img/icons/Add.svg b/desktopapp/img/icons/Add.svg deleted file mode 100644 index 28fd68a..0000000 --- a/desktopapp/img/icons/Add.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Add_white.svg b/desktopapp/img/icons/Add_white.svg deleted file mode 100644 index cd3e5fc..0000000 --- a/desktopapp/img/icons/Add_white.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Apps.svg b/desktopapp/img/icons/Apps.svg deleted file mode 100644 index cc7d380..0000000 --- a/desktopapp/img/icons/Apps.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Apps_white.svg b/desktopapp/img/icons/Apps_white.svg deleted file mode 100644 index 74de289..0000000 --- a/desktopapp/img/icons/Apps_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Backup.svg b/desktopapp/img/icons/Backup.svg deleted file mode 100644 index e6820d2..0000000 --- a/desktopapp/img/icons/Backup.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Banking_Transaction.svg b/desktopapp/img/icons/Banking_Transaction.svg deleted file mode 100644 index adf7240..0000000 --- a/desktopapp/img/icons/Banking_Transaction.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Banking_Transaction_white.svg b/desktopapp/img/icons/Banking_Transaction_white.svg deleted file mode 100644 index 24ec72a..0000000 --- a/desktopapp/img/icons/Banking_Transaction_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Bill.svg b/desktopapp/img/icons/Bill.svg deleted file mode 100644 index b891cd2..0000000 --- a/desktopapp/img/icons/Bill.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Bill_white.svg b/desktopapp/img/icons/Bill_white.svg deleted file mode 100644 index b33e4a2..0000000 --- a/desktopapp/img/icons/Bill_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Bookings.svg b/desktopapp/img/icons/Bookings.svg deleted file mode 100644 index 72cfb51..0000000 --- a/desktopapp/img/icons/Bookings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Bookings_white.svg b/desktopapp/img/icons/Bookings_white.svg deleted file mode 100644 index 63b6bf3..0000000 --- a/desktopapp/img/icons/Bookings_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Box.svg b/desktopapp/img/icons/Box.svg deleted file mode 100644 index d365881..0000000 --- a/desktopapp/img/icons/Box.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Box_white.svg b/desktopapp/img/icons/Box_white.svg deleted file mode 100644 index a943303..0000000 --- a/desktopapp/img/icons/Box_white.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Close.svg b/desktopapp/img/icons/Close.svg deleted file mode 100644 index c6f45da..0000000 --- a/desktopapp/img/icons/Close.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Close_white.svg b/desktopapp/img/icons/Close_white.svg deleted file mode 100644 index 6676fdd..0000000 --- a/desktopapp/img/icons/Close_white.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Contacts.svg b/desktopapp/img/icons/Contacts.svg deleted file mode 100644 index f8f1f12..0000000 --- a/desktopapp/img/icons/Contacts.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Contacts_white.svg b/desktopapp/img/icons/Contacts_white.svg deleted file mode 100644 index 0a082d5..0000000 --- a/desktopapp/img/icons/Contacts_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Add.svg b/desktopapp/img/icons/Data_Add.svg deleted file mode 100644 index d791206..0000000 --- a/desktopapp/img/icons/Data_Add.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Add_white.svg b/desktopapp/img/icons/Data_Add_white.svg deleted file mode 100644 index 6685c4b..0000000 --- a/desktopapp/img/icons/Data_Add_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Delete.svg b/desktopapp/img/icons/Data_Delete.svg deleted file mode 100644 index bba5aeb..0000000 --- a/desktopapp/img/icons/Data_Delete.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Delete_white.svg b/desktopapp/img/icons/Data_Delete_white.svg deleted file mode 100644 index 2486498..0000000 --- a/desktopapp/img/icons/Data_Delete_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Edit.svg b/desktopapp/img/icons/Data_Edit.svg deleted file mode 100644 index 418328c..0000000 --- a/desktopapp/img/icons/Data_Edit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Data_Edit_white.svg b/desktopapp/img/icons/Data_Edit_white.svg deleted file mode 100644 index edecd13..0000000 --- a/desktopapp/img/icons/Data_Edit_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Datasets.svg b/desktopapp/img/icons/Datasets.svg deleted file mode 100644 index 0722e4f..0000000 --- a/desktopapp/img/icons/Datasets.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Datasets_white.svg b/desktopapp/img/icons/Datasets_white.svg deleted file mode 100644 index 5c3f92d..0000000 --- a/desktopapp/img/icons/Datasets_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Duplicate.svg b/desktopapp/img/icons/Duplicate.svg deleted file mode 100644 index 75f65de..0000000 --- a/desktopapp/img/icons/Duplicate.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/Duplicate_white.svg b/desktopapp/img/icons/Duplicate_white.svg deleted file mode 100644 index 99be63a..0000000 --- a/desktopapp/img/icons/Duplicate_white.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/Edit.svg b/desktopapp/img/icons/Edit.svg deleted file mode 100644 index efc2ffd..0000000 --- a/desktopapp/img/icons/Edit.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/Edit_white.svg b/desktopapp/img/icons/Edit_white.svg deleted file mode 100644 index a4400a0..0000000 --- a/desktopapp/img/icons/Edit_white.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/Email.svg b/desktopapp/img/icons/Email.svg deleted file mode 100644 index 0aa4133..0000000 --- a/desktopapp/img/icons/Email.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Email_white.svg b/desktopapp/img/icons/Email_white.svg deleted file mode 100644 index 06b5b07..0000000 --- a/desktopapp/img/icons/Email_white.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Exit.svg b/desktopapp/img/icons/Exit.svg deleted file mode 100644 index 422872d..0000000 --- a/desktopapp/img/icons/Exit.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Exit_white.svg b/desktopapp/img/icons/Exit_white.svg deleted file mode 100644 index 915bfa0..0000000 --- a/desktopapp/img/icons/Exit_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/File.svg b/desktopapp/img/icons/File.svg deleted file mode 100644 index 8ef9359..0000000 --- a/desktopapp/img/icons/File.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Filter.svg b/desktopapp/img/icons/Filter.svg deleted file mode 100644 index fb7c41b..0000000 --- a/desktopapp/img/icons/Filter.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Folder.svg b/desktopapp/img/icons/Folder.svg deleted file mode 100644 index 66c9c4a..0000000 --- a/desktopapp/img/icons/Folder.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Folder_Share.svg b/desktopapp/img/icons/Folder_Share.svg deleted file mode 100644 index 5e8323c..0000000 --- a/desktopapp/img/icons/Folder_Share.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Folder_Share_white.svg b/desktopapp/img/icons/Folder_Share_white.svg deleted file mode 100644 index 99559b3..0000000 --- a/desktopapp/img/icons/Folder_Share_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Folder_white.svg b/desktopapp/img/icons/Folder_white.svg deleted file mode 100644 index de55dc9..0000000 --- a/desktopapp/img/icons/Folder_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/HDD.svg b/desktopapp/img/icons/HDD.svg deleted file mode 100644 index ccd157b..0000000 --- a/desktopapp/img/icons/HDD.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/HDD_white.svg b/desktopapp/img/icons/HDD_white.svg deleted file mode 100644 index 8b9548e..0000000 --- a/desktopapp/img/icons/HDD_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Help.svg b/desktopapp/img/icons/Help.svg deleted file mode 100644 index f12e1d8..0000000 --- a/desktopapp/img/icons/Help.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/desktopapp/img/icons/Help_white.svg b/desktopapp/img/icons/Help_white.svg deleted file mode 100644 index 5573110..0000000 --- a/desktopapp/img/icons/Help_white.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/desktopapp/img/icons/In_red.svg b/desktopapp/img/icons/In_red.svg deleted file mode 100644 index 705c299..0000000 --- a/desktopapp/img/icons/In_red.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Info.svg b/desktopapp/img/icons/Info.svg deleted file mode 100644 index 2951f71..0000000 --- a/desktopapp/img/icons/Info.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Info_white.svg b/desktopapp/img/icons/Info_white.svg deleted file mode 100644 index f642f9f..0000000 --- a/desktopapp/img/icons/Info_white.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Invoice.svg b/desktopapp/img/icons/Invoice.svg deleted file mode 100644 index 08efb4b..0000000 --- a/desktopapp/img/icons/Invoice.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/desktopapp/img/icons/Invoice_white.svg b/desktopapp/img/icons/Invoice_white.svg deleted file mode 100644 index 08efb4b..0000000 --- a/desktopapp/img/icons/Invoice_white.svg +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/desktopapp/img/icons/License.svg b/desktopapp/img/icons/License.svg deleted file mode 100644 index 880821c..0000000 --- a/desktopapp/img/icons/License.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/License_white.svg b/desktopapp/img/icons/License_white.svg deleted file mode 100644 index ed4beb2..0000000 --- a/desktopapp/img/icons/License_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Location.svg b/desktopapp/img/icons/Location.svg deleted file mode 100644 index 8c8a701..0000000 --- a/desktopapp/img/icons/Location.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/Next.svg b/desktopapp/img/icons/Next.svg deleted file mode 100644 index e431e35..0000000 --- a/desktopapp/img/icons/Next.svg +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/desktopapp/img/icons/Out_green.svg b/desktopapp/img/icons/Out_green.svg deleted file mode 100644 index 1c03e1c..0000000 --- a/desktopapp/img/icons/Out_green.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/PDF.svg b/desktopapp/img/icons/PDF.svg deleted file mode 100644 index 3c5e4bf..0000000 --- a/desktopapp/img/icons/PDF.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/desktopapp/img/icons/PDF_white.svg b/desktopapp/img/icons/PDF_white.svg deleted file mode 100644 index d59b81e..0000000 --- a/desktopapp/img/icons/PDF_white.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/desktopapp/img/icons/Phone.svg b/desktopapp/img/icons/Phone.svg deleted file mode 100644 index 9d92df3..0000000 --- a/desktopapp/img/icons/Phone.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/Preview.svg b/desktopapp/img/icons/Preview.svg deleted file mode 100644 index 3aca80b..0000000 --- a/desktopapp/img/icons/Preview.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Preview_white.svg b/desktopapp/img/icons/Preview_white.svg deleted file mode 100644 index 1ba2c0e..0000000 --- a/desktopapp/img/icons/Preview_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Print.svg b/desktopapp/img/icons/Print.svg deleted file mode 100644 index f65f14f..0000000 --- a/desktopapp/img/icons/Print.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/Print_white.svg b/desktopapp/img/icons/Print_white.svg deleted file mode 100644 index 392cf6b..0000000 --- a/desktopapp/img/icons/Print_white.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/Product.svg b/desktopapp/img/icons/Product.svg deleted file mode 100644 index 9cb14f3..0000000 --- a/desktopapp/img/icons/Product.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Product2.svg b/desktopapp/img/icons/Product2.svg deleted file mode 100644 index 01e34ac..0000000 --- a/desktopapp/img/icons/Product2.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Product2_white.svg b/desktopapp/img/icons/Product2_white.svg deleted file mode 100644 index 1ae22e7..0000000 --- a/desktopapp/img/icons/Product2_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Reload.svg b/desktopapp/img/icons/Reload.svg deleted file mode 100644 index 35574f7..0000000 --- a/desktopapp/img/icons/Reload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Reload_white.svg b/desktopapp/img/icons/Reload_white.svg deleted file mode 100644 index 94ffed2..0000000 --- a/desktopapp/img/icons/Reload_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Remove_red.svg b/desktopapp/img/icons/Remove_red.svg deleted file mode 100644 index 318a5c7..0000000 --- a/desktopapp/img/icons/Remove_red.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Settings.svg b/desktopapp/img/icons/Settings.svg deleted file mode 100644 index 61bc7ca..0000000 --- a/desktopapp/img/icons/Settings.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Settings_white.svg b/desktopapp/img/icons/Settings_white.svg deleted file mode 100644 index c67c1eb..0000000 --- a/desktopapp/img/icons/Settings_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Star.svg b/desktopapp/img/icons/Star.svg deleted file mode 100644 index 92fe9f5..0000000 --- a/desktopapp/img/icons/Star.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/Template.svg b/desktopapp/img/icons/Template.svg deleted file mode 100644 index 860ab38..0000000 --- a/desktopapp/img/icons/Template.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/Template_white.svg b/desktopapp/img/icons/Template_white.svg deleted file mode 100644 index 2622430..0000000 --- a/desktopapp/img/icons/Template_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/Trash.svg b/desktopapp/img/icons/Trash.svg deleted file mode 100644 index 31962e0..0000000 --- a/desktopapp/img/icons/Trash.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Trash_red.svg b/desktopapp/img/icons/Trash_red.svg deleted file mode 100644 index c64ad2e..0000000 --- a/desktopapp/img/icons/Trash_red.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Trash_white.svg b/desktopapp/img/icons/Trash_white.svg deleted file mode 100644 index 01adda6..0000000 --- a/desktopapp/img/icons/Trash_white.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/Upload.svg b/desktopapp/img/icons/Upload.svg deleted file mode 100644 index ba98d40..0000000 --- a/desktopapp/img/icons/Upload.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/User_Group.svg b/desktopapp/img/icons/User_Group.svg deleted file mode 100644 index d9a9079..0000000 --- a/desktopapp/img/icons/User_Group.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/User_Group_white.svg b/desktopapp/img/icons/User_Group_white.svg deleted file mode 100644 index 8cfc96f..0000000 --- a/desktopapp/img/icons/User_Group_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/ViewPDF.svg b/desktopapp/img/icons/ViewPDF.svg deleted file mode 100644 index 49169f9..0000000 --- a/desktopapp/img/icons/ViewPDF.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/desktopapp/img/icons/ViewPDF_white.svg b/desktopapp/img/icons/ViewPDF_white.svg deleted file mode 100644 index e10bab0..0000000 --- a/desktopapp/img/icons/ViewPDF_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/a106_barcode2.svg b/desktopapp/img/icons/a106_barcode2.svg deleted file mode 100644 index dc5a646..0000000 --- a/desktopapp/img/icons/a106_barcode2.svg +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/desktopapp/img/icons/a107_time.svg b/desktopapp/img/icons/a107_time.svg deleted file mode 100644 index 5d1f08f..0000000 --- a/desktopapp/img/icons/a107_time.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/a109_date.svg b/desktopapp/img/icons/a109_date.svg deleted file mode 100644 index 63665a8..0000000 --- a/desktopapp/img/icons/a109_date.svg +++ /dev/null @@ -1,15 +0,0 @@ - - diff --git a/desktopapp/img/icons/a119_history.svg b/desktopapp/img/icons/a119_history.svg deleted file mode 100644 index 13c0870..0000000 --- a/desktopapp/img/icons/a119_history.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/a121_revert.svg b/desktopapp/img/icons/a121_revert.svg deleted file mode 100644 index 59a4129..0000000 --- a/desktopapp/img/icons/a121_revert.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/a123_refresh.svg b/desktopapp/img/icons/a123_refresh.svg deleted file mode 100644 index b864194..0000000 --- a/desktopapp/img/icons/a123_refresh.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/a125_sync.svg b/desktopapp/img/icons/a125_sync.svg deleted file mode 100644 index 4f5e0fa..0000000 --- a/desktopapp/img/icons/a125_sync.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a129_badge.svg b/desktopapp/img/icons/a129_badge.svg deleted file mode 100644 index 512dd89..0000000 --- a/desktopapp/img/icons/a129_badge.svg +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/desktopapp/img/icons/a133_cart.svg b/desktopapp/img/icons/a133_cart.svg deleted file mode 100644 index 807a6ff..0000000 --- a/desktopapp/img/icons/a133_cart.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a135_home.svg b/desktopapp/img/icons/a135_home.svg deleted file mode 100644 index 60030b8..0000000 --- a/desktopapp/img/icons/a135_home.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a141_alert.svg b/desktopapp/img/icons/a141_alert.svg deleted file mode 100644 index 7817520..0000000 --- a/desktopapp/img/icons/a141_alert.svg +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/desktopapp/img/icons/a57_sort.svg b/desktopapp/img/icons/a57_sort.svg deleted file mode 100644 index 28d3bbc..0000000 --- a/desktopapp/img/icons/a57_sort.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/a60_filterOutline.svg b/desktopapp/img/icons/a60_filterOutline.svg deleted file mode 100644 index 6b12c73..0000000 --- a/desktopapp/img/icons/a60_filterOutline.svg +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/desktopapp/img/icons/a73_note.svg b/desktopapp/img/icons/a73_note.svg deleted file mode 100644 index f1b70e0..0000000 --- a/desktopapp/img/icons/a73_note.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a79_records.svg b/desktopapp/img/icons/a79_records.svg deleted file mode 100644 index 6f07b0b..0000000 --- a/desktopapp/img/icons/a79_records.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a7_import.svg b/desktopapp/img/icons/a7_import.svg deleted file mode 100644 index 9a4806a..0000000 --- a/desktopapp/img/icons/a7_import.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/a85_labels.svg b/desktopapp/img/icons/a85_labels.svg deleted file mode 100644 index bd0d974..0000000 --- a/desktopapp/img/icons/a85_labels.svg +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/desktopapp/img/icons/a89_find.svg b/desktopapp/img/icons/a89_find.svg deleted file mode 100644 index b5bbb6d..0000000 --- a/desktopapp/img/icons/a89_find.svg +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/desktopapp/img/icons/a91_image.svg b/desktopapp/img/icons/a91_image.svg deleted file mode 100644 index ac68cd5..0000000 --- a/desktopapp/img/icons/a91_image.svg +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/desktopapp/img/icons/back.svg b/desktopapp/img/icons/back.svg deleted file mode 100644 index 1b0ba17..0000000 --- a/desktopapp/img/icons/back.svg +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/desktopapp/img/icons/back_white.svg b/desktopapp/img/icons/back_white.svg deleted file mode 100644 index 3ab8f93..0000000 --- a/desktopapp/img/icons/back_white.svg +++ /dev/null @@ -1,5 +0,0 @@ - - diff --git a/desktopapp/img/icons/download.svg b/desktopapp/img/icons/download.svg deleted file mode 100644 index 9a4806a..0000000 --- a/desktopapp/img/icons/download.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/download_white.svg b/desktopapp/img/icons/download_white.svg deleted file mode 100644 index 757a68d..0000000 --- a/desktopapp/img/icons/download_white.svg +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/desktopapp/img/icons/duplicate2.svg b/desktopapp/img/icons/duplicate2.svg deleted file mode 100644 index cebaad8..0000000 --- a/desktopapp/img/icons/duplicate2.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/duplicate2_white.svg b/desktopapp/img/icons/duplicate2_white.svg deleted file mode 100644 index a643c74..0000000 --- a/desktopapp/img/icons/duplicate2_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/edit2.svg b/desktopapp/img/icons/edit2.svg deleted file mode 100644 index c0bb9ac..0000000 --- a/desktopapp/img/icons/edit2.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/edit2_white.svg b/desktopapp/img/icons/edit2_white.svg deleted file mode 100644 index bbbe89f..0000000 --- a/desktopapp/img/icons/edit2_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/in.svg b/desktopapp/img/icons/in.svg deleted file mode 100644 index 6c77f3c..0000000 --- a/desktopapp/img/icons/in.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/out.svg b/desktopapp/img/icons/out.svg deleted file mode 100644 index cf63b08..0000000 --- a/desktopapp/img/icons/out.svg +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/desktopapp/img/icons/percent.svg b/desktopapp/img/icons/percent.svg deleted file mode 100644 index b87a765..0000000 --- a/desktopapp/img/icons/percent.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/desktopapp/img/icons/plus.svg b/desktopapp/img/icons/plus.svg deleted file mode 100644 index 08e85b5..0000000 --- a/desktopapp/img/icons/plus.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/plus_white.svg b/desktopapp/img/icons/plus_white.svg deleted file mode 100644 index 22714fe..0000000 --- a/desktopapp/img/icons/plus_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/remove2.svg b/desktopapp/img/icons/remove2.svg deleted file mode 100644 index e459477..0000000 --- a/desktopapp/img/icons/remove2.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/remove2_white.svg b/desktopapp/img/icons/remove2_white.svg deleted file mode 100644 index 77e856e..0000000 --- a/desktopapp/img/icons/remove2_white.svg +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/desktopapp/img/icons/userconfig.svg b/desktopapp/img/icons/userconfig.svg deleted file mode 100644 index 3a5495c..0000000 --- a/desktopapp/img/icons/userconfig.svg +++ /dev/null @@ -1,31 +0,0 @@ - - diff --git a/desktopapp/img/icons/userconfig_white.svg b/desktopapp/img/icons/userconfig_white.svg deleted file mode 100644 index 60281cc..0000000 --- a/desktopapp/img/icons/userconfig_white.svg +++ /dev/null @@ -1,31 +0,0 @@ - - diff --git a/desktopapp/img/icons/website.svg b/desktopapp/img/icons/website.svg deleted file mode 100644 index a684987..0000000 --- a/desktopapp/img/icons/website.svg +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/desktopapp/img/icons/website_white.svg b/desktopapp/img/icons/website_white.svg deleted file mode 100644 index a684987..0000000 --- a/desktopapp/img/icons/website_white.svg +++ /dev/null @@ -1,13 +0,0 @@ - - diff --git a/desktopapp/img/invoicejournal.ico b/desktopapp/img/invoicejournal.ico new file mode 100644 index 0000000..b5061a5 Binary files /dev/null and b/desktopapp/img/invoicejournal.ico differ diff --git a/desktopapp/img/nas.svg b/desktopapp/img/nas.svg deleted file mode 100644 index b7db0b0..0000000 --- a/desktopapp/img/nas.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - diff --git a/desktopapp/package.json b/desktopapp/package.json index a56ac01..c513e85 100644 --- a/desktopapp/package.json +++ b/desktopapp/package.json @@ -5,8 +5,8 @@ "main": "main.js", "scripts": { "start": "electron .", - "package-win64": "electron-packager . invoicejournal --overwrite --platform=win32 --arch=x64 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=InvoiceJournal --icon=img/POT-logo.ico", - "package-win32": "electron-packager . invoicejournal --overwrite --platform=win32 --arch=ia32 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=InvoiceJournal --icon=img/POT-logo.ico" + "package-win64": "electron-packager . invoicejournal --overwrite --platform=win32 --arch=x64 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=InvoiceJournal --icon=img/invoicejournal.ico", + "package-win32": "electron-packager . invoicejournal --overwrite --platform=win32 --arch=ia32 --asar --out=../release-builds --version-string.CompanyName=DKS --version-string.FileDescription=DKS --version-string.ProductName=InvoiceJournal --icon=img/invoicejournal.ico" }, "keywords": [ "invoice", diff --git a/dev/app.json b/dev/app.json deleted file mode 100644 index d26a1ec..0000000 --- a/dev/app.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "projectpath":"D:/Workspace/invoicejournal/server", - "script":"D:/Workspace/invoicejournal/invoicejournal.pl", - "releasepath":"D:/Workspace/invoicejournal", - "libs":["D:/Workspace/invoicejournal/server"], - "output":"invoicejournal.exe", - "compress":"9", - "gui":"0", - "tempcache":"srvdks", - "modules":["Time::HiRes","JSON::MaybeXS","JSON::PP","Starlight","Encode","Encode::Guess","IO::String","DBI","English","DBD::SQLite","Template","CGI","CGI::Carp","Digest::SHA::PurePerl","MIME::Type::FileName","File::Copy::Recursive","CGI::Compile","Devel::StackTrace","Devel::StackTrace::AsHTML","Apache::LogFormat::Compiler"], - "files":[ - {"src":"C:/Strawberry/perl/site/lib/HTTP","dest":"lib/HTTP"}, - {"src":"C:/Strawberry/perl/site/lib/Plack","dest":"lib/Plack"}, - {"src":"C:/Strawberry/perl/site/lib/Starlight","dest":"lib/Starlight"}, - {"src":"C:/Strawberry/perl/site/lib/Text/Unidecode","dest":"lib/Text/Unidecode"}, - {"src":"C:/Strawberry/perl/lib/Encode","dest":"lib/Encode"}, - {"src":"C:/Strawberry/perl/site/lib/Text/Unidecode.pm","dest":"lib/Text/Unidecode.pm"} - ] -} \ No newline at end of file diff --git a/dev/compile_server.bat b/dev/compile_server.bat deleted file mode 100644 index 4541561..0000000 --- a/dev/compile_server.bat +++ /dev/null @@ -1,43 +0,0 @@ -@echo off -REM taskkill.exe /F /IM srvinvoicejournal.exe -REM del "%USERPROFILE%\Workspace\Release\srvinvoicejournal.exe" -C:\Strawberry\perl\bin\perl.exe ^ - -I "%USERPROFILE%\Workspace\invoicejournal\server" "C:\Strawberry\perl\site\bin\pp.bat" ^ - --output="%USERPROFILE%\Workspace\Release\srvinvoicejournal.exe" ^ - --cachedeps="%USERPROFILE%\Workspace\invoicejournal\Release\deps.txt" ^ - --compress 9 ^ - --gui ^ - --tempcache "srvinvoicejournal" ^ - --module="Time::HiRes" ^ - --module="JSON::MaybeXS" ^ - --module="JSON::PP" ^ - --module="Starlight" ^ - --module="Encode" ^ - --module="Encode::Guess" ^ - --module="IO::String" ^ - --module="DBI" ^ - --module="English" ^ - --module="DBD::SQLite" ^ - --addfile="C:\Strawberry\perl\site\lib\HTTP;lib/HTTP" ^ - --addfile="C:\Strawberry\perl\site\lib\Plack;lib/Plack" ^ - --addfile="C:\Strawberry\perl\site\lib\Starlight;lib/Starlight" ^ - --addfile="C:\Strawberry\perl\site\lib\Text\Unidecode;lib/Text/Unidecode" ^ - --addfile="C:\Strawberry\perl\lib\Encode;lib/Encode" ^ - --addfile="C:\Strawberry\perl\site\lib\Text\Unidecode.pm;lib/Text/Unidecode.pm" ^ - --bundle "%USERPROFILE%\Workspace\invoicejournal\server\invoicejournal.pl" - - REM --module="Image::ExifTool" ^ - - REM --addfile="C:\Strawberry\perl\site\lib\AnyEvent;lib/AnyEvent" ^ -REM --addfile="C:\Strawberry\perl\site\lib\AnyEvent.pm;lib/AnyEvent.pm" ^ - REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\Audio.pm;lib/Module/Audio.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\System.pm;lib/Module/System.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\SQLite.pm;lib/Module/SQLite.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\SSH.pm;lib/Module/SSH.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\Service.pm;lib/Module/Service.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\Test.pm;lib/Module/Test.pm" ^ -REM --addfile="C:\Users\ksaff\Workspace\DKSService\Module\OpenVPN.pm;lib/Module/OpenVPN.pm" ^ -REM --addfile="C:\Strawberry\perl\site\lib\Ogg;lib/Ogg" ^ -REM --addfile="C:\Strawberry\perl\site\lib\MP4;lib/MP4" ^ -REM --addfile="C:\Strawberry\perl\site\lib\MP3;lib/MP3" ^ -REM --addfile="C:\Strawberry\perl\site\lib\Audio;lib/Audio" ^ \ No newline at end of file diff --git a/dev/compile_server.pl b/dev/compile_server.pl deleted file mode 100644 index 568b33e..0000000 --- a/dev/compile_server.pl +++ /dev/null @@ -1,52 +0,0 @@ -#!C:\Strawberry\Perl\bin\perl.exe -use strict; -use Getopt::Long; -use JSON::PP; -use File::Path qw(make_path); -use FindBin qw($RealBin $Bin); -my $cfgfile = $RealBin."/app.json"; -my $cfg = (); -my $pp = 'C:\Strawberry\perl\site\bin\pp'; -my $perl = 'C:\Strawberry\perl\bin\perl.exe'; -GetOptions("file|f=s" => \$cfgfile); -if (-e "$cfgfile"){ - my $strcfg = ""; - open(CFG,$cfgfile); - while (my $l = ){ - $strcfg .= $l; - } - close(CFG); - $strcfg =~ s/\//\\\\/g; - $cfg = JSON::PP::decode_json($strcfg); -} - -if (! -d $cfg->{releasepath}){ - make_path($cfg->{releasepath}); -} -my $cmd = $perl." "; -$cmd .= join('', map { '-I "'.$_.'" ' } @{$cfg->{libs}}); -$cmd .= $pp." "; -$cmd .= '--output="'.$cfg->{releasepath}.'/'.$cfg->{output}.'"'." "; -$cmd .= '--cachedeps="'.$cfg->{releasepath}.'/deps.txt"'." "; -if (exists($cfg->{compress})){ - $cmd .= '--compress '.$cfg->{compress}." "; -} -if (exists($cfg->{gui}) && $cfg->{gui} eq "1"){ - $cmd .= '--gui'." "; -} -if (exists($cfg->{tempcache}) && $cfg->{tempcache} ne "" ){ - $cmd .= '--tempcache "'.$cfg->{tempcache}.'"'." "; -} -if (exists($cfg->{modules}) && (scalar(@{$cfg->{modules}}) > 0)){ - $cmd .= join('', map { '--module="'.$_.'"'." " } @{$cfg->{modules}}); -} -if (exists($cfg->{files}) && (scalar(@{$cfg->{files}}) > 0)){ - $cmd .= join('', map { '--addfile="'.$_->{src}.';'.$_->{dest}.'"'." " } @{$cfg->{files}}); -} -$cmd .= '--bundle "'.$cfg->{script}.'"'; -$cmd =~ s/\//\\/g; -print "$cmd"; -if (-e $cfg->{releasepath}.'/'.$cfg->{output}){ - unlink($cfg->{releasepath}.'/'.$cfg->{output}); -} -system($cmd); diff --git a/dev/createsite.pl b/dev/createsite.pl deleted file mode 100644 index f386b52..0000000 --- a/dev/createsite.pl +++ /dev/null @@ -1,105 +0,0 @@ -#!C:\Strawberry\perl\bin\perl.exe - -use strict; -use File::Basename; -use Template; -use FindBin qw($RealBin); -use File::Find::Rule; - -use File::Path qw/make_path remove_tree/; -use File::Copy::Recursive qw/rcopy/; -use utf8; -use lib ($RealBin.'/app/lib/'); -use dksconfig qw($sitecfg); -my $pagedir = "app/tmpl/"; -my $tmplpath = $RealBin."/app/tmpl/"; -my $outdir = "htdocs"; -my $staticdir = "app/static"; -if (! -d $outdir){ - mkdir ($outdir); -} -remove_tree( $outdir, {keep_root => 1} ); -my @files = File::Find::Rule->file()->in( "app/tmpl/module" ); - -foreach my $f (@files){ - print $f."==>"; - chomp($f); - - my $fabs = substr($f,length($pagedir)); - my $dabs = dirname($fabs); - $f =~ s/^app\/tmpl\///; - if ($dabs eq ".") {$dabs = '';} - my $foutdir = $outdir.(($dabs ne "")?'/':"").$dabs; - - # print "OUTDIR: ".$foutdir."\n"; - # if (! -d $foutdir){ - - # my $fx = $foutdir; - # if ($^O eq "MSWin32"){ - # $fx =~ s/\//\\/g; - # } - - # make_path($fx); - # } - # if ($dabs ne "") { - # my @xx = split(/\//,$dabs); - # $dabs = ""; - # foreach my $x (@xx) { - # $dabs .= "../"; - # } - # } - my $outfile = basename($f); - if ($outfile =~ /\.tt$/){ - $outfile =~ s/\.tt$/.html/; - } - $foutdir =~ s/\/module//; - print $foutdir.'/'.$outfile."\n"; - # print "ABSDIR: ".$dabs."\n"; - # #print $fabs."->'".$dabs."'\n"; - # #if (-e $foutdir.'/'.basename($f)){ - # # unlink($foutdir.'/'.basename($f)); - # #} - my $strpage = ""; - my $template = Template->new({INCLUDE_PATH => [$tmplpath],ENCODING => 'utf8',OUTPUT => \$strpage}); - # #TODO collect: title, description, keyords , basepath - my $vars = $sitecfg; - $vars->{page} = $f; - - $vars->{pagename} = basename($vars->{page}); - $vars->{pagename} =~ s/\.tt$//; - $vars->{lang} = 'de'; - - # #my $vars->{title} = "Test index Page"; - # my $vars->{abspath} = $dabs; - # $vars->{page} = $f; - # $vars->{pagename} = substr(basename($f),0,-5); - # $vars->{baseurl} = "http://www.dks.lu/"; - - my $skl = "index.tt"; - if ($f !~ /\.tt$/){ - print "set file.tt as skeleton!\n"; - $skl ="file.tt"; - } - $template->process($skl,$vars) || die "Template process failed: ", $template->error(),$f, "\n"; - $strpage =~ s/\r//g; - #$strpage =~ s/\s+/ /g; - $strpage =~ s/^\n//mg; - if (! -d dirname($foutdir.'/'.$outfile)){ - make_path(dirname($foutdir.'/'.$outfile)); - } - open (OUT,">".$foutdir.'/'.$outfile); - binmode(OUT, ":utf8"); - - print OUT $strpage; - close(OUT); -} -print "Copy static data!\n"; -rcopy($staticdir.'/*',$outdir.'/static/'); - -#print "Copy to Test\n"; -#rcopy($outdir.'/*',dirname($0)."C:\\xampp\\htdocs\\dks_lu"); - # - # - #$vars->{page} = "tmpl/page/index.html"; - #$template->process($file,$vars) || die "Template process failed: ", $template->error(), "\n";; - #print $ptosave."\n"; diff --git a/dev/defaultdata/invoicejournal.sqlite b/dev/defaultdata/invoicejournal.sqlite deleted file mode 100644 index 11591eb..0000000 Binary files a/dev/defaultdata/invoicejournal.sqlite and /dev/null differ diff --git a/dev/dependencies.pl b/dev/dependencies.pl deleted file mode 100644 index 5d07327..0000000 --- a/dev/dependencies.pl +++ /dev/null @@ -1,50 +0,0 @@ -#!C:\Strawberry\per\bin\perl.exe - -use strict; -use FindBin qw($Bin $RealBin); -use File::Basename; -use Data::Dumper; -use File::Find::Rule; -use Module::ScanDeps; -#print $RealBin."\n"; -my $basedir = dirname($RealBin); -my @sitebin = grep { $_ =~ /site\/lib$/ } @INC; -#my $sb = dirname($sitebin[0]).'/bin/scandeps.pl'; -#print $sb."\n"; -my @sp = ("$basedir/server/CGI/api"); -my @files = File::Find::Rule->file() - ->name( ['*.cgi','*.pm'] ) - ->in( @sp ); -print Dumper(@files); -my $usedlibs = (); -my @alldeps = (); -my $owndeps = (); -foreach my $f (@files){ - if ($f =~ /\.pm$/){ - my $odep = basename($f); - $odep =~ s/\.pm$//; - $owndeps->{$odep} = 1; - } -} -foreach my $f (@files){ - #print $f."\n"; - open(FF,$f); - while (my $l = ){ - if (($l =~ /^\s*use/) && ($l !~ /^\s*use strict/) && ($l !~ /^\s*use lib/)){ - chomp($l); - $l =~ s/;//g; - my @clib = split(/ /,$l); - if (!exists($usedlibs->{$clib[1]}) && !exists($owndeps->{$clib[1]})){ - $usedlibs->{$clib[1]} = 1; - push (@alldeps,$clib[1]); - } - } - } - close(FF); -# my $cmd = 'perl.exe "'.$sb.'" -c "'.$f.'"'; -# print $cmd."\n"; -# my $res = `$cmd`; -# print $res; -} -print "Deps:\n"; -print join("\n",@alldeps); \ No newline at end of file diff --git a/dev/deps.txt b/dev/deps.txt deleted file mode 100644 index d334e0e..0000000 Binary files a/dev/deps.txt and /dev/null differ diff --git a/dev/importfm.pl b/dev/importfm.pl deleted file mode 100644 index aa55f96..0000000 --- a/dev/importfm.pl +++ /dev/null @@ -1,158 +0,0 @@ -#!C:\Strawberry\perl\bin\perl.exe - -use strict; -use Getopt::Long; -use File::Basename; -use File::Copy qw(copy); -use FindBin qw($Bin $RealBin); -use lib ('./'); -use lib ('./dev/'); -use lib ($RealBin.'/'); -use lib ($RealBin.'/dev/'); -use Data::Dumper; -use JSON::PP; -use sqlite; -use Encode; -my $cfgpath = ""; -if ($^O eq "MSWin32"){ - $cfgpath = $ENV{APPDATA}.'/invoicejournal/server'; -} elsif ($^O eq "darwin"){ - $cfgpath = $ENV{HOME}.'/Library/Application Support/invoicejournal/server'; -} else { - $cfgpath = $ENV{HOME}.'/.invoicejournal/server'; -} - -my $dbfile=$RealBin."/profile/server/invoicejournal.sqlite"; -copy($cfgpath.'/invoicejournal.sqlite',$dbfile);#C:\Users\kilian\AppData\Roaming\invoicejournal\server\invoicejournal. -my $jsonexportpath=$RealBin."/fmsync"; -my $db = sqlite->new($dbfile); -print "GET triggers!\n"; -my $triggers = $db->dbquerysorted("select name,sql from sqlite_master WHERE type='trigger';"); - -# my $dbdefsql = "SELECT type, name,tbl_name,sql FROM sqlite_master order by name,tbl_name,type;"; -my $json = JSON::PP->new(); -my $importfiles = { - "bookings" => "BookingsData.json", - "invoices" => "InvoicesData.json", - "addresses" => "AddressenData.json", - "products" => "ProdukteData.json" -}; -my $dbdefsql = "SELECT type, name,tbl_name,sql FROM sqlite_master WHERE type='table' order by name,tbl_name,type ;"; -my $defschema = $db->dbquerysorted($dbdefsql); -#print Dumper($defschema); -print "disable triggers\n"; -&disable_triggers($triggers); -foreach my $pd (sort {$a <=> $b} keys(%{$defschema})){ - if (!exists($importfiles->{$defschema->{$pd}->{tbl_name}})){ - next; - } - my $dbobj= &getcoldef($defschema->{$pd}->{sql}); - print "Table:".$defschema->{$pd}->{tbl_name}."\n"; - print Dumper($dbobj); - print "-------------------\n"; - my $jsondata = ""; - open(JSN,$jsonexportpath.'/'.$importfiles->{$defschema->{$pd}->{tbl_name}}); - while (my $l = ){ - chomp($l); - $l =~ s/\r//g; - $l =~ s/\n//g; - $jsondata .= $l; - }; - close(JSN); - - $jsondata = decode("utf-8",$jsondata); - if ($jsondata eq ""){ next; } - open(XDL,">".$jsonexportpath.'/'.$defschema->{$pd}->{tbl_name}.".sql"); - my $impdata = $json->decode($jsondata); - foreach my $r (@{$impdata}){ - my $rdata = (); - foreach my $c (keys(%{$r})){ - if (exists($dbobj->{$c})){ - my $kn = $defschema->{$pd}->{tbl_name}."_".$c; - if ($c eq "id"){ - $kn = "ident_".$defschema->{$pd}->{tbl_name}."_".$c; - } - if ($dbobj->{$c} eq 'NUMERIC'){ - $r->{$c} =~ s/\s+//g; - $r->{$c} =~ s/^,/0./g; - $r->{$c} =~ s/,/./g; - } elsif ($dbobj->{$c} eq 'DATE'){ - my ($d,$m,$y) = $r->{$c} =~ m/^(\d\d).(\d\d).(\d\d\d\d)$/; - $r->{$c} = "date('".$y.'-'.$m.'-'.$d."')"; - } - $rdata->{$kn} = $r->{$c}; - } - - } - my @checksql = $db->create_cnt_statement($rdata); - my $ses = $db->dbquerysorted($checksql[0]); - my @sql = (); - if ($ses->{0}->{cnt} ne "0"){ - my @del = $db->create_ddl_delete($rdata); - $db->dbexec($del[0]); - #@sql = $db->create_ddl_update($rdata); - } - #else { - @sql = $db->create_ddl_insert($rdata); - #} - - print XDL $sql[0]."\n"; - $db->dbexec($sql[0]); - } - close(XDL); -} - -$db->dbexec("UPDATE invoices set direction ='in' WHERE direction='Eingang';"); -$db->dbexec("UPDATE invoices set direction ='out' WHERE direction='Ausgang';"); -$db->dbexec("update invoices set status='payed' WHERE status='bezahlt';"); -$db->dbexec("update invoices set status='planned' WHERE status='geplant';"); -$db->dbexec("update invoices set status='sended' WHERE status='verschickt';"); -$db->dbexec("update invoices set status='preparation' WHERE status='Vorbereitung';"); -$db->dbexec("update invoices set invoicetype='invoice' where invoicetype='Rechnung';"); -$db->dbexec("update invoices set invoicetype='creditnote' where invoicetype='Gutschrift';"); -$db->dbexec("update invoices set invoicetype='salary' where invoicetype='Gehalt';"); -$db->dbexec("update invoices set invoicetype='taxes' where invoicetype='Steuern';"); -$db->dbexec("update invoices set invoicetype='payroll' where invoicetype='Sozialabgaben';"); -$db->dbexec("update invoices set id_receipient=(select id from addresses where addresses.receipient=invoices.receipientname) where id_receipient is null;"); -&enable_triggers($triggers); -copy($RealBin."profile/server/invoicejournal.sqlite",$cfgpath.'/invoicejournal.sqlite'); - - - -sub getcoldef($){ - my $strddl = shift; - my $curddl = $strddl; - $curddl =~ s/\s+/\ /g; - my $bi = index($curddl,'(')+1; - my $ei = rindex($curddl,')'); - - $curddl = substr($curddl,$bi,length($curddl)-$bi-(length($curddl)-$ei)); - my @colsfull = split(/,/,$curddl); - my $tblobj = (); - foreach my $c (@colsfull){ - $c =~ s/^\s+//; - $c =~ s/\s+$//; - my @coldef = split(/\ /,$c); - my $type = uc($coldef[1]); - if (($type =~ /^TEXT/) || ($type =~ /^REAL/) || ($type =~ /^INTEGER/) || ($type =~ /^BOOLEAN/) || ($type =~ /^DATE/) || ($type =~ /^DATETIME/) || ($type =~ /^NUMERIC/)) { - $tblobj->{$coldef[0]} = $type; - } - } - return $tblobj; -} - -sub disable_triggers($){ - my $trg = shift; - foreach my $k (%{$trg}){ - print "DROP TRIGGER ".$trg->{$k}->{name}."\n"; - $db->dbexec("DROP TRIGGER ".$trg->{$k}->{name}.";"); - } -} - -sub enable_triggers($){ - my $trg = shift; - foreach my $k (%{$trg}){ - print "ENABLE TRIGGER ".$trg->{$k}->{name}."\n"; - $db->dbexec($trg->{$k}->{sql}); - } -} \ No newline at end of file diff --git a/dev/install.bat b/dev/install.bat deleted file mode 100644 index 668c7b7..0000000 --- a/dev/install.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off -rem cpanm --force Ogg::Vorbis::Header::PurePerl -rem cpanm MP3::Info -rem cpanm MP4::Info -rem cpanm Audio::FLAC::Header -rem cpanm Text::Unidecode -rem cpanm XML::Simple -rem cpanm LWP::Simple -rem cpanm LWP::UserAgent -rem cpanm Digest::SHA::PurePerl -rem cpanm URI::Encode -rem cpanm File::Find::Rule -rem panm JSON::PP -rem cpanm File::Copy::Recursive -rem cpanm Digest::SHA -rem cpanm MIME::Types -rem cpanm MIME::Type::FileName -rem cpanm Plack::App::File -rem cpanm Plack::App::WrapCGI -rem cpanm FindBin -rem cpanm CGI::Emulate::PSGI -rem cpanm CGI::Compile -rem cpanm Plack::Middleware::DirIndex -cpanm Starlight - diff --git a/dev/profile/server/invoicejournal.sqlite b/dev/profile/server/invoicejournal.sqlite deleted file mode 100644 index 1e80208..0000000 Binary files a/dev/profile/server/invoicejournal.sqlite and /dev/null differ diff --git a/dev/server.bat b/dev/server.bat deleted file mode 100644 index e85f373..0000000 --- a/dev/server.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -C:\Strawberry\perl\bin\perl.exe %~dp0\..\server\invoicejournal.pl \ No newline at end of file diff --git a/dev/sqlite.pm b/dev/sqlite.pm deleted file mode 100644 index ed9ce25..0000000 --- a/dev/sqlite.pm +++ /dev/null @@ -1,320 +0,0 @@ -package sqlite; -use strict; -use DBI; -use DBD::SQLite; -use Encode; -use File::Basename; - -sub new { - my $class = shift; - my $p = shift; - my $self = bless {}, $class; - $self->{dbfile} =$p; - return $self; -} - -sub strreplace(){ - my $self = shift; - my $text = shift; - $text =~ s/'/''/g; - return $text; -} - -sub dbquery(){ - my $self = shift; - my $key = shift; - my $stat = shift; - my $retdata =(); - my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1}) or return "dbquery Connection Error!".$!; - $stat = encode("utf8", $stat); - - #open FILE,">>/tmp/sql.log"; - # print FILE "key:".$key.";$stat\n"; - # close FILE; - my $sth = $dbh->prepare($stat); - $sth->execute() or print "dbquery: ".$sth->errstr; - while(my $data = $sth->fetchrow_hashref()) - { - if (exists $data->{$key}){ - foreach my $k (keys %{$data}){ - $retdata->{$data->{$key}}{$k} = $data->{$k}; - } - } - } - if (keys(%{$retdata}) == 0){ - $retdata =(); - } - $sth->finish(); - $dbh->disconnect(); - return $retdata; -} - -sub dbquerysorted(){ - my $self = shift; - my $stat = shift; - my $retdata = (); - my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1}) or return "dbquery Connection Error!".$!; - $stat = encode("utf8", $stat); - #open FILE,">>/tmp/sql.log"; - #print "$stat\n"; - # close FILE; - my $sth = $dbh->prepare($stat); - - $sth->execute() or print "dbquery: ".$sth->errstr; - my $count = 0; - while(my $data = $sth->fetchrow_hashref()) - { - foreach my $k (keys %{$data}){ - $retdata->{$count}->{$k} = $data->{$k}; - } - $count++; - } - - $sth->finish(); - $dbh->disconnect(); - #%retdata = sort {$a <=> $b} keys %retdata; - return $retdata; -} - -sub dbexec(){ - my $self = shift; - my $stat = shift; - my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,AutoCommit=>1}) or return "dbexec Connection Error!".$!; - $stat = encode("utf8", $stat); - #print $stat."\n"; - #open FILE,">>/Users/kilian/sql.log"; - #print FILE "$stat\n"; - #close FILE; - my $sth = $dbh->prepare($stat); - my $rv =$dbh->do($stat) or return "SQL ERROR:".$dbh->errstr; - $dbh->disconnect(); - return $rv; -} - - -#sub dbbackup(){ -# my $self = shift; -# my $path = shift; -# my $type = shift; -# -# my @dx = localtime(); -# $dx[5] = $dx[5] +1900; -# $dx[4] = $dx[4] +1; -# if ($dx[4] < 10){$dx[4] = '0'.$dx[4];} -# if ($dx[3] < 10){$dx[3] = '0'.$dx[3];} -# if ($dx[2] < 10){$dx[2] = '0'.$dx[2];} -# if ($dx[1] < 10){$dx[1] = '0'.$dx[1];} -# if ($dx[0] < 10){$dx[0] = '0'.$dx[0];} -# my $xdd = $dx[5].$dx[4].$dx[3].'_'.$dx[2].$dx[1].$dx[0]; -# my $bfile = ""; -# if ($type eq "binary" ) { -# $bfile = $path.'/'.basename(substr($self->{dbfile},0,rindex($self->{dbfile},'.'))).'_'.$xdd.'.sqlite'; -# my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1}) or die "dbexec Connection Error!".$!; -# $dbh->sqlite_backup_to_file($bfile); -# $dbh->disconnect(); -# }elsif($type eq "sql"){ -# $bfile = $path.'/'.basename($self->{dbfile}).'_'.$xdd.'.sql'; -# my $st = system('sqlite3 "'.$self->{dbfile}.'" ".dump" > '.$bfile); -# } -# return $bfile; -#} -# -#sub dbrestore(){ -# my $self = shift; -# my $file = shift; -# my $type = shift; -# if ($type eq "binary" ) { -# my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1}) or die "dbexec Connection Error!".$!; -# $dbh->sqlite_backup_from_file($file); -# $dbh->disconnect(); -# }elsif($type eq "sql"){ -# open(REST,$file) or die "cannot open restore file $file!\n"; -# my $rsql = ""; -# while (my $l = ) { -# $rsql .= $l; -# } -# close(REST); -# unlink($self->{dbfile}); -# $self->dbexec($rsql); -# } -#} -# -#sub dbrepair(){ -# my $self = shift; -# my $bfile = $self->dbbackup($ENV{'TMPDIR'},'sql'); -# $self->dbrestore($bfile,'sql'); -# unlink($bfile); -#} - -sub create_ddl_insert(){ - my $self = shift; - my $data = shift; - my $fields = (); - my @ddl = (); - - foreach my $f (keys(%{$data})){ - if (($f =~ /\_/) && ($f !~ /^ident_/)){ - my $t = substr($f,0,index($f,"_")); - my $c = substr($f,length($t)+1); - #my ($t,$c) = $f =~ m/(.+)\_(.+)/; - $fields->{$t}->{$c} = $data->{$f}; - } elsif ($f =~ /^ident_/){ - my $f2 = $f; - $f2 =~ s/^ident_//; - - my $t = substr($f2,0,index($f2,"_")); - my $c = substr($f2,length($t)+1); - $fields->{$t}->{$c} = $data->{$f}; - } - - } - - foreach my $tb (keys(%{$fields})){ - my @sqlcol = (); - my @sqlval = (); - foreach my $c (keys(%{$fields->{$tb}})){ - my $v = $fields->{$tb}->{$c}; - push (@sqlcol,$c); - if ($v eq ''){ - $v = 'null'; - } - elsif ($v =~ /^date\(/ ){ - $v = $v; - } - else { - $v =~ s/'/''/g; - $v = "'".$v."'"; - } - push (@sqlval,$v); - } - push(@ddl,"INSERT INTO ".$tb." (".join(",",@sqlcol).") VALUES (".join(",",@sqlval).");"); - } - return @ddl; -} - -sub create_ddl_update(){ - my $self = shift; - my $data = shift; - my $fields = (); - my @ddl = (); - foreach my $f (keys(%{$data})){ - if ($f =~ /^ident_/){ - my $fx = substr($f,6); - my $t = substr($fx,0,index($fx,"_")); - my $c = substr($fx,length($t)+1); - #my ($t,$c) = $f =~ m/^ident_(.+)\_([a-z0-9|\_]+)/; - $fields->{$t}->{cond}->{$c} = $data->{$f}; - } elsif ( ($f !~ /^ident/) && ($f =~ /.+\_.+/) ){ - my $t = substr($f,0,index($f,"_")); - my $c = substr($f,length($t)+1); - #my ($t,$c) = $f =~ m/^(.+)\_([a-z0-9|\_]+)/; - $fields->{$t}->{fields}->{$c} = $data->{$f}; - } - } - foreach my $tb (keys(%{$fields})){ - my @sqlupd = (); - my @sqlcond = (); - foreach my $c (keys(%{$fields->{$tb}->{fields}})){ - - my $v = $fields->{$tb}->{fields}->{$c}; - $v =~ s/'/''/g; - - if ($c =~ /-/){ - my @jp = split('-',$c); - if ($v eq ''){ - $v = 'null'; - } else { - $v = '"'.$v.'"'; - } - $c = 'jsonb_set(to_jsonb('.$jp[0].'),\'{"'.$jp[1].'"}\',\''.$v.'\')::json'; - push (@sqlupd,$jp[0]."=".$c); - }else { - if ($v eq ''){ - $v = 'null'; - } else { - $v = "'".$v."'"; - } - push (@sqlupd,$c."=".$v); - } - - } - foreach my $c (keys(%{$fields->{$tb}->{cond}})){ - my $v = $fields->{$tb}->{cond}->{$c}; - $v =~ s/'/''/g; - if ($v eq ''){ - $v = 'null'; - } else { - $v = "'".$v."'"; - } - push (@sqlcond,$c."=".$v); - } - push(@ddl,"UPDATE ".$tb." SET ".join(",",@sqlupd)." WHERE ".join(" AND ",@sqlcond).";"); - } - - return @ddl; -} - -sub create_cnt_statement(){ - my $self = shift; - my $data = shift; - my $fields = (); - my @ddl = (); - foreach my $f (keys(%{$data})){ - if ($f =~ /^ident_/){ - my $fx = substr($f,6); - my $t = substr($fx,0,index($fx,"_")); - my $c = substr($fx,length($t)+1); - #my ($t,$c) = $f =~ m/^ident_(.+)\_([a-z0-9|\_]+)/; - $fields->{$t}->{cond}->{$c} = $data->{$f}; - } - } - foreach my $tb (keys(%{$fields})){ - my @sqlcond = (); - foreach my $c (keys(%{$fields->{$tb}->{cond}})){ - my $v = $fields->{$tb}->{cond}->{$c}; - $v =~ s/'/''/g; - if ($v eq ''){ - $v = 'null'; - } else { - $v = "'".$v."'"; - } - push (@sqlcond,$c."=".$v); - } - push(@ddl,"SELECT count(*) as cnt from ".$tb." WHERE ".join(" AND ",@sqlcond).";"); - } - # open FILE,">>tmp/sql.log"; - # print FILE "\n==\n".join("\n",@ddl)."\n==\n"; - # close FILE; - return @ddl; -} - -sub create_ddl_delete(){ - my $self = shift; - my $data = shift; - my $fields = (); - my @ddl = (); - my @refcols = (); - my $refdata = (); - foreach my $f (keys(%{$data})){ - if ($f =~ /^ident_/){ - my ($t,$c) = $f =~ m/ident_(.+)\_(.+)/; - - $fields->{$t}->{cond}->{$c} = $data->{$f}; - push(@refcols,"'".$c.'_'.$t."'"); - $refdata->{$c.'_'.$t} = $data->{$f}; - } - } - - foreach my $tb (keys(%{$fields})){ - my @sqlcond = (); - foreach my $c (keys(%{$fields->{$tb}->{cond}})){ - my $v = $fields->{$tb}->{cond}->{$c}; - $v =~ s/'/''/g; - push (@sqlcond,$c."='".$v."'"); - } - push(@ddl,"DELETE FROM ".$tb." WHERE ".join(" AND ",@sqlcond).";"); - } - return @ddl; -} - -1; diff --git a/dev/updateprofile.pl b/dev/updateprofile.pl deleted file mode 100644 index 0de0b2a..0000000 --- a/dev/updateprofile.pl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/local/bin/perl - -use strict; -use FindBin qw($RealBin $Bin); -use File::Copy qw(copy); -use File::Path qw (make_path); -my $cfgpath = ""; -if ($^O eq "MSWin32"){ - $cfgpath = $ENV{APPDATA}.'/invoicejournal/server'; -} elsif ($^O eq "darwin"){ - $cfgpath = $ENV{HOME}.'/Library/Application Support/invoicejournal/server'; -} else { - $cfgpath = $ENV{HOME}.'/.invoicejournal/server'; -} -if (! -d $cfgpath){ - make_path($cfgpath); -} - -copy($RealBin.'/profile/server/invoicejournal.sqlite',$cfgpath.'/invoicejournal.sqlite'); diff --git a/dksserver.pl b/dksserver.pl deleted file mode 100644 index eb61ea0..0000000 --- a/dksserver.pl +++ /dev/null @@ -1,110 +0,0 @@ -#!C:\Strawberry\perl\bin\perl.exe -use strict; -use File::Basename; - -use Time::HiRes; -use Data::Dumper; -use FindBin qw($Bin $RealBin); -use Plack::Builder; -use Plack::App::File; -use Plack::App::WrapCGI; -use Plack::Request; -use File::Path qw (make_path); -use Plack::Runner; - -use lib ($RealBin); -our $cfgpath = ""; - -print $^O."\n"; -print $^X."\n"; -print "Process:".$$."\n"; -print join(@INC)."\n"; -my $cfg = (); -if (($ARGV[0] ne "") && (-e $ARGV[0])){ - open(CFG,$ARGV[0]); - while (my $l = ){ - chmop($l); - if (($l =~ /^\s*#/) || ($l =~ "") ) { next; } - my ($k,$v) = $l =~ m/\s*(\w+)\s*=\s*(.*)$/; - $cfg->{$k} = $v; - } - close(CFG); -} -print "ARGV:".Dumper(@ARGV)."\n--\n"; -my @match = grep { /par-.*inc$/} @INC; - -my $basedir = $RealBin; -if (scalar(@match) > 0){ - $basedir = $match[0]; -} - -print "BASEDIR:".$basedir."\n"; -my $name = basename($0); -$name =~ s/\.pl$//; -$name =~ s/\.exe$//; - -if (exists($ENV{"DKSAPPDATA"})){ - $cfgpath = $ENV{"DKSAPPDATA"}; -} -if ($^O eq "MSWin32"){ - $cfgpath = $ENV{APPDATA}.'/'.$name.'/server'; -} elsif ($^O eq "darwin"){ - $cfgpath = $ENV{HOME}.'/Library/Application Support/'.$name.'/server'; -} elsif ($ENV{uc($name)."_DATA"} ne "") { - $cfgpath = $ENV{uc($name)."_DATA"}; -} else { - $cfgpath = $RealBin.'/data'; -} - -our $glhostname = `hostname`; -chomp($glhostname); -print $glhostname."\n"; - -if (! -d $cfgpath ){ - make_path($cfgpath); -} -$cfgpath =~ s/\\/\//g; -print $cfgpath."\n"; -exit(0); -my $allapp = builder { - enable "DirIndex", dir_index => 'index.html'; - mount "/" => Plack::App::WrapCGI->new(script => $RealBin."/server/index.cgi")->to_app;#,execute=> 1 - - opendir(API,$RealBin."/server/api"); - while (my $s = readdir(API)){ - if ($s =~ /\.cgi$/){ - mount "/api/".$s => Plack::App::WrapCGI->new(script => $RealBin."/server/api/".$s)->to_app; - } - } - closedir(API); - mount "/static" => Plack::App::File->new(root => $RealBin."/server/static")->to_app; - # if (-e $cfgpath.'/'.$name.'.passwd'){ - # enable "Auth::Basic", authenticator => \&authen_cb; - # } -}; - - -my @args = ("-p","6060");#,"-R",$RealBin.'/CGI,'.$RealBin.'/CGI/api,'.$RealBin.'/CGI/api/lib',"--error-log",$RealBin."/error.log","--access-log",$RealBin."/access.log" -my $runner = Plack::Runner->new(server => 'Starlight', env => 'development', ipv6 => '1' );#env => development,deployment,development, test -$runner->parse_options(@args); -$runner->run($allapp); - -print "Started\n"; - -# sub authen_cb { -# my($username, $password, $env) = @_; -# my $auth = 0; -# #print "Check AUTH\n"; -# if (-e $cfgpath.'/'.$name.'.passwd'){ -# open(AUTH,$cfgpath.'/'.$name.'.passwd'); -# while (my $l = ){ -# chomp($l); -# if ($l eq $username.'='.$password){ -# $auth = 1; -# last; -# } -# } -# close(AUTH); -# } -# return $auth; -# } \ No newline at end of file diff --git a/img/dks_1000.png b/img/dks_1000.png deleted file mode 100644 index 87b44eb..0000000 Binary files a/img/dks_1000.png and /dev/null differ diff --git a/img/invoicejournal.png b/img/invoicejournal.png deleted file mode 100644 index 4191afb..0000000 Binary files a/img/invoicejournal.png and /dev/null differ diff --git a/install/EULA_Default.rtf b/install/EULA_Default.rtf new file mode 100644 index 0000000..032b0a4 --- /dev/null +++ b/install/EULA_Default.rtf @@ -0,0 +1,278 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31506\stshfloch31506\stshfhich31506\stshfbi31507\deflang4103\deflangfe4103\themelang4103\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} +{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f4\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;} +{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 00000000000000000000}Cambria;} +{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} +{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f46\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f47\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f49\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f50\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f51\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f52\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f53\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f54\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f66\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f67\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;} +{\f69\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f70\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f71\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f72\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);} +{\f73\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f74\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f86\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;}{\f87\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;} +{\f89\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f90\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f91\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f92\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);} +{\f93\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f94\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f416\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f417\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\f419\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f420\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f421\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f422\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);} +{\f423\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f424\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;} +{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;} +{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;\red51\green51\blue51;\red34\green34\blue34;}{\*\defchp +\f31506\fs22\lang4103\langfe1033\langfenp1033 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang4103\langfe1033\cgrid\langnp4103\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{ +\s2\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af0\afs36\alang1025 \ltrch\fcs0 \b\fs36\lang4103\langfe4103\cgrid\langnp4103\langfenp4103 +\sbasedon0 \snext2 \slink15 \sqformat \spriority9 \styrsid996065 heading 2;}{\s3\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af0\afs27\alang1025 +\ltrch\fcs0 \b\fs27\lang4103\langfe4103\cgrid\langnp4103\langfenp4103 \sbasedon0 \snext3 \slink16 \sqformat \spriority9 \styrsid996065 heading 3;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang4103\langfe1033\cgrid\langnp4103\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive +\rtlch\fcs1 \ab\af0\afs36 \ltrch\fcs0 \b\f0\fs36\lang0\langfe4103\langfenp4103 \sbasedon10 \slink2 \slocked \spriority9 \styrsid996065 \'dcberschrift 2 Zchn;}{\*\cs16 \additive \rtlch\fcs1 \ab\af0\afs27 \ltrch\fcs0 +\b\f0\fs27\lang0\langfe4103\langfenp4103 \sbasedon10 \slink3 \slocked \spriority9 \styrsid996065 \'dcberschrift 3 Zchn;}{\*\cs17 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \sbasedon10 \spriority0 \styrsid996065 app_name;}{ +\s18\ql \li0\ri0\sb100\sa100\sbauto1\saauto1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang4103\langfe4103\cgrid\langnp4103\langfenp4103 +\sbasedon0 \snext18 \ssemihidden \sunhideused \styrsid996065 Normal (Web);}{\*\cs19 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \sbasedon10 \spriority0 \styrsid996065 company_name;}{\*\cs20 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf2 +\sbasedon10 \ssemihidden \sunhideused \styrsid996065 Hyperlink;}{\*\cs21 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \sbasedon10 \spriority0 \styrsid996065 country;}}{\*\listtable{\list\listtemplateid1342201478{\listlevel\levelnfc23\levelnfcn23\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\lvltentative\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0 +\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0 +{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext +\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext +\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext +\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext +\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext +\'01\u-3929 ?;}{\levelnumbers;}\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1478454663}}{\*\listoverridetable{\listoverride\listid1478454663\listoverridecount0\ls1}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0 +\sa0}}{\*\rsidtbl \rsid996065\rsid6240907\rsid9981332\rsid12611109}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Kilian Saffran}{\operator Kilian Saffran} +{\creatim\yr2020\mo10\dy14\hr15\min22}{\revtim\yr2020\mo10\dy14\hr15\min25}{\version1}{\edmins0}{\nofpages2}{\nofwords582}{\nofchars3667}{\nofcharsws4241}{\vern9}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}} +\paperw11906\paperh16838\margl720\margr720\margt720\margb720\gutter567\ltrsect +\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace110\dgvspace180\dghorigin1287\dgvorigin720\dghshow2\dgvshow2 +\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct +\asianbrkrule\rsidroot996065\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0 +{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\psz9\linex0\headery709\footery709\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid12611109\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}} +{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}} +{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9 +\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa270\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 \rtlch\fcs1 \af31507\afs22\alang1025 +\ltrch\fcs0 \f31506\fs22\lang4103\langfe1033\cgrid\langnp4103\langfenp1033 {\rtlch\fcs1 \ab\af4\afs24 \ltrch\fcs0 \b\f4\fs24\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 End-User License Agreement (EULA) of\~Invoice Journal +\par }\pard \ltrpar\ql \li0\ri0\sa300\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 Th +is End-User License Agreement ("EULA") is a legal agreement between you and\~DKS S.\'e0 r.l.. Our EULA was created by\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 +\f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 HYPERLINK "https://www.eulatemplate.com/" }}{\fldrslt {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf20\lang4103\langfe4103\chbrdr\brdrnone\brdrframe1 +\langfenp4103\insrsid996065\charrsid996065 EULA Template}}}\sectd \ltrsect\psz9\linex0\headery709\footery709\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid12611109\sftnbj {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 +\f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \~for\~Invoice Journal. +\par This EULA agreement governs your acquisition and use of our\~Invoice Journal\~software ("Software") directly from\~DKS S.\'e0 r.l.\~or indirectly through a\~DKS S.\'e0 r.l.\~ +authorized reseller or distributor (a "Reseller"). Our Privacy Policy was created by\~}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 HYPERLINK + "https://www.generateprivacypolicy.com/" }}{\fldrslt {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf20\lang4103\langfe4103\chbrdr\brdrnone\brdrframe1 \langfenp4103\insrsid996065\charrsid996065 the Privacy Policy Generator}}}\sectd \ltrsect +\psz9\linex0\headery709\footery709\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sectrsid12611109\sftnbj {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 . +\par Please read this EULA agreement carefully before completing the installation process and using the\~Invoice Journal\~software. It provides a license to use the\~Invoice Journal\~software and contains warranty information and liability disclaimers. +\par If you register for a free trial of the\~Invoice Journal\~software, this EULA agreement will also govern that trial. By clicking "accept" or installing and/or using the\~Invoice Journal\~software, + you are confirming your acceptance of the Software and agreeing to become bound by the terms of this EULA agreement. +\par If you are entering into this EULA agreement on behalf of a company or other legal entity, you represent that you have the authority to bi +nd such entity and its affiliates to these terms and conditions. If you do not have such authority or if you do not agree with the terms and conditions of this EULA agreement, do not install or use the Software, and you must not accept this EULA agreement +. +\par This EULA agreement shall apply only to the Software supplied by\~DKS S.\'e0 r.l.\~herewith regardless of whether other software is referred to or described herein. The terms also apply to any\~DKS S.\'e0 r.l.\~ +updates, supplements, Internet-based services, and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply. +\par }\pard \ltrpar\ql \li0\ri0\sa270\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +License Grant +\par }\pard \ltrpar\ql \li0\ri0\sa300\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 DKS S.\'e0 + r.l.\~hereby grants you a personal, non-transferable, non-exclusive licence to use the\~Invoice Journal\~software on your devices in accordance with the terms of this EULA agreement. +\par You are permitted to load the\~Invoice Journal\~software (for example a PC, laptop, mobile or tablet) under your control. You are responsible for ensuring your device meets the minimum requirements of the\~Invoice Journal\~software. +\par You are not permitted to: +\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f3\fs20\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sb100\sa100\sbauto1\saauto1\widctlpar +\jclisttab\tx720\wrapdefault\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +Edit, alter, modify, adapt, translate or otherwise change the whole or any part of the Software nor permit the whole or any part of the Software to be combined with or become incorporated in any othe +r software, nor decompile, disassemble or reverse engineer the Software or attempt to do any such things +\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f3\fs20\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \loch\af3\dbch\af0\hich\f3 \'b7\tab} +Reproduce, copy, distribute, resell or otherwise use the Software for any commercial purpose +\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f3\fs20\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \loch\af3\dbch\af0\hich\f3 \'b7\tab}Allow any third party to use the Software on behalf of or +for the benefit of any third party +\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f3\fs20\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \loch\af3\dbch\af0\hich\f3 \'b7\tab} +Use the Software in any way which breaches any applicable local, national or international law +\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f3\fs20\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 \loch\af3\dbch\af0\hich\f3 \'b7\tab}use the Software for any purpose that\~DKS S.\'e0 r.l.\~ +considers is a breach of this EULA agreement +\par }\pard \ltrpar\ql \li0\ri0\sa270\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +Intellectual Property and Ownership +\par }\pard \ltrpar\ql \li0\ri0\sa300\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 DKS S.\'e0 + r.l.\~shall at all times retain ownership of the Software as originally downloaded by you and all subsequent downloads of the Software by you. The Software (and the copyright, and other intellectual property rights of whatever nature in the So +ftware, including any modifications made thereto) are and shall remain the property of\~DKS S.\'e0 r.l.. +\par DKS S.\'e0 r.l.\~reserves the right to grant licences to use the Software to third parties. +\par }\pard \ltrpar\ql \li0\ri0\sa270\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +Termination +\par }\pard \ltrpar\ql \li0\ri0\sa300\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +This EULA agreement is effective from the date you first use the Software and shall continue until terminated. You may terminate it at any time upon written notice to\~DKS S.\'e0 r.l.. +\par It will also terminate immediately if you fail to comply with any term of this EULA agreement. Upon such termination, the licenses granted by this EULA agreement will immediately terminate and you agree to stop all access and use of the Softwar +e. The provisions that by their nature continue and survive will survive any termination of this EULA agreement. +\par }\pard \ltrpar\ql \li0\ri0\sa270\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs24 \ltrch\fcs0 \f4\fs24\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +Governing Law +\par }\pard \ltrpar\ql \li0\ri0\sa300\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 \cbpat8 {\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 +This EULA agreement, and any dispute arising out of or in connection with this EULA agreement, shall be governed by and construed in accordance with the laws of\~}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 +\f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065 Luxembourg}{\rtlch\fcs1 \af4\afs21 \ltrch\fcs0 \f4\fs21\cf19\lang4103\langfe4103\langfenp4103\insrsid996065\charrsid996065 . +\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid996065 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid6240907\charrsid996065 +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210030dd4329a8060000a41b0000160000007468656d652f7468656d652f +7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87 +615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad +79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b +5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab +999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9 +699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586 +8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6 +0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f +9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be +15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979 +3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d +32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a +f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86 +e877f0034e16bafb0e258ebb4faf06b769e888340b103d331115bebc4eb813bf83291b63624a0d1475a756c734f9bbc2cd28546ecbe1e20a3794ca175f3fae90 +fb6d2dd99bb07b55e5ccf68942bd0877b23c77b908e8db5f9db7f024d9239010f35bd4bbe2fcae387bfff9e2bc289f2fbe24cfaa301468dd8bd846dbb4ddf1c2 +ae7b4c191ba8292337a469bc25ec3d411f06f53a73e224c5292c8de0516732307070a1c0660d125c7d44553488700a4d7bddd3444299910e254ab984c3a219ae +a4adf1d0f82b7bd46cea4388ad1c12ab5d1ed8e1153d9c9f350a3246aad01c6873462b9ac05999ad5cc988826eafc3acae853a33b7ba11cd1445875ba1b236b1 +399483c90bd560b0b0263435085a21b0f22a9cf9356b38ec6046026d77eba3dc2dc60b17e92219e180643ed27acffba86e9c94c7ca9c225a0f1b0cfae0788ad5 +4adc5a9aec1b703b8b93caec1a0bd8e5de7b132fe5113cf312503b998e2c2927274bd051db6b35979b1ef271daf6c6704e86c73805af4bdd476216c26593af84 +0dfb5393d964f9cc9bad5c313709ea70f561ed3ea7b053075221d51696910d0d339585004b34272bff7213cc7a510a5454a3b349b1b206c1f0af490176745d4b +c663e2abb2b34b23da76f6352ba57ca2881844c1111ab189d8c7e07e1daaa04f40255c77988aa05fe06e4e5bdb4cb9c5394bbaf28d98c1d971ccd20867e556a7 +689ec9166e0a522183792b8907ba55ca6e943bbf2a26e52f48957218ffcf54d1fb09dc3eac04da033e5c0d0b8c74a6b43d2e54c4a10aa511f5fb021a07533b20 +5ae07e17a621a8e082dafc17e450ffb739676998b48643a4daa7211214f623150942f6a02c99e83b85583ddbbb2c4996113211551257a656ec1139246ca86be0 +aadedb3d1441a89b6a929501833b197fee7b9641a3503739e57c732a59b1f7da1cf8a73b1f9bcca0945b874d4393dbbf10b1680f66bbaa5d6f96e77b6f59113d +316bb31a795600b3d256d0cad2fe354538e7566b2bd69cc6cbcd5c38f0e2bcc63058344429dc2121fd07f63f2a7c66bf76e80d75c8f7a1b622f878a18941d840 +545fb28d07d205d20e8ea071b283369834296bdaac75d256cb37eb0bee740bbe278cad253b8bbfcf69eca23973d939b97891c6ce2cecd8da8e2d343578f6648a +c2d0383fc818c798cf64e52f597c740f1cbd05df0c264c49134cf09d4a60e8a107260f20f92d47b374e32f000000ffff0300504b030414000600080000002100 +0dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f7 +8277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89 +d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd500 +1996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0f +bfff0000001c0200001300000000000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6 +a7e7c0000000360100000b00000000000000000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a +0000001c00000000000000000000000000190200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d00140006000800000021 +0030dd4329a8060000a41b00001600000000000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d001400060008 +00000021000dd1909fb60000001b0100002700000000000000000000000000b20900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000ad0a00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority59 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text; +\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2; +\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List; +\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1; +\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision; +\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1; +\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1; +\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; +\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2; +\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; +\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3; +\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4; +\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; +\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4; +\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5; +\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000050d5 +097e2da2d601feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/install/createmacicon.pl b/install/createmacicon.pl new file mode 100644 index 0000000..05be5c5 --- /dev/null +++ b/install/createmacicon.pl @@ -0,0 +1,30 @@ +#!/usr/bin/perl + +use strict; +use File::Basename; +use File::Copy; +use File::Path qw(make_path remove_tree); +print "Create MacOS ICON (*.icns)\n"; +my $BASEIMG= $ARGV[0]; +if ((! -e $BASEIMG) || ($BASEIMG !~ /\.png$/)){ + print "no PNG-image selected!\n"; + exit(1); +} +my $ICONSET=dirname($BASEIMG).'/appicon.iconset'; +if (-d $ICONSET) { + remove_tree($ICONSET,{keep_root => 1}); +} else { + make_path( $ICONSET); +} +copy($BASEIMG,$ICONSET."/icon_512x512.png"); +copy($BASEIMG,$ICONSET.'/icon_512x512@2x.png'); +copy($ICONSET.'/icon_512x512.png',$ICONSET.'/icon_256x256@2x.png'); +system('sips -s format png -Z 256 "'.$BASEIMG.'" --out "'.$ICONSET.'/icon_256x256.png"'); +copy($ICONSET.'/icon_256x256.png',$ICONSET.'/icon_128x128@2x.png'); +system('sips -s format png -Z 128 "'.$BASEIMG.'" --out "'.$ICONSET.'/icon_128x128.png"'); +system('sips -s format png -Z 64 "'.$BASEIMG.'" --out "'.$ICONSET.'/icon_32x32@2x.png"'); +system('sips -s format png -Z 32 "'.$BASEIMG.'" --out "'.$ICONSET.'/icon_32x32.png"'); +copy($ICONSET.'/icon_32x32.png',$ICONSET.'/icon_16x16@2x.png'); +system('sips -s format png -Z 16 "'.$BASEIMG.'" --out "'.$ICONSET.'/icon_16x16.png"'); +system('iconutil -c icns -o "'.dirname($BASEIMG).'/'.substr(basename($BASEIMG),0,-4).'.icns" "'.$ICONSET.'"'); +system('rm -r "'.$ICONSET.'"'); \ No newline at end of file diff --git a/install/glsigncert2020.pfx b/install/glsigncert2020.pfx new file mode 100644 index 0000000..93a9551 Binary files /dev/null and b/install/glsigncert2020.pfx differ diff --git a/install/macos/pkg-dmg b/install/macos/pkg-dmg new file mode 100644 index 0000000..f84ba96 --- /dev/null +++ b/install/macos/pkg-dmg @@ -0,0 +1,1520 @@ +#!/usr/bin/perl +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is pkg-dmg, a Mac OS X disk image (.dmg) packager +# +# The Initial Developer of the Original Code is +# Mark Mentovai . +# Portions created by the Initial Developer are Copyright (C) 2005 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +use strict; +use warnings; + +=pod + +=head1 NAME + +B - Mac OS X disk image (.dmg) packager + +=head1 SYNOPSIS + +B +B<--source> I +B<--target> I +[B<--format> I] +[B<--volname> I] +[B<--tempdir> I] +[B<--mkdir> I] +[B<--copy> I[:I]] +[B<--symlink> I[:I]] +[B<--license> I] +[B<--resource> I] +[B<--icon> I] +[B<--attribute> I:I[:I...] +[B<--idme>] +[B<--sourcefile>] +[B<--verbosity> I] +[B<--dry-run>] + +=head1 DESCRIPTION + +I takes a directory identified by I and transforms +it into a disk image stored as I. The disk image will +occupy the least space possible for its format, or the least space that the +authors have been able to figure out how to achieve. + +=head1 OPTIONS + +=over 5 + +==item B<--source> I + +Identifies the directory that will be packaged up. This directory is not +touched, a copy will be made in a temporary directory for staging purposes. +See B<--tempdir>. + +==item B<--target> I + +The disk image to create. If it exists and is not in use, it will be +overwritten. If I already contains a suitable extension, +it will be used unmodified. If no extension is present, or the extension +is incorrect for the selected format, the proper extension will be added. +See B<--format>. + +==item B<--format> I + +The format to create the disk image in. Valid values for I are: + - UDZO - zlib-compressed, read-only; extension I<.dmg> + - UDBZ - bzip2-compressed, read-only; extension I<.dmg>; + create and use on 10.4 ("Tiger") and later only + - UDRW - read-write; extension I<.dmg> + - UDSP - read-write, sparse; extension I<.sparseimage> + +UDBZ is the default format. + +See L for a description of these formats. + +=item B<--volname> I + +The name of the volume in the disk image. If not specified, I +defaults to the name of the source directory from B<--source>. + +=item B<--tempdir> I + +A temporary directory to stage intermediate files in. I must +have enough space available to accommodate twice the size of the files +being packaged. If not specified, defaults to the same directory that +the I is to be placed in. B will remove any +temporary files it places in I. + +=item B<--mkdir> I + +Specifies a directory that should be created in the disk image. +I and any ancestor directories will be created. This is +useful in conjunction with B<--copy>, when copying files to directories +that may not exist in I. B<--mkdir> may appear multiple +times. + +=item B<--copy> I[:I] + +Additional files to copy into the disk image. If I is +specified, I is copied to the location I identifies, +otherwise, I is copied to the root of the new volume. B<--copy> +provides a way to package up a I by adding files to it +without modifying the original I. B<--copy> may appear +multiple times. + +This option is useful for adding .DS_Store files and window backgrounds +to disk images. + +=item B<--symlink> I[:I] + +Like B<--copy>, but allows symlinks to point out of the volume. Empty symlink +destinations are interpreted as "like the source path, but inside the dmg" + +This option is useful for adding symlinks to external resources, +e.g. to /Applications. + +=item B<--license> I + +A plain text file containing a license agreement to be displayed before +the disk image is mounted. English is the only supported language. To +include license agreements in other languages, in multiple languages, +or to use formatted text, prepare a resource and use L<--resource>. + +=item B<--resource> I + +A resource file to merge into I. If I is UDZO or +UDBZ, the disk image will be flattened to a single-fork file that contains +the resource but may be freely transferred without any special encodings. +I must be in a format suitable for L. See L for a +description of the format, and L for a discussion on flattened +disk images. B<--resource> may appear multiple times. + +This option is useful for adding license agreements and other messages +to disk images. + +=item B<--icon> I + +Specifies an I file that will be used as the icon for the root of +the volume. This file will be copied to the new volume and the custom +icon attribute will be set on the root folder. + +=item B<--attribute> I :I[:I...] + +Sets the attributes of I to the attribute list in I . See +L + +=item B<--idme> + +Enable IDME to make the disk image "Internet-enabled." The first time +the image is mounted, if IDME processing is enabled on the system, the +contents of the image will be copied out of the image and the image will +be placed in the trash with IDME disabled. + +=item B<--sourcefile> + +If this option is present, I is treated as a file, and is +placed as a file within the volume's root folder. Without this option, +I is treated as the volume root itself. + +=item B<--verbosity> I + +Adjusts the level of loudness of B. The possible values for +I are: + 0 - Only error messages are displayed. + 1 - Print error messages and command invocations. + 2 - Print everything, including command output. + +The default I is 2. + +=item B<--dry-run> + +When specified, the commands that would be executed are printed, without +actually executing them. When commands depend on the output of previous +commands, dummy values are displayed. + +=back + +=head1 NON-OPTIONS + +=over 5 + +=item + +Resource forks aren't copied. + +=item + +The root folder of the created volume is designated as the folder +to open when the volume is mounted. See L. + +=item + +All files in the volume are set to be world-readable, only writable +by the owner, and world-executable when appropriate. All other +permissions bits are cleared. + +=item + +When possible, disk images are created without any partition tables. This +is what L refers to as I<-layout NONE>, and saves a handful of +kilobytes. The alternative, I, contains a partition table that +is not terribly handy on disk images that are not intended to represent any +physical disk. + +=item + +Read-write images are created with journaling off. Any read-write image +created by this tool is expected to be transient, and the goal of this tool +is to create images which consume a minimum of space. + +=back + +=head1 EXAMPLE + +pkg-dmg --source /Applications/DeerPark.app --target ~/DeerPark.dmg + --sourcefile --volname DeerPark --icon ~/DeerPark.icns + --mkdir /.background + --copy DeerParkBackground.png:/.background/background.png + --copy DeerParkDSStore:/.DS_Store + --symlink /Applications:"/Drag to here" + +=head1 REQUIREMENTS + +I has been tested with Mac OS X releases 10.2 ("Jaguar") +through 10.4 ("Tiger"). Certain adjustments to behavior are made +depending on the host system's release. Mac OS X 10.3 ("Panther") or +later are recommended. + +=head1 LICENSE + +MPL 1.1/GPL 2.0/LGPL 2.1. Your choice. + +=head1 AUTHOR + +Mark Mentovai + +=head1 SEE ALSO + +L, L, L, L, L, +L, L + +=cut + +use Fcntl; +use POSIX; +use Getopt::Long; + +sub argumentEscape(@); +sub cleanupDie($); +sub command(@); +sub commandInternal($@); +sub commandInternalVerbosity($$@); +sub commandOutput(@); +sub commandOutputVerbosity($@); +sub commandVerbosity($@); +sub copyFiles($@); +sub diskImageMaker($$$$$$$$); +sub giveExtension($$); +sub hdidMountImage($@); +sub isFormatCompressed($); +sub licenseMaker($$); +sub pathSplit($); +sub setAttributes($@); +sub trapSignal($); +sub usage(); + +# Variables used as globals +my(@gCleanup, %gConfig, $gDarwinMajor, $gDryRun, $gVerbosity); + +# Use the commands by name if they're expected to be in the user's +# $PATH (/bin:/sbin:/usr/bin:/usr/sbin). Otherwise, go by absolute +# path. These may be overridden with --config. +%gConfig = ('cmd_bless' => 'bless', + 'cmd_chmod' => 'chmod', + 'cmd_diskutil' => 'diskutil', + 'cmd_du' => 'du', + 'cmd_hdid' => 'hdid', + 'cmd_hdiutil' => 'hdiutil', + 'cmd_mkdir' => 'mkdir', + 'cmd_mktemp' => 'mktemp', + 'cmd_Rez' => '/Developer/Tools/Rez', + 'cmd_rm' => 'rm', + 'cmd_rsync' => 'rsync', + 'cmd_SetFile' => '/Developer/Tools/SetFile', + + # create_directly indicates whether hdiutil create supports + # -srcfolder and -srcdevice. It does on >= 10.3 (Panther). + # This is fixed up for earlier systems below. If false, + # hdiutil create is used to create empty disk images that + # are manually filled. + 'create_directly' => 1, + + # If hdiutil attach -mountpoint exists, use it to avoid + # mounting disk images in the default /Volumes. This reduces + # the likelihood that someone will notice a mounted image and + # interfere with it. Only available on >= 10.3 (Panther), + # fixed up for earlier systems below. + # + # This is presently turned off for all systems, because there + # is an infrequent synchronization problem during ejection. + # diskutil eject might return before the image is actually + # unmounted. If pkg-dmg then attempts to clean up its + # temporary directory, it could remove items from a read-write + # disk image or attempt to remove items from a read-only disk + # image (or a read-only item from a read-write image) and fail, + # causing pkg-dmg to abort. This problem is experienced + # under Tiger, which appears to eject asynchronously where + # previous systems treated it as a synchronous operation. + # Using hdiutil attach -mountpoint didn't always keep images + # from showing up on the desktop anyway. + 'hdiutil_mountpoint' => 0, + + # hdiutil makehybrid results in optimized disk images that + # consume less space and mount more quickly. Use it when + # it's available, but that's only on >= 10.3 (Panther). + # If false, hdiutil create is used instead. Fixed up for + # earlier systems below. + 'makehybrid' => 1, + + # hdiutil create doesn't allow specifying a folder to open + # at volume mount time, so those images are mounted and + # their root folders made holy with bless -openfolder. But + # only on >= 10.3 (Panther). Earlier systems are out of luck. + # Even on Panther, bless refuses to run unless root. + # Fixed up below. + 'openfolder_bless' => 1, + + # It's possible to save a few more kilobytes by including the + # partition only without any partition table in the image. + # This is a good idea on any system, so turn this option off. + # + # Except it's buggy. "-layout NONE" seems to be creating + # disk images with more data than just the partition table + # stripped out. You might wind up losing the end of the + # filesystem - the last file (or several) might be incomplete. + 'partition_table' => 1, + + # To create a partition table-less image from something + # created by makehybrid, the hybrid image needs to be + # mounted and a new image made from the device associated + # with the relevant partition. This requires >= 10.4 + # (Tiger), presumably because earlier systems have + # problems creating images from devices themselves attached + # to images. If this is false, makehybrid images will + # have partition tables, regardless of the partition_table + # setting. Fixed up for earlier systems below. + 'recursive_access' => 1); + +# --verbosity +$gVerbosity = 2; + +# --dry-run +$gDryRun = 0; + +# %gConfig fix-ups based on features and bugs present in certain releases. +my($ignore, $uname_r, $uname_s); +($uname_s, $ignore, $uname_r, $ignore, $ignore) = POSIX::uname(); +if($uname_s eq 'Darwin') { + ($gDarwinMajor, $ignore) = split(/\./, $uname_r, 2); + + # $major is the Darwin major release, which for our purposes, is 4 higher + # than the interesting digit in a Mac OS X release. + if($gDarwinMajor <= 6) { + # <= 10.2 (Jaguar) + # hdiutil create does not support -srcfolder or -srcdevice + $gConfig{'create_directly'} = 0; + # hdiutil attach does not support -mountpoint + $gConfig{'hdiutil_mountpoint'} = 0; + # hdiutil mkhybrid does not exist + $gConfig{'makehybrid'} = 0; + } + if($gDarwinMajor <= 7) { + # <= 10.3 (Panther) + # Can't mount a disk image and then make a disk image from the device + $gConfig{'recursive_access'} = 0; + # bless does not support -openfolder on 10.2 (Jaguar) and must run + # as root under 10.3 (Panther) + $gConfig{'openfolder_bless'} = 0; + } +} +else { + # If it's not Mac OS X, just assume all of those good features are + # available. They're not, but things will fail long before they + # have a chance to make a difference. + # + # Now, if someone wanted to document some of these private formats... + print STDERR ($0.": warning, not running on Mac OS X, ". + "this could be interesting.\n"); +} + +# Non-global variables used in Getopt +my(@attributes, @copyFiles, @createSymlinks, $iconFile, $idme, $licenseFile, + @makeDirs, $outputFormat, @resourceFiles, $sourceFile, $sourceFolder, + $targetImage, $tempDir, $volumeName); + +# --format +$outputFormat = 'UDBZ'; + +# --idme +$idme = 0; + +# --sourcefile +$sourceFile = 0; + +# Leaving this might screw up the Apple tools. +delete $ENV{'NEXT_ROOT'}; + +# This script can get pretty messy, so trap a few signals. +$SIG{'INT'} = \&trapSignal; +$SIG{'HUP'} = \&trapSignal; +$SIG{'TERM'} = \&trapSignal; + +Getopt::Long::Configure('pass_through'); +GetOptions('source=s' => \$sourceFolder, + 'target=s' => \$targetImage, + 'volname=s' => \$volumeName, + 'format=s' => \$outputFormat, + 'tempdir=s' => \$tempDir, + 'mkdir=s' => \@makeDirs, + 'copy=s' => \@copyFiles, + 'symlink=s' => \@createSymlinks, + 'license=s' => \$licenseFile, + 'resource=s' => \@resourceFiles, + 'icon=s' => \$iconFile, + 'attribute=s' => \@attributes, + 'idme' => \$idme, + 'sourcefile' => \$sourceFile, + 'verbosity=i' => \$gVerbosity, + 'dry-run' => \$gDryRun, + 'config=s' => \%gConfig); # "hidden" option not in usage() + +if(@ARGV) { + # All arguments are parsed by Getopt + usage(); + exit(1); +} + +if($gVerbosity<0 || $gVerbosity>2) { + usage(); + exit(1); +} + +if(!defined($sourceFolder) || $sourceFolder eq '' || + !defined($targetImage) || $targetImage eq '') { + # --source and --target are required arguments + usage(); + exit(1); +} + +# Make sure $sourceFolder doesn't contain trailing slashes. It messes with +# rsync. +while(substr($sourceFolder, -1) eq '/') { + chop($sourceFolder); +} + +if(!defined($volumeName)) { + # Default volumeName is the name of the source directory. + my(@components); + @components = pathSplit($sourceFolder); + $volumeName = pop(@components); +} + +my(@tempDirComponents, $targetImageFilename); +@tempDirComponents = pathSplit($targetImage); +$targetImageFilename = pop(@tempDirComponents); + +if(defined($tempDir)) { + @tempDirComponents = pathSplit($tempDir); +} +else { + # Default tempDir is the same directory as what is specified for + # targetImage + $tempDir = join('/', @tempDirComponents); +} + +# Ensure that the path of the target image has a suitable extension. If +# it didn't, hdiutil would add one, and we wouldn't be able to find the +# file. +# +# Note that $targetImageFilename is not being reset. This is because it's +# used to build other names below, and we don't need to be adding all sorts +# of extra unnecessary extensions to the name. +my($originalTargetImage, $requiredExtension); +$originalTargetImage = $targetImage; +if($outputFormat eq 'UDSP') { + $requiredExtension = '.sparseimage'; +} +else { + $requiredExtension = '.dmg'; +} +$targetImage = giveExtension($originalTargetImage, $requiredExtension); + +if($targetImage ne $originalTargetImage) { + print STDERR ($0.": warning: target image extension is being added\n"); + print STDERR (' The new filename is '. + giveExtension($targetImageFilename,$requiredExtension)."\n"); +} + +# Make a temporary directory in $tempDir for our own nefarious purposes. +my(@output, $tempSubdir, $tempSubdirTemplate); +$tempSubdirTemplate=join('/', @tempDirComponents, + 'pkg-dmg.'.$$.'.XXXXXXXX'); +if(!(@output = commandOutput($gConfig{'cmd_mktemp'}, '-d', + $tempSubdirTemplate)) || $#output != 0) { + cleanupDie('mktemp failed'); +} + +if($gDryRun) { + (@output)=($tempSubdirTemplate); +} + +($tempSubdir) = @output; + +push(@gCleanup, + sub {commandVerbosity(0, $gConfig{'cmd_rm'}, '-rf', $tempSubdir);}); + +my($tempMount, $tempRoot, @tempsToMake); +$tempRoot = $tempSubdir.'/stage'; +$tempMount = $tempSubdir.'/mount'; +push(@tempsToMake, $tempRoot); +if($gConfig{'hdiutil_mountpoint'}) { + push(@tempsToMake, $tempMount); +} + +if(command($gConfig{'cmd_mkdir'}, @tempsToMake) != 0) { + cleanupDie('mkdir tempRoot/tempMount failed'); +} + +# This cleanup object is not strictly necessary, because $tempRoot is inside +# of $tempSubdir, but the rest of the script relies on this object being +# on the cleanup stack and expects to remove it. +push(@gCleanup, + sub {commandVerbosity(0, $gConfig{'cmd_rm'}, '-rf', $tempRoot);}); + +# If $sourceFile is true, it means that $sourceFolder is to be treated as +# a file and placed as a file within the volume root, as opposed to being +# treated as the volume root itself. rsync will do this by default, if no +# trailing '/' is present. With a trailing '/', $sourceFolder becomes +# $tempRoot, instead of becoming an entry in $tempRoot. +if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', + $sourceFolder.($sourceFile?'':'/'),$tempRoot) != 0) { + cleanupDie('rsync failed'); +} + +if(@makeDirs) { + my($makeDir, @tempDirsToMake); + foreach $makeDir (@makeDirs) { + if($makeDir =~ /^\//) { + push(@tempDirsToMake, $tempRoot.$makeDir); + } + else { + push(@tempDirsToMake, $tempRoot.'/'.$makeDir); + } + } + if(command($gConfig{'cmd_mkdir'}, '-p', @tempDirsToMake) != 0) { + cleanupDie('mkdir failed'); + } +} + +# copy files and/or create symlinks +copyFiles($tempRoot, 'copy', @copyFiles); +copyFiles($tempRoot, 'symlink', @createSymlinks); + +if($gConfig{'create_directly'}) { + # If create_directly is false, the contents will be rsynced into a + # disk image and they would lose their attributes. + setAttributes($tempRoot, @attributes); +} + +if(defined($iconFile)) { + if(command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', $iconFile, + $tempRoot.'/.VolumeIcon.icns') != 0) { + cleanupDie('rsync failed for volume icon'); + } + + # It's pointless to set the attributes of the root when diskutil create + # -srcfolder is being used. In that case, the attributes will be set + # later, after the image is already created. + if(isFormatCompressed($outputFormat) && + (command($gConfig{'cmd_SetFile'}, '-a', 'C', $tempRoot) != 0)) { + cleanupDie('SetFile failed'); + } +} + +if(command($gConfig{'cmd_chmod'}, '-R', 'a+rX,a-st,u+w,go-w', + $tempRoot) != 0) { + cleanupDie('chmod failed'); +} + +my($unflattenable); +if(isFormatCompressed($outputFormat)) { + $unflattenable = 1; +} +else { + $unflattenable = 0; +} + +diskImageMaker($tempRoot, $targetImage, $outputFormat, $volumeName, + $tempSubdir, $tempMount, $targetImageFilename, defined($iconFile)); + +if(defined($licenseFile) && $licenseFile ne '') { + my($licenseResource); + $licenseResource = $tempSubdir.'/license.r'; + if(!licenseMaker($licenseFile, $licenseResource)) { + cleanupDie('licenseMaker failed'); + } + push(@resourceFiles, $licenseResource); + # Don't add a cleanup object because licenseResource is in tempSubdir. +} + +if(@resourceFiles) { + # Add resources, such as a license agreement. + + # Only unflatten read-only and compressed images. It's not supported + # on other image times. + if($unflattenable && + (command($gConfig{'cmd_hdiutil'}, 'unflatten', $targetImage)) != 0) { + cleanupDie('hdiutil unflatten failed'); + } + # Don't push flatten onto the cleanup stack. If we fail now, we'll be + # removing $targetImage anyway. + + # Type definitions come from Carbon.r. + if(command($gConfig{'cmd_Rez'}, 'Carbon.r', @resourceFiles, '-a', '-o', + $targetImage) != 0) { + cleanupDie('Rez failed'); + } + + # Flatten. This merges the resource fork into the data fork, so no + # special encoding is needed to transfer the file. + if($unflattenable && + (command($gConfig{'cmd_hdiutil'}, 'flatten', $targetImage)) != 0) { + cleanupDie('hdiutil flatten failed'); + } +} + +# $tempSubdir is no longer needed. It's buried on the stack below the +# rm of the fresh image file. Splice in this fashion is equivalent to +# pop-save, pop, push-save. +splice(@gCleanup, -2, 1); +# No need to remove licenseResource separately, it's in tempSubdir. +if(command($gConfig{'cmd_rm'}, '-rf', $tempSubdir) != 0) { + cleanupDie('rm -rf tempSubdir failed'); +} + +if($idme) { + if(command($gConfig{'cmd_hdiutil'}, 'internet-enable', '-yes', + $targetImage) != 0) { + cleanupDie('hdiutil internet-enable failed'); + } +} + +# Done. + +exit(0); + +# argumentEscape(@arguments) +# +# Takes a list of @arguments and makes them shell-safe. +sub argumentEscape(@) { + my(@arguments); + @arguments = @_; + my($argument, @argumentsOut); + foreach $argument (@arguments) { + $argument =~ s%([^A-Za-z0-9_\-/.=+,])%\\$1%g; + push(@argumentsOut, $argument); + } + return @argumentsOut; +} + +# cleanupDie($message) +# +# Displays $message as an error message, and then runs through the +# @gCleanup stack, performing any cleanup operations needed before +# exiting. Does not return, exits with exit status 1. +sub cleanupDie($) { + my($message); + ($message) = @_; + print STDERR ($0.': '.$message.(@gCleanup?' (cleaning up)':'')."\n"); + while(@gCleanup) { + my($subroutine); + $subroutine = pop(@gCleanup); + &$subroutine; + } + exit(1); +} + +# command(@arguments) +# +# Runs the specified command at the verbosity level defined by $gVerbosity. +# Returns nonzero on failure, returning the exit status if appropriate. +# Discards command output. +sub command(@) { + my(@arguments); + @arguments = @_; + return commandVerbosity($gVerbosity,@arguments); +} + +# commandInternal($command, @arguments) +# +# Runs the specified internal command at the verbosity level defined by +# $gVerbosity. +# Returns zero(!) on failure, because commandInternal is supposed to be a +# direct replacement for the Perl system call wrappers, which, unlike shell +# commands and C equivalent system calls, return true (instead of 0) to +# indicate success. +sub commandInternal($@) { + my(@arguments, $command); + ($command, @arguments) = @_; + return commandInternalVerbosity($gVerbosity, $command, @arguments); +} + +# commandInternalVerbosity($verbosity, $command, @arguments) +# +# Run an internal command, printing a bogus command invocation message if +# $verbosity is true. +# +# If $command is unlink: +# Removes the files specified by @arguments. Wraps unlink. +# +# If $command is symlink: +# Creates the symlink specified by @arguments. Wraps symlink. +sub commandInternalVerbosity($$@) { + my(@arguments, $command, $verbosity); + ($verbosity, $command, @arguments) = @_; + if($command eq 'unlink') { + if($verbosity || $gDryRun) { + print(join(' ', 'rm', '-f', argumentEscape(@arguments))."\n"); + } + if($gDryRun) { + return $#arguments+1; + } + return unlink(@arguments); + } + elsif($command eq 'symlink') { + if($verbosity || $gDryRun) { + print(join(' ', 'ln', '-s', argumentEscape(@arguments))."\n"); + } + if($gDryRun) { + return 1; + } + my($source, $target); + ($source, $target) = @arguments; + return symlink($source, $target); + } +} + +# commandOutput(@arguments) +# +# Runs the specified command at the verbosity level defined by $gVerbosity. +# Output is returned in an array of lines. undef is returned on failure. +# The exit status is available in $?. +sub commandOutput(@) { + my(@arguments); + @arguments = @_; + return commandOutputVerbosity($gVerbosity, @arguments); +} + +# commandOutputVerbosity($verbosity, @arguments) +# +# Runs the specified command at the verbosity level defined by the +# $verbosity argument. Output is returned in an array of lines. undef is +# returned on failure. The exit status is available in $?. +# +# If an error occurs in fork or exec, an error message is printed to +# stderr and undef is returned. +# +# If $verbosity is 0, the command invocation is not printed, and its +# stdout is not echoed back to stdout. +# +# If $verbosity is 1, the command invocation is printed. +# +# If $verbosity is 2, the command invocation is printed and the output +# from stdout is echoed back to stdout. +# +# Regardless of $verbosity, stderr is left connected. +sub commandOutputVerbosity($@) { + my(@arguments, $verbosity); + ($verbosity, @arguments) = @_; + my($pid); + if($verbosity || $gDryRun) { + print(join(' ', argumentEscape(@arguments))."\n"); + } + if($gDryRun) { + return(1); + } + if (!defined($pid = open(*COMMAND, '-|'))) { + printf STDERR ($0.': fork: '.$!."\n"); + return undef; + } + elsif ($pid) { + # parent + my(@lines); + while(!eof(*COMMAND)) { + my($line); + chop($line = ); + if($verbosity > 1) { + print($line."\n"); + } + push(@lines, $line); + } + close(*COMMAND); + if ($? == -1) { + printf STDERR ($0.': fork: '.$!."\n"); + return undef; + } + elsif ($? & 127) { + printf STDERR ($0.': exited on signal '.($? & 127). + ($? & 128 ? ', core dumped' : '')."\n"); + return undef; + } + return @lines; + } + else { + # child; this form of exec is immune to shell games + if(!exec {$arguments[0]} (@arguments)) { + printf STDERR ($0.': exec: '.$!."\n"); + exit(-1); + } + } +} + +# commandVerbosity($verbosity, @arguments) +# +# Runs the specified command at the verbosity level defined by the +# $verbosity argument. Returns nonzero on failure, returning the exit +# status if appropriate. Discards command output. +sub commandVerbosity($@) { + my(@arguments, $verbosity); + ($verbosity, @arguments) = @_; + if(!defined(commandOutputVerbosity($verbosity, @arguments))) { + return -1; + } + return $?; +} + +# copyFiles($tempRoot, $method, @arguments) +# +# Copies files or create symlinks in the disk image. +# See --copy and --symlink descriptions for details. +# If $method is 'copy', @arguments are interpreted as source:target, if $method +# is 'symlink', @arguments are interpreted as symlink:target. +sub copyFiles($@) { + my(@fileList, $method, $tempRoot); + ($tempRoot, $method, @fileList) = @_; + my($file, $isSymlink); + $isSymlink = ($method eq 'symlink'); + foreach $file (@fileList) { + my($source, $target); + ($source, $target) = split(/:/, $file); + if(!defined($target) and $isSymlink) { + # empty symlink targets would result in an invalid target and fail, + # but they shall be interpreted as "like source path, but inside dmg" + $target = $source; + } + if(!defined($target)) { + $target = $tempRoot; + } + elsif($target =~ /^\//) { + $target = $tempRoot.$target; + } + else { + $target = $tempRoot.'/'.$target; + } + + my($success); + if($isSymlink) { + $success = commandInternal('symlink', $source, $target); + } + else { + $success = !command($gConfig{'cmd_rsync'}, '-a', '--copy-unsafe-links', + $source, $target); + } + if(!$success) { + cleanupDie('copyFiles failed for method '.$method); + } + } +} + +# diskImageMaker($source, $destination, $format, $name, $tempDir, $tempMount, +# $baseName, $setRootIcon) +# +# Creates a disk image in $destination of format $format corresponding to the +# source directory $source. $name is the volume name. $tempDir is a good +# place to write temporary files, which should be empty (aside from the other +# things that this script might create there, like stage and mount). +# $tempMount is a mount point for temporary disk images. $baseName is the +# name of the disk image, and is presently unused. $setRootIcon is true if +# a volume icon was added to the staged $source and indicates that the +# custom volume icon bit on the volume root needs to be set. +sub diskImageMaker($$$$$$$$) { + my($baseName, $destination, $format, $name, $setRootIcon, $source, + $tempDir, $tempMount); + ($source, $destination, $format, $name, $tempDir, $tempMount, + $baseName, $setRootIcon) = @_; + if(isFormatCompressed($format)) { + my($uncompressedImage); + + if($gConfig{'makehybrid'}) { + my($hybridImage); + $hybridImage = giveExtension($tempDir.'/hybrid', '.dmg'); + + if(command($gConfig{'cmd_hdiutil'}, 'makehybrid', '-hfs', + '-hfs-volume-name', $name, '-hfs-openfolder', $source, '-ov', + $source, '-o', $hybridImage) != 0) { + cleanupDie('hdiutil makehybrid failed'); + } + + $uncompressedImage = $hybridImage; + + # $source is no longer needed and will be removed before anything + # else can fail. splice in this form is the same as pop/push. + splice(@gCleanup, -1, 1, + sub {commandInternalVerbosity(0, 'unlink', $hybridImage);}); + + if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) { + cleanupDie('rm -rf failed'); + } + + if(!$gConfig{'partition_table'} && $gConfig{'recursive_access'}) { + # Even if we do want to create disk images without partition tables, + # it's impossible unless recursive_access is set. + my($rootDevice, $partitionDevice, $partitionMountPoint); + + if(!(($rootDevice, $partitionDevice, $partitionMountPoint) = + hdidMountImage($tempMount, '-readonly', $hybridImage))) { + cleanupDie('hdid mount failed'); + } + + push(@gCleanup, sub {commandVerbosity(0, + $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);}); + + my($udrwImage); + $udrwImage = giveExtension($tempDir.'/udrw', '.dmg'); + + if(command($gConfig{'cmd_hdiutil'}, 'create', '-format', 'UDRW', + '-ov', '-srcdevice', $partitionDevice, $udrwImage) != 0) { + cleanupDie('hdiutil create failed'); + } + + $uncompressedImage = $udrwImage; + + # Going to eject before anything else can fail. Get the eject off + # the stack. + pop(@gCleanup); + + # $hybridImage will be removed soon, but until then, it needs to + # stay on the cleanup stack. It needs to wait until after + # ejection. $udrwImage is staying around. Make it appear as + # though it's been done before $hybridImage. + # + # splice in this form is the same as popping one element to + # @tempCleanup and pushing the subroutine. + my(@tempCleanup); + @tempCleanup = splice(@gCleanup, -1, 1, + sub {commandInternalVerbosity(0, 'unlink', $udrwImage);}); + push(@gCleanup, @tempCleanup); + + if(command($gConfig{'cmd_diskutil'}, 'eject', $rootDevice) != 0) { + cleanupDie('diskutil eject failed'); + } + + # Pop unlink of $uncompressedImage + pop(@gCleanup); + + if(commandInternal('unlink', $hybridImage) != 1) { + cleanupDie('unlink hybridImage failed: '.$!); + } + } + } + else { + # makehybrid is not available, fall back to making a UDRW and + # converting to a compressed image. It ought to be possible to + # create a compressed image directly, but those come out far too + # large (journaling?) and need to be read-write to fix up the + # volume icon anyway. Luckily, we can take advantage of a single + # call back into this function. + my($udrwImage); + $udrwImage = giveExtension($tempDir.'/udrw', '.dmg'); + + diskImageMaker($source, $udrwImage, 'UDRW', $name, $tempDir, + $tempMount, $baseName, $setRootIcon); + + # The call back into diskImageMaker already removed $source. + + $uncompressedImage = $udrwImage; + } + + # The uncompressed disk image is now in its final form. Compress it. + # Jaguar doesn't support hdiutil convert -ov, but it always allows + # overwriting. + # bzip2-compressed UDBZ images can only be created and mounted on 10.4 + # and later. The bzip2-level imagekey is only effective when creating + # images in 10.5. In 10.4, bzip2-level is harmlessly ignored, and the + # default value of 1 is always used. + if(command($gConfig{'cmd_hdiutil'}, 'convert', '-format', $format, + '-imagekey', ($format eq 'UDBZ' ? 'bzip2-level=9' : 'zlib-level=9'), + (defined($gDarwinMajor) && $gDarwinMajor <= 6 ? () : ('-ov')), + $uncompressedImage, '-o', $destination) != 0) { + cleanupDie('hdiutil convert failed'); + } + + # $uncompressedImage is going to be unlinked before anything else can + # fail. splice in this form is the same as pop/push. + splice(@gCleanup, -1, 1, + sub {commandInternalVerbosity(0, 'unlink', $destination);}); + + if(commandInternal('unlink', $uncompressedImage) != 1) { + cleanupDie('unlink uncompressedImage failed: '.$!); + } + + # At this point, the only thing that the compressed block has added to + # the cleanup stack is the removal of $destination. $source has already + # been removed, and its cleanup entry has been removed as well. + } + elsif($format eq 'UDRW' || $format eq 'UDSP') { + my(@extraArguments); + if(!$gConfig{'partition_table'}) { + @extraArguments = ('-layout', 'NONE'); + } + + if($gConfig{'create_directly'}) { + # Use -fs HFS+ to suppress the journal. + if(command($gConfig{'cmd_hdiutil'}, 'create', '-format', $format, + @extraArguments, '-fs', 'HFS+', '-volname', $name, + '-ov', '-srcfolder', $source, $destination) != 0) { + cleanupDie('hdiutil create failed'); + } + + # $source is no longer needed and will be removed before anything + # else can fail. splice in this form is the same as pop/push. + splice(@gCleanup, -1, 1, + sub {commandInternalVerbosity(0, 'unlink', $destination);}); + + if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) { + cleanupDie('rm -rf failed'); + } + } + else { + # hdiutil create does not support -srcfolder or -srcdevice, it only + # knows how to create blank images. Figure out how large an image + # is needed, create it, and fill it. This is needed for Jaguar. + + # Use native block size for hdiutil create -sectors. + delete $ENV{'BLOCKSIZE'}; + + my(@duOutput, $ignore, $sizeBlocks, $sizeOverhead, $sizeTotal, $type); + if(!(@output = commandOutput($gConfig{'cmd_du'}, '-s', $tempRoot)) || + $? != 0) { + cleanupDie('du failed'); + } + ($sizeBlocks, $ignore) = split(' ', $output[0], 2); + + # The filesystem itself takes up 152 blocks of its own blocks for the + # filesystem up to 8192 blocks, plus 64 blocks for every additional + # 4096 blocks or portion thereof. + $sizeOverhead = 152 + 64 * POSIX::ceil( + (($sizeBlocks - 8192) > 0) ? (($sizeBlocks - 8192) / (4096 - 64)) : 0); + + # The number of blocks must be divisible by 8. + my($mod); + if($mod = ($sizeOverhead % 8)) { + $sizeOverhead += 8 - $mod; + } + + # sectors is taken as the size of a disk, not a filesystem, so the + # partition table eats into it. + if($gConfig{'partition_table'}) { + $sizeOverhead += 80; + } + + # That was hard. Leave some breathing room anyway. Use 1024 sectors + # (512kB). These read-write images wouldn't be useful if they didn't + # have at least a little free space. + $sizeTotal = $sizeBlocks + $sizeOverhead + 1024; + + # Minimum sizes - these numbers are larger on Jaguar than on later + # systems. Just use the Jaguar numbers, since it's unlikely to wind + # up here on any other release. + if($gConfig{'partition_table'} && $sizeTotal < 8272) { + $sizeTotal = 8272; + } + if(!$gConfig{'partition_table'} && $sizeTotal < 8192) { + $sizeTotal = 8192; + } + + # hdiutil create without -srcfolder or -srcdevice will not accept + # -format. It uses -type. Fortunately, the two supported formats + # here map directly to the only two supported types. + if ($format eq 'UDSP') { + $type = 'SPARSE'; + } + else { + $type = 'UDIF'; + } + + if(command($gConfig{'cmd_hdiutil'}, 'create', '-type', $type, + @extraArguments, '-fs', 'HFS+', '-volname', $name, + '-ov', '-sectors', $sizeTotal, $destination) != 0) { + cleanupDie('hdiutil create failed'); + } + + push(@gCleanup, + sub {commandInternalVerbosity(0, 'unlink', $destination);}); + + # The rsync will occur shortly. + } + + my($mounted, $rootDevice, $partitionDevice, $partitionMountPoint); + + $mounted=0; + if(!$gConfig{'create_directly'} || $gConfig{'openfolder_bless'} || + $setRootIcon) { + # The disk image only needs to be mounted if: + # create_directly is false, because the content needs to be copied + # openfolder_bless is true, because bless -openfolder needs to run + # setRootIcon is true, because the root needs its attributes set. + if(!(($rootDevice, $partitionDevice, $partitionMountPoint) = + hdidMountImage($tempMount, $destination))) { + cleanupDie('hdid mount failed'); + } + + $mounted=1; + + push(@gCleanup, sub {commandVerbosity(0, + $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);}); + } + + if(!$gConfig{'create_directly'}) { + # Couldn't create and copy directly in one fell swoop. Now that + # the volume is mounted, copy the files. --copy-unsafe-links is + # unnecessary since it was used to copy everything to the staging + # area. There can be no more unsafe links. + if(command($gConfig{'cmd_rsync'}, '-a', + $source.'/',$partitionMountPoint) != 0) { + cleanupDie('rsync to new volume failed'); + } + + # We need to get the rm -rf of $source off the stack, because it's + # being cleaned up here. There are two items now on top of it: + # removing the target image and, above that, ejecting it. Splice it + # out. + my(@tempCleanup); + @tempCleanup = splice(@gCleanup, -2); + # The next splice is the same as popping once and pushing @tempCleanup. + splice(@gCleanup, -1, 1, @tempCleanup); + + if(command($gConfig{'cmd_rm'}, '-rf', $source) != 0) { + cleanupDie('rm -rf failed'); + } + } + + if($gConfig{'openfolder_bless'}) { + # On Tiger, the bless docs say to use --openfolder, but only + # --openfolder is accepted on Panther. Tiger takes it with a single + # dash too. Jaguar is out of luck. + if(command($gConfig{'cmd_bless'}, '-openfolder', + $partitionMountPoint) != 0) { + cleanupDie('bless failed'); + } + } + + setAttributes($partitionMountPoint, @attributes); + + if($setRootIcon) { + # When "hdiutil create -srcfolder" is used, the root folder's + # attributes are not copied to the new volume. Fix up. + + if(command($gConfig{'cmd_SetFile'}, '-a', 'C', + $partitionMountPoint) != 0) { + cleanupDie('SetFile failed'); + } + } + + if($mounted) { + # Pop diskutil eject + pop(@gCleanup); + + if(command($gConfig{'cmd_diskutil'}, 'eject', $rootDevice) != 0) { + cleanupDie('diskutil eject failed'); + } + } + + # End of UDRW/UDSP section. At this point, $source has been removed + # and its cleanup entry has been removed from the stack. + } + else { + cleanupDie('unrecognized format'); + print STDERR ($0.": unrecognized format\n"); + exit(1); + } +} + +# giveExtension($file, $extension) +# +# If $file does not end in $extension, $extension is added. The new +# filename is returned. +sub giveExtension($$) { + my($extension, $file); + ($file, $extension) = @_; + if(substr($file, -length($extension)) ne $extension) { + return $file.$extension; + } + return $file; +} + +# hdidMountImage($mountPoint, @arguments) +# +# Runs the hdid command with arguments specified by @arguments. +# @arguments may be a single-element array containing the name of the +# disk image to mount. Returns a three-element array, with elements +# corresponding to: +# - The root device of the mounted image, suitable for ejection +# - The device corresponding to the mounted partition +# - The mounted partition's mount point +# +# If running on a system that supports easy mounting at points outside +# of the default /Volumes with hdiutil attach, it is used instead of hdid, +# and $mountPoint is used as the mount point. +# +# The root device will differ from the partition device when the disk +# image contains a partition table, otherwise, they will be identical. +# +# If hdid fails, undef is returned. +sub hdidMountImage($@) { + my(@arguments, @command, $mountPoint); + ($mountPoint, @arguments) = @_; + my(@output); + + if($gConfig{'hdiutil_mountpoint'}) { + @command=($gConfig{'cmd_hdiutil'}, 'attach', @arguments, + '-mountpoint', $mountPoint); + } + else { + @command=($gConfig{'cmd_hdid'}, @arguments); + } + + if(!(@output = commandOutput(@command)) || + $? != 0) { + return undef; + } + + if($gDryRun) { + return('/dev/diskX','/dev/diskXsY','/Volumes/'.$volumeName); + } + + my($line, $restOfLine, $rootDevice); + + foreach $line (@output) { + my($device, $mountpoint); + if($line !~ /^\/dev\//) { + # Consider only lines that correspond to /dev entries + next; + } + ($device, $restOfLine) = split(' ', $line, 2); + + if(!defined($rootDevice) || $rootDevice eq '') { + # If this is the first device seen, it's the root device to be + # used for ejection. Keep it. + $rootDevice = $device; + } + + if($restOfLine =~ /(\/.*)/) { + # The first partition with a mount point is the interesting one. It's + # usually Apple_HFS and usually the last one in the list, but beware of + # the possibility of other filesystem types and the Apple_Free partition. + # If the disk image contains no partition table, the partition will not + # have a type, so look for the mount point by looking for a slash. + $mountpoint = $1; + return($rootDevice, $device, $mountpoint); + } + } + + # No mount point? This is bad. If there's a root device, eject it. + if(defined($rootDevice) && $rootDevice ne '') { + # Failing anyway, so don't care about failure + commandVerbosity(0, $gConfig{'cmd_diskutil'}, 'eject', $rootDevice); + } + + return undef; +} + +# isFormatCompressed($format) +# +# Returns true if $format corresponds to a compressed disk image format. +# Returns false otherwise. +sub isFormatCompressed($) { + my($format); + ($format) = @_; + return $format eq 'UDZO' || $format eq 'UDBZ'; +} + +# licenseMaker($text, $resource) +# +# Takes a plain text file at path $text and creates a license agreement +# resource containing the text at path $license. English-only, and +# no special formatting. This is the bare-bones stuff. For more +# intricate license agreements, create your own resource. +# +# ftp://ftp.apple.com/developer/Development_Kits/SLAs_for_UDIFs_1.0.dmg +sub licenseMaker($$) { + my($resource, $text); + ($text, $resource) = @_; + if(!sysopen(*TEXT, $text, O_RDONLY)) { + print STDERR ($0.': licenseMaker: sysopen text: '.$!."\n"); + return 0; + } + if(!sysopen(*RESOURCE, $resource, O_WRONLY|O_CREAT|O_EXCL)) { + print STDERR ($0.': licenseMaker: sysopen resource: '.$!."\n"); + return 0; + } + print RESOURCE << '__EOT__'; +// See /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/Script.h for language IDs. +data 'LPic' (5000) { + // Default language ID, 0 = English + $"0000" + // Number of entries in list + $"0001" + + // Entry 1 + // Language ID, 0 = English + $"0000" + // Resource ID, 0 = STR#/TEXT/styl 5000 + $"0000" + // Multibyte language, 0 = no + $"0000" +}; + +resource 'STR#' (5000, "English") { + { + // Language (unused?) = English + "English", + // Agree + "Agree", + // Disagree + "Disagree", +__EOT__ + # This stuff needs double-quotes for interpolations to work. + print RESOURCE (" // Print, ellipsis is 0xC9\n"); + print RESOURCE (" \"Print\xc9\",\n"); + print RESOURCE (" // Save As, ellipsis is 0xC9\n"); + print RESOURCE (" \"Save As\xc9\",\n"); + print RESOURCE (' // Descriptive text, curly quotes are 0xD2 and 0xD3'. + "\n"); + print RESOURCE (' "If you agree to the terms of this license '. + "agreement, click \xd2Agree\xd3 to access the software. If you ". + "do not agree, press \xd2Disagree.\xd3\"\n"); +print RESOURCE << '__EOT__'; + }; +}; + +// Beware of 1024(?) byte (character?) line length limitation. Split up long +// lines. +// If straight quotes are used ("), remember to escape them (\"). +// Newline is \n, to leave a blank line, use two of them. +// 0xD2 and 0xD3 are curly double-quotes ("), 0xD4 and 0xD5 are curly +// single quotes ('), 0xD5 is also the apostrophe. +data 'TEXT' (5000, "English") { +__EOT__ + + while(!eof(*TEXT)) { + my($line); + chop($line = ); + + while(defined($line)) { + my($chunk); + + # Rez doesn't care for lines longer than (1024?) characters. Split + # at less than half of that limit, in case everything needs to be + # backwhacked. + if(length($line)>500) { + $chunk = substr($line, 0, 500); + $line = substr($line, 500); + } + else { + $chunk = $line; + $line = undef; + } + + if(length($chunk) > 0) { + # Unsafe characters are the double-quote (") and backslash (\), escape + # them with backslashes. + $chunk =~ s/(["\\])/\\$1/g; + + print RESOURCE ' "'.$chunk.'"'."\n"; + } + } + print RESOURCE ' "\n"'."\n"; + } + close(*TEXT); + + print RESOURCE << '__EOT__'; +}; + +data 'styl' (5000, "English") { + // Number of styles following = 1 + $"0001" + + // Style 1. This is used to display the first two lines in bold text. + // Start character = 0 + $"0000 0000" + // Height = 16 + $"0010" + // Ascent = 12 + $"000C" + // Font family = 1024 (Lucida Grande) + $"0400" + // Style bitfield, 0x1=bold 0x2=italic 0x4=underline 0x8=outline + // 0x10=shadow 0x20=condensed 0x40=extended + $"00" + // Style, unused? + $"02" + // Size = 12 point + $"000C" + // Color, RGB + $"0000 0000 0000" +}; +__EOT__ + close(*RESOURCE); + + return 1; +} + +# pathSplit($pathname) +# +# Splits $pathname into an array of path components. +sub pathSplit($) { + my($pathname); + ($pathname) = @_; + return split(/\//, $pathname); +} + +# setAttributes($root, @attributeList) +# +# @attributeList is an array, each element of which must be in the form +# :. is a list of attributes, per SetFile. is a file +# which is taken as relative to $root (even if it appears as an absolute +# path.) SetFile is called to set the attributes on each file in +# @attributeList. +sub setAttributes($@) { + my(@attributes, $root); + ($root, @attributes) = @_; + my($attribute); + foreach $attribute (@attributes) { + my($attrList, $file, @fileList, @fixedFileList); + ($attrList, @fileList) = split(/:/, $attribute); + if(!defined($attrList) || !@fileList) { + cleanupDie('--attribute requires :'); + } + @fixedFileList=(); + foreach $file (@fileList) { + if($file =~ /^\//) { + push(@fixedFileList, $root.$file); + } + else { + push(@fixedFileList, $root.'/'.$file); + } + } + if(command($gConfig{'cmd_SetFile'}, '-a', $attrList, @fixedFileList)) { + cleanupDie('SetFile failed to set attributes'); + } + } + return; +} + +sub trapSignal($) { + my($signalName); + ($signalName) = @_; + cleanupDie('exiting on SIG'.$signalName); +} + +sub usage() { + print STDERR ( +"usage: pkg-dmg --source \n". +" --target \n". +" [--format ] (default: UDZO)\n". +" [--volname ] (default: same name as source)\n". +" [--tempdir ] (default: same dir as target)\n". +" [--mkdir ] (make directory in image)\n". +" [--copy [:]] (extra files to add)\n". +" [--symlink [:]] (extra symlinks to add)\n". +" [--license ] (plain text license agreement)\n". +" [--resource ] (flat .r files to merge)\n". +" [--icon ] (volume icon)\n". +" [--attribute :] (set file attributes)\n". +" [--idme] (make Internet-enabled image)\n". +" [--sourcefile] (treat --source as a file)\n". +" [--verbosity ] (0, 1, 2; default=2)\n". +" [--dry-run] (print what would be done)\n"); + return; +} diff --git a/install/macos_dmg.sh b/install/macos_dmg.sh new file mode 100644 index 0000000..fdcdeb0 --- /dev/null +++ b/install/macos_dmg.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +use strict; +use File::Copy; +#use File::Copy::Recursive qw(rcopy); +#use Getopt::Long; +use File::Basename; +use FindBin qw($Bin); + +# my $setup = ""; +REPPATH=${CMDPATH}; + +chdir($reppath.'/desktopapp'); +system('npm run package-macos'); +print "Move some Files\n"; +move($reppath."/release-builds/pot-darwin-x64/LICENSE",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/LICENSE"); +move($reppath."/release-builds/pot-darwin-x64/LICENSES.chromium.html",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/LICENSES.chromium.html"); +move($reppath."/release-builds/pot-darwin-x64/version",$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Resources/version"); + + +print "Sign App-Files\n"; +my @frm = ($reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Electron Framework.framework/Versions/Current/Helpers/chrome_crashpad_handler", + $reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Electron Framework.framework", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Mantle.framework", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/ReactiveCocoa.framework", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/Squirrel.framework", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (GPU).app", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (Plugin).app", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper (Renderer).app", +$reppath."/release-builds/pot-darwin-x64/pot.app/Contents/Frameworks/pot Helper.app", +$reppath.'/release-builds/pot-darwin-x64/pot.app/Contents/MacOS/pot', +$reppath.'/release-builds/pot-darwin-x64/pot.app' + +); +foreach my $fr (@frm){ + my $cmd = 'codesign -s "Developer ID Application: DKS sarl" -fv --ignore-resources "'.$fr.'"'; + my $r = `$cmd`; + print $r; +} + +print "Create DMG now\n"; +if (! -d $reppath.'/website/downloads'){ + make_path($reppath.'/website/downloads'); +} +if (-e $reppath.'/website/downloads/POT_Setup.dmg'){ + unlink($reppath.'/website/downloads/POT_Setup.dmg'); +} +system('perl "'.$reppath.'/install/macos/pkg-dmg" --sourcefile --source "'.$reppath.'/release-builds/pot-darwin-x64/pot.app" --target "'.$reppath.'/website/downloads/pot_setup.dmg" --volname "POT_Setup" --symlink /Applications:"installer ici"'); +print "DMG created: ".$reppath.'/website/downloads/POT_Setup.dmg'."\n"; +print localtime()." Normal End!\n"; + diff --git a/install/sign.bat b/install/sign.bat new file mode 100644 index 0000000..c3a0b3a --- /dev/null +++ b/install/sign.bat @@ -0,0 +1,6 @@ +@echo off + REM cd C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64 +"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/standard /td SHA256 C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_64bit.exe +"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/standard /td SHA256 C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_32bit.exe +"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe" verify /v /pa C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_64bit.exe +"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/signtool.exe" verify /v /pa C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_32bit.exe \ No newline at end of file diff --git a/install/windows/icons/Install-Icon.ico b/install/windows/icons/Install-Icon.ico new file mode 100644 index 0000000..a2335d8 Binary files /dev/null and b/install/windows/icons/Install-Icon.ico differ diff --git a/install/windows/icons/Install-Icon.png b/install/windows/icons/Install-Icon.png new file mode 100644 index 0000000..00fe028 Binary files /dev/null and b/install/windows/icons/Install-Icon.png differ diff --git a/install/windows/setup_32bit.iss b/install/windows/setup_32bit.iss new file mode 100644 index 0000000..b8f1666 --- /dev/null +++ b/install/windows/setup_32bit.iss @@ -0,0 +1,57 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define public MyAppName "Invoice Journal" +#define public MyAppVersion "1.0.0" +#define public MyAppPublisher "DKS sarl" +#define public MyAppURL "https://www.dks.lu/" +#define public MyAppExeName "invoicejournal.exe" +#define public MyOutputDir "C:\Users\kilian\Workspace\pot_lu\website\downloads" +#define public MySourceDir "C:\Users\kilian\Workspace\pot_lu" +#define public MySetupName {#myAppName}"_Setup_32bit" +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{C583A11C-7811-4C73-B26C-1D61A6F5B679} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={autopf}\POT +DisableProgramGroupPage=yes +DisableDirPage=yes +CloseApplications=force +CloseApplicationsFilter=pot.exe +LicenseFile={#MySourceDir}\install\EULA_Default.rtf +; Uncomment the following line to run in non administrative install mode (install for current user only.) +PrivilegesRequired=lowest +;PrivilegesRequiredOverridesAllowed=dialog +OutputDir={#MyOutputDir} +OutputBaseFilename={#MySetupName} +SetupIconFile={#MySourceDir}\install\windows\icons\Install-Icon.ico +Compression=lzma +SolidCompression=yes +WizardStyle=modern +WizardImageFile=wizsize.bmp +WizardSmallImageFile=wizsmall.bmp +MinVersion=6.1 +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" + +[Files] +Source: "{#MySourceDir}\release-builds\pot-win32-ia32\pot.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion +Source: "{#MySourceDir}\release-builds\pot-win32-ia32\*"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/install/windows/setup_64bit.iss b/install/windows/setup_64bit.iss new file mode 100644 index 0000000..dd2c3ec --- /dev/null +++ b/install/windows/setup_64bit.iss @@ -0,0 +1,58 @@ +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +#define MyAppName "POT - Plan d'Organisation du Travail" +#define MyAppVersion "1.0.0" +#define MyAppPublisher "POT s.à r.l." +#define MyAppURL "http://pot.dks.lu/" +#define MyAppExeName "pot.exe" +#define MyOutputDir "C:\Users\kilian\Workspace\pot_lu\website\downloads" +#define MySourceDir "C:\Users\kilian\Workspace\pot_lu" +#define MySetupName "POT_Setup_64bit" +[Setup] +; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{C583A11C-7811-4C73-B26C-1D61A6F5B679} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={autopf}\POT +DisableProgramGroupPage=yes +DisableDirPage=yes +CloseApplications=force +CloseApplicationsFilter=pot.exe +LicenseFile={#MySourceDir}\install\CGV.rtf +; Uncomment the following line to run in non administrative install mode (install for current user only.) +PrivilegesRequired=lowest +;PrivilegesRequiredOverridesAllowed=dialog +OutputDir={#MyOutputDir} +OutputBaseFilename={#MySetupName} +SetupIconFile={#MySourceDir}\install\windows\icons\Install-Icon.ico +Compression=lzma +SolidCompression=yes +WizardStyle=modern +WizardSmallImageFile=wizpotsmall.bmp +ArchitecturesInstallIn64BitMode=x64 +ArchitecturesAllowed=x64 +MinVersion=6.1 +[Languages] +;Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +;Name: "german"; MessagesFile: "compiler:Languages\German.isl" + +[Files] +Source: "{#MySourceDir}\release-builds\pot-win32-x64\pot.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion +Source: "{#MySourceDir}\release-builds\pot-win32-x64\*"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" + +[Run] +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent + diff --git a/install/windows/wizside.bmp b/install/windows/wizside.bmp new file mode 100644 index 0000000..499693b Binary files /dev/null and b/install/windows/wizside.bmp differ diff --git a/install/windows/wizsmall.bmp b/install/windows/wizsmall.bmp new file mode 100644 index 0000000..44d4239 Binary files /dev/null and b/install/windows/wizsmall.bmp differ diff --git a/install/windows_icon.bat b/install/windows_icon.bat new file mode 100644 index 0000000..9f75b06 --- /dev/null +++ b/install/windows_icon.bat @@ -0,0 +1,3 @@ +@echo off +cd ../desktopapp/img +C:\Users\kilian\Tools\Images\convert.exe -background transparent "invoicejournal.png" -define icon:auto-resize=16,24,32,48,64,72,96,128,256 "invoicejournal.ico" \ No newline at end of file diff --git a/install/windows_installer.bat b/install/windows_installer.bat new file mode 100644 index 0000000..8458c91 --- /dev/null +++ b/install/windows_installer.bat @@ -0,0 +1,16 @@ +@echo off +set appname=InvoiceJournal +set reppath=%~dp0 +cd %~dp0 +cd .. +mkdir release +cd desktopapp +npm run package-win32 +npm run package-win64 +"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" /DMyAppVersion=1.0.0 /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_32bit.exe %reppath%/install/windows/setup_32bit.iss +"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" /DMyAppVersion=1.0.0 /DMyOutputDir=%reppath%/../release /DMySourceDir=%reppath% /DMySetupName=%appname%_Setup_64bit.exe %reppath%/install/windows/setup_64bit.iss + +rem "C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "C:/Users/kilian/Workspace/pot_lu/website/downloads/%appname%_Setup_64bit.exe" +rem "C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/signtool.exe" sign /a /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "C:/Users/kilian/Workspace/pot_lu/website/downloads/%appname%_Setup_32bit.exe" +rem system('"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x86/signtool.exe" sign /v /f "C:/Users/kilian/Workspace/pot_lu/install/glsigncert2020.pfx" /p "fb1ia1ka" /t http://timestamp.globalsign.com/scripts/timestamp.dll /v "C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_32bit.exe"'); +rem system('"C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe" sign /v /f "C:/Users/kilian/Workspace/pot_lu/install/glsigncert2020.pfx" /p "fb1ia1ka" /t http://timestamp.globalsign.com/scripts/timestamp.dll /v "C:/Users/kilian/Workspace/pot_lu/website/downloads/POT_Setup_64bit.exe"'); \ No newline at end of file diff --git a/server.bat b/server.bat deleted file mode 100644 index 9f1dd57..0000000 --- a/server.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -C:\Strawberry\perl\bin\perl.exe %~dp0\server\invoicejournal.pl \ No newline at end of file diff --git a/server/api/app.cgi b/server/api/app.cgi deleted file mode 100644 index 30f65e0..0000000 --- a/server/api/app.cgi +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use FindBin qw($Bin $RealBin); -# use lib ('CGI/api/lib/perl5'); -# use lib ('CGI/api/lib'); -use lib ($RealBin.'/server/api/lib/perl5'); -use lib ($RealBin.'/server/api/lib'); -use lib ($RealBin.'/api/lib/perl5'); -use lib ($RealBin.'/api/lib'); -use lib ($RealBin.'/lib/perl5'); -use lib ($RealBin.'/lib'); -use CGI; -use CGI::Cookie; - -use CGI; -use CGI::Cookie; -# use CGI::Carp qw/fatalsToBrowser/; -use File::Basename; -use JSON::PP; -use dksconfig qw/$sitecfg/; -use File::Copy qw(copy); -use dksdb; - -# use session; -#use sendemail; -my $cgi = new CGI(); -my $scriptpath = $cgi->url(-absolute => 1); -my $p = (); -my @params = $cgi->param(); -foreach my $pe (@params){ - $p->{$pe} = $cgi->param($pe); -} -my $html->{result} = (); -# $p->{sid} = $cgi->cookie($sitecfg->{cookiename}); -# my $se = session->new(); -# my $sess = $se->getsession($p->{sid}); -print $cgi->header(-type=>"application/json", -charset => "utf-8"); - -if (exists($p->{databases})){ - my @dbfiles = (); - opendir(DBS,$sitecfg->{datapath}); - while (my $dbf = readdir(DBS)){ - if ($dbf =~ /\.sqlite$/){ - my $dbn = $dbf; - $dbn =~ s/\.sqlite//; - push(@dbfiles,{id => $dbn, value => $dbn}); - } - } - closedir(DBS); - if (scalar(@dbfiles) == 0){ - print dirname($0); - copy(dirname($0).'/defaultdata/invoicejournal.sqlite',$sitecfg->{datapath}.'/invoicejournal.sqlite'); - push(@dbfiles,{id => "invoicejournal", value => 'invoicejournal'}); - } - $html->{result}->{databases} = \@dbfiles; -} -if (exists($p->{hostname})){ - $html->{result}->{hostname} = $sitecfg->{hostname}; -} -if (exists($p->{env})){ - foreach my $e (keys(%ENV)){ - $html->{result}->{$e} = $ENV{$e}; - } -} -if (exists($p->{sitecfg})){ - foreach my $e (keys(%ENV)){ - $html->{result} = $sitecfg; - } -} - -print JSON::PP::encode_json($html); \ No newline at end of file diff --git a/server/api/db.cgi b/server/api/db.cgi deleted file mode 100644 index 2cfdbac..0000000 --- a/server/api/db.cgi +++ /dev/null @@ -1,226 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use FindBin qw($RealBin $Bin); -# use lib ('CGI/api/lib/perl5'); -# use lib ('CGI/api/lib'); -use lib ($Bin.'/server/api/lib/perl5'); -use lib ($Bin.'/server/api/lib'); -use lib ($Bin.'/api/lib/perl5'); -use lib ($Bin.'/api/lib'); -use lib ($RealBin.'/lib/perl5'); -use lib ($RealBin.'/lib'); -use CGI; -use CGI::Cookie; -use CGI::Carp qw/fatalsToBrowser/; -use File::Basename; -use JSON::PP; -use dksconfig qw/$sitecfg/; -use dksdb; - -# use session; -#use sendemail; -my $cgi = new CGI(); -my $scriptpath = $cgi->url(-absolute => 1); -my $p = (); -my @params = $cgi->param(); -my $sess = undef; -foreach my $pe (@params){ - $p->{$pe} = $cgi->param($pe); -} -my $html->{result} = (); -my $dbredirect = {}; -if ($sitecfg->{cookiename} != undef ){ - $p->{sid} = $cgi->cookie($sitecfg->{cookiename}); - my $se = session->new(); - $sess = $se->getsession($p->{sid}); - -} else { - $sess->{username} = $ENV{USERNAME}; - $dbredirect->{dsn} = $sitecfg->{dsn}; - # foreach my $e (%ENV){ - # $html->{env}->{$e} = $ENV{$e}; - # } -} -$sess->{host} = $ENV{REMOTE_ADDR}; - -print $cgi->header(-type=>"application/json", -charset => "utf-8"); -# if ($sitecfg->{dbtype} eq "SQLite"){ - if (exists($p->{db}) && (-e $sitecfg->{datapath}.'/'.$p->{db}.'.sqlite')){ - $dbredirect->{dsn} = "DBI:SQLite:dbname=".$sitecfg->{datapath}.'/'.$p->{db}.'.sqlite'; - } - #else { - # $html->{error} = $sitecfg->{datapath}.'/'.$p->{db}.'.sqlite does not exist!'; - # } -# } -$html->{conn} = $dbredirect; - -# if ($sess == undef){ -# $html->{error} = "No Authorisation"; -# print JSON::PP::encode_json($html); -# exit(0); -# } -# $html->{p} = $p; -# $html->{sess} =$sess; -#my $datapath = $ENV{"DOCUMENT_ROOT"}.dirname(dirname($scriptpath)).'/data/'; -if (($cgi->request_method() eq "GET") || ($cgi->request_method() eq "POST")){ - - # my @params = $cgi->param(); - # foreach my $pp (@params){ - # $p->{$pp} = $cgi->param($pp); - # } - my $db = dksdb->new($dbredirect); - if (exists($p->{get})){ - my $sql = "select * from ".$p->{get}." WHERE id='".$p->{id}."';"; - # if (exists($p->{fields}) ){ - # $sql = "select ".$p->{fields}." from vw_".$p->{get}; - # } - $html->{result}->{view} = $p->{get}; - $html->{result}->{sqldata} = $db->query($sql); - } - elsif (exists($p->{set})){ - my $type = "ins"; - foreach my $x (keys(%{$p})){ - if ($x =~ /^ident_/ ){ - if ($p->{$x} ne ""){ - $type = "upd"; - } - #else { - # #my $uuid = create_uuid(UUID_TIME); - # my $uuid_str=uuid_to_string($uuid); - # $p->{$x} = $uuid_str; - # } - - } - } - - my $x = $p; - delete $x->{sid}; - delete $x->{set}; - delete $x->{db}; - my @sql = (); - - if ($type eq "ins"){ - - @sql = $db->create_ddl_insert($x); - - }else { - @sql = $db->create_ddl_update($x); - } - if (scalar(@sql) > 0 ){ - - my $rid = $db->exec($sql[0]); - # if ($type eq "ins" && exists($p->{return})){ - # my $rid = $db->query('select seq as id from sqlite_sequence where name="'.$p->{return}.'";'); - # $html->{result} = $rid; - # } else { - # $html->{result} = $rid->{0}; - # } - - } - } - elsif (exists($p->{del})){ - my $sql = "DELETE FROM ".$p->{del}." WHERE id in ('".$p->{id}."');"; - my $res = $db->exec($sql); - $html->{result} = $res; - } - elsif (exists($p->{sql})){ - $html->{result}->{sql} = $p->{sql}; - if (exists($p->{key})){ - $html->{result} = $db->querybykey($p->{key},$p->{sql}); - } - else { - $html->{result} = $db->queryarray($p->{sql}); - } - } - elsif (exists($p->{ins})){ - my $uuid = $db->newuuid(); - my $ndata = { $p->{ins}."_id" => $uuid }; - if (($p->{data}) && $p->{data} =~ /^\{.*\}$/) { - my $idata = JSON::PP::decode_json($p->{data}); - foreach my $d (keys(%{$idata})){ - $ndata->{$p->{ins}."_".$d} = $idata->{$d}; - } - } - - my @inssql = $db->create_ddl_insert($ndata); - #my $sql = "insert into ".$p->{ins}." (id) VALUES ('".$uuid."');"; - my $res = $db->exec($inssql[0]); - #$html->{result}->{sql} = $inssql[0]; - $html->{result}->{id} = $uuid; - } - elsif (exists($p->{dupl})){ - $p->{exclude} = $p->{exclude}.','; - my $sql = "select * from sqlite_master where sql LIKE '\%REFERENCES ".$p->{dupl}."(id)\%'"; - my $reftbls = $db->queryarray($sql); - my $basetbl = $p->{dupl}; - #my @sqls = ("SELECT * FROM ".$p->{dupl}." WHERE id='".$p->{id}."';"); - my $basetable = $db->query("SELECT * FROM ".$p->{dupl}." WHERE id='".$p->{id}."';"); - my $nbtbl = (); - my $nbid = $db->newuuid(); - foreach my $b (keys(%{$basetable})){ - my $v = $basetable->{$b};; - if ($b eq 'id') { $v = $nbid; } - if (index($p->{exclude},$b.',') > 0){next;} - $nbtbl->{$basetbl."_".$b} = $v; - } - my @sqls = $db->create_ddl_insert($nbtbl); - my $nrtbl = (); - foreach my $r (@{$reftbls}){ - my $search = $r->{sql}; - $search =~ s/\r//g; - $search =~ s/\n//g; - chomp($search); - #print Dumper($search); - my ($mtldata) = $search=~ m/.*,\s*FOREIGN\s+KEY\s*$(.+)$\s+REFERENCES\s+invoices$id$.*$/g; - #print Dumper($mtldata); - if ($mtldata ne ""){ - my $subclonesql = "SELECT * FROM ".$r->{name}." WHERE ".$mtldata."='".$p->{id}."';"; - #push (@sqls,$subclonesql); - my $refdata = $db->queryarray($subclonesql); - foreach my $q (@{$refdata}){ - my $nrtbl = (); - my $nrid = $db->newuuid(); - foreach my $b (keys(%{$q})){ - my $v = $q->{$b}; - if ($b eq 'id') { $v = $nrid; } - if ($b eq $mtldata) { $v = $nbid; } - $nrtbl->{$r->{name}."_".$b} = $v; - } - push(@sqls,$db->create_ddl_insert($nrtbl)); - } - } - foreach my $s (@sqls){ - $db->exec($s); - } - } - $html->{result}->{id} = $nbid; - } - elsif (exists($p->{save})){ - $html->{result} = $db->exec("UPDATE ".$db->securetext($p->{table})." SET ".$db->securetext($p->{column})."='".$db->securetext($p->{value})."' WHERE id='".$db->securetext($p->{id})."';"); - } - elsif (exists($p->{exec})){ - $html->{result} = $db->exec($p->{exec}); - } - elsif (exists($p->{ddl})){ - $html->{result} = $db->exec($p->{ddl}); - } - elsif (exists($p->{pref})){ - my $get = $db->query("SELECT username,host,page,preference FROM preferences WHERE host='".$sess->{host}."' AND username='".$sess->{username}."' AND page='".$p->{page}."';"); - if ($p->{pref} eq "set"){ - if (keys(%{$get}) > 0){ - $db->exec("UPDATE preferences SET preference='".$p->{preference}."' WHERE host='".$sess->{host}."' AND username='".$sess->{username}."' AND page='".$p->{page}."';"); - } else { - $db->exec("INSERT INTO preferences (host,username,page,preference) VALUES ('".$sess->{host}."','".$sess->{username}."','".$p->{page}."','".$p->{preference}."')"); - $get = $db->query("SELECT username,host,page,preference FROM preferences WHERE host='".$sess->{host}."' AND username='".$sess->{username}."' AND page='".$p->{page}."';"); - } - } - if ($get->{preference} =~/^\{.*\}$/){ - $get->{preference} = JSON::PP::decode_json($get->{preference}); - } - $html->{result}->{pref} = $get; - } -} -print JSON::PP::encode_json($html); -# for my $e ( keys %ENV ) { -# print "$e: $ENV{$e}
"; -# } \ No newline at end of file diff --git a/server/api/lib/dksconfig.pm b/server/api/lib/dksconfig.pm deleted file mode 100644 index 7a94501..0000000 --- a/server/api/lib/dksconfig.pm +++ /dev/null @@ -1,56 +0,0 @@ -package dksconfig; - -use strict; -# use lib ('./lib/perl5'); -# use lib ('./lib'); -# use lib ('./'); -use File::Basename; -use Exporter 'import'; -our @EXPORT_OK = qw($sitecfg); - - -our $sitecfg ={ - cookiename => undef, - staticpath => 'static/', - page => 'index.tt', - pagename => 'index', - basename => '/' - #docroot => $ENV{"DOCUMENT_ROOT"}, -}; - - -if ($ENV{DOCUMENT_ROOT} eq ""){ - my $name = basename($0); - $name =~ s/\.pl$//; - $name =~ s/\.exe$//; - my $cfgpath=$ENV{HOME}.'/.'.$name; - $cfgpath =~ s/\\/\//g; - my $glhostname = `hostname`; - chomp($glhostname); - $sitecfg->{hostname} = $glhostname; - if ($^O eq "MSWin32"){ - if (!exists$ENV{DKSAPPDATA}){ - $cfgpath = $ENV{APPDATA}.'/'.$name.'/server'; - } else { - $cfgpath = $ENV{DKSAPPDATA}; - } - - } elsif ($^O eq "darwin"){ - $cfgpath = $ENV{HOME}.'/Library/Application Support/'.$name.'/server'; - } - $sitecfg->{dsn}='DBI:SQLite:dbname='.$cfgpath.'/'.$name.'.sqlite'; - $sitecfg->{datapath}=$cfgpath; - -} else { - $sitecfg->{app}='invoicejournal'; - $sitecfg->{datapath}=$ENV{DOCUMENT_ROOT}.'/'.$sitecfg->{app}.'/data'; - $sitecfg->{tmplpath}=$ENV{DOCUMENT_ROOT}.'/'.$sitecfg->{app}.'/tmpl'; - $sitecfg->{dsn}='DBI:SQLite:dbname='.$sitecfg->{datapath}.'/invoicejournal.sqlite'; - $sitecfg->{tools}->{wkhtmltopdf} = '/usr/local/bin/wkhtmltopdf'; -} - -foreach my $e (keys(%ENV)){ - $sitecfg->{env}->{$e} = $ENV{$e}; -} - -1; \ No newline at end of file diff --git a/server/api/page.cgi b/server/api/page.cgi deleted file mode 100644 index 00c32dd..0000000 --- a/server/api/page.cgi +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use lib ('./server/api/lib/perl5'); -use lib ('./server/api/lib'); -use lib ('./lib/perl5'); -use lib ('./lib'); -use CGI; -use CGI::Cookie; -use CGI::Carp qw/fatalsToBrowser/; -use File::Basename; -use FindBin qw/$RealBin/; -use Template; -#use session; -use dksconfig qw/$sitecfg/; -use JSON::PP; -use Data::Dumper; -my $cgi = new CGI(); -my $scriptpath = $cgi->url(-absolute => 1); -my $p = (); -my @params = $cgi->param(); -foreach my $pe (@params){ - $p->{$pe} = $cgi->param($pe); -} -print $cgi->header(-type=>"text/html", -charset => "utf-8"); -my $html->{result} = (); -# $p->{sid} = $cgi->cookie($sitecfg->{cookiename}); -#print Dumper($p); -#my $se = session->new(); -#my $sess = $se->getsession($p->{sid}); -#print Dumper($sess); -# if ($sess == undef){ -# $html->{error} = "No Authorisation"; -# print JSON::PP::encode_json($html); -# exit(0); -# } -my $vars = $sitecfg; -#$vars->{session} = $sess; -$vars->{params} = $p; -$vars->{filepath} = 'module/'.$p->{page}.'.tt'; -$vars->{baseurl} = $cgi->url({-base=>1}); -$vars->{siteurl} = $cgi->url({-base=>1}).'/'.$sitecfg->{staticpath}; -my @lv = split(/\//,$vars->{filepath}); -my $absnum = scalar(@lv)-1; -$vars->{abspath} = ""; -# for (my $i=0;$i<$absnum;$i++){ -# $vars->{abspath} .= "../"; -# } -if ($vars->{filepath} ne ""){ - $vars->{suffix} = substr($vars->{filepath},rindex($vars->{filepath},'.')); - $vars->{page} = $vars->{filepath}; - $vars->{page} =~ s/html$/tt/; -} -my $tmplincpath2 = $sitecfg->{tmplpath}; -# $vars->{tmplpath} = $tmplincpath2; -my ($browserlang2) = $ENV{HTTP_ACCEPT_LANGUAGE} =~ /^(\w+)[,|;|-]/; -$vars->{lang} = 'de'; -if (-e $tmplincpath2.'/lang/'.$browserlang2.'.tt'){ - $vars->{lang} = $browserlang2; -} -#print '

'.Dumper($vars).'

'; -my $template = Template->new({INCLUDE_PATH => [$sitecfg->{tmplpath}]}); - -$template->process($vars->{filepath},$vars) || die "Template process failed: ", $template->error(), "\n"; diff --git a/server/api/parsestatement.cgi b/server/api/parsestatement.cgi deleted file mode 100644 index 1e3cd3c..0000000 --- a/server/api/parsestatement.cgi +++ /dev/null @@ -1,261 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use CGI; -use CGI::Carp qw/fatalsToBrowser/; -use File::Path qw/make_path/; -use File::Basename; -use JSON::PP; -use FindBin qw($RealBin $Bin); -use Data::Dumper; -# use lib ('CGI/api/lib/perl5'); -# use lib ('CGI/api/lib'); -use lib ($Bin.'/api/lib/perl5'); -use lib ($Bin.'/api/lib'); -use lib ($RealBin.'/api/lib/perl5'); -use lib ($RealBin.'/api/lib'); -use dksconfig qw/$sitecfg/; -use dksdb; - -my $cgi = new CGI(); -my $p = (); -# my $cfgpath=""; -# if ($^O eq "MSWin32"){ -# $cfgpath = $ENV{APPDATA}.'/dks'; -# } elsif ($^O eq "darwin"){ -# $cfgpath = $ENV{HOME}.'/Library/Application Support/dks'; -# } else { -# $cfgpath = $ENV{HOME}.'/.dks'; -# } -# $cfgpath =~ s/\\/\//g; -# #print $cfgpath."\n"; -# my $docpath = $cfgpath.'/'.$p->{app}; -my @params = $cgi->param(); -foreach my $pp (@params){ - $p->{$pp} = $cgi->param($pp); -} -print $cgi->header(-type=> 'text/html', -charset=>"UTF-8"); -#print Dumper($p); -my $dbredirect = {}; -my $html->{result}->{test} = (); -my $js = JSON::PP->new(); -my @allsql = (); -my @files = (); -if (exists($p->{dir}) && (-d $sitecfg->{datapath}.'/'.$p->{dir})){ - opendir(STMT,$sitecfg->{datapath}.'/'.$p->{dir}); - while (my $f = readdir(STMT)){ - if ($f =~ /\.pdf$/){ - push(@files,$p->{dir}.'/'.$f); - } - } - closedir(STMT); -} elsif (exists($p->{file})) { - @files = split(',',$p->{file}); -} -$html->{result}->{files} = \@files; -foreach my $f (@files){ -if (-f $sitecfg->{datapath}.'/'.$f){ - my $sdata = &parsestatement($sitecfg->{datapath}.'/'.$f); - if (exists($p->{import}) && (exists($p->{db}))){ - #if ($sitecfg->{dbtype} eq "SQLite"){ - if (exists($p->{db})){ - $dbredirect->{dsn} = "DBI:SQLite:dbname=".$sitecfg->{datapath}.'/'.$p->{db}.'.sqlite'; - } - #} - my $db = dksdb->new($dbredirect); - $html->{conn} = $dbredirect; - my $updates = 0; - my $inserts = 0; - foreach my $i (keys(%{$sdata})){ - my @tr = $db->queryarray("select id from transactions where transactionident='".$sdata->{$i}->{transactionident}."';"); - my $tid=0; - if (scalar(@tr) > 1){ - $tid = $tr[0]->{id}; - } - my $ddlv = {}; - foreach my $x (keys(%{$sdata->{$i}})){ - $ddlv->{"transactions_".$x} = $sdata->{$i}->{$x}; - } - $ddlv->{"transactions_pdffile"} = $f; - my @sql = (); - if ($tid == 0){ - $ddlv->{"transactions_id"} = $db->newuuid(); - @sql = $db->create_ddl_insert($ddlv); - - $inserts++; - }else { - $ddlv->{"ident_transactions_id"} = $tid; - @sql = $db->create_ddl_update($ddlv); - $updates++; - } - push (@allsql,@sql); - if (scalar(@sql) > 0 ){ - my $rid = $db->exec($sql[0]); - } - } - $html->{result}->{total} = keys(%{$sdata}); - $html->{result}->{updates} = $updates; - $html->{result}->{inserts} = $inserts; - #$html->{result}->{sql} = \@allsql; - }else { - $html->{result}->{bookings} = $sdata; - } - - -} else { - print "FILE: ".$sitecfg->{datapath}.'/'.$f." does not exist!\n"; -} -} - -print $js->utf8->encode($html); - -sub pdfextract(){ - my $file = shift; - my $pdftotext; - my $sep = "/"; - if ($^O eq "MSWin32") { - $sep = "\\"; - $pdftotext=dirname($0).'/tools/pdftotext.exe'; - }else { - $pdftotext=dirname($0).'/tools/pdftotext'; - } - if (-e $file.'.txt'){ - unlink($file.'.txt'); - } - my $cmd = 'start /b "" "'.$pdftotext.'" -q -table -eol unix "'.$file.'" "'.$file.'.txt"'; - my $st = `$cmd`;#'system(1,$cmd)' ; - #print $cmd."->".$st."\n"; - return $st; -} - - -sub parsestatement(){ - my $file = shift; - my $pxdata = (); - my @pdata = (); - my $jdata = (); - if (-e $file){ - my $st = &pdfextract($file); - - if (($st == 0) && (-e $file.".txt")){ - open(PDFDATA,$file.".txt"); - while (my $l = ) { - chomp($l); - if ($l ne "") {push @pdata,$l;} - } - close(PDFDATA); - } - my $caccount = ""; - my $stmtnum = ""; - my $r = 0; - my $cpos = ""; - foreach my $p (@pdata){ - if ($p =~ /^\s+Konto\s+:/ ) { - $cpos = ""; - ($caccount) = $p =~ m/.+IBAN\s+(.+)$/; - next; - }elsif ($p =~ /Kontoauszug Nr\./){ - $cpos = ""; - ($stmtnum) = $p =~ m/^Kontoauszug Nr\.\s(\d+).+$/; - next; - }elsif ($p =~ /^\d\d\.\d\d\s+[GUT|UEBER|SEPA|Geb|]/){ - $cpos = ""; - $r++; - my ($type,$trdate,$trval,$trsign) = $p =~ m/^\d\d\.\d\d\s+(.+)(\d\d\.\d\d\.\d\d)\s+([\d|,|\.]+)\s+([+|-])/; - $type =~ s/Geb.hr//g; - $type =~ s/\s//g; - $trsign =~ s/\+//; - $trval=~ s/\.//g; - $trdate = substr($trdate,0,6).'20'.substr($trdate,-2); - $jdata->{$r}->{"transfertype"} = $type; - $jdata->{$r}->{"account"} = $caccount; - $jdata->{$r}->{"statementnumber"} = $stmtnum; - $jdata->{$r}->{"bookingdate"} = $trdate; - my $dt = $jdata->{$r}->{"bookingdate"}; - my ($d,$m,$y) = $jdata->{$r}->{"bookingdate"} =~ m/(\d\d)\.(\d\d)\.(\d\d\d\d)/; - $jdata->{$r}->{"bookingdate"} = $y."-".$m."-".$d; - $jdata->{$r}->{"amount"} = $trsign.$trval; - $jdata->{$r}->{"amount"} =~ s/\,/\./g; - $jdata->{$r}->{"transactionident"} = ""; - $jdata->{$r}->{"message"} = ""; - $jdata->{$r}->{"foreignaccountowner"} = ""; - $jdata->{$r}->{"bank"} = ""; - $jdata->{$r}->{"transferaccount"} = ""; - $jdata->{$r}->{"transfercosts"} = 0; - #$jdata->{$r}->{"BookingType"} = $type; - next; - }elsif ($p =~ /^\s+Unser Zeichen/){ - $cpos = "transactionident"; - my ($trid) = $p =~ m/^\s+Unser Zeichen\s+(.+)$/; - $jdata->{$r}->{$cpos} =$trid; - }elsif ($p =~ /^\s+Mitteilung/){ - $cpos = "message"; - my ($msg) = $p =~ m/^\s+Mitteilung\s+(.+)$/; - $jdata->{$r}->{$cpos} = $msg; - }elsif ($p =~ /^\s+Auftraggeber/){ - $cpos = "foreignaccountowner"; - my ($apl) = $p =~ /^\s+Auftraggeber\s+(.+)$/; - $apl =~ s/\s+/\ /g; - $jdata->{$r}->{$cpos} =$apl; - }elsif ($p =~ /^\s+Bank d. Auftr.gebers/){ - $cpos = ""; - }elsif ($p =~ /^\s+BIC-Code Bank d. Auftraggebers/){ - $cpos = "bank"; - my ($trfbank) = $p =~ /^\s+BIC-Code\sBank\sd\.\sAuftraggebers\s+(.+)$/; - $jdata->{$r}->{$cpos} =$trfbank; - }elsif ($p =~ /^\s+End-to-End-Identifizierung/){ - $cpos = ""; - }elsif ($p =~ /^\s+Beg.nstigter/){ - $cpos = "foreignaccountowner"; - my ($recp) = $p =~ /^\s+Beg.nstigter\s+(.+)$/; - $recp =~ s/\s+/\ /g; - $jdata->{$r}->{$cpos} =$recp; - $cpos=""; - }elsif ($p =~ /^\s+Konto Nr. Beg.nst./){ - $cpos = "transferaccount"; - - my ($trfacc) = $p =~ /^\s+Konto\sNr\.\sBeg.nst.\s+(.+)$/; - $trfacc =~ s/\///g; - $trfacc =~ s/(....)/$1 /sg; - $trfacc =~ s/\s+$//; - $jdata->{$r}->{$cpos} =$trfacc; - $cpos=""; - }elsif ($p =~ /^\s+bei/){ - $cpos = ""; - }elsif ($p =~ /^\s+Transfergeb.hr/){ - $cpos = "transfercosts"; - my ($tramount) = $p =~ /^\s+Transfergeb.hr\s+EUR\s+(.+)$/; - $tramount =~ s/\,/\./g; - $jdata->{$r}->{$cpos} =$tramount; - - }elsif ($p =~ /^\s+.BERW\sEISUNGSGEB.HR/){ - $cpos = "transfercosts"; - my ($tramount) = $p =~ /^\s+.BERW\sEISUNGSGEB.HR\s+EUR\s+(.+)$/; - $tramount =~ s/\,/\./g; - $jdata->{$r}->{$cpos} =$tramount; - - }elsif ($p =~ /^\s+Durch Ihren Bonus abgedeckt/){ - $cpos = "transfercosts"; - my ($tramount) = $p =~ /^\s+Durch Ihren Bonus abgedeckt\s+EUR\s+(.+)$/; - $tramount =~ s/\,/\./g; - $jdata->{$r}->{$cpos} = $jdata->{$r}->{$cpos} + $tramount; - }elsif ($p =~ /^\s+Zeichen/){ - $cpos = ""; - } elsif ($p =~ /^\s+Neuer Kontostand/){ - $cpos=""; - } elsif ($p =~ /^\s+Karte/){ - $cpos = "message"; - my $m = $p =~ s/^\s+//g; - $jdata->{$r}->{$cpos} .= $m; - }elsif ($cpos ne "") { - my ($data) = $p =~ m/\s+(.+)$/; - $jdata->{$r}->{$cpos} .= " ".$data; - } - } - } - - # if (-e $file.'.txt'){ - # unlink($file.'.txt'); - # } - return $jdata; - -} \ No newline at end of file diff --git a/server/api/report.cgi b/server/api/report.cgi deleted file mode 100644 index 031f890..0000000 --- a/server/api/report.cgi +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use FindBin qw($RealBin $Bin); -# use lib ('CGI/api/lib/perl5'); -# use lib ('CGI/api/lib'); -use lib ($Bin.'/api/lib/perl5'); -use lib ($Bin.'/api/lib'); -use lib ($RealBin.'/lib/perl5'); -use lib ($RealBin.'/lib'); -use CGI; -use CGI::Cookie; -use CGI::Carp qw/fatalsToBrowser/; -use File::Basename; -use JSON::PP; -use File::Path qw(make_path); -use MIME::Type::FileName; -use dksconfig qw/$sitecfg/; -use dksdb; -use pdfreport; -use utf8; - -#Beispiel: http://localhost:6060/api/report.cgi?generate=invoices/dks-deutsch&app=invoicejournal&filename=dks_test.pdf&db=dksbuchhaltung&data={"id_invoice":"469"} -#http://localhost:6060/api/report.cgi?open=invoices/dks_test.pdf&app=invoicejournal -# use session; -#use sendemail; -my $cgi = new CGI(); -my $scriptpath = $cgi->url(-absolute => 1); -my $p = (); -my @params = $cgi->param(); -foreach my $pe (@params){ - $p->{$pe} = $cgi->param($pe); -} -my $html->{result} = (); -# $p->{sid} = $cgi->cookie($sitecfg->{cookiename}); -# my $se = session->new(); -# my $sess = $se->getsession($p->{sid}); - -# my $dbredirect = {}; -# # if ($sitecfg->{dbtype} eq "SQLite"){ -# $dbredirect->{dsn} = $sitecfg->{dsn}; - -# # } -# my $db = dksdb->new($dbredirect); -#$html->{conn} = $dbredirect; -# if ($sess == undef){ -# $html->{error} = "No Authorisation"; -# print JSON::PP::encode_json($html); -# exit(0); -# } -# $html->{p} = $p; -# $html->{sess} =$sess; -if (($cgi->request_method() eq "GET") || ($cgi->request_method() eq "POST")){ - - if (exists($p->{generate})){ - print $cgi->header(-type=>"application/json", -charset => "utf-8"); - # $html->{params} = $p; - my $dbredirect->{dsn} = $sitecfg->{dsn}; - if (exists($p->{db})){ - $dbredirect->{dsn} = "DBI:SQLite:dbname=".$sitecfg->{datapath}.'/'.$p->{db}.'.sqlite'; - } - my $db = dksdb->new($dbredirect); - my $data = JSON::PP::decode_json($p->{data}); - $data->{dsn} = $dbredirect->{dsn}; - my $repdata = $db->query("select * from reports WHERE id='".$p->{generate}."'"); - #print Dumper($repdata); - my $sqlfname = $repdata->{sqlfilename}; - my $rid =$data->{id}; - $sqlfname =~ s/%%id%%/$rid/g; - my $fn = $db->query($sqlfname); - my $proc = basename($fn->{filename}); - # print Dumper($fn,$proc); - # #print Dumper($proc); - if (! -d $sitecfg->{datapath}.'/tmp/'.$proc){ - make_path($sitecfg->{datapath}.'/tmp/'.$proc); - } - my $pdfopts = (); - foreach my $o (keys(%{$repdata})){ - if ($o =~ /^pdf/){ - $pdfopts->{$o} = $repdata->{$o}; - } - } - my $enc = ":utf8"; - # if (exists($pdfopts->{pdfencoding}) && $pdfopts->{pdfencoding} ne ""){ - # # $enc = ":".$pdfopts->{pdfencoding}; - # } - open(CONT,">".$sitecfg->{datapath}.'/tmp/'.$proc.'/'.$repdata->{id}.'.tt'); - binmode(CONT, ":utf8"); - $repdata->{content} =~ s/\r//g; - print CONT $repdata->{content}; - close(CONT); - open(HDR,">".$sitecfg->{datapath}.'/tmp/'.$proc.'/'.$repdata->{id}.'.header.tt'); - binmode(HDR, ":utf8"); - $repdata->{header} =~ s/\r//g; - print HDR $repdata->{header}; - close(HDR); - open(FTR,">".$sitecfg->{datapath}.'/tmp/'.$proc.'/'.$repdata->{id}.'.footer.tt'); - binmode(FTR, ":utf8"); - $repdata->{footer} =~ s/\r//g; - print FTR $repdata->{footer}; - close(FTR); - - my $reportpath = $sitecfg->{datapath}.'/tmp/'.$proc; - my $output = $sitecfg->{datapath}.'/'.$fn->{filename}; - if (! -d dirname($sitecfg->{datapath}.'/'.$fn->{filename})){ - make_path(dirname($sitecfg->{datapath}.'/'.$fn->{filename})); - } - - my $rep = pdfreport->new({tmplpath => $reportpath, tmp => $reportpath}); - my ($result,$file) = $rep->createpdf($p->{generate},$output,$pdfopts,$data); - $html->{result}->{file} = $fn->{filename}; - - } - elsif (exists($p->{open})){ - - my $file = $sitecfg->{datapath}.'/'.$p->{open}; - if (-e $file){ - my $mimetype = MIME::Type::FileName::guess ($file); - my @stat = stat($file); - print $cgi->header( - -type => $mimetype, - # -target => basename($p->{open}), - -attachment => basename($p->{open}) - ); - open(DLD,$file); - binmode(DLD); - local $/ = \1024; - while (){ - print $_; - } - close(DLD); - exit(0); - } - else { - print $cgi->header(-type=>"application/json", -charset => "utf-8"); - $html->{result}->{file} = $file; - } - } -} -print JSON::PP::encode_json($html); diff --git a/server/api/upload.cgi b/server/api/upload.cgi deleted file mode 100644 index 16f2796..0000000 --- a/server/api/upload.cgi +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/local/bin/perl -use strict; -use CGI; -# use CGI::Carp qw/fatalsToBrowser/; -use File::Path qw/make_path/; -use File::Basename; -use JSON::PP; -use FindBin qw($RealBin $Bin); -use Data::Dumper; -use File::Basename; -use JSON::PP; -use File::Path qw(make_path); -use MIME::Type::FileName; -use lib ($RealBin.'/api/lib/perl5'); -use lib ($RealBin.'/api/lib'); -# use CGI::Carp qw/fatalsToBrowser/; - -use dksconfig qw/$sitecfg/; - -my $cgi = new CGI(); -my $p = (); -my @params = $cgi->param(); -foreach my $pp (@params){ - $p->{$pp} = $cgi->param($pp); -} -my $html->{result} = (); -$html->{result}->{params} = $p; -#print Dumper(@io_handles); -#my $upl = $cgi->upload('file'); -#my @uploads = $req->uploads->get_all('file'); - # $html->{result}->{file} = $p->{file}; -if (! -d $sitecfg->{datapath}."/".$p->{folder}){ - make_path($sitecfg->{datapath}."/".$p->{folder}); -} -my $fh =$cgi->upload('file'); -open(SPF,'>'.$sitecfg->{datapath}."/".$p->{folder}.'/'.$p->{file}); - binmode(1); - while (my $l = <$fh>) { - print SPF $l; - } - close(SPF); -if (-e $sitecfg->{datapath}."/".$p->{folder}.'/'.$p->{file}){ - $html->{result}->{file} = $p->{folder}.'/'.$p->{file}; -} -print $cgi->header(-type=> 'application/json', -charset=>"UTF-8"); -my $js = JSON::PP->new(); -$js->allow_blessed(1); -$js->convert_blessed(1); -print $js->utf8->encode($html); \ No newline at end of file diff --git a/server/data/.htaccess b/server/data/.htaccess deleted file mode 100644 index 14249c5..0000000 --- a/server/data/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all \ No newline at end of file diff --git a/server/data/invoicejournal.sqlite b/server/data/invoicejournal.sqlite deleted file mode 100644 index 61ea2fb..0000000 Binary files a/server/data/invoicejournal.sqlite and /dev/null differ diff --git a/server/ijsrv.pl b/server/ijsrv.pl deleted file mode 100644 index cacb965..0000000 --- a/server/ijsrv.pl +++ /dev/null @@ -1,118 +0,0 @@ -use strict; -#use lib ($ENV{HOME}.'/perl5/lib/perl5'); -use File::Basename; -use Getopt::Long; -use Time::HiRes; -use Data::Dumper; -use Plack::Builder; -use Plack::App::File; -#use Plack::App::WrapCGI; -use Plack::Middleware::Auth::Basic; -use Plack::Middleware::DirIndex; -use Plack::Request; -use Plack::Runner; -use Getopt::Long; -use Digest::SHA::PurePerl qw(sha256_hex); -use Cwd; -use FindBin qw($RealBin); -use lib ($RealBin.'/lib'); -use API::SQLite; -my $cfgfile =""; -GetOptions("config|c=s" => \$cfgfile); -if (! -e $cfgfile ){ - print STDERR "No config-file found!\n"; - exit(1); -} -our $cfg = &readconfig(); -print $^O."\n"; -print $RealBin."\n"; -print Dumper($cfg); -#my $datapath=$ENV{HOME}.'/.hourtrax'; -# if ($^O eq "MSWin32"){ -# $datapath = getcwd().'/data'; -# } elsif ($^O eq "darwin"){ -# $datapath = getcwd().'/data'; -# } -#my $webdir = dirname($RealBin).'/web'; -print "datapath:".$cfg->{datapath}."\n"; -my @match = grep { /par-.*inc$/} @INC; - -if (($cfg->{daemon} == 1)){ - use POSIX qw(setsid); - #open STDIN, '/dev/null' or die "Can't read /dev/null: $!"; - # open STDOUT, '>/dev/null' or die "Can't write to /dev/null: $!"; - # open STDERR, '>/dev/null' or die "Can't write to /dev/null: $!"; - - die "cannot start process $!" unless defined (my $child = fork); - exit 0 if $child; - setsid() or die "cannot start new session $!"; - chdir('/'); - umask(0); - system("echo ".$$." > ".$cfg->{datapath}.'/'.$cfg->{pidfile}); -} - -my $basedir = dirname($0); -if (scalar(@match) > 0){ - $basedir = $match[0]; -} - -my $cfgpath = ""; - - - -# my $name = basename($0); -# $name =~ s/srv\.pl$//; -# $name =~ s/srv\.exe$//; -# $name = lc($name); - -sub authen_cb { - my($username, $password, $env) = @_; - my $auth = 0; - print "Check AUTH\n"; - my $pwd = sha256_hex($password); - print "$username=$pwd\n"; - if (-e $cfg->{datapath}.'/'.$cfg->{pwdfile}){ - open(AUTH,$cfg->{datapath}.'/'.$cfg->{pwdfile}); - while (my $l = ){ - chomp($l); - if ($l eq $username.'='.$pwd){ - $auth = 1; - last; - } - } - close(AUTH); - } - return $auth; - } - -sub readconfig(){ - my $retcfg = (); - open(CFG,$cfgfile); - while (my $l = ){ - chomp($l); - $l =~ s/^\s+//; - $l =~ s/\s+$//; - if (($l eq "") || ($l =~ /^#/) || ($l =~ /^;/)){next;} - my ($k,$v) = $l =~ m/(\w+)\s*=\s*(.*)$/; - $retcfg->{lc($k)} = $v; - } - close(CFG); - return $retcfg; -} - -my $allapp = builder { - #enable_if { $_[0]->{REMOTE_ADDR} ne 'localhost' && $_[0]->{REMOTE_ADDR} ne '127.0.0.1' } "Auth::Basic", authenticator => \&authen_cb; - #enable "Plack::Middleware::DirIndex", dir_index => 'index.html'; - mount "/db" => API::SQLite->new({datapath => $cfg->{datapath}})->to_app; #,dbfile => $cfg->{datapath}.'/'.$cfg->{dbfile} - #mount "/report" => Web::IJReport->new({datapath => $cfg->{datapath}})->to_app; - #mount "/" => Plack::App::File->new(root => $RealBin."/htdocs")->to_app; -}; - - -my @args = ("-p",$cfg->{port},"--error-log",$cfg->{datapath}."/error.log","--access-log",$cfg->{datapath}."/access.log","--timeout",$cfg->{timeout}); -#,"--error-log",$datapath."/error.log","--access-log",$datapath."/access.log"); -my $runner = Plack::Runner->new(server => 'Starlight', env => $cfg->{mode}, ipv6 => '1' );#env => , test ,deployment -$runner->parse_options(@args); -$runner->run($allapp); - -print "Started\n"; \ No newline at end of file diff --git a/server/index.cgi b/server/index.cgi deleted file mode 100644 index 66e368b..0000000 --- a/server/index.cgi +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use FindBin qw($RealBin $Bin); -# use lib ('CGI/api/lib/perl5'); -# use lib ('CGI/api/lib'); -use lib ($Bin.'/api/lib/perl5'); -use lib ($Bin.'/api/lib'); -use lib ($Bin.'/server/api/lib/perl5'); -use lib ($Bin.'/server/api/lib'); -use File::Basename qw/dirname basename/; -use Template; -use Template::Constants qw( :debug ); -use CGI; -use CGI::Carp qw(fatalsToBrowser); -use CGI::Cookie; -use Data::Dumper; -use JSON::PP; -my $cgi = new CGI(); -use dksconfig qw/$sitecfg/; -use session; - -my $skl = "index.tt"; - -my $p=(); -my $cookie; -my $vars = $sitecfg; - -$vars->{filepath} = substr($cgi->url({-absolute=>1}),length($vars->{app})+2); -#$vars->{filepath} = substr($ENV{PATH_INFO},1); -if ($sitecfg->{cookie} != undef){ - #we do need a session - -} -# $vars->{baseurl} = $cgi->url({-base=>1}).$vars->{basepath}; -# if ($vars->{basepath} eq "/"){ -# $vars->{siteurl} = $cgi->url({-base=>1}); -# }else { -# $vars->{siteurl} = $cgi->url({-base=>1}).dirname($vars->{basepath}); -# $vars->{docroot} = $vars->{docroot}.dirname($vars->{basepath}); -# #$vars->{sitepath} = dirname($vars->{basepath}); -# } -if ($vars->{filepath} ne ""){ - $vars->{suffix} = substr($vars->{filepath},rindex($vars->{filepath},'.')); - $vars->{page} = $vars->{filepath}; - $vars->{page} =~ s/html$/tt/; - -} -if ($cgi->request_method() eq "GET"){ - my @params = $cgi->param(); - foreach my $pp (@params){ - $p->{$pp} = $cgi->param($pp); - } - -} -my $ctype = 'text/html'; -if ($vars->{suffix} eq ".js"){ - $vars->{ctype}= "text/javascript"; - $skl = "file.tt"; -} elsif ($vars->{suffix} eq ".css"){ - $vars->{ctype} = "text/css"; - $skl = "file.tt"; -} -print $cgi->header(-type=>$ctype, -charset=>"utf-8"); -if (exists($p->{db}) && (-e $sitecfg->{datapath}.'/'.$p->{db}.'.sqlite')){ - $vars->{dsn} = 'DBI:SQLite:dbname='.$sitecfg->{datapath}.'/'.$p->{db}.'.sqlite'; -} -# my $tmplincpath = $RealBin.'/tmpl'; -# if (basename($RealBin) eq "server" ){ -# $tmplincpath = $RealBin.'/tmpl'; -# } -# $vars->{tmplpath} = $tmplincpath; -# my @lv = split(/\//,$vars->{filepath}); -# my $absnum = scalar(@lv)-1; -# $vars->{abspath} = ""; -# for (my $i=0;$i<$absnum;$i++){ -# $vars->{abspath} .= "../"; -# } -$vars->{abspath} = ""; -# $vars->{app} = "index"; -# if ($vars->{page} !~ /\.tt$/) { -# $skl = "file.tt"; -# } else { -# $vars->{lv} = \@lv; -# if (scalar(@lv) > 1){ -# $vars->{app} = $lv[0]; -# } -# # $vars->{app} = $vars->{page}; -# # $vars->{app} =~ s/^app\///; -# # $vars->{app} =~ s/\.tt$//; -# # if (-e $tmplincpath.'/skeleton/'.$vars->{app}.'.tt'){ -# # $skl = 'skeleton/'.$vars->{app}.'.tt'; -# # } -# } -$vars->{page} = 'module/'.$vars->{page}; -$vars->{pagename} = basename($vars->{page}); -$vars->{pagename} =~ s/\.tt$//; - -$vars->{params}= $p; -my ($browserlang) = $ENV{HTTP_ACCEPT_LANGUAGE} =~ /^(\w+)[,|;|-]/; -$vars->{lang} = 'de'; -if (-e $sitecfg->{tmplpath}.'/lang/'.$browserlang.'.tt'){ - $vars->{lang} = $browserlang; -} -#print '

'.Dumper($vars)."";
-#print Dumper(%ENV);
-
-my $template = Template->new({INCLUDE_PATH => [$sitecfg->{tmplpath}]});
-$template->process($skl,$vars) || die "Template process failed: ", $template->error(), "\n";
-if ($vars->{page} =~ /\.tt$/) {
-  print ''.Dumper($vars)."";
-}
-#
diff --git a/server/invoicejournal.old.pl b/server/invoicejournal.old.pl
deleted file mode 100644
index b36a5b7..0000000
--- a/server/invoicejournal.old.pl
+++ /dev/null
@@ -1,96 +0,0 @@
-#!C:\Strawberry\perl\bin\perl.exe
-use strict;
-use File::Basename;
-
-use Time::HiRes;
-use Data::Dumper;
-use FindBin qw($Bin $RealBin);
-use Plack::Builder;
-use Plack::App::File;
-use Plack::App::WrapCGI;
-use Plack::Request; 
-use File::Path qw (make_path);
-use Plack::Runner;
-use lib ($RealBin);
-our $cfgpath = "";
-
-print $^O."\n";
-print $^X."\n";
-print "Process:".$$."\n";
-print join(@INC)."\n";
-
-my @match =  grep { /par-.*inc$/} @INC;
-
-my $basedir = $RealBin;
-if (scalar(@match) > 0){
-	$basedir = $match[0];
-}
-
-print "BASEDIR:".$basedir."\n";
-my $name = basename($0);
-$name =~ s/\.pl$//;
-$name =~ s/\.exe$//;
-
-if ($^O eq "MSWin32"){
-	$cfgpath = $ENV{APPDATA}.'/'.$name.'/server';
-} elsif ($^O eq "darwin"){
-	$cfgpath = $ENV{HOME}.'/Library/Application Support/'.$name.'/server';
-} elsif ($ENV{uc($name)."_DATA"} ne "")  {
-	$cfgpath = $ENV{uc($name)."_DATA"};
-} else {
-  $cfgpath = $RealBin.'/data';
-}
-
-our $glhostname = `hostname`;
-chomp($glhostname);
-print $glhostname."\n";
-
-if (! -d $cfgpath ){
-  make_path($cfgpath);
-}	
-$cfgpath =~ s/\\/\//g;
-print $cfgpath."\n";
-
-my $allapp = builder {
-  enable "DirIndex", dir_index => 'index.html';
-  mount "/" => Plack::App::WrapCGI->new(script => $RealBin."/server/index.cgi")->to_app;#,execute=> 1
-  
-  opendir(API,$RealBin."/server/api");
-   while (my $s = readdir(API)){
-     if ($s =~ /\.cgi$/){
-       print "mount "."/api/".$s." using ".$RealBin."/server/api/".$s."\n";
-       mount "/api/".$s => Plack::App::WrapCGI->new(script => $RealBin."/server/api/".$s)->to_app;
-     }
-   }
-   closedir(API);
-   mount "/htdocs" => Plack::App::File->new(root => $RealBin."/server/htdocs")->to_app;
-  #  if (-e $cfgpath.'/'.$name.'.passwd'){
-  #  		enable "Auth::Basic", authenticator => \&authen_cb;	
-  #  }
-};
-
-
-my @args = ("-p","6060","--max-workers","20");#,"-R",$RealBin.'/CGI,'.$RealBin.'/CGI/api,'.$RealBin.'/CGI/api/lib'o,"--errr-log",$RealBin."/error.log","--access-log",$RealBin."/access.log"
-my $runner = Plack::Runner->new(server => "Starlight", env => 'development', ipv6 => '1' );#env => development,deployment,development, test 
-$runner->parse_options(@args);
-$runner->run($allapp);
-
-print "Started\n";
-
-# sub authen_cb {
-#       my($username, $password, $env) = @_;
-#       my $auth = 0;
-#       #print "Check AUTH\n";
-#       if (-e $cfgpath.'/'.$name.'.passwd'){
-#       	open(AUTH,$cfgpath.'/'.$name.'.passwd');
-#       	while (my $l = ){
-#       		chomp($l);
-#       		if ($l eq $username.'='.$password){
-#       			$auth = 1;
-#       			last;
-#       		}
-#       	}
-#       	close(AUTH);
-#       }
-#       return $auth;
-#   }
\ No newline at end of file
diff --git a/server/lib/API/FileSystem.pm b/server/lib/API/FileSystem.pm
deleted file mode 100644
index c066a9e..0000000
--- a/server/lib/API/FileSystem.pm
+++ /dev/null
@@ -1,305 +0,0 @@
-package API::FileSystem;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use Data::Dumper;
-use File::Find::Rule;
-use File::Basename;
-use JSON::PP;
-use File::Path qw(make_path remove_tree);
-use File::Copy;
-use MIME::Types;
-if ($^O eq "MSWin32"){
-	eval('use Win32::File;');
-}
-
-sub call {
-    my($self, $env) = @_;
-      if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-	if ($env->{PATH_INFO} =~ /^\/search/){
-		return $self->search($env);	
-	} elsif ($env->{PATH_INFO} =~ /^\/directory/) {
-		return $self->directory($env);
-	} elsif ($env->{PATH_INFO} =~ /^\/file/) {
-		return $self->file($env);
-	} elsif ($env->{PATH_INFO} =~ /^\/userenv/){
-		return $self->userenv($env);
-	}
-	return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Unknown System Request!" ]
-     	];
-}
-
-sub search() {
-	my $self = shift;
-	my $env = shift;
-  	my $html->{result} = ();
-  	my $ct="application/json";
-  	my $status=200;
-  	my $req = Plack::Request->new($env);
-  	my $ff  = File::Find::Rule->new;
-    if (exists($req->query_parameters->{name})){
-   		my $namesearch = $req->query_parameters->{name};
-    	$ff->name($req->query_parameters->{name})
-    }elsif((exists($req->query_parameters->{namelist}))){
-			my @nl = split(",",$req->query_parameters->{namelist});
-			$ff->name(@nl);
-		}
-    if (exists($req->query_parameters->{type})){
-    	if ($req->query_parameters->{type} eq 'd'){
-    		$ff->directory;	
-    	} else {
-    		$ff->file;
-    	}
-    }
-    if (exists($req->query_parameters->{relative})){
-    	$ff->relative;
-    }
-    if (exists($req->query_parameters->{osspec})){
-    	$ff->canonpath;
-    }
-    my @data = $ff->in($req->query_parameters->{path});
-    if (exists($req->query_parameters->{sorted})){
-    	@data = sort {$a cmp $b} @data;
-    	if ($req->query_parameters->{sorted} eq "desc"){
-    		@data = reverse(@data);
-    	} 
-    }
-		my $ret = undef;
-		if (exists($req->query_parameters->{output}) && $req->query_parameters->{output} eq "text"){
-			$ct = "text/plain";
-			$ret = "";
-			foreach my $d  (@data){
-				$ret .= $d."\n";
-			}
-		} elsif (exists($req->query_parameters->{output}) && $req->query_parameters->{output} eq "fmlist"){
-			$ct = "text/plain";
-			$ret = "";
-			foreach my $d  (@data){
-				$ret .= $d."\r";
-			}
-		} 
-		else {
-			$html->{result} = \@data;
-			$ret = JSON::PP::encode_json($html)
-		}
-    
-    return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ $ret ]
-  ];
-}
-
-sub directory() {
-	my $self = shift;
-	my $env = shift;
-  	my $html;
-  	my $ct="application/json";
-  	my $status=200;
-  	
-  	my $req = Plack::Request->new($env);
-  	if ($env->{PATH_INFO} =~ /^\/directory\/list/){
-    	my $mt = MIME::Types->new();
-    	$html->{result} = 0;
-    	if (exists($req->query_parameters->{path})){
-    		my $dir = $req->query_parameters->{path};
-    		#print $dir."\n";
-    		$html->{result} = {'path' => $dir};
-    		if (-d $dir){
-    		my @dirs = ();
-    		my @files = ();
-    		opendir(LDIR,$dir);
-    		while (my $f = readdir(LDIR)){
-    			if ($f =~ /^\./){ next; }
-    			
-    			if (-d $dir.'/'.$f){
-    				my $bok =1 ;
-    				if ($^O eq "MSWin32"){
-    					eval ('my $attr;
-    					Win32::File::GetAttributes($dir.\'/\'.$f,$attr);
-    					if ($attr & HIDDEN){
-    						$bok = 0;
-    					}');
-    				}
-    				if ($bok == 1){
-    					push(@dirs,$f);	
-    				}
-    				
-    			} elsif (-f $dir.'/'.$f) {
-    				my $bok =1 ;
-    				if ($^O eq "MSWin32"){
-    					eval ('my $attr;
-    					Win32::File::GetAttributes($dir.\'/\'.$f,$attr);
-    					if ($attr & HIDDEN){
-    						$bok = 0;
-    					}');
-    				}
-    				if ($bok == 1){
-    					print $f."\n";
-    					my $fi->{name} = $f;
-    					my $mtf = $mt->mimeTypeOf($f);
-    					$fi->{mimetype} = (exists($mtf->{MT_simplified})?$mtf->{MT_simplified}:'unknown');  
-    	
-    					push(@files,$fi);
-    				}
-    			}
-    		}
-    		closedir(LDIR);
-    		$html->{result}->{directory} = \@dirs;
-    		$html->{result}->{file} = \@files;
-    		}
-    	}
-    }
-	if ($env->{PATH_INFO} =~ /^\/directory\/exists/){
-    	$html->{result} = 0;
-    	if (exists($req->query_parameters->{path})){
-    		if (-d $req->query_parameters->{path}){
-    	    	$html->{result} = 1;
-    	   	}
-    	}
-    }
-    if ($env->{PATH_INFO} =~ /^\/directory\/make/){
-    	make_path($req->query_parameters->{path});
-    	$html->{result} = 0;
-    	if (-d $req->query_parameters->{path}){
-    		$html->{result} = 1;
-    	}
-   	}
-   	if ($env->{PATH_INFO} =~ /^\/directory\/delete/){
-    	my $keep_root = 0;
-    	if (exists($req->query_parameters->{keep_root})){
-    		$keep_root = 1;
-    	}
-    	$html->{result} = 0;
-    	if (-d $req->query_parameters->{path}){
-    		remove_tree( $req->query_parameters->{path}, {keep_root => $keep_root} );
-    		$html->{result} = 1;
-    	}
-	}
-	return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub file() {
-	my $self = shift;
-	my $env = shift;
-  	my $html->{result} = ();
-  	my $ct="application/json";
-  	my $status=200;
-  	
-  	my $req = Plack::Request->new($env);
-  	if ($env->{PATH_INFO} =~ /^\/file\/exists/){
-    	$html->{result} = 0;
-    	if (exists($req->query_parameters->{path})){
-    		if (-f $req->query_parameters->{path}){
-    	    	$html->{result} = 1;
-    	    }
-    	}
-    }
-#    if ($env->{PATH_INFO} =~ /^\/file\/choose/){
-#    	  	# A simple open file with graphic filers
-#		my ( @fss, $fss );
-#		my ( @parms );
-#		push @parms,
-#  			-filter => [ 'PDF - fichiers PDF', '*.pdf' ],
-#  			-directory => $ENV{HOME},
-#  			-title => 'selectionner un fichier PDF';
-#			@fss = Win32::GUI::GetOpenFileName ( @parms );
-#			if (scalar(@fss) > 0 ){
-#				 $html->{result} = \@fss;
-#			}
-#    	  }
-    if ($env->{PATH_INFO} =~ /^\/file\/write/){
-   		$html->{result} = 0;
-    	if (exists($req->query_parameters->{path})){
-    	    if (! -d (dirname($req->query_parameters->{path}))){
-    	    	make_path(dirname($req->query_parameters->{path}))
-    	    }
-    	    my $fwrite = ">";
-    	    if (exists($req->query_parameters->{append})){
-    	    	$fwrite = ">>";	
-    	    }
-    	    my $datax = $req->body_parameters->{data};
-    	    print $req->body_parameters->{data}."\n";
-    	    open(WFI,$fwrite.$req->query_parameters->{path});
-    	    	print WFI $req->body_parameters->{data};
-    	    close(WFI);
-    	    $html->{result} = 1;
-    	   }
-    	  }
-    	  if ($env->{PATH_INFO} =~ /^\/file\/read/){
-    	  	$html->{result} = "";
-    	   if (exists($req->query_parameters->{path})){
-    	    if (-f $req->query_parameters->{path}){
-    	    	my $rdata = "";
-    	    	open(RFI,$req->query_parameters->{path});
-    	    	while ( my $l = ){
-    	    		$rdata .= $l; 
-    	    	} 
-    	    	close(RFI);
-    	    	$html->{result} = $rdata;
-    	    }
-    	   }
-    	  }
-    	  if ($env->{PATH_INFO} =~ /^\/file\/copy/){
-    	  	$html->{result} = "";
-    	   if (exists($req->query_parameters->{src})){ 
-    	    if (-f $req->query_parameters->{src}){
-    	    	my $dest = $req->query_parameters->{dest};
-    	    	if (! -d dirname($req->query_parameters->{dest})){
-    	    		make_path(dirname($req->query_parameters->{dest}))
-    	    	}
-    	    	if ($req->query_parameters->{src} ne $req->query_parameters->{dest}){
-    	    		my $cp = copy($req->query_parameters->{src},$req->query_parameters->{dest});
-    	    		$html->{result} = $cp;	
-    	    	} else {
-    	    		$html->{result} = 1;
-    	    	}
-    	    }
-    	   }
-   }
-
-  return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-
-sub userenv() {
-	my $self = shift;
-	my $env = shift;
-  	my $html->{result} = ();
-  	my $ct="application/json";
-  	my $status=200;
-  	
-  	my $req = Plack::Request->new($env);
-	foreach my $k (keys(%ENV)){
-  		$html->{result}->{$k} = $ENV{$k};
-  	}
-  	 
-  	return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-1;
\ No newline at end of file
diff --git a/server/lib/API/IJAPI.pm b/server/lib/API/IJAPI.pm
deleted file mode 100644
index 1f53f20..0000000
--- a/server/lib/API/IJAPI.pm
+++ /dev/null
@@ -1,208 +0,0 @@
-package API::SQLite;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use File::Basename;
-use Encode;
-use JSON::PP;
-use DB::SQLite;
-use lib ('./');
-use lib ('./lib');
-
-sub call {
-    my($self, $env) = @_;
-    if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-    #$self->_app->($env);
-    return $self->sqlite($env);
-}
-
-sub sqlite {
-	my $self = shift;
-	my $env = shift;
-  my $html->{result} = ();
-  my $ct="application/json";
-  my $status=200;
-  my $req = Plack::Request->new($env);
-  my $res = ();
-  
-  my @param = $req->param;
-  my $p = ();
-  my $json = JSON::PP->new();
-  #$json->convert_blessed(1);
-  #  $json->allow_blessed(1);
-  foreach my $pp (@param){
-    $p->{$pp} = $req->param($pp);
-  }
-  if ($req->raw_body =~ /^\{.*\}$/){
-    my $pnew = $json->decode($req->raw_body);
-    $html->{pnew} = $pnew;
-    foreach my $pn (keys(%{$pnew})){
-      $p->{$pn} = $pnew->{$pn};
-    }
-  }
-  if (exists($p->{schema})){
-    $self->{dbfile} = 
-  }
-  my $db = DB::SQLite->new({dbfile => $self->{dbfile}});
-  $html->{raw_body} = $req->raw_body;
-
-  # if (exists($p->{POSTDATA})){
-  #   my $pjson = JSON::PP::decode_json($p->{POSTDATA});
-  #   foreach my $k (keys(%{$pjson})){
-  #     $p->{$k} = $pjson->{$k};
-  #   }
-  # }
-  $html->{params} = $p;
-  #$html->{params} = $req->;
-  
-  if (exists($p->{get})){
-
-    if ($p->{get} eq "addresslist"){
-
-    }
-    if ($p->{get} eq "bookingsdata"){
-
-    }
-    if ($p->{get} eq "invoicebookings"){
-
-    }
-    if ($p->{get} eq "fileslist"){
-
-    }
-    if ($p->{get} eq "invoicedetails"){
-
-    }
-    if ($p->{get} eq "accountslist"){
-
-    }
-    if ($p->{get} eq "reportlist"){
-
-    }
-    if ($p->{get} eq "accountaddresses"){
-
-    }
-    if ($p->{get} eq "products"){
-
-    }
-    if ($p->{get} eq "invoicesums"){
-
-    }
-    if ($p->{get} eq "invoiceslist"){
-
-    }
-    if ($p->{get} eq "invoicefilters"){
-
-    }
-    if ($p->{get} eq "offersdata"){
-
-    }
-    if ($p->{get} eq "offerfilters"){
-
-    }
-    if ($p->{get} eq "receipientlist"){
-
-    }
-    if ($p->{get} eq "accountaddresses"){
-
-    }
-    if ($p->{get} eq "offersums"){
-
-    }
-    if ($p->{get} eq "offerdetails"){
-
-    }
-    if ($p->{get} eq "offerlist"){
-
-    }
-    if ($p->{get} eq "transactiondetails"){
-
-    }
-    if ($p->{get} eq "accountslist"){
-
-    }
-    if ($p->{get} eq "accountaddresses"){
-
-    }
-    if ($p->{get} eq "transactionlist"){
-
-    }
-    if ($p->{get} eq "transactionfilters"){
-
-    }
-  } elsif (exists($p->{fn})){
-    if ($p->{fn} eq "add_address"){
-
-    }
-    if ($p->{fn} eq "add_booking"){
-
-    }
-    if ($p->{fn} eq "invoice_reference"){
-
-    }
-    if ($p->{fn} eq "invoicesums"){
-
-    }
-    if ($p->{fn} eq "add_invoice"){
-
-    }
-    if ($p->{fn} eq "duplicate_invoice"){
-
-    }
-    if ($p->{fn} eq "add_offer"){
-
-    }
-    if ($p->{fn} eq "duplicate_offer"){
-
-    }
-    if ($p->{fn} eq "duplicate_transaction"){
-
-    }
-  } elsif (exists($p->{save})){
-    
-  } elsif (exists($p->{sql})){
-    if (exists($p->{type})) {
-  		my $q = $p->{sql};
-  		my $t = $p->{type};
-  		if ($t eq "querybykey"){
-  			$res = $db->querybykey($p->{key},$q);
-  		} elsif ($t eq "query"){
-  			$res = $db->query($q);
-  		}elsif ($t eq "querysorted"){
-  			$res = $db->querysorted($q);
-  		} elsif ($t eq "queryarray"){
-  			$res = $db->queryarray($q);
-  		} elsif ($t eq "exec"){
-  			$res = $db->exec($q);
-  		}
-  		$html->{result}->{sqldata} = $res;
-
-  	}
-  } else {
-    
-
-        return [
-         400,
-         [ 'Content-Type' => $ct.'; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-         [ $json->encode($html) ]
-       ];
-  }
-  
-  	return [
-    200,
-     [ 'Content-Type' => $ct.'; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ $json->encode($html) ]
-  ];
-};
-
-1;
\ No newline at end of file
diff --git a/server/lib/API/IJReport.pm b/server/lib/API/IJReport.pm
deleted file mode 100644
index 34c08d7..0000000
--- a/server/lib/API/IJReport.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-package Web::IJAPI;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use File::Basename;
-use Encode;
-use JSON::PP;
-use DB::SQLite;
-
-sub call {
-    my($self, $env) = @_;
-    if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-    if ($env->{PATH_INFO} =~ /^\/generate/){
-      return $self->generate($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/open/){
-      return $self->open($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/upload/){
-      return $self->upload($env);
-    } else {
-      return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "unknown function!" ]
-     	];
-    }
-    #$self->_app->($env);
-    return $self->sqlite($env);
-}
-
-sub generate(){
-  my $self = shift;
-	my $env = shift;
-	my $html->{result} = 0;
-	my $req = Plack::Request->new($env);
-  return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub open(){
-  my $self = shift;
-	my $env = shift;
-	my $html->{result} = 0;
-	my $req = Plack::Request->new($env);
-  return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub upload(){
-  my $self = shift;
-	my $env = shift;
-	my $html->{result} = 0;
-	my $req = Plack::Request->new($env);
-  return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
\ No newline at end of file
diff --git a/server/lib/API/OpenVPN.pm b/server/lib/API/OpenVPN.pm
deleted file mode 100644
index 4267ef6..0000000
--- a/server/lib/API/OpenVPN.pm
+++ /dev/null
@@ -1,207 +0,0 @@
-package Module::OpenVPN;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use Data::Dumper;
-use File::Find::Rule;
-use File::Basename;
-use JSON::PP;
-use File::Copy;
-use File::Path qw(make_path);
-
-sub call {
-    my($self, $env) = @_;
-    #$self->_app->($env);
-    if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-  	if ($env->{PATH_INFO} =~ /^\/connect/){
-    	return $self->vpnconnect($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/disconnect/){
-    	return $self->vpndisconnect($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/installprofile/){
-    	return $self->vpninstallprofile($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/listprofiles/){
-    	return $self->vpnprofilelist($env);
-    }
-    return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Unknown System Request!" ]
-     	];
-}
-
-sub vpnconnect(){
-	my $self = shift;
-	my $env = shift;
-	my $html->{result} = 0;
-	my $req = Plack::Request->new($env);
-	my $uprofile = "";
-	#is gui or vpn running
-	
-	if (exists($req->query_parameters->{vpnprofile})){
-		my $status = $self->vpnstatus();
-		if (!exists($status->{active}->{$req->query_parameters->{vpnprofile}})){
-			if ($^O eq "MSWin32"){
-				if (exists($status->{gui})){
-					system('taskkill.exe /F /IM openvpn.exe');
-					system('taskkill.exe /F /IM openvpn-gui.exe');
-					sleep(1);
-				}
-				my $st = system('start /b "" "C:\Program Files\OpenVPN\bin\openvpn-gui.exe" --connect '.$req->query_parameters->{vpnprofile}.'.ovpn');
-		 		if ($st == 0){
-		 			
-		 			my $bconn = 0;
-		 			my $i = 30;
-		 			while ($bconn == 0 || $i > 0){
-		 				$status = $self->vpnstatus();
-		 				if (exists($status->{active}->{$req->query_parameters->{vpnprofile}})){
-		 					$html->{result} = $status;
-		 					$bconn = 1;
-		 				}
-		 				$i--;
-		 				sleep(1);
-		 			}
-		 		}
-			}	
-		} else {
-			$html->{result} = $status;
-		}
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub vpnstatus(){
-	my $self = shift;
-	my $status = ();
-	if ($^O eq "MSWin32"){
-		
-		my $tasklist = `tasklist`;
-		my @task = split("\n",$tasklist);
-		my @ovpntasks = grep(/openvpn-gui\.exe/,@task);
-		if (scalar(@ovpntasks) > 0){
-			$status->{gui} = "running";
-		}
-		@ovpntasks = grep(/openvpn.exe/,@task);
-		#$status->{active_connections} = scalar(@ovpntasks);
-		if (scalar(@ovpntasks) > 0){
-			my $ff = File::Find::Rule->new();
-			$ff->file;
-			$ff->name('*.log');
-			my @loglist =$ff->in($ENV{USERPROFILE}.'/OpenVPN/log');
-			foreach my $c (@loglist){
-				open(CLOG,$c);
-				my @data = ;
-				close(CLOG);
-				my $laststate=$data[scalar(@data)-1];
-				chomp($laststate);
-				if ($laststate =~ /CONNECTED/){
-					my ($time,$ip,$server,$port) = $laststate =~ /.+MANAGEMENT:\s>STATE:(\d+),CONNECTED,SUCCESS,(.+),(.+),(.+),,$/;
-					if (!exists($status->{connection}->{$ip})){
-						$status->{connection}->{$ip}->{config} = substr(basename($c),0,-4);;
-						$status->{connection}->{$ip}->{server} = $server; 
-						$status->{connection}->{$ip}->{port} = $port;
-						$status->{connection}->{$ip}->{connected_since} = $time;
-					}else {
-						if ($time >= $status->{connection}->{$ip}->{connected_since}){
-							$status->{connection}->{$ip}->{config} = substr(basename($c),0,-4);
-							$status->{connection}->{$ip}->{server}= $server; 
-							$status->{connection}->{$ip}->{port} = $port;
-							$status->{connection}->{$ip}->{connected_since} = $time;
-						}
-					}
-				}
-			}
-			my @notactive = ();
-			my $active = ();
-			foreach my $c (keys(%{$status->{connection}})){
-				my $routeslist = `route print -4`;	
-				my @routes = split("\n",$routeslist);
-				my @activetest = grep(/$c/,@routes);
-				if (scalar(@activetest) == 0){
-					push @notactive,$c;
-				} else {
-					$active->{$status->{connection}->{$c}->{config}} = $c;
-				}
-			}
-			foreach my $na (@notactive){
-				delete $status->{connection}->{$na};
-			}
-			$status->{active} = $active;
-		}
-	}
-	return $status;
-}
-
-sub vpndisconnect(){
-	my $self = shift;
-	my $env = shift;
-	my $html->{result} = 1;
-	if ($^O eq "MSWin32"){
-		system('taskkill.exe /F /IM openvpn.exe');
-		system('taskkill.exe /F /IM openvpn-gui.exe');
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub vpninstallprofile(){
-	my $self = shift;
-	my $env = shift;
-	my $req = Plack::Request->new($env);
-	my $html->{result} = 0;
-	if ($^O eq "MSWin32"){
-		if ( ! -d $ENV{USERPROFILE}.'/OpenVPN'){
-			make_path($ENV{USERPROFILE}.'/OpenVPN');
-		}
-		if (exists($req->query_parameters->{vpnprofile}) && (-e $req->query_parameters->{vpnprofile}) && ($req->query_parameters->{vpnprofile} =~ /\.ovpn$/)){
-			copy(req->query_parameters->{vpnprofile},$ENV{USERPROFILE}.'/OpenVPN/'.basename($req->query_parameters->{vpnprofile}));
-				$html->{result} = 1;
-		}
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub vpnprofilelist(){
-	my $self = shift;
-	my $env = shift;
-	my $html->{result} = ();
-	if ($^O eq "MSWin32"){
-		my $ff = File::Find::Rule->new();
-		$ff->file;
-		$ff->name('*.ovpn');
-		my @vpnlist =$ff->in($ENV{USERPROFILE}.'/OpenVPN');
-		foreach (my $p=0;$p{result} = \@vpnlist;
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-
-1;
\ No newline at end of file
diff --git a/server/lib/API/PDFExtract.pm b/server/lib/API/PDFExtract.pm
deleted file mode 100644
index 506b224..0000000
--- a/server/lib/API/PDFExtract.pm
+++ /dev/null
@@ -1,409 +0,0 @@
-package Module::PDFExtract;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use File::Basename;
-use Data::Dumper;
-use PDF::API2; 
-use File::Path qw/make_path/;
-
-sub call {
-    my($self, $env) = @_;
-    #$self->_app->($env);
-    my $html->{result} = "unknown function";
-    if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-  	if ($env->{PATH_INFO} =~ /^\/pdfsplit/){
-  		return $self->pdfsplit($env);
-  	}
-  	if ($env->{PATH_INFO} =~ /^\/pdfpagenumbers/){
-  		return $self->pdfpagesnumbers($env);
-  	}
-#  	if ($env->{PATH_INFO} =~ /^\/pdfextract/){
-#  		return $self->pdfextract($env);
-#  	}
-  	if ($env->{PATH_INFO} =~ /^\/parsedata/){
-  		return $self->parsedata($env);
-  	}
-  	if ($env->{PATH_INFO} =~ /^\/parsestatement/){
-  		return $self->parsestatement($env);
-  	}
-  	return [
-    404,
-     [ 'Content-Type' => 'text/html','Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ "unknown function" ]
-  ];
-}
-
-sub pdfpagesnumbers(){
-	my $self = shift;
-  	my $env = shift;
-  	my $ct="application/json";
-  	my $status=200;
-  	my $req = Plack::Request->new($env);
-  	my $html->{result}->{pagenumbers} = 0;
-  	if (exists($req->query_parameters->{file}) && ($req->query_parameters->{file} =~ /\.pdf$/)){
-  		my $pdf = PDF::API2->open($req->query_parameters->{file});
-		$html->{result}->{pagenumbers} = $pdf->pages;
-  	}
-  	return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub pdfsplit(){
-	my $self = shift;
-  	my $env = shift;
-  	my $html->{result} = ();
-  	my $ct="application/json";
-  	my $status=200;
-  	my $req = Plack::Request->new($env);
-  	my @nfiles = ();
-  	my $outputdir = $ENV{TEMP};
-	if (exists($req->query_parameters->{file}) && exists($req->query_parameters->{prefix})){
-		my $basepdf = basename($req->query_parameters->{file});
-		$outputdir =~ s/\\/\//g;
-		
-		my $oldpdf = PDF::API2->open($req->query_parameters->{file});
-		my $xx = $oldpdf->pages;
-		for my $page_nb (1..$xx) {
-  			my $newpdf = PDF::API2->new;
-  			my $page = $newpdf->importpage($oldpdf, $page_nb);
-  			
-  			my $npdfname = $outputdir.'/'.$req->query_parameters->{prefix}.substr($basepdf,0,-4).".".$page_nb.".pdf"; 
-  			push @nfiles,$npdfname;
-  			if (-e $npdfname){  unlink($npdfname); }
-  			$newpdf->saveas($npdfname);
-		}
-	}
-	foreach my $n (@nfiles){
-		my $r  = $self->pdfextract($n);
-	}
-	$html->{result}->{files} = \@nfiles;
-  	return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-};
-
-sub pdfextract(){
-	my $self = shift;
-  	my $file = shift;
-#  	my $html->{result} = ();
-#  	my $ct="application/json";
-#  	my $status=200;
-#  	my $req = Plack::Request->new($env);
-  	my $pdftotext;
-  	my $sep = "/";
-  	if ($^O eq "MSWin32") {
-  		$sep = "\\";
-  		$pdftotext=dirname($0).$sep.'pdftotext.exe';
-	}else {
-  		$pdftotext=dirname($0).$sep.'pdftotext';
-	}
-  	if (-e $file.'.txt'){
-      	unlink($file.'.txt');
-    }
-  	my $cmd = 'start /b "" "'.$pdftotext.'" -q -table -eol unix "'.$file.'" "'.$file.'.txt"';
-	my $st = `$cmd`;#'system(1,$cmd)' ;
-	#print $cmd."->".$st."\n";
-   	return $st;
-}
-
-sub parsedata(){
-	my $self = shift;
-	my $env = shift;
-	my $req = Plack::Request->new($env);
-	if (exists($req->query_parameters->{type}) && exists($req->query_parameters->{file})){
-		if ($req->query_parameters->{type} eq "inv"){
-			return $self->parseinvoice($req->query_parameters->{file});
-		} elsif ($req->query_parameters->{type} eq "invold"){
-			return $self->parseoldinvoice($req->query_parameters->{file});
-		} elsif ($req->query_parameters->{type} eq "stmt") {
-			return $self->parsestatement($req->query_parameters->{file});
-		} else {
-			return [
-    404,
-     [ 'Content-Type' => 'text/html','Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ "unknown function" ]
-  ];
-		}
-	}
-}
-
-sub parseinvoice(){
-  my $self = shift;
-  my $file = shift;
-  my $html->{result} = ();
-  my $ct="application/json";
-  my $status=200;
-  my $pxdata = ();
-  if (-e $file){
-  	my @invoicedata = ();
-  	open(EXT,$file);
-  	while (my $l = ){
-  		chomp($l);
-  		push(@invoicedata,$l);
-  	}
-  	close(EXT);
-	foreach my $p (@invoicedata){
-        if ($p =~ /^N. Facture/) {
-          my ($tmp) = $p =~ m/.+\s(\d{4,}.\d{1,2}.\d{4,})\s.+$/;
-          $pxdata->{reference} = $tmp;
-        }
-        if ($p =~ /^Date de la facture/) {
-          my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,}).+$/;
-          if (length($d) == 1) { $d = "0".$d;}
-          if (length($m) == 1) { $m = "0".$m;}
-          $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d;
-        }
-#        if (($p =~ /facture/) && ($pxdata->{invoicedate} eq "--")) {
-#          my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,})$/;
-#          if (length($d) == 1) { $d = "0".$d;}
-#          if (length($m) == 1) { $m = "0".$m;}
-#          $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d;
-#        }
-        if ($p =~ /^Enfant/) {
-          my ($tmp) = $p =~ m/.+\s\((\d+)\).+$/;
-          $pxdata->{checkservice} = $tmp;
-        }
-        if (($p =~ /^\s+\(\d+\)$/) && (!defined($pxdata->{checkservice}))) {
-          my ($tmp) = $p =~ m/\s+\((\d+)\)$/;
-          $pxdata->{checkservice} = $tmp;
-        }
-        if ($p =~ /Heures.+\sh\s/) {
-          my ($hrs,$p1,$e1) = $p =~ m/.+Heures.+\s+([\s|\d]+,\d{1,2})\sh\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
-          $p1 =~ s/,/\./;
-          $e1 =~ s/,/\./;
-          $p1 =~ s/\ //;
-          $e1 =~ s/\ //;
-          if (exists($pxdata->{hoursamount})){
-          	$pxdata->{hoursamount} = $pxdata->{hoursamount} + $p1 + $e1;
-          } else {
-          	$pxdata->{hoursamount} = $p1 + $e1;	
-          }
-          
-        }
-        if ($p =~ /Repas/) {
-          my ($rn,$p1,$e1) = $p =~ m/.+Repas.+\s+(\d+)\s+([\s|\d]+,\d{1,2})\s+([\s|\d]+,\d{1,2}).+$/;
-          $p1 =~ s/,/\./;
-          $e1 =~ s/,/\./;
-          $p1 =~ s/\ //;
-          $e1 =~ s/\ //;
-          $pxdata->{lunchnum} = $rn;
-          $pxdata->{lunchamount} = $p1 + $e1;
-        }
-        if ($p =~ /Participation totale de l.Etat/){
-        	my ($e1) = $p =~ m/.+Participation totale de l.Etat\s+([\s|\d]+,\d{1,2}).+$/;
-        	$e1 =~ s/,/\./;
-        	$e1 =~ s/\ //;
-        	$pxdata->{benefitamount} = $e1;
-        }
-        if ($p =~ /Montant\s.\sr.gler/) {
-          my ($m1) = $p =~ m/.+Montant.+\s+([\s|\d]+,\d{1,2}).+$/;
-          $m1 =~ s/,/\./;
-          $m1 =~ s/\ //;
-          $pxdata->{totalamount} = $m1;
-        }
-        #print Dumper(@pdata);
-      }
-  }
-  $html->{result} = $pxdata;
-  return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub parseoldinvoice(){
-  my $self = shift;
-  my $file = shift;
-  my $html->{result} = ();
-  my $ct="application/json";
-  my $status=200;
-  my $pxdata = ();
-  if (-e $file){
-  	my @invoicedata = ();
-  	open(EXT,$file);
-  	while (my $l = ){
-  		chomp($l);
-  		push(@invoicedata,$l);
-  	}
-  	close(EXT);
-	foreach my $p (@invoicedata){
-        if ($p =~ /N. Facture/) {
-          my ($tmp) = $p =~ m/.+\s(\d{4,}.\d{1,2}.\d{4,})\s.+$/;
-          $pxdata->{reference} = $tmp;
-        }
-        if ($p =~ /Date de la/) {
-          my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,})$/;
-          if (length($d) == 1) { $d = "0".$d;}
-          if (length($m) == 1) { $m = "0".$m;}
-          $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d;
-        }
-        if (($p =~ /facture/) && ($pxdata->{invoicedate} eq "--")) {
-          my ($d,$m,$y) = $p =~ m/.+\s(\d{1,2}).(\d{1,2}).(\d{4,})$/;
-          if (length($d) == 1) { $d = "0".$d;}
-          if (length($m) == 1) { $m = "0".$m;}
-          $pxdata->{invoicedate} = $y.'-'.$m.'-'.$d;
-        }
-        if ($p =~ /Carte N./) {
-          my ($tmp) = $p =~ m/.+\s(\d+)$/;
-          $pxdata->{checkservice} = $tmp;
-        }
-        if ($p =~ /Heure/) {
-          my ($tmp1,$tmp2) = $p =~ m/.+\s(\d+).(\d+)+$/;
-          $pxdata->{hoursamount} = $tmp1.'.'.$tmp2;
-        }
-        if ($p =~ /Repas/) {
-          my ($tmp1,$tmp2) = $p =~ m/.+\s(\d+).(\d+)+$/;
-          $pxdata->{lunchamount} = $tmp1.'.'.$tmp2;
-        }
-        if ($p =~ /Montant\s.\spayer/) {
-          my ($tmp1,$tmp2) = $p =~ m/.+\s(\d+).(\d+)+$/;
-          $pxdata->{totalamount} = $tmp1.'.'.$tmp2;
-        }
-        #print Dumper(@pdata);
-      }
-  }
-  $html->{result} = $pxdata;
-  return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub parsestatement(){
-  	my $self = shift;
-  	my $file = shift;
-  	my $html->{result} = ();
-  	my $ct="application/json";
-  	my $status=200;
-  	my $sxdata = ();
-	my $cmonth = "none";
-  	my $frmonth = {"Janvier" => '01',"Fï¿½vrier"=> '02',"Mars" => '03',"Avril" => '04', "Mai" => '05',"Juin" => '06',"Juillet" => '07',"Aoï¿½t" => '08',"Septembre" => '09',"Octobre" => '10',"Novembre" => '11',"Dï¿½cembre" => '12'}; 
-  	if (-e $file){
-  		my @xstmtdata = ();
-  		open(EXT,$file);
-  		while (my $l = ){
-  			chomp($l);
-  			push(@xstmtdata,$l);
-  		}
-  		close(EXT);
-		my $sxdata = ();
-  
-  	foreach my $p (@xstmtdata){
-    if ($p =~ /P.riode/) {
-      my ($m1,$y1,$m2,$y2) = $p =~ m/.+\s(.+)\s+(\d+)\s+.\s+(.+)\s+(\d+)$/;
-      if (($m1 eq $m2) && ($y1 eq $y2)){
-        $cmonth=$y1.'-'.$frmonth->{$m1};
-      }
-    }
-    if ($p =~ /\d{13,}/) {
-      my ($csnum,$am) = $p =~ m/.+\s+(\d{13,})\s+([\d|\ |,]+)$/;
-      $am =~ s/\s+//;
-      $am =~ s/,/./;
-      $sxdata->{$cmonth}->{$csnum}=$am; 
-    }
-  }
-  }
-  $html->{result} = $sxdata;
-  return [
-    200,
-     [ 'Content-Type' => $ct,'Cache-Control' =>  'no-store, no-cache, must-revalidate' , 'Access-Control-Allow-Origin'=> '*'], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-
-#
-#sub importstatementdata(){
-#  my $simpdata = shift;
-#  my $fname = shift;
-#  #print Dumper($simpdata);
-#  my $n=0;
-#  foreach my $m (keys(%{$simpdata})){
-#    $n++;
-#     if (-e dirname($fname).$sep."prestation.".$m."-".$n.".pdf"){
-#      unlink(dirname($fname).$sep."prestation.".$m."-".$n.".pdf");
-#     }
-#     rename($fname,dirname($fname).$sep."prestation.".$m."-".$n.".pdf");
-#     foreach my $csnum (keys(%{$simpdata->{$m}})){
-#      $simpdata->{$m}->{fnum} = $n;
-#     }
-#  }
-#  foreach my $m (keys(%{$simpdata})){
-#    $n++;
-#    if ($m =~ /\d{4,}-\d{2,}/) {
-#      foreach my $csnum (keys(%{$simpdata->{$m}})){
-#        print "Import Check-Service no: " + $csnum + "\n";
-#        if (defined($db)){
-#          my $child = $db->dbquerysorted("select uuid from childs where replace(checkservicenumber,' ','') = '".$csnum."';");
-#          if (keys(%{$child}) == 1) {
-#            my $accdata = $db->dbquerysorted("select accmonth,childuuid from accounting where childuuid='".$child->{0}->{uuid}."' and accmonth=date('".substr($m,0,4).'-'.substr($m,5,2)."-01');");
-#            if (keys(%{$accdata}) == 1) {
-#              #make update
-#              my @upd = ();
-#              push @upd,"benefitamount='".$simpdata->{$m}->{$csnum}."'";
-#              push @upd,"benefitfile='prestation.".$m."-".$simpdata->{$m}->{fnum}.".pdf'";
-#              my $sql = "update accounting set ".join(',',@upd)." where childuuid='".$child->{0}->{uuid}."' and accmonth=date('".substr($m,0,4).'-'.substr($m,5,2)."-01');";
-#              #print $sql."\n";
-#              my $r = $db->dbexec($sql);
-#              if  (($log ne "") && (-e $log)){
-#              	if (!defined($r)) {
-#                	open(LOG,">>".$log);
-#                	print LOG localtime().":ERROR:".$sql."\n";
-#                	close(LOG);
-#              	} else {
-#              		 open(LOG,">>".$log);
-#                	print LOG localtime().":SUCCESS:".$sql."\n";
-#                	close(LOG);
-#              	}
-#              }
-#            }else {
-#              my @ins1 = ();
-#              my @ins2 = ();
-#              push(@ins1,"accmonth");push (@ins2,"date('".substr($m,0,4).'-'.substr($m,5,2)."-01')");
-#              push(@ins1,"childuuid");push (@ins2,"'".$child->{0}->{uuid}."'");
-#              push(@ins1,"benefitamount");push (@ins2,"".$simpdata->{$m}->{$csnum}."");
-#              push(@ins1,"benefitfile");push (@ins2,"'prestation.".$m."-".$simpdata->{$m}->{fnum}.".pdf'");
-#              
-#              #accmonth,childuuid,invoicedate,invoiceamount,reference
-#              my $sql = "insert into accounting (".join(',',@ins1).") VALUES (".join(',',@ins2).");";
-#              #print $sql."\n";
-#              my $r = $db->dbexec($sql);
-#              if  (($log ne "") && (-e $log)){
-#              	if (!defined($r)) {
-#                	open(LOG,">>".$log);
-#                	print LOG localtime().":ERROR:".$sql."\n";
-#                	close(LOG);
-#              	} else {
-#              		 open(LOG,">>".$log);
-#                	print LOG localtime().":SUCCESS:".$sql."\n";
-#                	close(LOG);
-#              	}
-#              }
-#            }
-#          }
-#        }
-#      }
-#    }
-#  }
-#}
-
-1;
\ No newline at end of file
diff --git a/server/lib/API/SQLite.pm b/server/lib/API/SQLite.pm
deleted file mode 100644
index 07a1775..0000000
--- a/server/lib/API/SQLite.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-package API::SQLite;
-
-use strict;
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use File::Basename;
-#use Data::Dumper;
-use Encode;
-use JSON::PP;
-use lib ('./');
-use lib ('./lib');
-use DB::Sqlite;
-
-sub call {
-    my($self, $env) = @_;
-    if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => 'application/json; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ JSON::PP::encode_json({"error" => "access denied"}) ]
-     	];
-  	}
-    my $res = ();
-    my $db;
-    my ($schema,$fn) = $env->{PATH_INFO} =~ m/^\/(\w+)\/(\w+)/;
-    if (-e $self->{datapath}.'/'.$schema.'/'.$schema.'.sqlite'){
-      $db = DB::SQLite->new({dbfile => $self->{datapath}.'/'.$schema.'/'.$schema.'.sqlite'});
-      my $req = Plack::Request->new($env);
-      my @param = $req->param;
-      my $p = ();
-      # my $json = JSON::PP->new();
-      foreach my $pp (@param){
-        $p->{$pp} = $req->param($pp);
-      }
-      if ($req->raw_body =~ /^\{.*\}$/){
-        my $json = JSON::PP->new();
-        my $pnew = $json->decode($req->raw_body);
-        # $html->{pnew} = $pnew;
-        foreach my $pn (keys(%{$pnew})){
-          $p->{$pn} = $pnew->{$pn};
-        }
-      }
-      if ($fn eq "query"){
-  			$res = $db->query($p->{sql});
-  		} elsif ($fn eq "querybykey"){
-  			$res = $db->querysorted($p->{key},$p->{sql});
-  		}elsif ($fn eq "querysorted"){
-  			$res = $db->querysorted($p->{sql});
-  		} elsif ($fn eq "queryarray"){
-  			$res = $db->queryarray($p->{sql});
-  		} elsif ($fn eq "exec"){
-  			$res = $db->exec($p->{sql});
-  		} elsif ($fn eq "savefield"){
-
-      } elsif ($fn eq "saveform"){
-        
-      }
-      $db->disconnect();
-      #
-      return [
-         200,
-         [ 'Content-Type' => 'application/json; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-         [ JSON::PP::encode_json($res) ]
-       ];
-    } else {
-      return [
-         400,
-         [ 'Content-Type' => 'application/json; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-         [ JSON::PP::encode_json({"error" => "unknown database"}) ]
-       ];
-    }
-    return [
-         400,
-         [ 'Content-Type' => 'application/json; charset=utf-8','Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-         [ JSON::PP::encode_json({"error" => "unknown database"}) ]
-       ];
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/API/SSH.pm b/server/lib/API/SSH.pm
deleted file mode 100644
index a185ff7..0000000
--- a/server/lib/API/SSH.pm
+++ /dev/null
@@ -1,171 +0,0 @@
-package Module::SSH;
-
-use strict;
-
-use warnings;
-use parent qw(Plack::Component);
-use Plack::Request;
-use File::Basename;
-use File::Path qw(make_path);
-
-sub call {
-    my($self, $env) = @_;
-      if (($env->{REMOTE_ADDR} =~ "^127\.0\.") && 
-  		($env->{REMOTE_ADDR} =~ "^10\.") && 
-  		($env->{REMOTE_ADDR} =~ "^172\.16\.") && 
-  		($env->{REMOTE_ADDR} =~ "^192\.168\.")) {
-  		return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Sorry no remote access allowed!" ]
-     	];
-  	}
-	if ($^O eq "MSWin32"){
-		$self->{PLINK} = dirname($0).'\\tools\\PLINK.EXE' ;
-		$self->{PSCP} = dirname($0).'\\tools\\PSCP.EXE' ;
-		$self->{SFTP} = dirname($0).'\\tools\\PSFTP.EXE' ;
-		$self->{PUTTY} = dirname($0).'\\tools\\PUTTY.EXE' ;
-	}
-    #$self->_app->($env);
-    if ($env->{PATH_INFO} =~ /^\/storeauth/){
-    	return $self->storeauth($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/cmd/){
-    	return $self->cmd($env);
-    } elsif ($env->{PATH_INFO} =~ /^\/openterminal/){
-    	return $self->openterminal($env);
-    }
-    return [
-    	404,
-     	[ 'Content-Type' => "text/html",'Cache-Control' =>  'no-store, no-cache, must-revalidate' ], 
-     		[ "Unknown System Request!" ]
-     	];
-    
-}
-
-sub storeauth(){
-	my $self = shift;
-	my $env = shift;
-	my $cfgpath = "";
-	my $html->{result} = 0;
-	if ($^O eq "MSWin32"){
-		$cfgpath = $ENV{APPDATA}.'/dks/vpn';
-		if (! -e $ENV{APPDATA}.'/dks/vpn'){
-			make_path($ENV{APPDATA}.'/dksvpn');
-		}
-	}
-	my $req = Plack::Request->new($env);
-	if ( ( -d $cfgpath) && (exists($req->query_parameters->{user})) && 
-		(exists($req->query_parameters->{password})) && 
-		(exists($req->query_parameters->{host}))){
-		my $sshdata->{host} = $req->query_parameters->{host};
-		$sshdata->{opts}->{user} = $req->query_parameters->{user};
-		$sshdata->{opts}->{password} = $req->query_parameters->{password};
-		if (exists($req->query_parameters->{port})){
-			$sshdata->{opts}->{port} = $req->query_parameters->{port};
-		}
-		open(SCFG,">".$cfgpath.'/ssh_'.$req->query_parameters->{host}."_".$req->query_parameters->{user}.'.json');
-		print SCFG JSON::PP::encode_json($sshdata);
-		close(SCFG);
-		$html->{result} = 1;		
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub cmd(){
-	my $self = shift;		
-	my $env = shift;
-	my $req = Plack::Request->new($env);
-	my $cfgpath = "";
-	my $html->{result} = 0;
-	if ($^O eq "MSWin32"){
-		$cfgpath = $ENV{APPDATA}.'/dks/vpn/';
-	}
-	if ( (exists($req->query_parameters->{user})) && (exists($req->query_parameters->{host})) && (exists($req->query_parameters->{cmd}))){
-		if (-e $cfgpath.'/ssh_'.$req->query_parameters->{host}.'_'.$req->query_parameters->{user}.'.json'){
-		 	my $host = "";
-		 	my $uopts = {};
-		 	open(SCFG,$cfgpath.'/ssh_'.$req->query_parameters->{host}.'_'.$req->query_parameters->{user}.'.json');
-		 	my $strcfg = "";
-		 	while (my $l = ){
-		 		$strcfg .= $l;
-		 	}
-		 	close(SCFG);
-		 	if ( ($strcfg ne "") && ($strcfg =~ /^\{.+\}$/) ){
-		 		my $jcfg = JSON::PP::decode_json($strcfg);
-		 		$html->{cmd} = $req->query_parameters->{cmd}; 
-		 		my $sshcmd = $self->{PLINK}." -batch -P ".$jcfg->{opts}->{port}." -pw ".$jcfg->{opts}->{password}." ".$jcfg->{opts}->{user}."@".$jcfg->{host}.' "'.$html->{cmd}.'"';
-  				#print "SEND: ".$sshcmd."\n";
-  				my $cmdout = `$sshcmd`;
-  				if ($cmdout =~ /^\{.*\}$/){
-  					$html->{result} = JSON::PP::decode_json($cmdout);	
-  				}else {
-  					$html->{result} = $cmdout;
-  				}
-  				
-		 	}
-		}
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-sub put(){
-	my $self = shift;
-	my $env = shift;
-}
-
-sub get(){
-	my $self = shift;
-	my $env = shift; 
-}
-
-
-sub openterminal(){
-	my $self = shift;
-	my $env = shift;
-	my $req = Plack::Request->new($env);
-	my $cfgpath = "";
-	my $html->{result} = 0;
-	if ($^O eq "MSWin32"){
-		$cfgpath = $ENV{APPDATA}.'/dks/vpn/';
-	}
-	if ( (exists($req->query_parameters->{user})) && (exists($req->query_parameters->{host}))){
-		if (-e $cfgpath.'/ssh_'.$req->query_parameters->{host}.'_'.$req->query_parameters->{user}.'.json'){
-		 	my $host = "";
-		 	my $uopts = {};
-		 	open(SCFG,$cfgpath.'/ssh_'.$req->query_parameters->{host}.'_'.$req->query_parameters->{user}.'.json');
-		 	my $strcfg = "";
-		 	while (my $l = ){
-		 		$strcfg .= $l;
-		 	}
-		 	close(SCFG);
-		 	if ( ($strcfg ne "") && ($strcfg =~ /^\{.+\}$/) ){
-		 		my $jcfg = JSON::PP::decode_json($strcfg);
-		 		
-		 		if ($^O eq "MSWin32"){
-		 			print "Start Terminal Session!\n";
-		 			print "CMD: ".'start /b "" "'.$self->{PUTTY}.'" -P '.$jcfg->{opts}->{port}.' -l '.$jcfg->{opts}->{user}.' -pw '.$jcfg->{opts}->{password}.' '.$jcfg->{host}."\n";
-		 			my $st = system('start /b "" "'.$self->{PUTTY}.'" -P '.$jcfg->{opts}->{port}.' -l '.$jcfg->{opts}->{user}.' -pw '.$jcfg->{opts}->{password}.' '.$jcfg->{host}.'');
-		 			print "exit Code".$st."\n";
-		 			if ($st == 0){
-		 				$html->{result} = 1;
-		 			}
-		 		}
-		 	}
-		}
-	}
-	return [
-    200,
-     [ 'Content-Type' => "application/json",'Cache-Control' =>  'no-store, no-cache, must-revalidate', 'Access-Control-Allow-Origin'=> '*' ], 
-     [ JSON::PP::encode_json($html) ]
-  ];
-}
-
-1;
diff --git a/server/lib/DB/SQLite.pm b/server/lib/DB/SQLite.pm
deleted file mode 100644
index 8648cb3..0000000
--- a/server/lib/DB/SQLite.pm
+++ /dev/null
@@ -1,404 +0,0 @@
-package DB::SQLite;
-
-use strict;
-use DBI;
-use File::Basename;
-use DBD::SQLite;
-use URI::Encode qw(uri_encode uri_decode);
-use Encode;
-use Data::Dumper;
-use Text::Unidecode;
-
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{debug} = 1;
-    $self->{dbh} = DBI->connect("DBI:SQLite:dbname=".$p->{dbfile},'','',{PrintError=>1,RaiseError=>1,AutoCommit=>1})  or return "query Connection Error!".$!;
-    return $self;
-}
-
-sub disconnect(){
-  my $self = shift;
-  return $self->{dbh}->disconnect();
-}
-
-sub securetext(){
-	my $self = shift;
-	my $text = shift;
-	$text =~ s/'/''/g;
-	return $text;
-}
-
-sub value(){
-  my $self = shift;
-  my $text = shift;
-  if ($text eq ""){
-    return 'null';
-  }
-  return "'".$text."'";
-}
-
-sub logerror(){
-  my $self = shift;
-  my $fn = shift;
-  my $stat = shift;
-
-  return ();
-}
-
-sub newuuid(){
-	my $self = shift;
-	my $rx = $self->query("SELECT lower(hex( randomblob(4)) || '-' || hex( randomblob(2)) || '-' || hex( randomblob(2)) || '-' || hex( randomblob(2))  ||  '-' || hex(randomblob(6))) as id;");
-	return $rx->{id};
-}
-
-sub query_unenc(){
-	my $self = shift;
-    my $stat = shift;
-
-    my $retdata = ();
-    $stat = encode("utf8", $stat);
-    if ($self->{debug} == 1){
-      print STDERR "QUERY_UNENC:\n".$stat."\n===\n";
-    }
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("query_unenc",$stat);
-
-		
-   $sth->execute() or return $self->logerror("query_unenc",$stat);
-   
-   my $data = $sth->fetchrow_hashref();
-   foreach my $k (keys %{$data}){
-      $retdata->{$k} = $data->{$k};#decode("utf-8",$data->{$k});
-   }
-   
-   $sth->finish();
-	 
-   return $retdata;
-}
-
-sub query(){
-	my $self = shift;
-    my $stat = shift;
-    my $retdata = ();
-    $stat = encode("utf8", $stat);
-    if ($self->{debug} == 1){
-      print STDERR "QUERY:\n".$stat."\n===\n";
-    }
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("query",$stat);
-
-   $sth->execute() or return $self->logerror("query",$stat);
-   
-   my $data = $sth->fetchrow_hashref();
-   foreach my $k (keys %{$data}){
-      $retdata->{$k} = decode("utf-8",$data->{$k});
-   }
-   
-   $sth->finish();
-	 
-   return $retdata;
-}
-
-sub querybykey(){
-    my $self = shift;
-    my $key = shift;
-    my $stat = shift;
-    my $retdata =();
-    if ($self->{debug} == 1){
-      print STDERR "QUERYBYKEY:\n".$stat."\n===\n";
-    }
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("querybykey",$stat);
-   $sth->execute() or return $self->logerror("querybykey",$stat);
-   while(my $data = $sth->fetchrow_hashref())
-   {
-     if (exists $data->{$key}){
-        foreach my $k (keys %{$data}){
-           $retdata->{$data->{$key}}{$k} =decode("utf-8",$data->{$k});
-        }
-     }
-   }
-   if (keys(%{$retdata}) == 0){
-    $retdata =();
-   }
-   $sth->finish();
-   return $retdata;
-}
-
-sub querysorted(){
-    my $self = shift;
-    my $stat = shift;
-    my $retdata = ();
-    if ($stat !~ /sessions/){
-      if ($self->{debug} == 1){
-        print STDERR "QUERYSORTED:\n".$stat."\n===\n";
-      }
-    } 
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("querysorted",$stat);
-   $sth->execute() or return $self->logerror("querysorted",$stat);
-   my $count = 0;
-   while(my $data = $sth->fetchrow_hashref()){
-			foreach my $k (keys %{$data}){
-        if ($data->{$k} =~ /^{.*}$/){
-          $retdata->{$count}->{$k} = JSON::PP::decode_json($data->{$k});  
-        } else {
-          $retdata->{$count}->{$k} = decode("utf-8",$data->{$k});
-        }
-      }
-     $count++;
-   }
-   $sth->finish();
-   return $retdata;
-}
-
-sub exec(){
-    my $self = shift;
-    my $stat = shift;
-    my $retdata;
-    $stat = encode("UTF-8", $stat);
-    if ($self->{debug} == 1){
-      print STDERR "EXEC:\n".$stat."\n===\n";
-    }
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("exec",$stat);
-   $retdata->{success}  = $self->{dbh}->do($stat) or return $self->logerror("exec",$stat);
-   return $retdata;
-}
-
-sub queryarray(){
-   my $self = shift;
-   my $stat = shift;
-   my @retdata = ();
-  my $res = $self->querysorted($stat);
-  foreach my $r (sort {$a <=> $b} keys(%{$res})){
-    push(@retdata,$res->{$r});
-  }
-  return \@retdata;
-}
-
-
-sub create_ddl_insert(){
-	my $self = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	foreach my $f (keys(%{$data})){
-		 	if (($f =~ /\_/) && ($f !~ /^ident_/) && ($f !~ /\_id$/)){
-		 		my $t = substr($f,0,index($f,"_"));
-		 		my $c = substr($f,length($t)+1);
-		 		$fields->{$t}->{$c} = $data->{$f};
-		 	} elsif ($f =~ /^ident_/){
-        my $f2 = $f; 
-        $f2 =~ s/^ident_//;
-
-        my $t = substr($f2,0,index($f2,"_"));
-		 		my $c = substr($f2,length($t)+1);
-         if ($c ne "id"){
-           $fields->{$t}->{$c} = $data->{$f};
-         }
-      }
-
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcol = ();
-		my @sqlval = ();
-		foreach my $c (keys(%{$fields->{$tb}})){
-			my $v = $fields->{$tb}->{$c};
-			$v =~ s/'/''/g;
-			push (@sqlcol,$c);
-			if ($v eq ''){
-				$v = 'null';
-			} else {
-				$v = "'".$v."'";
-			}
-			push (@sqlval,$v);
-		}
-		push(@ddl,"INSERT INTO ".$tb." (".join(",",@sqlcol).") VALUES (".join(",",@sqlval).") returning id;");
-	}
-	return @ddl;
-}
-
-
-sub create_ddl_update(){
-	my $self = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my $fx = substr($f,6);
-		 		my $t = substr($fx,0,index($fx,"_"));
-		 		my $c = substr($fx,length($t)+1);
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 	} elsif ( ($f !~ /^ident/) && ($f =~ /.+\_.+/) ){
-		 		my $t = substr($f,0,index($f,"_"));
-		 		my $c = substr($f,length($t)+1);
-		 		$fields->{$t}->{fields}->{$c} = $data->{$f};
-		 	}
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlupd = ();
-		my @sqlcond = ();
-			foreach my $c (keys(%{$fields->{$tb}->{fields}})){
-				
-				my $v = $fields->{$tb}->{fields}->{$c};
-				$v =~ s/'/''/g;
-				
-        if ($c =~ /-/){
-          my @jp = split('-',$c);
-          if ($v eq ''){
-					  $v = 'null';
-				  } else {
-					  $v = '"'.$v.'"';
-				  }
-          $c = 'jsonb_set(to_jsonb('.$jp[0].'),\'{"'.$jp[1].'"}\',\''.$v.'\')::json';
-          push (@sqlupd,$jp[0]."=".$c);  
-        }else {
-          if ($v eq ''){
-					  $v = 'null';
-				  } else {
-					  $v = "'".$v."'";
-				  }
-          push (@sqlupd,$c."=".$v);
-        }
-				
-			}
-			foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-				my $v = $fields->{$tb}->{cond}->{$c};
-				$v =~ s/'/''/g;
-				if ($v eq ''){
-					$v = 'null';
-				} else {
-					$v = "'".$v."'";
-				}
-				push (@sqlcond,$c."=".$v);
-			}
-		push(@ddl,"UPDATE ".$tb." SET ".join(",",@sqlupd)." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	
-	return @ddl; 
-}
-
-sub create_cnt_statement(){
-	my $self = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my $fx = substr($f,6);
-		 		my $t = substr($fx,0,index($fx,"_"));
-		 		my $c = substr($fx,length($t)+1);
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 	} 
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcond = ();
-			foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-				my $v = $fields->{$tb}->{cond}->{$c};
-				$v =~ s/'/''/g;
-				if ($v eq ''){
-					$v = 'null';
-				} else {
-					$v = "'".$v."'";
-				}
-				push (@sqlcond,$c."=".$v);
-			}
-     
-		push(@ddl,"SELECT count(*) as cnt from ".$tb." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	return @ddl; 
-}
-
-sub create_ddl_delete(){
-	my $self = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	my @refcols = ();
-	my $refdata = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my ($t,$c) = $f =~ m/ident_(.+)\_(.+)/;
-		 		
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 		push(@refcols,"'".$c.'_'.$t."'");
-		 		$refdata->{$c.'_'.$t} = $data->{$f};
-		 	} 
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcond = ();
-		foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-			my $v = $fields->{$tb}->{cond}->{$c};
-			$v =~ s/'/''/g;
-			push (@sqlcond,$c."='".$v."'");
-		}
-		push(@ddl,"DELETE FROM ".$tb." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	return @ddl;
-}
-
-sub textunidecode(){
-  my $self = shift;
-  my $text = shift;
-  $text = lc(unidecode(decode("utf-8",$text)));
-  $text =~ s/^[a-z0-9]//g;
-  return $text;
-} 
-
-#sub dbbackup(){
-#    my $self = shift;
-#    my $path = shift;
-#    my $type = shift;
-#    
-#    my @dx = localtime();
-#    $dx[5] = $dx[5] +1900;
-#    $dx[4] = $dx[4] +1;
-#    if ($dx[4] < 10){$dx[4] = '0'.$dx[4];}
-#    if ($dx[3] < 10){$dx[3] = '0'.$dx[3];}
-#    if ($dx[2] < 10){$dx[2] = '0'.$dx[2];}
-#    if ($dx[1] < 10){$dx[1] = '0'.$dx[1];}
-#    if ($dx[0] < 10){$dx[0] = '0'.$dx[0];}
-#    my $xdd = $dx[5].$dx[4].$dx[3].'_'.$dx[2].$dx[1].$dx[0];
-#    my $bfile = "";
-#    if ($type eq "binary" ) {
-#        $bfile = $path.'/'.basename(substr($self->{dbfile},0,rindex($self->{dbfile},'.'))).'_'.$xdd.'.sqlite';
-#        my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1})  or die "dbexec Connection Error!".$!;
-#        $dbh->sqlite_backup_to_file($bfile);
-#        $dbh->disconnect();
-#    }elsif($type eq "sql"){
-#        $bfile = $path.'/'.basename($self->{dbfile}).'_'.$xdd.'.sql';
-#        my $st = system('sqlite3 "'.$self->{dbfile}.'" ".dump" > '.$bfile);
-#    }
-#    return $bfile;
-#}
-#
-#sub dbrestore(){
-#    my $self = shift;
-#    my $file = shift;
-#    my $type = shift;
-#    if ($type eq "binary" ) {
-#        my $dbh = DBI->connect('DBI:SQLite:dbname='.$self->{dbfile},"","",{PrintError=>1,RaiseError=>1,AutoCommit=>1})  or die "dbexec Connection Error!".$!;
-#        $dbh->sqlite_backup_from_file($file);
-#        $dbh->disconnect();
-#    }elsif($type eq "sql"){
-#        open(REST,$file) or die "cannot open restore file $file!\n";
-#        my $rsql = "";
-#        while (my $l = ) {
-#            $rsql .= $l;
-#        }
-#        close(REST);
-#        unlink($self->{dbfile});
-#        $self->dbexec($rsql);
-#    }
-#}
-#
-#sub dbrepair(){
-#    my $self = shift;
-#    my $bfile = $self->dbbackup($ENV{'TMPDIR'},'sql');
-#    $self->dbrestore($bfile,'sql');
-#    unlink($bfile);
-#}
-
-1;
-
-
diff --git a/server/lib/IJ/Account.pm b/server/lib/IJ/Account.pm
deleted file mode 100644
index efd67ba..0000000
--- a/server/lib/IJ/Account.pm
+++ /dev/null
@@ -1,86 +0,0 @@
-package IJ::Account;
-
-use strict;
-use POSIX qw(strftime);
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-sub getAccount(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  my $sql = "SELECT receipient AS accountname,
-    address AS accountaddress,
-    zip AS accountzip,
-    city AS accountcity,
-    country AS accountcountry,
-    clientnumber,id
-   FROM ".$schema.".addresses WHERE id='".$id."';";
-   return $self->{db}->query($sql);
-}
-
-sub getAccountSelectList(){
-  my $self = shift;
-  my $schema = shift;
-  my $filter = shift;
-  my $sql = "SELECT NULL::text AS value,
-    NULL::text AS text
-UNION
- SELECT addresses.id AS value,
-    addresses.receipient AS text
-   FROM ".$schema.".addresses
-  ORDER BY 2;";
-   return $self->{db}->querysorted($sql);
-}
-
-sub getAccounts(){
-  my $self = shift;
-  my $schema = shift;
-  my $sql = "SELECT *
-   FROM ".$schema.".addresses
-  ORDER BY receipient;";
-  return $self->{db}->querysorted($sql);
-}
-
-sub addAccount(){
-  my $self = shift;
-  my $schema = shift;
-  my $newuuid = $self->{db}->newuuid();
-  my $cntsql = "select count(*) as cnt from ".$schema.".addresses";
-  my $cnt = $self->{db}->query($cntsql);
-  my $clnum = strftime('%y%m', localtime(time)).sprintf("%03d", $cnt->{cnt});
-
-  my $sql = "insert into ".$schema.".addresses (id,clientnumber) values ('".$newuuid."','".$clnum."');";
-  $self->{db}->exec($sql);
-  return {id => $newuuid};
-}
-
-sub deleteAccount(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  my $sql = "DELETE from ".$schema.".addresses WHERE id='".$id."'";
-  $self->{db}->exec($sql);
-  return 1;
-}
-
-sub duplicateAccount(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  my $newuuid = $self->{db}->newuuid();
-  my $cntsql = "select count(*) as cnt from ".$schema.".addresses";
-  my $cnt = $self->{db}->query($cntsql);
-  my $clnum = strftime('%y%m', localtime(time)).sprintf("%03d", $cnt->{cnt});
-  my $sql = "INSERT INTO ".$schema.".addresses (id, receipient, title, prename, surname, address, zip, city, country, email, phone, clientnumber, vatid, iban, bic, ijgroup, lang) SELECT '".$newuuid."' as id, receipient, title, prename, surname, address, zip, city, country, email, phone,'".$clnum."' as clientnumber, vatid, iban, bic, ijgroup, lang FROM ".$schema.".addresses where id='".$id."';";
-  $self->{db}->exec($sql);
-  return {id => $newuuid};
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Booking.pm b/server/lib/IJ/Booking.pm
deleted file mode 100644
index 488c3eb..0000000
--- a/server/lib/IJ/Booking.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::Booking;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/File.pm b/server/lib/IJ/File.pm
deleted file mode 100644
index ebf7d7d..0000000
--- a/server/lib/IJ/File.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::File;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Invoice.pm b/server/lib/IJ/Invoice.pm
deleted file mode 100644
index d78c324..0000000
--- a/server/lib/IJ/Invoice.pm
+++ /dev/null
@@ -1,73 +0,0 @@
-package IJ::Invoice;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-sub duplicateInvoice(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  my $newuuid = $self->{db}->newuuid();
-   my $dldays = $self->{db}->query("select deadlinedays from ".$schema.".invoices WHERE id='".$id."';");
-  my $dsql = "INSERT INTO ".$schema.".invoices
-	   (id,direction, id_accounts, id_sender, id_template, id_offer, accountname, accountaddress, accountzip, accountcity, accountcountry, receipientvatid, clientnumber, sendername, senderaddress, senderzip, sendercity, sendercountry, isinnereu, footertext, invoicetype, headertext, offerreference,deadlinedays,invoicedate,businessyear,status,deadlinedate)
-SELECT  '".$newuuid."' as id,direction, id_accounts, id_sender, id_template, id_offer, accountname, accountaddress, accountzip, accountcity, accountcountry, receipientvatid, clientnumber, sendername, senderaddress, senderzip, sendercity, sendercountry, isinnereu, footertext, invoicetype, headertext, offerreference,deadlinedays,current_date as invoice_date,date_part('year',current_date)::int4 as businessyear,'preparation' as status,date(CURRENT_DATE + ('' || ".$dldays->{deadlinedays}." || ' days')::interval) as deadlinedate
-FROM ".$schema.".invoices where id='".$id."';";
-    $self->{db}->exec($dsql);
-		my $bsql = "INSERT INTO ".$schema.".bookings
-(id_invoices, id_products, producttype, sku, quantity, unitamount, unit, \"name\", description, taxamount, taxpercent, bookingdate, netamount)
-		SELECT  '".$newuuid."' as id_invoices, id_products, producttype, sku, quantity, unitamount, unit, \"name\", description, taxamount, taxpercent, bookingdate, netamount
-FROM ".$schema.".bookings where id_invoices = '".$id."';";
-  $self->{db}->exec($bsql);
-  return $newuuid;
-}
-
-sub addInvoice(){
-  my $self = shift;
-  my $schema = shift;
-  my $newuuid = $self->{db}->newuuid();
-  my $defdata = $self->{db}->querybykey("id","select id,pref from ".$schema.".defaultpref where id in ('invoicedeadlinedays','id_address','id_invoicetemplate');");
-  my $isql = "INSERT INTO ".$schema.".invoices (id,direction,status,invoicetype,invoicedate,deadlinedays,deadlinedate,businessyear) VALUES ('".$newuuid."','out','preparation','invoice',CURRENT_DATE,".$defdata->{invoicedeadlinedays}.",date(CURRENT_DATE + interval '".$defdata->{invoicedeadlinedays}." days',date_part('year',CURRENT_YEAR)::int4)";
-  $self->{db}->exec($isql);
-  my $bnewuuid = $self->{db}->newuuid();
-  my $bsql = "INSERT INTO ".$schema.".bookings (id,id_invoices,quantity) VALUES ('".$bnewuuid."','".$newuuid."',1);";
-  $self->{db}->exec($bsql);
-  return $newuuid;
-}
-
-sub deleteInvoice(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  $self->{db}->exec("DELETE FROM ".$schema.".bookings WHERE id_invoices='".$id."';");
-  $self->{db}->exec("DELETE FROM ".$schema.".invoices WHERE id='".$id."';");
-  return 1;
-}
-
-sub getInvoicesByDateRange(){
-  my $self = shift;
-  my $schema = shift;
-  my $datestart = shift;
-  my $dateend = shift;
-  my $sql = "SELECT * from ".$schema.".invoices where invoicedate between date('.$datestart.') and date('".$dateend."');";
-  my $ret = $self->{db}->querysorted($sql);
-  return $ret;
-}
-
-sub getInvoice(){
-  my $self = shift;
-  my $schema = shift;
-  my $id = shift;
-  my $sql = "SELECT * from ".$schema.".invoices where id='".$id."';";
-  my $ret = $self->{db}->querysorted($sql);
-  return $ret;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Offer.pm b/server/lib/IJ/Offer.pm
deleted file mode 100644
index 7fd3283..0000000
--- a/server/lib/IJ/Offer.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::Offer;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Product.pm b/server/lib/IJ/Product.pm
deleted file mode 100644
index 2e8f37f..0000000
--- a/server/lib/IJ/Product.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::Product;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Report.pm b/server/lib/IJ/Report.pm
deleted file mode 100644
index 24ed0ef..0000000
--- a/server/lib/IJ/Report.pm
+++ /dev/null
@@ -1,88 +0,0 @@
-package IJ::Report;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    $self->{tmplpath} =$p->{tmplpath};
-    $self->{tmp} =$p->{tmp};
-    $self->{db} = $p->{db};
-    $self->{wkhtmltopdf} = $p->{wkhtmltopdf};
-    return $self;
-}
-
-sub createpdf(){
-  my $self = shift;
-  my $template = shift;
-  my $output = shift;
-  my $pdfopts = shift;
-  my $inputdata = shift;
-  if (exists($pdfopts->{pdfencoding})){
-    $inputdata->{encoding} = $pdfopts->{pdfencoding};
-  }
-  my $r = -1;
-    my  $tt = $self->createTTReport($template,$inputdata);
-    my $tmpreportpath = $self->{tmp};
-  if (-e  $self->{tmp}.'/'.$tt.'.html'){
-    my $cmd = '"'.$self->{wkhtmltopdf}.'"';
-    if ($pdfopts->{pdfbottom}){ $cmd .= " -B ".$pdfopts->{pdfbottom}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdfleft}){ $cmd .= " -L ".$pdfopts->{pdfleft}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdfright}){ $cmd .= " -R ".$pdfopts->{pdfright}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdftop}){ $cmd .= " -T ".$pdfopts->{pdftop}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdforientation}){ $cmd .= " -O ".$pdfopts->{pdforientation}; }
-    if ($pdfopts->{pdfsize}){ $cmd .= " -s ".$pdfopts->{pdfsize}; }
-    if ($pdfopts->{pdfencoding}){ $cmd .= " --encoding '".$pdfopts->{pdfencoding}."'"; }
-    if (-e $self->{tmp}.'/'.$tt.'.header.html'){
-      $cmd .= ' --header-html "'.$self->{tmp}.'/'.$tt.'.header.html"';
-    }
-    if (-e $self->{tmp}.'/'.$tt.'.footer.html'){
-      $cmd .= ' --footer-html "'.$self->{tmp}.'/'.$tt.'.footer.html"';
-    }
-    $cmd .= ' "'.$self->{tmp}.'/'.$tt.'.html"';
-    $cmd .= ' "'.$output.'"';
-    #print Dumper($cmd);
-    $r = system($cmd);
-  }
-  if (-e $output){
-    return ($r,$output);
-  }
-  return ($r,undef);
-}
-
-sub createTTReport(){
-  my $self = shift;
-  my $template = shift;
-  my $indata = shift;
-  my $uniquekey = $$;
-  if (-e $self->{tmplpath}.'/'.$template.".tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".tt",$self->{tmp}.'/'.$template.$$.".html",$indata);
-  }
-  if (-e $self->{tmplpath}.'/'.$template.".header.tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".header.tt",$self->{tmp}.'/'.$template.$$.".header.html",$indata);
-  }
-  if (-e $self->{tmplpath}.'/'.$template.".footer.tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".footer.tt",$self->{tmp}.'/'.$template.$$.".footer.html",$indata);
-  }
-  if (-d $self->{tmplpath}.'/'.$template){
-    dircopy($self->{tmplpath}.'/'.$template,$self->{tmp}.'/'.$template);
-  }
-  return $template.$$;
-}
-
-sub TTtoHTML(){
-  my $self = shift;
-  my $ttfile = shift;
-  my $outfile = shift;
-  my $indata = shift;
-  my $enc = "utf8";
-  # if (exists($indata->{encoding})){
-  #   $enc = $indata->{encoding};
-  # }
-  my $tttohtml = Template->new({INCLUDE_PATH => [dirname($ttfile)]});#,ENCODING => 'utf8'
-  $tttohtml->process(basename($ttfile),$indata,$outfile) || die "Template process failed: ", $tttohtml->error(), "\n";#,{binmode => ':utf8'}
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Settings.pm b/server/lib/IJ/Settings.pm
deleted file mode 100644
index 1ae9530..0000000
--- a/server/lib/IJ/Settings.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::Settings;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/Transaction.pm b/server/lib/IJ/Transaction.pm
deleted file mode 100644
index a436ce9..0000000
--- a/server/lib/IJ/Transaction.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::Transaction;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/IJ/User.pm b/server/lib/IJ/User.pm
deleted file mode 100644
index 58905ad..0000000
--- a/server/lib/IJ/User.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IJ::User;
-
-use strict;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/dksconfig.pm b/server/lib/dksconfig.pm
deleted file mode 100644
index 6981c1a..0000000
--- a/server/lib/dksconfig.pm
+++ /dev/null
@@ -1,62 +0,0 @@
-package dksconfig;
-
-use strict;
-# use lib ('./lib/perl5');
-# use lib ('./lib');
-# use lib ('./');
-use File::Basename;
-use Exporter 'import';
-our @EXPORT_OK = qw($sitecfg);
- 
-
-our $sitecfg ={
-  cookiename => 'invoicejournal',
-  staticpath => 'static/',
-  page => 'index.tt',
-  pagename => 'index',
-  basename => '/',
-  cookiename=> 'invoicejournal',
-  dsn => 'DBI:PgPP:dbname=invoicejournal;host=localhost',
-  #dsn => 'DBI:PgPP:dbname=potlu_db;host=sql629.your-server.de',
-  dbuser => 'invoicejournal',
-  dbpassword => 'invoicejournal',
-  dbschema => 'dks',
-  #docroot => $ENV{"DOCUMENT_ROOT"},
-};
-
-
-if ($ENV{DOCUMENT_ROOT} eq ""){
-  my $name = basename($0);
-  $name =~ s/\.pl$//;
-  $name =~ s/\.exe$//;
-  my $cfgpath=$ENV{HOME}.'/.'.$name;
-  $cfgpath =~ s/\\/\//g;
-  my $glhostname = `hostname`;
-  chomp($glhostname);
-  $sitecfg->{hostname} = $glhostname;
-  if ($^O eq "MSWin32"){
-    if (!exists$ENV{DKSAPPDATA}){
-      $cfgpath = $ENV{APPDATA}.'/'.$name.'/server';
-    } else {
-      $cfgpath = $ENV{DKSAPPDATA};
-    }
-    
-  } elsif ($^O eq "darwin"){
-	  $cfgpath = $ENV{HOME}.'/Library/Application Support/'.$name.'/server';
-  } 
-  $sitecfg->{dsn}='DBI:PgPP:dbname='.$cfgpath.'/'.$name.'.sqlite';
-  $sitecfg->{datapath}=$cfgpath;
-  
-} else {
-  $sitecfg->{app}='invoicejournal';
-  $sitecfg->{datapath}=$ENV{DOCUMENT_ROOT}.'/'.$sitecfg->{app}.'/data';
-  $sitecfg->{tmplpath}=$ENV{DOCUMENT_ROOT}.'/'.$sitecfg->{app}.'/tmpl';
-  # $sitecfg->{dsn}='DBI:SQLite:dbname='.$sitecfg->{datapath}.'/invoicejournal.sqlite';
-  $sitecfg->{tools}->{wkhtmltopdf} = '/usr/local/bin/wkhtmltopdf';
-}
-
-foreach my $e (keys(%ENV)){
-  $sitecfg->{env}->{$e} = $ENV{$e};
-}  
-
-1;
\ No newline at end of file
diff --git a/server/lib/dksdb.pm b/server/lib/dksdb.pm
deleted file mode 100644
index d2e2ac1..0000000
--- a/server/lib/dksdb.pm
+++ /dev/null
@@ -1,364 +0,0 @@
-package dksdb;
-
-use strict;
-use FindBin qw($Bin $RealBin);
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
-use lib ($Bin.'/api/lib/perl5');
-use lib ($Bin.'/api/lib');
-use lib ($RealBin.'/lib/perl5');
-use lib ($RealBin.'/lib');
-
-BEGIN { $ENV{DBI_PUREPERL} = 2 }
-use DBI;
-use File::Basename;
-
-use Digest::SHA::PurePerl qw(sha256_hex);
-use DBD::PgPP;
-
-use URI::Encode qw(uri_encode uri_decode);
-use Encode;
-use dksconfig qw($sitecfg); 
-use Text::Unidecode;
-
-
-sub new {
-  my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-		$self->{debug} = 1;
-		$self->{logfile} = 'sql.log';
-    $self->{dbh} = DBI->connect($p->{dsn},$p->{dbuser},$p->{dbpassword},{PrintError=>1,RaiseError=>1,AutoCommit=>1})  or return "query Connection Error!".$!;
-    return $self;
-}
-
-sub disconnect(){
-  my $self = shift;
-  return $self->{dbh}->disconnect();
-}
-
-sub securetext(){
-	my $self = shift;
-	my $text = shift;
-	$text =~ s/'/''/g;
-	return $text;
-}
-
-sub newuuid(){
-	my $self = shift;
-	my $rx = $self->query("SELECT uuid_in(md5(random()::text || clock_timestamp()::text)::cstring) as id;");
-	return $rx->{id};
-}
-
-sub logerror(){
-  my $self = shift;
-  my $fn = shift;
-  my $stat = shift;
-	if ($self->{debug} == 1){
-			open(LOG,">>".$self->{logfile});
-			print LOG "$fn: ".$stat."\n";
-			close(LOG);
-		}
-  return ();
-}
-
-
-sub query(){
-	my $self = shift;
-    my $stat = shift;
-    # my $vw_info = shift;
-    my @retdata = ();
-    $stat = encode("utf8", $stat);
-    if (($self->{debug} == 1) && ($stat !~ /from sessions/) ){
-			open(LOG,">>".$self->{logfile});
-			print LOG "query: ".$stat."\n";
-			close(LOG);
-		}
-		
-    my $sth = $self->{dbh}->prepare($stat) or return ("ERROR: query: ".$self->{dbh}->errstr. "- SQL: ".$stat);
-   	$sth->execute() or return ("query: ".$sth->errstr);;
-   	my $data = $sth->fetchrow_hashref();
-   	my $row = ();
- 	 	foreach my $k (keys %{$data}){
-    	$row->{$k} = decode("utf-8",$data->{$k});
-    }
-   	$sth->finish();
-   	
-  return $row;
-}
-
-sub querybykey(){
-    my $self = shift;
-    my $key = shift;
-    my $stat = shift;
-    my $retdata =();
-    if ($self->{debug} == 1){
-			open(LOG,">>".$self->{logfile});
-			print LOG "query: ".$stat."\n";
-			close(LOG);
-		}
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("querybykey",$stat);
-   $sth->execute() or return $self->logerror("querybykey",$stat);
-   while(my $data = $sth->fetchrow_hashref())
-   {
-     if (exists $data->{$key}){
-        foreach my $k (keys %{$data}){
-           $retdata->{$data->{$key}}{$k} =decode("utf-8",$data->{$k});
-        }
-     }
-   }
-   if (keys(%{$retdata}) == 0){
-    $retdata =();
-   }
-   $sth->finish();
-   return $retdata;
-}
-
-
-sub querysorted(){
-    my $self = shift;
-    my $stat = shift;
-    my $retdata = ();
-    if ($self->{debug} == 1){
-			open(LOG,">>".$self->{logfile});
-			print LOG "query: ".$stat."\n";
-			close(LOG);
-		}
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("querysorted",$stat);
-   $sth->execute() or return $self->logerror("querysorted",$stat);
-   my $count = 0;
-   while(my $data = $sth->fetchrow_hashref()){
-			foreach my $k (keys %{$data}){
-        if ($data->{$k} =~ /^{.*}$/){
-          $retdata->{$count}->{$k} = JSON::PP::decode_json($data->{$k});  
-        } else {
-          $retdata->{$count}->{$k} = decode("utf-8",$data->{$k});
-        }
-      }
-     $count++;
-   }
-   $sth->finish();
-   return $retdata;
-}
-
-sub exec(){
-    my $self = shift;
-    my $stat = shift;
-    my $retdata;
-    $stat = encode("UTF-8", $stat);
-    if ($self->{debug} == 1){
-			open(LOG,">>".$self->{logfile});
-			print LOG "query: ".$stat."\n";
-			close(LOG);
-		}
-    my $sth = $self->{dbh}->prepare($stat) or return $self->logerror("exec",$stat);
-   $retdata->{success}  = $self->{dbh}->do($stat) or return $self->logerror("exec",$stat);
-   return $retdata;
-}
-
-sub queryarray(){
-   my $self = shift;
-   my $stat = shift;
-   my @retdata = ();
-  my $res = $self->querysorted($stat);
-  foreach my $r (sort {$a <=> $b} keys(%{$res})){
-    push(@retdata,$res->{$r});
-  }
-  return \@retdata;
-}
-
-
-sub create_ddl_insert(){
-	my $self = shift;
-	my $schema = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-
-	foreach my $f (keys(%{$data})){
-		 	if (($f =~ /\_/) && ($f !~ /^ident_/)){
-		 		my $t = substr($f,0,index($f,"_"));
-		 		my $c = substr($f,length($t)+1);
-		 		#my ($t,$c) = $f =~ m/(.+)\_(.+)/;
-		 		$fields->{$t}->{$c} = $data->{$f};
-		 	} elsif ($f =~ /^ident_/){
-        my $f2 = $f; 
-        $f2 =~ s/^ident_//;
-
-        my $t = substr($f2,0,index($f2,"_"));
-		 		my $c = substr($f2,length($t)+1);
-		 		$fields->{$t}->{$c} = $data->{$f};     
-      }
-
-		 }
-
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcol = ();
-		my @sqlval = ();
-		foreach my $c (keys(%{$fields->{$tb}})){
-			my $v = $fields->{$tb}->{$c};
-			$v =~ s/'/''/g;
-			push (@sqlcol,$c);
-			if ($v eq ''){
-				$v = 'null';
-			} else {
-				$v = "'".$v."'";
-			}
-			push (@sqlval,$v);
-		}
-		push(@ddl,"INSERT INTO ".$schema.".".$tb." (".join(",",@sqlcol).") VALUES (".join(",",@sqlval).");");
-	}
-	return @ddl;
-}
-
-
-
-sub create_ddl_update(){
-	my $self = shift;
-	my $schema = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my $fx = substr($f,6);
-		 		my $t = substr($fx,0,index($fx,"_"));
-		 		my $c = substr($fx,length($t)+1);
-		 		#my ($t,$c) = $f =~ m/^ident_(.+)\_([a-z0-9|\_]+)/;
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 	} elsif ( ($f !~ /^ident/) && ($f =~ /.+\_.+/) ){
-		 		my $t = substr($f,0,index($f,"_"));
-		 		my $c = substr($f,length($t)+1);
-		 		#my ($t,$c) = $f =~ m/^(.+)\_([a-z0-9|\_]+)/;
-		 		$fields->{$t}->{fields}->{$c} = $data->{$f};
-		 	}
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlupd = ();
-		my @sqlcond = ();
-			foreach my $c (keys(%{$fields->{$tb}->{fields}})){
-				
-				my $v = $fields->{$tb}->{fields}->{$c};
-				$v =~ s/'/''/g;
-				
-        if ($c =~ /-/){
-          my @jp = split('-',$c);
-          if ($v eq ''){
-					  $v = 'null';
-				  } else {
-					  $v = '"'.$v.'"';
-				  }
-          $c = 'jsonb_set(to_jsonb('.$jp[0].'),\'{"'.$jp[1].'"}\',\''.$v.'\')::json';
-          push (@sqlupd,$jp[0]."=".$c);  
-        }else {
-          if ($v eq ''){
-					  $v = 'null';
-				  } else {
-					  $v = "'".$v."'";
-				  }
-          push (@sqlupd,$c."=".$v);
-        }
-				
-			}
-			foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-				my $v = $fields->{$tb}->{cond}->{$c};
-				$v =~ s/'/''/g;
-				if ($v eq ''){
-					$v = 'null';
-				} else {
-					$v = "'".$v."'";
-				}
-				push (@sqlcond,$c."=".$v);
-			}
-		push(@ddl,"UPDATE ".$schema.".".$tb." SET ".join(",",@sqlupd)." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	
-	return @ddl; 
-}
-
-sub create_cnt_statement(){
-	my $self = shift;
-	my $schema = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my $fx = substr($f,6);
-		 		my $t = substr($fx,0,index($fx,"_"));
-		 		my $c = substr($fx,length($t)+1);
-		 		#my ($t,$c) = $f =~ m/^ident_(.+)\_([a-z0-9|\_]+)/;
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 	} 
-		 }
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcond = ();
-			foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-				my $v = $fields->{$tb}->{cond}->{$c};
-				$v =~ s/'/''/g;
-				if ($v eq ''){
-					$v = 'null';
-				} else {
-					$v = "'".$v."'";
-				}
-				push (@sqlcond,$c."=".$v);
-			}
-		push(@ddl,"SELECT count(*) as cnt from ".$schema.".".$tb." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	# open FILE,">>tmp/sql.log";
-  #   print FILE "\n==\n".join("\n",@ddl)."\n==\n";
-  #   close FILE;
-	return @ddl; 
-}
-
-sub create_ddl_delete(){
-	my $self = shift;
-	my $schema = shift;
-	my $data = shift;
-	my $fields = ();
-	my @ddl = ();
-	my @refcols = ();
-	my $refdata = ();
-	foreach my $f (keys(%{$data})){
-		 	if ($f =~ /^ident_/){
-		 		my ($t,$c) = $f =~ m/ident_(.+)\_(.+)/;
-		 		
-		 		$fields->{$t}->{cond}->{$c} = $data->{$f};
-		 		push(@refcols,"'".$c.'_'.$t."'");
-		 		$refdata->{$c.'_'.$t} = $data->{$f};
-		 	} 
-		 }
-	
-# 	my $ref = $self->dbquerysorted("select TABLE_NAME,COLUMN_NAME from information_schema.KEY_COLUMN_USAGE where COLUMN_NAME in (".join(",",@refcols).") and CONSTRAINT_SCHEMA='".$self->{dbname}."';");
-# 	foreach my $r (keys(%{$ref})){
-# 		my $refv = $refdata->{$ref->{$r}->{COLUMN_NAME}};
-# 		if ($refv eq ''){
-# 			$refv = ' is null';
-# 		} else {
-# 			$refv =~ s/'/''/g;
-# 			$refv = "='".$refv."'";
-# 		}
-# 		push(@ddl,"DELETE from ".$ref->{$r}->{TABLE_NAME}." where ".$ref->{$r}->{COLUMN_NAME}.$refv.";");
-# 	}
-	foreach my $tb (keys(%{$fields})){
-		my @sqlcond = ();
-		foreach my $c (keys(%{$fields->{$tb}->{cond}})){
-			my $v = $fields->{$tb}->{cond}->{$c};
-			$v =~ s/'/''/g;
-			push (@sqlcond,$c."='".$v."'");
-		}
-		push(@ddl,"DELETE FROM ".$schema.".".$tb." WHERE ".join(" AND ",@sqlcond).";");
-	} 
-	return @ddl;
-}
-
-sub textunidecode(){
-  my $self = shift;
-  my $text = shift;
-  $text = lc(unidecode(decode("utf-8",$text)));
-  $text =~ s/^[a-z0-9]//g;
-  return $text;
-} 
-
-1;
diff --git a/server/lib/filesystem.pm b/server/lib/filesystem.pm
deleted file mode 100644
index c395e3c..0000000
--- a/server/lib/filesystem.pm
+++ /dev/null
@@ -1,115 +0,0 @@
-package filesystem;
-
-use strict;
-
-use File::Basename qw/dirname basename/;
-use MIME::Type::FileName;
-
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
-use FindBin qw($RealBin);
-use lib ($RealBin.'/server/api/lib/perl5');
-use lib ($RealBin.'/server/api/lib');
-use lib ($RealBin.'/api/lib/perl5');
-use lib ($RealBin.'/api/lib');
-use lib ($RealBin.'/lib/perl5');
-use lib ($RealBin.'/lib');
-use dksconfig qw/$sitecfg/;
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-sub getstructureddatafolders(){
-  my $self = shift;
-  $self->{basedatafolder} = shift;
-  my $alldata = ();
-  $alldata = $self->getrecursivefolders($self->{basedatafolder},$alldata);
-  return $alldata;
-}
-
-sub getrecursivefolders(){
-  my $self = shift;
-  my $dir = shift;
-  my $data = shift;
-  my $ndata = ();
-  my @subdir = ();
-  opendir(DIR,$dir);
-  while (my $d = readdir(DIR)){
-    if ($d =~ /^\./){next;}
-    if (-d $dir.'/'.$d){
-      push(@subdir,$dir.'/'.$d);
-    }
-  } 
-  closedir(DIR);
-  foreach my $dd (@subdir){
-    my $xdata->{"name"} = basename($dd);
-    $xdata->{"path"} = substr($dd,length($self->{basedatafolder}));
-    my $cdata = $self->getrecursivefolders($dd,$data);
-    if (defined($cdata)){
-      $xdata->{"_children"} = $cdata;
-    }
-    push (@{$ndata},$xdata);
-  }
-  return $ndata;
-}
-
-sub getfiles(){
-  my $self = shift;
-  my $folder = shift;
-  my $files = ();
-  opendir(DIR,$folder);
-  while (my $f = readdir(DIR)){
-    if ($f =~ /^\./){next;}
-    if (-f $folder.'/'.$f){
-      my @stat = stat($folder.'/'.$f);
-      my $mimetype = MIME::Type::FileName::guess ($folder.'/'.$f);
-      my $fd->{name} = $f;
-      $fd->{path} = $folder;
-      $fd->{mimetype} = $mimetype;
-      $fd->{size} = $self->hr_filesize($stat[7]);
-      $fd->{date} = $self->getdatetime($stat[9]); 
-      #print $d."=>".$dir.'/'.$d."\n";
-      push(@{$files},$fd);
-      #$data = {"name" => $d,"path" => $dir.'/'.$d};
-      #$data->{"_children"} = 
-    }
-  } 
-  closedir(DIR);
-}
-
-sub hr_filesize  {
-  my $self = shift;
-  my $size = shift;
-  if ($size > 1099511627776){
-    return sprintf("%.2f TB", $size / 1099511627776);
-  } elsif ($size > 1073741824) {
-     return sprintf("%.2f GB", $size / 1073741824);
-  } elsif ($size > 1048576) {
-    return sprintf("%.2f MB", $size / 1048576);
-  } elsif ($size > 1024)  {
-    return sprintf("%.2f KB", $size / 1024);
-  } else  {
-    return "$size B" . ($size == 1 ? "" : "s");
-  }
-}
-
-sub getdatetime(){
-  my $self = shift;
-  my $utime = shift;
-  my @cdate = localtime($utime);
-  $cdate[5] = $cdate[5] +1900;
-  $cdate[4] = $cdate[4] +1;
-  if ($cdate[4] < 10){$cdate[4] = '0'.$cdate[4];}
-  if ($cdate[3] < 10){$cdate[3] = '0'.$cdate[3];}
-  if ($cdate[2] < 10){$cdate[2] = '0'.$cdate[2];}
-  if ($cdate[1] < 10){$cdate[1] = '0'.$cdate[1];}
-  my $cmpdate = $cdate[5].'-'.$cdate[4].'-'.$cdate[3].' '.$cdate[2].':'.$cdate[1];
-  return $cmpdate;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/pdfreport.pm b/server/lib/pdfreport.pm
deleted file mode 100644
index bb1044d..0000000
--- a/server/lib/pdfreport.pm
+++ /dev/null
@@ -1,137 +0,0 @@
-package pdfreport;
-
-use strict;
-use Template;
-use File::Basename qw/dirname basename/;
-use Data::Dumper;
-
-use File::Copy::Recursive qw(dircopy);
-<<<<<<< HEAD:server/lib/pdfreport.pm
-
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
-use FindBin qw($RealBin);
-=======
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
->>>>>>> 69f990baa72347e7fbd569aa40f027c80a9748be:server/api/lib/pdfreport.pm
-use lib ($RealBin.'/server/api/lib/perl5');
-use lib ($RealBin.'/server/api/lib');
-use lib ($RealBin.'/api/lib/perl5');
-use lib ($RealBin.'/api/lib');
-use lib ($RealBin.'/lib/perl5');
-use lib ($RealBin.'/lib');
-use dksconfig qw/$sitecfg/;
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{tmplpath} =$p->{tmplpath};
-    $self->{tmp} =$p->{tmp};
-<<<<<<< HEAD:server/lib/pdfreport.pm
-    $self->{db} = $p->{db};
-=======
->>>>>>> 69f990baa72347e7fbd569aa40f027c80a9748be:server/api/lib/pdfreport.pm
-    if ($^O eq "MSWin32"){
-
-    } else {
-
-    }
-    $self->{wkhtmltopdf} = $sitecfg->{tools}->{wkhtmltopdf};
-    return $self;
-}
-
-sub createpdf(){
-  my $self = shift;
-  my $template = shift;
-  my $output = shift;
-  my $pdfopts = shift;
-  my $inputdata = shift;
-  if (exists($pdfopts->{pdfencoding})){
-    $inputdata->{encoding} = $pdfopts->{pdfencoding};
-  }
-  my $r = -1;
-    my  $tt = $self->createTTReport($template,$inputdata);
-    my $tmpreportpath = $self->{tmp};
-  if (-e  $self->{tmp}.'/'.$tt.'.html'){
-    my $cmd = '"'.$self->{wkhtmltopdf}.'"';
-    if ($pdfopts->{pdfbottom}){ $cmd .= " -B ".$pdfopts->{pdfbottom}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdfleft}){ $cmd .= " -L ".$pdfopts->{pdfleft}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdfright}){ $cmd .= " -R ".$pdfopts->{pdfright}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdftop}){ $cmd .= " -T ".$pdfopts->{pdftop}.$pdfopts->{pdfunit}; }
-    if ($pdfopts->{pdforientation}){ $cmd .= " -O ".$pdfopts->{pdforientation}; }
-    if ($pdfopts->{pdfsize}){ $cmd .= " -s ".$pdfopts->{pdfsize}; }
-    if ($pdfopts->{pdfencoding}){ $cmd .= " --encoding '".$pdfopts->{pdfencoding}."'"; }
-    if (-e $self->{tmp}.'/'.$tt.'.header.html'){
-      $cmd .= ' --header-html "'.$self->{tmp}.'/'.$tt.'.header.html"';
-    }
-    if (-e $self->{tmp}.'/'.$tt.'.footer.html'){
-      $cmd .= ' --footer-html "'.$self->{tmp}.'/'.$tt.'.footer.html"';
-    }
-    $cmd .= ' "'.$self->{tmp}.'/'.$tt.'.html"';
-    $cmd .= ' "'.$output.'"';
-    #print Dumper($cmd);
-    $r = system($cmd);
-  }
-  if (-e $output){
-    return ($r,$output);
-  }
-  return ($r,undef);
-}
-
-sub createTTReport(){
-  my $self = shift;
-  my $template = shift;
-  my $indata = shift;
-  my $uniquekey = $$;
-  if (-e $self->{tmplpath}.'/'.$template.".tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".tt",$self->{tmp}.'/'.$template.$$.".html",$indata);
-  }
-  if (-e $self->{tmplpath}.'/'.$template.".header.tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".header.tt",$self->{tmp}.'/'.$template.$$.".header.html",$indata);
-  }
-  if (-e $self->{tmplpath}.'/'.$template.".footer.tt"){
-    $self->TTtoHTML($self->{tmplpath}.'/'.$template.".footer.tt",$self->{tmp}.'/'.$template.$$.".footer.html",$indata);
-  }
-  if (-d $self->{tmplpath}.'/'.$template){
-    dircopy($self->{tmplpath}.'/'.$template,$self->{tmp}.'/'.$template);
-  }
-  return $template.$$;
-}
-
-sub TTtoHTML(){
-  my $self = shift;
-  my $ttfile = shift;
-  my $outfile = shift;
-  my $indata = shift;
-  my $enc = "utf8";
-  # if (exists($indata->{encoding})){
-  #   $enc = $indata->{encoding};
-  # }
-  my $tttohtml = Template->new({INCLUDE_PATH => [dirname($ttfile)]});#,ENCODING => 'utf8'
-  $tttohtml->process(basename($ttfile),$indata,$outfile) || die "Template process failed: ", $tttohtml->error(), "\n";#,{binmode => ':utf8'}
-}
-
-# sub readpdfconfig(){
-#   my $self = shift;
-#   my $template = shift;
-#   my $inputdata = shift;
-#   open(CFG,$self->{tmplpath}.'/'.$template.'.conf');
-#   while (my $l = ){
-#     chomp($l);
-#     #print $l."\n";
-#     $l =~ s/^\s+//;
-#     if (($l =~ /^#/) || ($l eq "")) {next;}
-#     if ($l =~ /\w+=.+/){
-#       my ($k1,$k2,$v) = $l =~ m/^(\w+)_(\w+)=\"(.+)\"$/;
-#       $self->{lc($k1)}->{lc($k2)} = $v;
-#     }
-#   }
-#   close(CFG);
-#   foreach my $ik (keys(%{$inputdata})){
-#     $self->{template}->{lc($ik)} = $inputdata->{$ik};
-#   }
-# }
-1;
\ No newline at end of file
diff --git a/server/lib/sendemail.pm b/server/lib/sendemail.pm
deleted file mode 100644
index 8f2a654..0000000
--- a/server/lib/sendemail.pm
+++ /dev/null
@@ -1,132 +0,0 @@
-package sendemail;
-
-use strict;
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
-use Data::Dumper;
-use File::Basename qw/dirname basename/;
-use dksdb;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{server} = "mail.your-server.de";
-    $self->{port} = "587";
-    $self->{user} = 'kilian.saffran@fld.lu';
-    $self->{password} = "Y6cWvXR6D2";
-    $self->{from} = 'webmaster@fld.lu';
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-sub sendemail(){
-  my $self = shift;
-  my $template = shift;
-  my $iduser = shift;
-  my $sendto = shift;
-  my $data = shift;
-  my $attach = shift;
-  my $body = "";
-  my $subject = "";
-  my $maildata = ();
-  my $db = dksdb->new();
-  my $send = -1;
-  my $tmpl = $db->queryarray("select *,ml.mailtemplate from mailtemplates mt join maillayouts ml on (mt.id_maillayout=ml.id) where templatename='".$template."';");
-  if (keys(%{$tmpl}) > 0){
-    $tmpl = $tmpl->{0};
-  }
-  # open (LOG,">>tmp/sendmail.log");
-  # print LOG $ENV{SCRIPT_FILENAME};
-  # print LOG "SEND EMAIL:".Dumper($data)."\n";
-  # close(LOG);
-  my $datasql = $tmpl->{'emaildatasql'};
-  $data->{id} = $iduser;
-  foreach my $key (keys(%{$data})){
-    my $srch = '%%'.lc($key).'%%';
-    my $repl = $data->{$key};
-    $datasql =~ s/$srch/$repl/g;
-  }
-  # open (LOG,">>tmp/sendmail.log");
-  # print LOG "TEMPLATE DATA:".$datasql."\n";
-  # close(LOG);
-  $maildata = $db->queryarray($datasql);
-  
-  $body = $tmpl->{'emailtext'};
-  $subject = $tmpl->{'mailsubject'};
-  foreach my $key (keys(%{$maildata->{0}})){
-    $data->{$key} = $maildata->{0}->{$key};   
-  }
-  foreach my $key (keys(%{$data})){
-    my $srch = '%%'.lc($key).'%%';
-    my $repl = $data->{$key};
-    $body =~ s/$srch/$repl/g;
-    $subject =~ s/$srch/$repl/g;
-  }
-  my $bodytmpl = $tmpl->{mailtemplate};
-  $bodytmpl =~ s/%%BODYCONTENT%%/$body/;
-  my $siteurl = $ENV{'REQUEST_SCHEME'}.'://'.$ENV{"HTTP_HOST"};
-  $bodytmpl =~ s/%%siteurl%%/$siteurl/g;
-  $bodytmpl =~ s/%%SITEURL%%/$siteurl/g;
-  $bodytmpl =~ s/\r//g;
-  #$bodytmpl =~ s/"/\\\"/g;
-  #PROD REPLACE all not replaced DATA       
-  #$bodytmpl =~ s/%%\w+%%//g;
-  #$sendto = 'ksaffran@dks.lu';
-  # open (LOG,">>tmp/sendmail.log");
-  # print LOG "SUBJECT:".$subject."\n";
-  # print LOG "BODY TEXT:".$bodytmpl."\n";
-  # close(LOG);
-  if (($bodytmpl ne "") && ($subject ne "") && ($sendto =~ /.+\@.+\..+/)){
-
-    
-    my $binsemail = dirname($ENV{'SCRIPT_FILENAME'}).'/sendEmail';
-    my $f = dirname($ENV{SCRIPT_FILENAME}).'/tmp/mailbody_'.$sendto.'.txt';
-    $f =~ s/\@/_/g;
-    if (! -e  $binsemail){
-      $binsemail = dirname($ENV{'SCRIPT_FILENAME'}).'/api/sendEmail';
-      $f = dirname($ENV{SCRIPT_FILENAME}).'/api/tmp/mailbody_'.$sendto.'.txt';
-    $f =~ s/\@/_/g;
-      if (! -e $binsemail){
-        return 256;
-      }
-    }
-    
-    my $cmd= 'perl "'.$binsemail.'" -f '.$tmpl->{mailfrom}.' ';
-    $cmd .= ' -s "'.$self->{server}.':'.$self->{port}.'" -xu "'.$self->{user}.'" -xp "'.$self->{password}.'" -q ';
-    $cmd .= '-o tls=auto ';
-    $cmd .= '-o message-content-type=html ';
-    $cmd .= '-o message-charset=ISO-8859-1 ';
-    $cmd .= '-o message-file='.$f.' ';
-    $cmd .= '-t "'.$sendto.'" ';
-    $cmd .= '-u "'.$subject.'" ';
-  #    open (LOG,">>sendmail.log");
-  #  print LOG $cmd."\n";
-  # # print LOG "BODY TEXT:".$bodytmpl."\n";
-  #  close(LOG);
-    open(EML,">".$f);
-    print EML $bodytmpl;
-    close(EML);
-    # $cmd .= '-m "'.$bodytmpl.'" ';
-    if ($attach != undef){
-      $cmd .= " -a";
-      
-      foreach my $a (@{$attach}){
-        $cmd .= " ".$a." ";
-      }
-    }
-    # open (LOG,">>tmp/sendmail.log");
-    # print LOG "SEND EMAIL CMD:".$cmd."\n";
-    # close(LOG);
-    # $cmd =~ s/'/''/g; 
-    $send = system($cmd);
-    # open (LOG,">>tmp/sendmail.log");
-    # print LOG "CMD RETURN NUM:".$send."\n";
-    # close(LOG);
-    unlink($f);
-  }    
-  return $send;
-}
-
-1;
\ No newline at end of file
diff --git a/server/lib/session.pm b/server/lib/session.pm
deleted file mode 100644
index 6cf37ad..0000000
--- a/server/lib/session.pm
+++ /dev/null
@@ -1,239 +0,0 @@
-package session;
-
-use strict;
-use File::Basename;
-use Digest::SHA qw(sha256_hex);
-use FindBin qw($RealBin);
-use Data::Dumper;
-use lib ('./lib/perl5');
-use lib ('./lib');
-use lib ('./');
-use lib ($RealBin.'/server/api/lib/perl5');
-use lib ($RealBin.'/server/api/lib');
-use lib ($RealBin.'/api/lib/perl5');
-use lib ($RealBin.'/api/lib');
-use lib ($RealBin.'/lib/perl5');
-use lib ($RealBin.'/lib');
-
-
-use dksdb;
-use sendemail;
-# use Data::Dumper;
-
-sub new {
-    my $class = shift;
-    my $p = shift;
-    my $self = bless {}, $class;
-    $self->{db} = $p->{db};
-    return $self;
-}
-
-sub checklogin(){
-  my $self = shift;
-  my $login = shift;
-  my $password = shift;
-  # open FILE,">>tmp/sql.log";
-  # print FILE "pwd: $password\n";
-  # close(FILE);
-  my $pwd = sha256_hex($password);
-  my $ret->{messagetype} ='red';
-  # my $newsid = undef;
-  $login = lc($login);
-  $login =~ s/^\s+//;
-  $login =~ s/\s+$//;
-
-  $ret->{message} = "unknown_login";
-  $ret->{messagetype} = "red";
-  $ret->{sid} = undef;
-  my $user = $self->{db}->query("select id from users where lower(username)=lower('".$self->{db}->securetext($login)."') and password = '".$pwd."' and isblocked is not true;");
-  # open FILE,">>sql.log";
-  # print FILE "select id from users where lower(username)=lower('".$self->{db}->securetext($login)."') and password = '".$pwd."' and isblocked is not true;\n";
-  # print FILE Dumper($user);
-  
-  if (keys(%{$user}) > 0){
-    $ret->{sid} =$self->{db}->newuuid();
-    $self->{db}->exec("DELETE FROM sessions where id_users='".$user->{id}."' and remote_addr='".$ENV{REMOTE_ADDR}."' and user_agent='".$ENV{HTTP_USER_AGENT}."';");
-    my $r = $self->{db}->exec("INSERT INTO sessions (id,id_users,remote_addr,user_agent) VALUES ('".$ret->{sid}."','".$user->{id}."','".$ENV{REMOTE_ADDR}."', '".$ENV{HTTP_USER_AGENT}."');");
-   # print FILE "INSERT INTO sessions (id,id_users,remote_addr,user_agent) VALUES ('".$ret->{sid}."','".$user->{id}."','".$ENV{REMOTE_ADDR}."', '".$ENV{HTTP_USER_AGENT}."');";
-  }
-  # close FILE;
-  return $ret;
-}
-
-sub savepassword(){
-  my $self = shift;
-  my $iduser = shift;
-  my $newpwd = shift;
-  my $pwd = sha256_hex($newpwd);
-  $self->{db}->exec("UPDATE users SET password = '".$pwd."' WHERE id=".$iduser.";");
-  return 1;
-}
-
-sub passwordforgotten(){
-  my $self = shift;
-  my $email = shift;
-  my $ret->{messagetype} ='red';
-  $ret->{message} = "unknown_email";
-  my $sql = "select id,password from users where username='".$self->{db}->securetext($email)."';";
-  my $ex = $self->{db}->dbquerysorted($sql);
-  if (keys(%{$ex}) > 0){
-    my $newpwd = $self->randomstring(12);
-    my $pwd = sha256_hex($newpwd);
-    $self->{db}->dbexec("UPDATE users SET password = '".$pwd."' WHERE id=".$ex->{0}->{id}.";");
-    my $data->{newpassword} = $newpwd; 
-    my $eml = sendemail->new();
-    my $mret = $eml->sendemail('user_forgotpasswd',$ex->{0}->{id},$email,$data,undef);
-    if ($mret != 0){
-      $ret->{messagetype} ='red';
-      $ret->{message} = "service_error";
-      return $ret;
-    }
-    $ret->{message} = "sent_newpassword!";
-    $ret->{messagetype} = "green";
-  }
-  return $ret;
-}
-
-# sub registeruser(){
-#   my $self = shift;
-#   my $data = shift;
-#   my $ret->{messagetype} ='red';
-#   $ret->{message} = "Een Fehler ass passÃ©iert, probÃ©ier et spÃ©ier nach eemol!";
-#   $ret->{page} = "message.tt";
-#   if (!exists($data->{license}) || !exists($data->{regcode}) || !exists($data->{email}) || !exists($data->{terms})){
-#     $ret->{message} = "W.e.g. All Felder ausfÃ«llen!";
-#     $ret->{page} =  "register.tt";
-#     return $ret;
-#   }
-#   foreach my $d (%{$data}){
-#     $data->{$d} = $self->{db}->securetext($data->{$d});
-#   }
-  
-#   my $user = $self->{db}->dbquerysorted("select id from users where username='".$data->{email}."';");
-#   if (keys(%{$user}) > 0){
-#     $ret->{page} = "register.tt";
-#     $ret->{message} = "Een Benotzer matt der selwechter E-Mail existÃ©iert schon!";
-#     return $ret; 
-#   }
-#   my $license = $self->{db}->dbquerysorted("select us.id as id_user,lic.license,mb.id as id_member,us.username,us.vcode,us.regcode from members mb join licenses lic on (lic.id_member=mb.id) join users us on (mb.id_user=us.id) where us.regcode='".$data->{regcode}."' and lic.license='".$data->{license}."' limit 1");
-#   if (keys(%{$license}) == 0){
-#     $ret->{message} = "Falsch Lizenz-Nummer oder falschen RÃ©gistrÃ©ierungs-Code!";
-#     return $ret; 
-#   }
-#   my $regcode = $license->{0}->{regcode};
-#   my $newcode = $self->randomstring(6);
-#   #my $usergroup = $self->{db}->dbquerysorted("select id from usergroups where usergroup ='avocat';");
-#   my $newuserid = $self->{db}->dbquerysorted("UPDATE users set username='".$data->{email}."',vcode='".$newcode."' where id=".$license->{0}->{id_user}." ;");
-#   my $maildata->{vcode} = $newcode;
-#   my $eml = sendemail->new();
-#   my $mret = $eml->sendemail('user_verification',$license->{0}->{id_user},$data->{email},$maildata,undef);
-#   if ($mret == 0){
-#     $ret->{message} = "Merci,
Mir hun dir elo eng E-Mail gescheckt, mattengem Code fir deng E-Mail ze verifizÃ©ieren!
GÃ«ff desen Code w.e.g. an daat Feld hei drÃ«nner an!
Bei Problemer wend dech w.e.g. via E-Mail un webmaster\@fld.lu";
-#     $ret->{messagetype} = "green";
-#     $ret->{page} = "validationcode.tt";
-#   } else {
-#     $self->{db}->dbexec("UPDATE users set username='".$data->{email}."',vcode=null where id=".$license->{0}->{id_user}." ;");
-#     $ret->{message} = "Aus iergend engem Grond konnten mir dir keng E-Mail un '".$data->{email}."' schecken! Falls dess E-Mail-Address net existÃ©iert, versich et nach eng KÃ©ier matt enger E-Mail-Address, dÃ©i existÃ©iert!
Bei Problemer wend dech w.e.g. via E-Mail un webmaster\@fld.lu";
-#     $ret->{messagetype} = "red";
-#     $ret->{page} = "register.tt";
-#   }
-# 	#$self->{db}->dbexec("insert into appaccess (id_user) values (".$newuserid->{0}->{id}.");");
-#   # $ret->{messagetype} =  "green";
-  
-#   return $ret;
-# }
-
-# sub validateaccount(){
-#   my $self = shift;
-#   my $data = shift;
-#   foreach my $d (%{$data}){
-#     $data->{$d} = $self->{db}->securetext($data->{$d});
-#   }
-  
-#   my $ret->{messagetype} ='red';
-#   my $vcodedata = $self->{db}->dbquerysorted("select id,vcode,username from users where vcode='".$data->{vcode}."';");
-#   if (keys(%{$vcodedata}) == 0){
-#     $ret->{message} = "Benotzer onbekannt oder Code falsch!";
-#     $ret->{page} = "validationcode.tt";
-#   }
-#   my $newpwd = $self->randomstring(12);
-#   my $pwd = sha256_hex($newpwd);
-#   my $maildata->{password} = $newpwd;
-#   my $eml = sendemail->new();
-#   my $newuserid = $self->{db}->dbquerysorted("UPDATE users set userpassword='".$pwd."',vcode=null,regcode=null where id=".$vcodedata->{0}->{id}." returning id,username;");
-#   my $mret = $eml->sendemail('user_registration',$vcodedata->{0}->{id},$vcodedata->{0}->{username},$maildata,undef);
-#   if ($mret == 0){
-#     $ret->{message} = "Merci,
Mir hun dir elo eng E-Mail gescheckt, matt all deenen nÃ©idegen DonnÃ©een fir dech anzeloggen!
Bei Problemer wend dech w.e.g. via E-Mail un webmaster\@fld.lu";
-#     $ret->{messagetype} = "green";
-#     $ret->{page} = "message.tt";
-#   } else {
-#     $ret->{message} = "Aus iergend engem Grond konnten mir dir keng E-Mail un '".$newuserid->{0}->{username}."' schecken! Falls dess E-Mail-Address net existÃ©iert, versich et nach eng KÃ©ier matt enger E-Mail-Address, dÃ©i existÃ©iert!
Bei Problemer wend dech w.e.g. via E-Mail un webmaster\@fld.lu";
-#     $ret->{page} = "message.tt";
-#   }
-#   return $ret;
-# }
-
-sub getsession($){
-  my $self = shift;
-  my $sid = shift;
-  my $sql ="select se.id,us.username,se.id_users from sessions se join users us on (se.id_users=us.id) where se.id='".$self->{db}->securetext($sid)."'";
-  my $res= $self->{db}->query($sql);
-  my $ret = undef;
-  if (keys(%{$res}) > 0){
-    return $res;
-  }
-  return $ret;
-}
-
-sub deletesession(){
-	my $self = shift;
-	my $sid = shift;
-	$self->{db}->exec("Delete from sessions where id='".$self->{db}->securetext($sid)."';");
-}
-
-sub randomstring(){
-	my $self = shift;
-  my $num = shift;
-	my @alphanumeric = ('a'..'z', 'A'..'Z', 0..9);
-	my $randstring = join '', map $alphanumeric[rand @alphanumeric], 0..$num;
- 	return $randstring;
-}
-
-
-# sub deleteprofile(){
-#   my $self = shift;
-#   my $data = shift;
-#   my $ret->{message} = "mot de passe ou profile inconnue!";
-#   $ret->{messagetype} = "danger";
-#   if ($data->{id_user} eq ''){
-#     $ret->{sid} = undef;
-#     return $ret;
-#   }
-#   my $pwd = sha256_hex($data->{password});
-#   my $user = $self->{db}->dbquerysorted("select id from users where id= '".$data->{id_user}."' and userpassword = '".$pwd."';");
-#   if (keys(%{$user}) > 0){
-#     $self->admindeleteuser($data->{id_user});
-#     my $ret->{'message'} = "Votre profile a Ã©tÃ© supprimÃ©!";
-#     $ret->{'messagetype'} = "info"; 
-#     $ret->{sid} = undef;
-#   }
-#   return $ret;
-  
-# }
-
-# sub admindeleteuser(){
-#   my $self = shift;
-#   my $id_user = shift;
-#   my @dl = ("DELETE FROM public.useringroups WHERE id_uset=".$id_user.";",
-# "DELETE FROM public.userclients WHERE id_user=".$id_user.";",
-# "DELETE FROM public.appaccess WHERE id_user=".$id_user.";",
-# "DELETE FROM public.modulepreferences WHERE id_user=".$id_user.";",,
-# "DELETE FROM public.sessions WHERE id_user=".$id_user.";",
-# "delete from users where id=".$id_user.";");
-# foreach my $s (@dl){
-#   $self->{db}->dbexec($s);
-# }
-#   return 1;
-# }
-
-1;
\ No newline at end of file
diff --git a/server/server.conf b/server/server.conf
deleted file mode 100644
index a9e9b54..0000000
--- a/server/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-DATAPATH=\\home-backup\mirror\invoicejournal
-PORT=6060
-mode=development
-timeout=300
diff --git a/server/static/css/dkstheme.css b/server/static/css/dkstheme.css
deleted file mode 100644
index 1fa4799..0000000
--- a/server/static/css/dkstheme.css
+++ /dev/null
@@ -1,619 +0,0 @@
-html,body {
-	background-color: #52638e;
-}
-button
-{
-	background-image: none;
-	background-color: rgba(95.6863%,95.6863%,95.6863%,1);
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	border-image-source: none;
-	font-size: 10pt;
-	color: rgba(0%,0%,0%,1);
-	line-height: 1line;
-	text-align: center;
-	-fm-text-vertical-align: center;
-}
-button:hover
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-}
-button:pressed
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-}
-button:focus
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-image-source: none;
-}
-button .inner_border
-{
-	padding-top: 0pt;
-	padding-right: 0pt;
-	padding-bottom: 0pt;
-	padding-left: 0pt;
-}
-button .text
-{
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-}
-button .icon
-{
-	-fm-icon-color: rgba(0%,0%,0%,1);
-	-fm-icon-padding: 0.33em;
-}
-button:hover .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-button:pressed .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-button:focus .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-
-body
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-	-fm-body-alt-background: true;
-	-fm-use-body-current-row-style: true;
-}
-body:checked
-{
-	background-image: none;
-	background-color: rgba(57.2549%,61.9608%,75.2941%,1);
-	border-image-source: none;
-}
-
-
-
-header
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-}
-
- input
-{
-	background-image: none;
-	background-color: rgba(100%,100%,100%,1);
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	border-image-source: none;
-	font-family: -fm-font-family(Arial,ArialMT); 
-	font-weight: normal;
-	font-size: 11pt;
-	color: rgba(0%,0%,0%,1);
-	line-height: 1line;
-	text-align: left;
-}
-input:focus
-{
-	border-top-color: rgba(0%,43.9216%,81.1765%,1);
-	border-right-color: rgba(0%,43.9216%,81.1765%,1);
-	border-bottom-color: rgba(0%,43.9216%,81.1765%,1);
-	border-left-color: rgba(0%,43.9216%,81.1765%,1);
-}
-::-webkit-input-placeholder
-{
-	color: rgba(60.3922%,60.3922%,60.3922%,1);
-}
-
-
-textarea
-{
-	background-color: rgba(100%,100%,100%,1);
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	font-size: 11pt;
-	color: rgba(0%,0%,0%,1);
-	line-height: 1line;
-	text-align: left;
-	/* margin-top: 0.88em;
-	margin-right: 0.75em;
-	margin-bottom: 0.63em;
-	margin-left: 0.75em;
-	top: 0pt;
-	right: 30pt;
-	bottom: 0pt;
-	left: 0pt;
-	position: absolute;
-	box-sizing: border-box; */
-}
-textarea:focus
-{
-	border-top-color: rgba(0%,43.9216%,81.1765%,1);
-	border-right-color: rgba(0%,43.9216%,81.1765%,1);
-	border-bottom-color: rgba(0%,43.9216%,81.1765%,1);
-	border-left-color: rgba(0%,43.9216%,81.1765%,1);
-}
-textarea:placeholder
-{
-	color: rgba(80%,80%,80%,1);
-}
-/* textarea .text
-{
-	
-} */
-textarea .scrollbar_track
-{
-	width: 30pt;
-	top: 0pt;
-	right: 0pt;
-	bottom: 0pt;
-	position: absolute;
-	box-sizing: border-box;
-}
-
-
-footer
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-}
-
-
-
-title_header
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-}
-
-
-bottom_nav_div
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-}
-
-top_nav_div
-{
-	background-color: rgba(100%,100%,100%,1);
-	box-sizing: border-box;
-}
-
-div.group_container
-{
-	background-color: #e3e3e3;
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-  border-left-width: 1pt;
-  padding-top: 4px;
-  padding-bottom: 8px;
-}
-
-/* Custom Styles */
-.ListView_Default
-{
-	background-image: none;
-	background-color: rgba(0%,0%,0%,0);
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	border-image-source: none;
-	color: rgba(0%,0%,0%,1);
-	text-align: left;
-	margin-top: 2pt;
-	margin-right: 2pt;
-	margin-bottom: 2pt;
-	margin-left: 2pt;
-}
-
-
-button.btnNavigation 
-{
-	background-image: none;
-	background-color: rgba(0%,0%,0%,0);
-	border-image-source: none;
-	font-family: -fm-font-family(Arial,Arial-BoldMT);
-	font-weight: bold;
-	font-size: 10pt;
-	color: rgba(100%,100%,100%,1);
-	padding-top: 0pt;
-	padding-right: 0pt;
-	padding-bottom: 0pt;
-	padding-left: 0pt;
-}
-/* button.btnNavigation .inner_border
-{
-	
-} */
-button.btnNavigation .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-
-drop_down.DropDown_Filter
-{
-	background-image: none;
-	background-color: rgba(30.1961%,30.1961%,30.1961%,1);
-	border-image-source: none;
-	color: rgba(100%,100%,100%,1);
-	-fm-text-vertical-align: center;
-}
-drop_down.DropDown_Filter:focus
-{
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-}
-drop_down.DropDown_Filter .text
-{
-	margin-top: 2pt;
-	margin-right: 2pt;
-	margin-bottom: 2pt;
-	margin-left: 2pt;
-}
-drop_down.DropDown_Filter .icon
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-drop_down.DropDown_Filter:pressed .icon
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-}
-drop_down.DropDown_Filter:focus .icon
-{
-	border-left-color: rgba(80%,80%,80%,1);
-}
-drop_down.DropDown_Filter:focus .repeat_border
-{
-	border-bottom-color: rgba(80%,80%,80%,1);
-}
-
-div.PageListHeader
-{
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	color: rgba(100%,100%,100%,1);
-	-fm-text-vertical-align: center;
-}
-div.PageListHeader .inner_border
-{
-	padding-top: 5pt;
-	padding-right: 5pt;
-	padding-bottom: 5pt;
-	padding-left: 5pt;
-}
-
-.TopNavigation
-{
-	background-color: rgba(16.0784%,19.2157%,27.451%,1);
-}
-
-div.BodySectionHeader
-{
-	font-family: -fm-font-family(Arial,Arial-BoldMT);
-	font-weight: bold;
-}
-
-button.Button_ImgPlacer
-{
-	background-image: none;
-	background-color: rgba(0%,0%,0%,0);
-	border-top-style: none;
-	border-right-style: none;
-	border-bottom-style: none;
-	border-left-style: none;
-	border-image-source: none;
-	font-family: -fm-font-family(Arial,Arial-BoldMT);
-	font-weight: bold;
-	font-size: 10pt;
-	color: rgba(100%,100%,100%,1);
-}
-button.Button_ImgPlacer .inner_border
-{
-	padding-top: 0pt;
-	padding-right: 0pt;
-	padding-bottom: 0pt;
-	padding-left: 0pt;
-}
-button.Button_ImgPlacer .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-
-div.PageHeadTitle
-{
-	font-size: 18pt;
-	color: rgba(100%,100%,100%,1);
-}
-
-div.ListView_SectionHeader
-{
-	background-image: none;
-	background-color: rgba(22.3529%,26.6667%,38.4314%,1);
-	border-image-source: none;
-}
-
-button.Button_Navigation
-{
-  border: 0.5px solid #c6c6c6;
-	background-image: none;
-	background-color: rgba(0%,0%,0%,0);
-	border-image-source: none;
-	color: rgba(100%,100%,100%,1);
-}
-button.Button_Navigation:hover
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-}
-button.Button_Navigation:pressed
-{
-	background-image: none;
-	background-color: rgba(20.3922%,20.3922%,20.3922%,1);
-	border-image-source: none;
-}
-button.Button_Navigation:focus
-{
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-}
-button.Button_Navigation .icon
-{
-	-fm-icon-color: rgba(100%,100%,100%,1);
-}
-
-
-div.ListView_Header
-{
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	font-weight: normal;
-	color: rgba(100%,100%,100%,1);
-	-fm-text-vertical-align: center;
-}
-div.ListView_Header .inner_border
-{
-	padding-top: 2pt;
-	padding-right: 2pt;
-	padding-bottom: 2pt;
-	padding-left: 2pt;
-}
-
-div.DKS
-{
-	background-image: none;
-	background-color: rgba(32.1569%,38.8235%,55.6863%,1);
-	border-image-source: none;
-}
-
-div.FooterLabel
-{
-	color: rgba(100%,100%,100%,1);
-}
-
-button.Buttom_BodyNav:hover
-{
-	background-image: none;
-	background-color: rgb(141, 141, 141);
-	border-image-source: none;
-	/* color: rgba(100%,100%,100%,1); */
-}
-
-
-div.portalpanel {
-	display: -webkit-box;
-	width: 100%;
-}
-
-.portal{
-	width: 100%; 
-	table-layout: fixed;
-	border-collapse: collapse;
-}
-
-.portal tbody{
-display:block;
-width: 100%;
-overflow-y: scroll;
- 
-}
-
-.portal thead tr,.portal tfoot tr {
- display: block;
- width: 100%;
- 
-}
-
-.portal thead,.portal tfoot {
-background: #384462;
-color:#fff;
-}
-
-.portal th, .portal td {
-padding: 5px;
-text-align: left;
-width: 100%;
- border: 1px solid #c6c6c6;
-
-}
-
-.portal tbody tr:nth-child(even) { 
-	background-color: rgb(247, 247, 247);
-}
-
-.portal tbody tr:hover{
-	background-color: #959fb9;
-}
-
-.portal_selected {
-	background-color: #acacac!important;
-}
-
-
-
-
-::-webkit-scrollbar {
--webkit-appearance: none;
-width: 10px;
-}
-
-::-webkit-scrollbar-track {
-	background-color:  rgba(80%, 80%, 80%, .5);
-}
-
-::-webkit-scrollbar-thumb {
-border-radius: 0px;
-background-color: rgba(0, 0, 0, .5);
--webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);
-}	
-
-div.portaltextheader {
-	padding: 2px;
-	border: 1px solid white;
-}
-
-
-select
-{
-	background-image: none;
-	background-color: rgba(100%,100%,100%,1);
-	border-top-color: rgba(80%,80%,80%,1);
-	border-right-color: rgba(80%,80%,80%,1);
-	border-bottom-color: rgba(80%,80%,80%,1);
-	border-left-color: rgba(80%,80%,80%,1);
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-width: 1pt;
-	border-right-width: 1pt;
-	border-bottom-width: 1pt;
-	border-left-width: 1pt;
-	border-image-source: none;
-	font-family: -fm-font-family(Arial,ArialMT); 
-	font-weight: normal;
-	font-size: 11pt;
-	color: rgba(0%,0%,0%,1);
-	line-height: 1line;
-	text-align: left;
-}
-select:focus
-{
-	border-top-color: rgba(0%,43.9216%,81.1765%,1);
-	border-right-color: rgba(0%,43.9216%,81.1765%,1);
-	border-bottom-color: rgba(0%,43.9216%,81.1765%,1);
-	border-left-color: rgba(0%,43.9216%,81.1765%,1);
-}
-::-webkit-select-placeholder
-{
-	color: rgba(60.3922%,60.3922%,60.3922%,1);
-}
-
-div.DataFooter{
-	background: #384462;
-}
-.w3-input-sum{padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D; }  
-
-.w3-currency-sum {padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D;}
-
-.w3-currency-sum,.w3-currency-sum:read-only {
-  display: block;
-  color: #fff;
-  padding: 2px;
-  padding-right: 12px;
-  width: 100%;
-  max-width: 100%; 
-  box-sizing: border-box;
-  margin: 0;
-  border: 1px solid #ccc;
-  border-radius: 0px;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: #4D4D4D;
-  background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22225%22%20height=%22300%22%3E%3Cpath%20fill=%22white%22%20stroke=%22none%22%20d=%22m%20224.99996,16.22698%20-8.11342,36.41161%20q%20-24.14255,-19.78892%20-54.61741,-19.78892%20-41.3588,0%20-65.00658,23.74671%20-23.647774,23.7467%20-28.397115,53.23215%20l%20134.960355,0%20-5.14505,26.71508%20-132.981532,0%20-0.395848,7.71771%200.395848,18.20566%20127.242642,0%20-5.14505,26.71508%20-117.941954,0%20q%207.519719,40.17154%2032.552754,59.06997%2025.03303,18.89844%2056.49745,18.89844%2037.20302,0%2057.98149,-19.59107%20l%200,40.9631%20Q%20192.34828,300%20162.26913,300%2053.034301,300%2030.474864,189.18206%20l%20-30.474864,0%205.738751,-26.71508%2020.580475,0%20q%20-0.395708,-4.74934%20-0.395708,-17.80995%20l%200,-8.11342%20-25.923518,0%205.738751,-26.71508%2023.152999,0%20Q%2039.181988,55.21112%2076.583149,27.60556%20113.98417,0%20163.06069,0%20199.868,0%20224.99996,16.22698%20z%22%20/%3E%3C/svg%3E');
-  background-repeat: no-repeat, repeat;
-  background-position: right 2px top 50%, 0 0;
-  background-size: 9px auto, 100%;
-}
-
-
diff --git a/server/static/css/w3pro.css b/server/static/css/w3pro.css
deleted file mode 100644
index 65812f2..0000000
--- a/server/static/css/w3pro.css
+++ /dev/null
@@ -1,452 +0,0 @@
-/* W3PRO.CSS 4.13 June 2019 by Jan Egil and Borge Refsnes */
-html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
-/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
-html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
-html,body {-webkit-user-select: none;-ms-user-select: none;user-select: none;-moz-user-select:none;}
-article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item}
-audio,canvas,progress,video{display:inline-block}progress{vertical-align:baseline}
-audio:not([controls]){display:none;height:0}[hidden],template{display:none}
-a{background-color:transparent}a:active,a:hover{outline-width:0}
-abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}
-b,strong{font-weight:bolder}dfn{font-style:italic}mark{background:#ff0;color:#000}
-small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-sub{bottom:-0.25em}sup{top:-0.5em}figure{margin:1em 40px}img{border-style:none}
-code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}hr{box-sizing:content-box;height:0;overflow:visible}
-button,input,select,textarea,optgroup{font:inherit;margin:0}optgroup{font-weight:bold}
-button,input{overflow:visible}button,select{text-transform:none}
-button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}
-button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}
-button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}
-fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
-legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}
-[type=checkbox],[type=radio]{padding:0}
-[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
-[type=search]{-webkit-appearance:textfield;outline-offset:-2px}
-[type=search]::-webkit-search-decoration{-webkit-appearance:none}
-::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
-/* End extract */
-html,body{font-family:Verdana,sans-serif;font-size:9pt;line-height:1.5}html{overflow-x:hidden}
-h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}.w3-serif{font-family:serif}
-h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin: 0}.w3-wide{letter-spacing:4px}
-hr{border:0;border-top:1px solid #eee;margin:20px 0}
-.w3-image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
-.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
-.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
-.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
-.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
-.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
-.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
-.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
-.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
-.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
-.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
-.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
-.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
-.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
-.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
-.w3-input{padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #fff; }/*#e8f0fe*/
-.w3-select{padding:2px 0; display:block;width:100%;border:1px solid #ccc;background-color: #fff;}
-.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
-.w3-dropdown-hover:hover .w3-dropdown-content{display:block; }
-.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
-.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
-.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
-.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
-.w3-sidebar{height:100%;width:160px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
-.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
-.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
-.w3-main,#main{transition:margin-left .4s}
-.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
-.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
-.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
-.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
-.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
-.w3-bar .w3-button{white-space:normal}
-.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
-.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
-.w3-responsive{display:block;overflow-x:auto}
-.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
-.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
-.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter,.w3-fifth,.w3-twofifth,.w3-threefifth,.w3-fourfifth{float:left;width:100%}
-.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
-.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
-.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
-@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}.w3-fifth{width:20%;min-width:100px}
-.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
-.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}.w3-twofifth{width:40%}.w3-threefifth{width:60%}.w3-fourfifth{width:80%}}
-@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
-.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
-.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
-.w3-rest{overflow:hidden}.w3-stretch{margin-left:-16px;margin-right:-16px}
-.w3-content,.w3-auto{margin-left:auto;margin-right:auto}.w3-content{max-width:980px}.w3-auto{max-width:1140px}
-.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
-.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
-.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
-@media (max-width:1205px){.w3-auto{max-width:95%}}
-@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
-.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
-.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
-.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
-@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
-@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
-@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
-@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}.w3-auto{max-width:100%}}
-.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
-.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
-.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
-.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
-.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
-.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
-.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
-.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
-.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
-.w3-display-position{position:absolute}
-.w3-circle{border-radius:50%}
-.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
-.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
-.w3-container,.w3-panel{padding:0.01em 8px}.w3-panel{margin-top:8px;margin-bottom:8px}
-.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
-.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
-.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
-.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16)}
-.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
-.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
-.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
-.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
-.w3-animate-top{position:relative;animation:animatetop 1s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
-.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
-.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
-.w3-animate-bottom{position:relative;animation:animatebottom 1s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
-.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
-.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
-.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
-.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
-.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
-.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
-.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
-.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
-.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
-.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
-.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
-.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
-.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
-.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
-.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
-.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
-.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
-.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
-.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px!important}.w3-padding-large{padding:12px 24px!important}
-.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
-.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
-.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
-.w3-left{float:left!important}.w3-right{float:right!important}
-.w3-button:hover{color:#000!important;background-color:#ccc!important}
-.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
-.w3-hover-none:hover{box-shadow:none!important}
-/* DEFAULT COLORS */
-.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
-.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
-.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
-.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
-.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
-.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
-.w3-blue-grey,.w3-hover-blue-grey:hover{color:#fff!important;background-color:#607d8b!important}
-.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
-.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
-.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
-.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
-.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
-.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
-.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
-.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
-.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
-.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
-.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
-.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
-.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
-.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
-.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
-.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
-.w3-grey,.w3-hover-grey:hover{color:#000!important;background-color:#9e9e9e!important}
-.w3-light-grey,.w3-hover-light-grey:hover{color:#000!important;background-color:#f1f1f1!important}
-.w3-dark-grey,.w3-hover-dark-grey:hover{color:#fff!important;background-color:#616161!important}
-.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffe7e7!important}.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#e7ffe7!important}
-.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffd7!important}.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#e7ffff!important}
-.w3-text-align-right { text-align: right;}
-.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
-.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
-.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
-.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
-.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
-.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
-.w3-text-blue-grey,.w3-hover-text-blue-grey:hover{color:#607d8b!important}
-.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
-.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
-.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
-.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
-.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
-.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
-.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
-.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
-.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
-.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
-.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
-.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
-.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
-.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
-.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
-.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
-.w3-text-grey,.w3-hover-text-grey:hover{color:#757575!important}
-.w3-text-light-grey,.w3-hover-text-light-grey:hover{color:#f1f1f1!important}
-.w3-text-dark-grey,.w3-hover-text-dark-grey:hover{color:#3a3a3a!important}
-.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
-.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
-.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
-.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
-.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
-.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
-.w3-border-blue-grey,.w3-hover-blue-grey:hover{border-color:#607d8b!important}
-.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
-.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
-.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
-.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
-.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
-.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
-.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
-.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
-.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
-.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
-.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
-.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
-.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
-.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
-.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
-.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
-.w3-border-grey,.w3-hover-border-grey:hover{border-color:#9e9e9e!important}
-.w3-border-light-grey,.w3-hover-border-light-grey:hover{border-color:#f1f1f1!important}
-.w3-border-dark-grey,.w3-hover-border-dark-grey:hover{border-color:#616161!important}
-.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
-.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffd7!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}
-/* DEFAULT THEME */
-.w3-theme-l5 {color:#000 !important; background-color:#f6f8fc !important}
-.w3-theme-l4 {color:#000 !important; background-color:#e1e9f6 !important}
-.w3-theme-l3 {color:#000 !important; background-color:#c3d3ed !important}
-.w3-theme-l2 {color:#000 !important; background-color:#a5bee4 !important}
-.w3-theme-l1 {color:#fff !important; background-color:#88a8db !important}
-.w3-theme-d1 {color:#fff !important; background-color:#5180cb !important}
-.w3-theme-d2 {color:#fff !important; background-color:#3a6fc3 !important}
-.w3-theme-d3 {color:#fff !important; background-color:#3361aa !important}
-.w3-theme-d4 {color:#fff !important; background-color:#2c5392 !important}
-.w3-theme-d5 {color:#fff !important; background-color:#24457a !important}
-
-.w3-theme-light {color:#000 !important; background-color:#f6f8fc !important}
-.w3-theme-dark {color:#fff !important; background-color:#24457a !important}
-.w3-theme-action {color:#fff !important; background-color:#24457a !important}
-
-.w3-theme {color:#fff !important; background-color:#6a92d3 !important}
-.w3-text-theme {color:#6a92d3 !important}
-.w3-border-theme {border-color:#6a92d3 !important}
-
-.w3-hover-theme:hover {color:#fff !important; background-color:#6a92d3 !important}
-.w3-hover-text-theme:hover {color:#6a92d3 !important}
-.w3-hover-border-theme:hover {border-color:#6a92d3 !important}
-
-.w3-label { color: #000; font-size: 8pt;}
-/* #main {margin-left: 210px;} */
-@media (max-width:768px){
-  #sidebar { display: none;}
-  #main { margin-left: 0px;} 
-}
-
-.w3-select {
-  display: block;
-  color: #000;
-  padding: 2px;
-  width: 100%;
-  max-width: 100%; 
-  box-sizing: border-box;
-  margin: 0;
-  border-bottom: 1px solid #aaa;
-  box-shadow: 0 1px 0 1px rgba(0,0,0,.04);
-  border-radius: 0px;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: #fff;
-  background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%3E%3Cpath%20fill%3D%22%23000%22%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8%200-5-1.9-9.2-5.5-12.8z%22%2F%3E%3C%2Fsvg%3E'), 
-    linear-gradient(to bottom, #fff 0%,#fff 100%);
-  background-repeat: no-repeat, repeat;
-  background-position: right .7em top 50%, 0 0;
-  background-size: .65em auto, 100%;
-}
-
-.w3-currency {
-  display: block;
-  color: #000;
-  padding: 2px;
-  padding-right: 12px;
-  width: 100%;
-  max-width: 100%; 
-  box-sizing: border-box;
-  margin: 0;
-  border-bottom: 1px solid #aaa;
-  box-shadow: 0 1px 0 1px rgba(0,0,0,.04);
-  border-radius: 0px;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: #fff;
-  background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22225%22%20height=%22300%22%3E%3Cpath%20stroke=%22none%22%20d=%22m%20224.99996,16.22698%20-8.11342,36.41161%20q%20-24.14255,-19.78892%20-54.61741,-19.78892%20-41.3588,0%20-65.00658,23.74671%20-23.647774,23.7467%20-28.397115,53.23215%20l%20134.960355,0%20-5.14505,26.71508%20-132.981532,0%20-0.395848,7.71771%200.395848,18.20566%20127.242642,0%20-5.14505,26.71508%20-117.941954,0%20q%207.519719,40.17154%2032.552754,59.06997%2025.03303,18.89844%2056.49745,18.89844%2037.20302,0%2057.98149,-19.59107%20l%200,40.9631%20Q%20192.34828,300%20162.26913,300%2053.034301,300%2030.474864,189.18206%20l%20-30.474864,0%205.738751,-26.71508%2020.580475,0%20q%20-0.395708,-4.74934%20-0.395708,-17.80995%20l%200,-8.11342%20-25.923518,0%205.738751,-26.71508%2023.152999,0%20Q%2039.181988,55.21112%2076.583149,27.60556%20113.98417,0%20163.06069,0%20199.868,0%20224.99996,16.22698%20z%22%20/%3E%0A%3C/svg%3E'), 
-    linear-gradient(to bottom, #fff 0%,#fff 100%);
-  background-repeat: no-repeat, repeat;
-  background-position: right 2px top 50%, 0 0;
-  background-size: 9px auto, 100%;
-}
-
-.w3-currency:read-only {
-  background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22225%22%20height=%22300%22%3E%3Cpath%20stroke=%22none%22%20d=%22m%20224.99996,16.22698%20-8.11342,36.41161%20q%20-24.14255,-19.78892%20-54.61741,-19.78892%20-41.3588,0%20-65.00658,23.74671%20-23.647774,23.7467%20-28.397115,53.23215%20l%20134.960355,0%20-5.14505,26.71508%20-132.981532,0%20-0.395848,7.71771%200.395848,18.20566%20127.242642,0%20-5.14505,26.71508%20-117.941954,0%20q%207.519719,40.17154%2032.552754,59.06997%2025.03303,18.89844%2056.49745,18.89844%2037.20302,0%2057.98149,-19.59107%20l%200,40.9631%20Q%20192.34828,300%20162.26913,300%2053.034301,300%2030.474864,189.18206%20l%20-30.474864,0%205.738751,-26.71508%2020.580475,0%20q%20-0.395708,-4.74934%20-0.395708,-17.80995%20l%200,-8.11342%20-25.923518,0%205.738751,-26.71508%2023.152999,0%20Q%2039.181988,55.21112%2076.583149,27.60556%20113.98417,0%20163.06069,0%20199.868,0%20224.99996,16.22698%20z%22%20/%3E%0A%3C/svg%3E'), 
-    linear-gradient(to bottom, #d3d3d3 0%,#d3d3d3 100%);
-}
-
-.w3-percent {
-  display: block;
-  color: #000;
-  padding: 2px;
-  padding-right: 12px;
-  width: 100%;
-  max-width: 100%; 
-  box-sizing: border-box;
-  margin: 0;
-  border-bottom: 1px solid #aaa;
-  box-shadow: 0 1px 0 1px rgba(0,0,0,.04);
-  border-radius: 0px;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: #fff;
-  background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22256%22%20height=%22232%22%20version=%221.0%22%3E%3Cg%20transform=%22translate(-112.3674,-128.3649)%22%3E%3Cpath%20style=%22fill:black;fill-opacity:1;stroke:none%22%20d=%22M%20317.1674,257.53698%20C%20308.53463,257.53708%20301.73774,261.20839%20296.77671,268.55094%20C%20291.91449,275.89365%20289.48349,286.1138%20289.48368,299.2114%20C%20289.48349,312.11067%20291.91449,322.2812%20296.77671,329.72303%20C%20301.73774,337.06568%20308.53463,340.737%20317.1674,340.73698%20C%20325.60128,340.737%20332.24934,337.06568%20337.11159,329.72303%20C%20342.07258,322.2812%20344.5532,312.11067%20344.55345,299.2114%20C%20344.5532,286.21302%20342.07258,276.04249%20337.11159,268.69977%20C%20332.24934,261.25801%20325.60128,257.53708%20317.1674,257.53698%20M%20317.1674,238.63466%20C%20332.84469,238.63477%20345.29739,244.09213%20354.52554,255.00675%20C%20363.75318,265.92157%20368.36713,280.65644%20368.3674,299.2114%20C%20368.36713,317.76648%20363.70357,332.50135%20354.37671,343.41605%20C%20345.14855,354.23156%20332.74546,359.6393%20317.1674,359.63931%20C%20301.29123,359.6393%20288.7393,354.23156%20279.51159,343.41605%20C%20270.28351,332.50135%20265.66956,317.76648%20265.66973,299.2114%20C%20265.66956,280.55721%20270.28351,265.82234%20279.51159,255.00675%20C%20288.83853,244.09213%20301.39045,238.63477%20317.1674,238.63466%20M%20163.5674,147.9928%20C%20155.03401,147.993%20148.28673,151.71393%20143.32554,159.15559%20C%20138.46349,166.49841%20136.03248,176.61933%20136.03252,189.51838%20C%20136.03248,202.61621%20138.46349,212.83635%20143.32554,220.17884%20C%20148.18751,227.52161%20154.93479,231.19292%20163.5674,231.1928%20C%20172.19989,231.19292%20178.94717,227.52161%20183.80926,220.17884%20C%20188.77041,212.83635%20191.25103,202.61621%20191.25113,189.51838%20C%20191.25103,176.71856%20188.77041,166.59764%20183.80926,159.15559%20C%20178.84794,151.71393%20172.10066,147.993%20163.5674,147.9928%20M%20297.9674,129.09047%20L%20321.78136,129.09047%20L%20182.7674,359.63931%20L%20158.95345,359.63931%20L%20297.9674,129.09047%20M%20163.5674,129.09047%20C%20179.24484,129.0907%20191.74715,134.54806%20201.07438,145.46256%20C%20210.4014,156.27827%20215.06496,170.96352%20215.06508,189.51838%20C%20215.06496,208.27201%20210.4014,223.05649%20201.07438,233.87187%20C%20191.84638,244.68748%20179.34406,250.09523%20163.5674,250.09512%20C%20147.79061,250.09523%20135.28829,244.68748%20126.06043,233.87187%20C%20116.93172,222.95727%20112.36739,208.17279%20112.3674,189.51838%20C%20112.36739,171.06275%20116.98134,156.37749%20126.20926,145.46256%20C%20135.43713,134.54806%20147.88983,129.0907%20163.5674,129.09047%22%20/%3E%3C/g%3E%3C/svg%3E'), 
-    linear-gradient(to bottom, #fff 0%,#fff 100%);
-  background-repeat: no-repeat, repeat;
-  background-position: right 2px top 50%, 0 0;
-  background-size: 9px auto, 100%;
-}
-
-.w3-select::-ms-expand {
-  display: none;
-}
-.w3-select:hover {
-  border-color: #888;
-}
-.w3-select:focus {
-  border-color: #aaa;
-  box-shadow: 0 0 1px 1px #fff;
-  box-shadow: 0 0 0 1px -moz-mac-focusring;
-  color: #222; 
-  outline: none;
-}
-
-
-.w3-select option {
-  font-weight:normal;
-}
-
-.w3-table {
-  table-layout: fixed;
-}
-
-.w3-text-line-through { text-decoration: line-through; }
-
-#snackbar {
-  visibility: hidden;
-  min-width: 250px;
-  margin-left: -125px;
-  background-color: #333;
-  color: #fff;
-  text-align: center;
-  
-  padding: 16px;
-  position: fixed;
-  z-index: 1;
-  left: 50%;
-  bottom: 30px;
-  font-size: 17px;
-}
-
-#snackbar.show {
-  visibility: visible;
-  -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
-  animation: fadein 0.5s, fadeout 0.5s 2.5s;
-}
-
-@-webkit-keyframes fadein {
-  from {bottom: 0; opacity: 0;} 
-  to {bottom: 30px; opacity: 1;}
-}
-
-@keyframes fadein {
-  from {bottom: 0; opacity: 0;}
-  to {bottom: 30px; opacity: 1;}
-}
-
-@-webkit-keyframes fadeout {
-  from {bottom: 30px; opacity: 1;} 
-  to {bottom: 0; opacity: 0;}
-}
-
-@keyframes fadeout {
-  from {bottom: 30px; opacity: 1;}
-  to {bottom: 0; opacity: 0;}
-}
-
-.tabulator-header-filter > input {
-  background-color: #fff;
-  border: 1px solid #ccc;
-  font-weight: normal;
-}
-
-.readonly {
-  pointer-events:none;
-  color: #000!important;
-  background-color: #d3d3d3!important;
-}
-
-input[readonly=true]{
-  color: #000!important;
-  background-color: #d3d3d3!important;
-}
-
-.right-side-bg {
-  background: url("../img/bg1.jpg");
-  background-size: cover;
-  min-height: 100vh;
-}
-
-input[type=number]::-webkit-inner-spin-button, 
-input[type=number]::-webkit-outer-spin-button { 
-  -webkit-appearance: none; 
-  margin: 0; 
-}
-
-input[type=date]::-webkit-inner-spin-button, 
-input[type=date]::-webkit-outer-spin-button { 
-  -webkit-appearance: none; 
-  margin: 0; 
-}
-input[type=date]::-webkit-clear-button{
-  -webkit-appearance: none; 
-  margin: 0;
-}
-
-
-/* .mceContentBody { 
-  background: #fff;
-  color:#000;
-} */
-
-/* .tabulator-row-even {
-  background-color: #757575;
-} */
-
diff --git a/server/static/img/Euro.svg b/server/static/img/Euro.svg
deleted file mode 100644
index 80d3d88..0000000
--- a/server/static/img/Euro.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/server/static/img/calendar.svg b/server/static/img/calendar.svg
deleted file mode 100644
index 2e7a8a2..0000000
--- a/server/static/img/calendar.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/down.svg b/server/static/img/down.svg
deleted file mode 100644
index f52b416..0000000
--- a/server/static/img/down.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/server/static/img/favicon.png b/server/static/img/favicon.png
deleted file mode 100644
index 96d07ae..0000000
Binary files a/server/static/img/favicon.png and /dev/null differ
diff --git a/server/static/img/icons/Add.svg b/server/static/img/icons/Add.svg
deleted file mode 100644
index 07beeaa..0000000
--- a/server/static/img/icons/Add.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Add_white.svg b/server/static/img/icons/Add_white.svg
deleted file mode 100644
index 7817c97..0000000
--- a/server/static/img/icons/Add_white.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Apps.svg b/server/static/img/icons/Apps.svg
deleted file mode 100644
index cc7d380..0000000
--- a/server/static/img/icons/Apps.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Apps_white.svg b/server/static/img/icons/Apps_white.svg
deleted file mode 100644
index 4b59f17..0000000
--- a/server/static/img/icons/Apps_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Backup.svg b/server/static/img/icons/Backup.svg
deleted file mode 100644
index e6820d2..0000000
--- a/server/static/img/icons/Backup.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Banking_Transaction.svg b/server/static/img/icons/Banking_Transaction.svg
deleted file mode 100644
index adf7240..0000000
--- a/server/static/img/icons/Banking_Transaction.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Banking_Transaction_white.svg b/server/static/img/icons/Banking_Transaction_white.svg
deleted file mode 100644
index e59f26f..0000000
--- a/server/static/img/icons/Banking_Transaction_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Bill.svg b/server/static/img/icons/Bill.svg
deleted file mode 100644
index b891cd2..0000000
--- a/server/static/img/icons/Bill.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Bill_white.svg b/server/static/img/icons/Bill_white.svg
deleted file mode 100644
index 8eab311..0000000
--- a/server/static/img/icons/Bill_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Bookings.svg b/server/static/img/icons/Bookings.svg
deleted file mode 100644
index 72cfb51..0000000
--- a/server/static/img/icons/Bookings.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Bookings_white.svg b/server/static/img/icons/Bookings_white.svg
deleted file mode 100644
index f2e0838..0000000
--- a/server/static/img/icons/Bookings_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Box.svg b/server/static/img/icons/Box.svg
deleted file mode 100644
index cb8fe66..0000000
--- a/server/static/img/icons/Box.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Box_white.svg b/server/static/img/icons/Box_white.svg
deleted file mode 100644
index 035f607..0000000
--- a/server/static/img/icons/Box_white.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Close.svg b/server/static/img/icons/Close.svg
deleted file mode 100644
index 7a68825..0000000
--- a/server/static/img/icons/Close.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Close_white.svg b/server/static/img/icons/Close_white.svg
deleted file mode 100644
index d683f7f..0000000
--- a/server/static/img/icons/Close_white.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Contacts.svg b/server/static/img/icons/Contacts.svg
deleted file mode 100644
index f8f1f12..0000000
--- a/server/static/img/icons/Contacts.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Contacts_white.svg b/server/static/img/icons/Contacts_white.svg
deleted file mode 100644
index 06c0c86..0000000
--- a/server/static/img/icons/Contacts_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Data_Add.svg b/server/static/img/icons/Data_Add.svg
deleted file mode 100644
index d791206..0000000
--- a/server/static/img/icons/Data_Add.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Data_Add_white.svg b/server/static/img/icons/Data_Add_white.svg
deleted file mode 100644
index e8b9433..0000000
--- a/server/static/img/icons/Data_Add_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Data_Delete.svg b/server/static/img/icons/Data_Delete.svg
deleted file mode 100644
index bba5aeb..0000000
--- a/server/static/img/icons/Data_Delete.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Data_Delete_white.svg b/server/static/img/icons/Data_Delete_white.svg
deleted file mode 100644
index 11c49be..0000000
--- a/server/static/img/icons/Data_Delete_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Data_Edit.svg b/server/static/img/icons/Data_Edit.svg
deleted file mode 100644
index 418328c..0000000
--- a/server/static/img/icons/Data_Edit.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Data_Edit_white.svg b/server/static/img/icons/Data_Edit_white.svg
deleted file mode 100644
index 97148d3..0000000
--- a/server/static/img/icons/Data_Edit_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Datasets.svg b/server/static/img/icons/Datasets.svg
deleted file mode 100644
index 0722e4f..0000000
--- a/server/static/img/icons/Datasets.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Datasets_white.svg b/server/static/img/icons/Datasets_white.svg
deleted file mode 100644
index 8dc1c07..0000000
--- a/server/static/img/icons/Datasets_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Duplicate.svg b/server/static/img/icons/Duplicate.svg
deleted file mode 100644
index 118e050..0000000
--- a/server/static/img/icons/Duplicate.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/Duplicate_white.svg b/server/static/img/icons/Duplicate_white.svg
deleted file mode 100644
index b57a8e9..0000000
--- a/server/static/img/icons/Duplicate_white.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/Edit.svg b/server/static/img/icons/Edit.svg
deleted file mode 100644
index a78b066..0000000
--- a/server/static/img/icons/Edit.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/Edit_white.svg b/server/static/img/icons/Edit_white.svg
deleted file mode 100644
index dc5dc76..0000000
--- a/server/static/img/icons/Edit_white.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/Email.svg b/server/static/img/icons/Email.svg
deleted file mode 100644
index d7cbfaf..0000000
--- a/server/static/img/icons/Email.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Email_white.svg b/server/static/img/icons/Email_white.svg
deleted file mode 100644
index e25faca..0000000
--- a/server/static/img/icons/Email_white.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Exit.svg b/server/static/img/icons/Exit.svg
deleted file mode 100644
index 422872d..0000000
--- a/server/static/img/icons/Exit.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Exit_white.svg b/server/static/img/icons/Exit_white.svg
deleted file mode 100644
index 9ee1559..0000000
--- a/server/static/img/icons/Exit_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/File.svg b/server/static/img/icons/File.svg
deleted file mode 100644
index 285aa44..0000000
--- a/server/static/img/icons/File.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Filter.svg b/server/static/img/icons/Filter.svg
deleted file mode 100644
index ac61437..0000000
--- a/server/static/img/icons/Filter.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Folder.svg b/server/static/img/icons/Folder.svg
deleted file mode 100644
index 66c9c4a..0000000
--- a/server/static/img/icons/Folder.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Folder_Share.svg b/server/static/img/icons/Folder_Share.svg
deleted file mode 100644
index 5e8323c..0000000
--- a/server/static/img/icons/Folder_Share.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Folder_Share_white.svg b/server/static/img/icons/Folder_Share_white.svg
deleted file mode 100644
index ea1aa96..0000000
--- a/server/static/img/icons/Folder_Share_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Folder_white.svg b/server/static/img/icons/Folder_white.svg
deleted file mode 100644
index bf24904..0000000
--- a/server/static/img/icons/Folder_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/HDD.svg b/server/static/img/icons/HDD.svg
deleted file mode 100644
index ccd157b..0000000
--- a/server/static/img/icons/HDD.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/HDD_white.svg b/server/static/img/icons/HDD_white.svg
deleted file mode 100644
index c5e164f..0000000
--- a/server/static/img/icons/HDD_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Help.svg b/server/static/img/icons/Help.svg
deleted file mode 100644
index 117ab7c..0000000
--- a/server/static/img/icons/Help.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/server/static/img/icons/Help_white.svg b/server/static/img/icons/Help_white.svg
deleted file mode 100644
index 568c558..0000000
--- a/server/static/img/icons/Help_white.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/server/static/img/icons/In_red.svg b/server/static/img/icons/In_red.svg
deleted file mode 100644
index 2719d6e..0000000
--- a/server/static/img/icons/In_red.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Info.svg b/server/static/img/icons/Info.svg
deleted file mode 100644
index d590d93..0000000
--- a/server/static/img/icons/Info.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Info_white.svg b/server/static/img/icons/Info_white.svg
deleted file mode 100644
index a69337f..0000000
--- a/server/static/img/icons/Info_white.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Invoice.svg b/server/static/img/icons/Invoice.svg
deleted file mode 100644
index c476641..0000000
--- a/server/static/img/icons/Invoice.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/server/static/img/icons/Invoice_white.svg b/server/static/img/icons/Invoice_white.svg
deleted file mode 100644
index c476641..0000000
--- a/server/static/img/icons/Invoice_white.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/server/static/img/icons/License.svg b/server/static/img/icons/License.svg
deleted file mode 100644
index 880821c..0000000
--- a/server/static/img/icons/License.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/License_white.svg b/server/static/img/icons/License_white.svg
deleted file mode 100644
index 489c053..0000000
--- a/server/static/img/icons/License_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Location.svg b/server/static/img/icons/Location.svg
deleted file mode 100644
index dc25661..0000000
--- a/server/static/img/icons/Location.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/Next.svg b/server/static/img/icons/Next.svg
deleted file mode 100644
index 62fe46f..0000000
--- a/server/static/img/icons/Next.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/server/static/img/icons/Out_green.svg b/server/static/img/icons/Out_green.svg
deleted file mode 100644
index e03e87a..0000000
--- a/server/static/img/icons/Out_green.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/PDF.svg b/server/static/img/icons/PDF.svg
deleted file mode 100644
index 0017fb1..0000000
--- a/server/static/img/icons/PDF.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/server/static/img/icons/PDF_white.svg b/server/static/img/icons/PDF_white.svg
deleted file mode 100644
index 816c7c2..0000000
--- a/server/static/img/icons/PDF_white.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/server/static/img/icons/Phone.svg b/server/static/img/icons/Phone.svg
deleted file mode 100644
index b6fbe3d..0000000
--- a/server/static/img/icons/Phone.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/Preview.svg b/server/static/img/icons/Preview.svg
deleted file mode 100644
index 3aca80b..0000000
--- a/server/static/img/icons/Preview.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Preview_white.svg b/server/static/img/icons/Preview_white.svg
deleted file mode 100644
index 082713a..0000000
--- a/server/static/img/icons/Preview_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Print.svg b/server/static/img/icons/Print.svg
deleted file mode 100644
index 8b24d23..0000000
--- a/server/static/img/icons/Print.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/Print_white.svg b/server/static/img/icons/Print_white.svg
deleted file mode 100644
index 44366b8..0000000
--- a/server/static/img/icons/Print_white.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/Product.svg b/server/static/img/icons/Product.svg
deleted file mode 100644
index 9cb14f3..0000000
--- a/server/static/img/icons/Product.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Product2.svg b/server/static/img/icons/Product2.svg
deleted file mode 100644
index 01e34ac..0000000
--- a/server/static/img/icons/Product2.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Product2_white.svg b/server/static/img/icons/Product2_white.svg
deleted file mode 100644
index dd64d1d..0000000
--- a/server/static/img/icons/Product2_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Reload.svg b/server/static/img/icons/Reload.svg
deleted file mode 100644
index 35574f7..0000000
--- a/server/static/img/icons/Reload.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Reload_white.svg b/server/static/img/icons/Reload_white.svg
deleted file mode 100644
index 5bf7fa1..0000000
--- a/server/static/img/icons/Reload_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Remove_red.svg b/server/static/img/icons/Remove_red.svg
deleted file mode 100644
index 28467dd..0000000
--- a/server/static/img/icons/Remove_red.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Settings.svg b/server/static/img/icons/Settings.svg
deleted file mode 100644
index 61bc7ca..0000000
--- a/server/static/img/icons/Settings.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Settings_white.svg b/server/static/img/icons/Settings_white.svg
deleted file mode 100644
index b63879b..0000000
--- a/server/static/img/icons/Settings_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Star.svg b/server/static/img/icons/Star.svg
deleted file mode 100644
index 9dcf04b..0000000
--- a/server/static/img/icons/Star.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/Template.svg b/server/static/img/icons/Template.svg
deleted file mode 100644
index 860ab38..0000000
--- a/server/static/img/icons/Template.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/Template_white.svg b/server/static/img/icons/Template_white.svg
deleted file mode 100644
index 0c91a3c..0000000
--- a/server/static/img/icons/Template_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/Trash.svg b/server/static/img/icons/Trash.svg
deleted file mode 100644
index 4e64895..0000000
--- a/server/static/img/icons/Trash.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Trash_red.svg b/server/static/img/icons/Trash_red.svg
deleted file mode 100644
index f60c798..0000000
--- a/server/static/img/icons/Trash_red.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Trash_white.svg b/server/static/img/icons/Trash_white.svg
deleted file mode 100644
index 891b8b4..0000000
--- a/server/static/img/icons/Trash_white.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/Upload.svg b/server/static/img/icons/Upload.svg
deleted file mode 100644
index 7fce2f1..0000000
--- a/server/static/img/icons/Upload.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/User_Group.svg b/server/static/img/icons/User_Group.svg
deleted file mode 100644
index d9a9079..0000000
--- a/server/static/img/icons/User_Group.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/User_Group_white.svg b/server/static/img/icons/User_Group_white.svg
deleted file mode 100644
index 0ab463e..0000000
--- a/server/static/img/icons/User_Group_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/ViewPDF.svg b/server/static/img/icons/ViewPDF.svg
deleted file mode 100644
index 49169f9..0000000
--- a/server/static/img/icons/ViewPDF.svg
+++ /dev/null
@@ -1 +0,0 @@
- 

\ No newline at end of file
diff --git a/server/static/img/icons/ViewPDF_white.svg b/server/static/img/icons/ViewPDF_white.svg
deleted file mode 100644
index b3e047a..0000000
--- a/server/static/img/icons/ViewPDF_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-
\ No newline at end of file
diff --git a/server/static/img/icons/a106_barcode2.svg b/server/static/img/icons/a106_barcode2.svg
deleted file mode 100644
index c6de2d6..0000000
--- a/server/static/img/icons/a106_barcode2.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/server/static/img/icons/a107_time.svg b/server/static/img/icons/a107_time.svg
deleted file mode 100644
index 4ff92d6..0000000
--- a/server/static/img/icons/a107_time.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/a109_date.svg b/server/static/img/icons/a109_date.svg
deleted file mode 100644
index f9647a1..0000000
--- a/server/static/img/icons/a109_date.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/server/static/img/icons/a119_history.svg b/server/static/img/icons/a119_history.svg
deleted file mode 100644
index f53343b..0000000
--- a/server/static/img/icons/a119_history.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/a121_revert.svg b/server/static/img/icons/a121_revert.svg
deleted file mode 100644
index bc237ef..0000000
--- a/server/static/img/icons/a121_revert.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/a123_refresh.svg b/server/static/img/icons/a123_refresh.svg
deleted file mode 100644
index 79aec89..0000000
--- a/server/static/img/icons/a123_refresh.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/a125_sync.svg b/server/static/img/icons/a125_sync.svg
deleted file mode 100644
index 95801eb..0000000
--- a/server/static/img/icons/a125_sync.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a129_badge.svg b/server/static/img/icons/a129_badge.svg
deleted file mode 100644
index ca10602..0000000
--- a/server/static/img/icons/a129_badge.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/server/static/img/icons/a133_cart.svg b/server/static/img/icons/a133_cart.svg
deleted file mode 100644
index edd39e6..0000000
--- a/server/static/img/icons/a133_cart.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a135_home.svg b/server/static/img/icons/a135_home.svg
deleted file mode 100644
index d64625a..0000000
--- a/server/static/img/icons/a135_home.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a141_alert.svg b/server/static/img/icons/a141_alert.svg
deleted file mode 100644
index bf593a1..0000000
--- a/server/static/img/icons/a141_alert.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/server/static/img/icons/a57_sort.svg b/server/static/img/icons/a57_sort.svg
deleted file mode 100644
index 25fa5a2..0000000
--- a/server/static/img/icons/a57_sort.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/a60_filterOutline.svg b/server/static/img/icons/a60_filterOutline.svg
deleted file mode 100644
index 6e48514..0000000
--- a/server/static/img/icons/a60_filterOutline.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/server/static/img/icons/a73_note.svg b/server/static/img/icons/a73_note.svg
deleted file mode 100644
index cd69303..0000000
--- a/server/static/img/icons/a73_note.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a79_records.svg b/server/static/img/icons/a79_records.svg
deleted file mode 100644
index d96012a..0000000
--- a/server/static/img/icons/a79_records.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a7_import.svg b/server/static/img/icons/a7_import.svg
deleted file mode 100644
index 3f5ca6d..0000000
--- a/server/static/img/icons/a7_import.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/a85_labels.svg b/server/static/img/icons/a85_labels.svg
deleted file mode 100644
index 7c0a020..0000000
--- a/server/static/img/icons/a85_labels.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/server/static/img/icons/a89_find.svg b/server/static/img/icons/a89_find.svg
deleted file mode 100644
index 5045cea..0000000
--- a/server/static/img/icons/a89_find.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/server/static/img/icons/a91_image.svg b/server/static/img/icons/a91_image.svg
deleted file mode 100644
index bee8a08..0000000
--- a/server/static/img/icons/a91_image.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/server/static/img/icons/back.svg b/server/static/img/icons/back.svg
deleted file mode 100644
index 51ca6c1..0000000
--- a/server/static/img/icons/back.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/server/static/img/icons/back_white.svg b/server/static/img/icons/back_white.svg
deleted file mode 100644
index f770b9f..0000000
--- a/server/static/img/icons/back_white.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/server/static/img/icons/download.svg b/server/static/img/icons/download.svg
deleted file mode 100644
index 3f5ca6d..0000000
--- a/server/static/img/icons/download.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/download_white.svg b/server/static/img/icons/download_white.svg
deleted file mode 100644
index a7f9734..0000000
--- a/server/static/img/icons/download_white.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/server/static/img/icons/duplicate2.svg b/server/static/img/icons/duplicate2.svg
deleted file mode 100644
index cebaad8..0000000
--- a/server/static/img/icons/duplicate2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/duplicate2_white.svg b/server/static/img/icons/duplicate2_white.svg
deleted file mode 100644
index a643c74..0000000
--- a/server/static/img/icons/duplicate2_white.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/edit2.svg b/server/static/img/icons/edit2.svg
deleted file mode 100644
index c0bb9ac..0000000
--- a/server/static/img/icons/edit2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/edit2_white.svg b/server/static/img/icons/edit2_white.svg
deleted file mode 100644
index bbbe89f..0000000
--- a/server/static/img/icons/edit2_white.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/percent.svg b/server/static/img/icons/percent.svg
deleted file mode 100644
index b87a765..0000000
--- a/server/static/img/icons/percent.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/server/static/img/icons/plus.svg b/server/static/img/icons/plus.svg
deleted file mode 100644
index 08e85b5..0000000
--- a/server/static/img/icons/plus.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/plus_white.svg b/server/static/img/icons/plus_white.svg
deleted file mode 100644
index 22714fe..0000000
--- a/server/static/img/icons/plus_white.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/remove2.svg b/server/static/img/icons/remove2.svg
deleted file mode 100644
index e459477..0000000
--- a/server/static/img/icons/remove2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/remove2_white.svg b/server/static/img/icons/remove2_white.svg
deleted file mode 100644
index 77e856e..0000000
--- a/server/static/img/icons/remove2_white.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/server/static/img/icons/userconfig.svg b/server/static/img/icons/userconfig.svg
deleted file mode 100644
index 8c4cd3d..0000000
--- a/server/static/img/icons/userconfig.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
diff --git a/server/static/img/icons/userconfig_white.svg b/server/static/img/icons/userconfig_white.svg
deleted file mode 100644
index 2cb6e07..0000000
--- a/server/static/img/icons/userconfig_white.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
diff --git a/server/static/img/icons/website.svg b/server/static/img/icons/website.svg
deleted file mode 100644
index 2c3d8fa..0000000
--- a/server/static/img/icons/website.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/server/static/img/icons/website_white.svg b/server/static/img/icons/website_white.svg
deleted file mode 100644
index 2c3d8fa..0000000
--- a/server/static/img/icons/website_white.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/server/static/img/invoicejournal.png b/server/static/img/invoicejournal.png
deleted file mode 100644
index 4191afb..0000000
Binary files a/server/static/img/invoicejournal.png and /dev/null differ
diff --git a/server/static/img/nas.svg b/server/static/img/nas.svg
deleted file mode 100644
index fe20423..0000000
--- a/server/static/img/nas.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
diff --git a/server/static/js/app.js b/server/static/js/app.js
deleted file mode 100644
index 8c335a9..0000000
--- a/server/static/js/app.js
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-var app = {
-    mainapps : ["index"],
-    dataset: null,
-    loadapp: function(app){
-      //console.log(location.protocol + " - " +);
-      location.href = location.origin + '/' + app + '/index.html';
-    },
-    getpage: function(modulepage,data) {
-      var rdata = {"page":modulepage};
-      if (typeof data == 'object') {
-        for (var i in data) {
-            rdata[i] = data[i];
-        }
-      }
-      console.log("index:" + app.mainapps.indexOf(modulepage));
-      if (modulepage.endsWith('index')){
-        document.getElementById("tblapps").style.display = 'none';
-        document.getElementById("tblmain").style.display = 'block';
-      } else {
-        document.getElementById("tblmain").style.display = 'none';
-        document.getElementById("tblapps").style.display = 'block';
-      }
-      console.log("loading module:" + modulepage);
-      req.reqdata("POST","page.cgi",rdata,app.loadpage);
-    },
-    loadpage: function(data){
-      if (table){
-        table.selection = null;
-      }
-      document.getElementById("modulescripts").innerHTML ="";
-      document.getElementById("mainapp").innerHTML = '';
-      app.addmoduledata(data);
-      document.getElementById("mainapp").insertAdjacentHTML('afterbegin',data);
-      var re = '\
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/server/tmpl/lang/de.tt b/server/tmpl/lang/de.tt
deleted file mode 100644
index c3ab4ac..0000000
--- a/server/tmpl/lang/de.tt
+++ /dev/null
@@ -1,86 +0,0 @@
-
-[% lbl = {
-    invoicejournal => "Invoice Jounral",
-    nas => "NAS",
-    back => "zurÃ¼ck",
-    edit => "bearbeiten",
-    remove => "lÃ¶schen",
-    duplicate => "duplizieren",
-    cancel => "Abbrechen",
-    add => "neu",
-    dashboard => "Dashboard"
-    close => "schliessen"
-    settings => "Einstellungen",
-    exit => "Beenden",
-    invoices => "Rechnungen",
-    invoice => "Rechnung",
-    addresses => "Adressen",
-    offers => "Angebote",
-    products => "Preis-Katalog",
-    transactions => "Transaktionen",
-    bookings => "Buchungen",
-    booking => "Buchung",
-    settings => "Einstellungen",
-    reports => "Vorlagen",
-    reload => "neu Laden",
-    product => "Produkt",
-    displayname => "Name / Firma",
-    title => "Titel",
-    prename => "Vorname",
-    surname => "Nachname",
-    import => "importieren",
-    open => "Ã¶ffnen",
-    preview => "Vorschau",
-    print => "drucken",
-    send => "senden",
-    create => "erstellen",
-    apps => "Apps",
-    users => "Benutzer",
-    templates => "Vorlagen",
-    datasets => "DatensÃ¤tze",
-    license => "Lizenz",
-    backups => "Backup",
-    about => "About",
-    help => "Hilfe",
-address => "Adresse",
-zip => "PLZ",
-city => "Ort",
-country => "Land",
-email => "E-mail",
-language => "Sprache",
-days => "Tage",
-website => "Webseite",
-phone => "Telefon",
-clientnumber => "Kundern-Nr.",
-vatid => "USt-Id",
-vat_short = "MwSt.",
-vat_long => "Mehrwertsteuer",
-rcs => "Handelsregister",
-iban => "Kontonummer",
-bic => "BIC",
-ijgroup => "Groupe",
-lang => "Sprache",
-smtpserver => "Mail-Server",
-smtpport => "Port",
-smtplogin => "Login",
-save => "OK",
-smtppassword => "Passwort",
-deadlinedays => "FÃ¤lligkeit (Tage)",
-mailsettings => "Mail-Einstellungen",
-deletedatasettitle => "Datensatz lÃ¶schen?",
-deletedatasetmessage => "Sind Sie sicher dass Sie den ausgewÃ¤hlten Datensatz lÃ¶schen mÃ¶chten?",
-sku => 'SKU',
-name => "Name",
-description => "Beschreibung",
-unit => "Einheit",
-price => "Preis",
-netamount => "Netto",
-grossamount => "Brutto",
-quantity => "Anzahl",
-quantityshort => "Anz.",
-de => 'deutsch',
-fr => 'franÃ§ais',
-en => 'english',
-lb => 'lÃ«tzebuergesch'
-  }
-%]
diff --git a/server/tmpl/toolbars/invoicejournal.tt b/server/tmpl/toolbars/invoicejournal.tt
deleted file mode 100644
index 2c21f90..0000000
--- a/server/tmpl/toolbars/invoicejournal.tt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-       Invoice Journal
-      
-      
-       
-      
-       
-       
-       
-      
-      
-      
-      
-      
-      
-      
-       
-       
\ No newline at end of file
diff --git a/server/tools/win32/libwkhtmltox.a b/server/tools/win32/libwkhtmltox.a
deleted file mode 100644
index 26e08c9..0000000
Binary files a/server/tools/win32/libwkhtmltox.a and /dev/null differ
diff --git a/server/tools/win32/wkhtmltoimage.exe b/server/tools/win32/wkhtmltoimage.exe
deleted file mode 100644
index 946c10d..0000000
Binary files a/server/tools/win32/wkhtmltoimage.exe and /dev/null differ
diff --git a/server/tools/win32/wkhtmltopdf.exe b/server/tools/win32/wkhtmltopdf.exe
deleted file mode 100644
index 2233756..0000000
Binary files a/server/tools/win32/wkhtmltopdf.exe and /dev/null differ
diff --git a/server/tools/win32/wkhtmltox.dll b/server/tools/win32/wkhtmltox.dll
deleted file mode 100644
index ae72905..0000000
Binary files a/server/tools/win32/wkhtmltox.dll and /dev/null differ