\#55: input durch textarea ersetzt, TemplateProcessor erkennt newlines automatisch. Evtl. noch größe der textareas anpassen

ajax.php

@@ -158,7 +158,7 @@ switch($_REQUEST['action']) {
     case 'saveNewDocument':
         header("Status: 200 OK");
 
-        $newDocument = new DocumentHandler($_REQUEST['filename'], $_REQUEST['draft']);
+        $newDocument = new DocumentHandler(Label::getLabelById($_REQUEST['labelId'])->getPath() . '/' . $_REQUEST['filename'], $_REQUEST['draft']);
 
         foreach($_REQUEST['draftVars'] as $key => $draftVar) {
             $newDocument->setVal($key, htmlspecialchars($draftVar));
@@ -166,7 +166,7 @@ switch($_REQUEST['action']) {
 
         $newDocument->saveFile();
 
-        echo json_encode(array("ok"));
+        echo json_encode($_REQUEST);
 
         //pa($_REQUEST);
 

includes/label.inc.php

@@ -2,10 +2,12 @@
 class Label {
     private $id = NULL;
     private $name = '';
+    private $path = '';
 
-    public function __construct($id, $name) {
+    public function __construct($id, $name, $path) {
         $this->id = $id;
         $this->name = $name;
+        $this->path = $path;
     }
 
     public function getId() {
@@ -16,6 +18,10 @@ class Label {
         return $this->name;
     }
 
+    public function getPath() {
+        return $this->path;
+    }
+
    /**
     * Get all Labels
     *
@@ -31,7 +37,7 @@ class Label {
     	$labels = $db->selectQuery("SELECT * FROM `labels`;");
 
     	foreach($labels as $label) {
-    		$return[] = new Label($label->id, $label->name);
+    		$return[] = new Label($label->id, $label->name, $label->path);
     	}
 
     	return $return;
@@ -54,7 +60,7 @@ class Label {
         $labels = $db->selectQuery("SELECT * FROM `labels` WHERE `id` = " . $labelId . ";");
 
         foreach($labels as $label) {
-            $return[] = new Label($label->id, $label->name);
+            $return[] = new Label($label->id, $label->name, $label->path);
         }
 
         if(sizeof($return) > 1) {
@@ -81,7 +87,7 @@ class Label {
         $labels = $db->selectQuery("SELECT * FROM `labels` WHERE `path` = '" . $path . "';");
 
         foreach($labels as $label) {
-            $return[] = new Label($label->id, $label->name);
+            $return[] = new Label($label->id, $label->name, $label->path);
         }
 
         if(sizeof($return) > 1) {

scripts/custom.js

@@ -116,6 +116,7 @@ $(document).ready(function() {
             data = {
                 draft: $("#editbox-input-vorlage").val(),
                 filename: $("#editbox-input-filename").val(),
+                labelId: getUrlGetParameter("labelId"),
                 draftVars: {}
             }
 
@@ -141,7 +142,10 @@ $(document).ready(function() {
             $(".fancybox-inner").append("<div id=\"draft-vars\"></div>")
 
             r.forEach(function(item) {
-                $(".fancybox-inner #draft-vars").append(item + "<input id=\"editbox-draft-vars-" + item + "\" class=\"editbox-draft-vars\" type=\"text\" /><br><br>");
+                //$(".fancybox-inner #draft-vars").append(item + "<input id=\"editbox-draft-vars-" + item + "\" class=\"editbox-draft-vars\" type=\"text\" /><br><br>");
+
+                $(".fancybox-inner #draft-vars").append(item + "<textarea id=\"editbox-draft-vars-" + item + "\" class=\"editbox-draft-vars\"></textarea><br><br><br>");
+
             })
 
             $(".fancybox-inner #draft-vars").append("<a href=\"#\"type=\"button\" id=\"save-new-document\" class=\"btn btn-success\">Dokument speichern</a>");