WebODF: Use ajxpServerAccessPath instead hardcoding index.php

pydio · Apr 21, 2014 · b4f700f · b4f700f
1 parent e147725
commit b4f700f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/src/plugins/editor.webodf/class.WebodfEditor.js b/core/src/plugins/editor.webodf/class.WebodfEditor.js
@@ -54,7 +54,6 @@ Class.create("WebodfEditor", AbstractEditor, {
 		$super(nodeOrNodes);
         this.node = nodeOrNodes;
 		var fileName = nodeOrNodes.getPath();
-        var fileContent = ajxpBootstrap.parameters.get('ajxpServerAccess')+'&get_action=download&file='+fileName;
 
         this.contentMainContainer = this.element.down('#webodf_container');
         this.contentMainContainer.src = 'plugins/editor.webodf/frame.php?token='+Connexion.SECURE_TOKEN+'&file='+fileName;

diff --git a/core/src/plugins/editor.webodf/frame.php b/core/src/plugins/editor.webodf/frame.php
@@ -10,7 +10,7 @@ function init()
         {
             var odfelement = document.getElementById("odf");
             window.odfcanvas = new odf.OdfCanvas(odfelement);
-            window.odfcanvas.load("../../index.php?secure_token=<?php echo $AJXP_SECURE_TOKEN; ?>&get_action=download&file=<?php echo $AJXP_FILE_URL; ?>");
+            window.odfcanvas.load("../../" + window.parent.ajxpServerAccessPath + "&get_action=download&file=<?php echo $AJXP_FILE_URL; ?>");
             //window.odfcanvas.setEditable(true);
             /*
             odfcanvas.odfContainer().save(function(err){