[add] csrf defense and render_array functionality

1 files changed, 5 insertions, 11 deletions

diff --git a/codebase/data_connector.php b/codebase/data_connector.php
index a5419e0..f094fb8 100644
--- a/codebase/data_connector.php
+++ b/codebase/data_connector.php
@@ -102,7 +102,6 @@ class DataConnector extends Connector{
 		if (!$data_type) $data_type="CommonDataProcessor";
 
 		$this->sections = array();
-		$this->attributes = array();
 
 		if (!$render_type) $render_type="RenderStrategy";
 		parent::__construct($res,$type,$item_type,$data_type,$render_type);
@@ -114,11 +113,6 @@ class DataConnector extends Connector{
 		$this->sections[$name] = $string;
 	}
 
-	protected $attributes;
-	public function add_top_attribute($name, $string){
-		$this->attributes[$name] = $string;
-	}
-
 	protected function parse_request_mode(){
 		//do nothing, at least for now
 	}
@@ -150,9 +144,6 @@ class DataConnector extends Connector{
 		if (isset($_GET["start"]) && isset($_GET["count"]))
 			$this->request->set_limit($_GET["start"],$_GET["count"]);
 
-		$key = ConnectorSecurity::checkCSRF($this->editing);
-		if ($key !== "")
-			$this->add_top_attribute("dhx_security", $key);
 	}
 	
 	/*! renders self as  xml, starting part
@@ -167,7 +158,6 @@ class DataConnector extends Connector{
 			$start .= "<".$k.">".$v."</".$k.">\n";
 		return $start;
 	}
-
 };
 
 class JSONDataConnector extends DataConnector{
@@ -232,10 +222,14 @@ class JSONDataConnector extends DataConnector{
 
 
 		$is_sections = sizeof($this->sections) && $this->is_first_call();
-		if ($this->dload || $is_sections){
+		if ($this->dload || $is_sections || sizeof($this->attributes)){
 			$start = $start.$end;
 			$end="";
 
+			$attributes = "";
+			foreach($this->attributes as $k=>$v)
+				$end .= ", ".$k.":\"".$v."\"";
+
 			if ($is_sections){
 				//extra sections
 				foreach($this->sections as $k=>$v)