using more conventionnal ways to get path

CarnetApp · Oct 8, 2018 · c80b2c9 · c80b2c9
1 parent 2e246f5
commit c80b2c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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) {