From c80b2c94b5888b7dbd06958efe96c372ca8e1d51 Mon Sep 17 00:00:00 2001
From: Phie <phie@phie.ovh>
Date: Mon, 8 Oct 2018 16:02:30 +0200
Subject: [PATCH] using more conventionnal ways to get path

---
 templates/index.php    | 7 ++-----
 templates/settings.php | 7 ++-----
 templates/writer.php   | 4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/templates/index.php b/templates/index.php
index 9386b1a..acc52a0 100755
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,10 +1,7 @@
 <?php
 
-$currentpath = substr(get_defined_vars()["file"],0, -strlen("index.php"))."/CarnetElectron/";
-$root = substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']));
-if (strpos(__DIR__, '/snap/') !== false) {
-   $root = "/extra-apps/carnet/templates";
-}
+$currentpath = __DIR__."/CarnetElectron/";
+$root = \OCP\Util::linkToAbsolute("carnet","templates");
 $file = file_get_contents($currentpath."index.html");
 //
 $file = str_replace("href=\"","href=\"".$root."/CarnetElectron/",$file);
diff --git a/templates/settings.php b/templates/settings.php
index 85b53c0..4f24dc3 100755
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,10 +1,7 @@
 <?php
 
-$currentpath = substr(get_defined_vars()["file"],0, -strlen("settings.php"))."/CarnetElectron/";
-$root = substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT']));
-if (strpos(__DIR__, '/snap/') !== false) {
-   $root = "/extra-apps/carnet/templates";
-}
+$currentpath = __DIR__."/CarnetElectron/";
+$root = \OCP\Util::linkToAbsolute("carnet","templates");
 $file = file_get_contents($currentpath."settings/index.html");
 
 //
diff --git a/templates/writer.php b/templates/writer.php
index 6716318..3fb973d 100755
--- a/templates/writer.php
+++ b/templates/writer.php
@@ -1,7 +1,7 @@
 <?php
-$currentpath = getcwd()."/CarnetElectron/";
+$currentpath = getcwd()."/";
 
-$file = file_get_contents($currentpath."reader/reader.html");
+$file = file_get_contents($currentpath."CarnetElectron/reader/reader.html");
 $file = str_replace("<!ROOTPATH>", "CarnetElectron/", $file);
 
 $file = preg_replace_callback('/<script(.*?)src=\"(.*?\.js(?:\?.*?)?)"/s',function ($matches) {