[update] version 3.0

Author: AlexKlimenkov

README.md

@@ -1,4 +1,4 @@
-dhtmlxGantt v.2.1
+dhtmlxGantt v.3.0
 =================
 
 dhtmlxGantt is an open source JavaScript Gantt chart that helps you illustrate a project schedule in a nice-looking chart. It can show the dependencies between tasks as lines and allows you to set up different relationships between tasks (finish-to-start, start-to-start, end-to-end). dhtmlxGantt provides flexible API and a large number of event handles, which gives you the freedom to customize it for your needs. 

bower.json

@@ -1,9 +1,12 @@
 {
   "name": "gantt",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "homepage": "http://dhtmlx.com/docs/products/dhtmlxGantt/",
   "description": "JavaScript event calendar. Allows to manage events and appointments in different views",
-  "main": "codebase/dhtmlxgantt.js",
+  "main": [
+    "codebase/dhtmlxgantt.js",
+    "skins/dhtmlxgantt_terrace.css"
+  ],
   "keywords": [
     "calendar",
     "scheduler",

codebase/connector/base_connector.php

@@ -290,6 +290,7 @@ class Connector {
 
 	public static $filter_var="dhx_filter";
 	public static $sort_var="dhx_sort";
+	public static $kids_var="dhx_kids";
 
 	public $model=false;
 

codebase/connector/crosslink_connector.php

@@ -97,7 +97,7 @@ public function get_only_related($filters){
 	public function afterProcessing($action){
 		$status = $action->get_status();
 
-		$master_key = $action->get_value($this->master_name);	
+		$master_key = $action->get_id();//value($this->master_name);	
 		$link_key = $action->get_value($this->link_name);
 		$link_key = explode(',', $link_key);
 

codebase/connector/data_connector.php

@@ -277,11 +277,16 @@ function to_xml(){
 		for ($i=0; $i<sizeof($this->config->text); $i++){
 			$extra = $this->config->text[$i]["name"];
 			$data[$extra]=$this->data[$extra];
+			if (is_null($data[$extra]))
+			    $data[$extra] = "";
 		}
 
 		if ($this->userdata !== false)
-			foreach ($this->userdata as $key => $value)
+			foreach ($this->userdata as $key => $value){
+				if ($value === null)
+					$data[$key]="";
 				$data[$key]=$value;
+			}
 
 		return $data;
 	}
@@ -346,7 +351,7 @@ function to_xml_start(){
 				$str.=" ".$key."='".$this->xmlentities($value)."'";
 
 		if ($this->kids === true)
-			$str .=" dhx_kids='1'";
+			$str .=" ".Connector::$kids_var."='1'";
 
 		return $str.">";
 	}
@@ -363,6 +368,7 @@ function set_kids($value){
 
 class TreeDataConnector extends DataConnector{
 	protected $parent_name = 'parent';
+	public $rootId = "0";
 
 	/*! constructor
 		
@@ -392,15 +398,18 @@ protected function parse_request(){
 		if (isset($_GET[$this->parent_name]))
 			$this->request->set_relation($_GET[$this->parent_name]);
 		else
-			$this->request->set_relation("0");
+            $this->request->set_relation($this->rootId);
 
 		$this->request->set_limit(0,0); //netralize default reaction on dyn. loading mode
 	}
 
 	/*! renders self as  xml, starting part
 	*/
 	protected function xml_start(){
-		$attributes = " parent='".$this->request->get_relation()."' ";
+		$attributes = " ";
+		if (!$this->rootId || $this->rootId != $this->request->get_relation())
+			$attributes = " parent='".$this->request->get_relation()."' ";
+
 		foreach($this->attributes as $k=>$v)
 			$attributes .= " ".$k."='".$v."'";
 
@@ -423,7 +432,9 @@ protected function output_as_xml($res){
 		if ($this->simple) return $result;
 
 		$data = array();
-		$data["parent"] = $this->request->get_relation();
+		if (!$this->rootId || $this->rootId != $this->request->get_relation())
+			$data["parent"] = $this->request->get_relation();
+
 		$data["data"] = $result;
 
         $this->fill_collections();
@@ -503,7 +514,7 @@ function to_xml_start(){
 				$data[$key]=$value;
 
 		if ($this->kids === true)
-			$data["dhx_kids"] = 1;
+			$data[Connector::$kids_var] = 1;
 
 		return $data;
 	}
@@ -514,4 +525,4 @@ function to_xml_end(){
 }
 
 
-?>
+?>

codebase/connector/dataprocessor.php

@@ -488,11 +488,23 @@ function success($id=false){
 	function to_xml(){
 		$str="<action type='{$this->status}' sid='{$this->id}' tid='{$this->nid}' ";
 		foreach ($this->attrs as $k => $v) {
-			$str.=$k."='".$v."' ";
+			$str.=$k."='".$this->xmlentities($v)."' ";
 		}
 		$str.=">{$this->output}</action>";	
 		return $str;
 	}
+
+	/*! replace xml unsafe characters
+		
+		@param string 
+			string to be escaped
+		@return 
+			escaped string
+	*/
+	public function xmlentities($string) { 
+   		return str_replace( array( '&', '"', "'", '<', '>', '’' ), array( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;', '&apos;' ), $string);
+	}
+
 	/*! convert self to string ( for logs )
 		
 		@return 

codebase/connector/db_common.php

@@ -523,7 +523,7 @@ abstract class DataWrapper{
 		@param config 
 			DataConfig instance
 	*/
-	public function __construct($connection,$config){
+	public function __construct($connection = false,$config = false){
 		$this->config=$config;
 		$this->connection=$connection;
 	}
@@ -800,8 +800,14 @@ protected function build_where($rules,$relation=false){
 					else
 						array_push($sql,$this->escape_name($rules[$i]["name"])." ".$rules[$i]["operation"]." '".$this->escape($rules[$i]["value"])."'");
 				}
-		if ($relation !== false && $relation !== "")
-			array_push($sql,$this->escape_name($this->config->relation_id["db_name"])." = '".$this->escape($relation)."'");
+
+		if ($relation !== false && $relation !== ""){
+			$relsql = $this->escape_name($this->config->relation_id["db_name"])." = '".$this->escape($relation)."'";
+			if ($relation == "0")
+				$relsql = "( ".$relsql." OR ".$this->escape_name($this->config->relation_id["db_name"])." IS NULL )";
+
+			array_push($sql,$relsql);
+		}
 		return implode(" AND ",$sql);
 	}	
 	/*! convert sorting rules to sql string

codebase/connector/db_oracle.php

@@ -23,8 +23,8 @@ public function query($sql){
 
 
 		$mode = ($this->is_record_transaction() || $this->is_global_transaction())?OCI_DEFAULT:OCI_COMMIT_ON_SUCCESS;
-		$res=oci_execute($stm,$mode);
-		if ($res===false) throw new Exception("Oracle - sql execution failed\n".oci_error($this->connection));
+		$res = @oci_execute($stm,$mode);
+		if ($res===false) throw new Exception(oci_error($this->connection));
 
 		$this->last_id=$out[0];
 

codebase/connector/db_pdo.php

@@ -39,6 +39,31 @@ protected function select_query($select,$from,$where,$sort,$start,$count){
 		return $sql;
 	}
 
+	public function tables_list() {
+		$result = $this->query("SHOW TABLES");
+		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
+
+		$tables = array();
+		while ($table = $result->next()) {
+			$tables[] = $table[0];
+		}
+		return $tables;
+	}
+
+	public function fields_list($table) {
+		$result = $this->query("SHOW COLUMNS FROM `".$table."`");
+		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
+
+		$fields = array();
+        $id = "";
+		while ($field = $result->next()) {
+			if ($field['Key'] == "PRI")
+				$id = $field["Field"];
+            else
+			    $fields[] = $field["Field"];
+		}
+		return array("fields" => $fields, "key" => $id );
+	}
 
 	public function get_next($res){
 		$data = $res->next();

codebase/connector/grid_connector.php

@@ -87,20 +87,27 @@ function set_row_attribute($attr,$value){
 	public function to_xml_start(){
 		if ($this->skip) return "";
 
-		$str="<row id='".$this->get_id()."'";
+		$str="<row id='".$this->xmlentities($this->get_id())."'";
 		foreach ($this->row_attrs as $k=>$v)
 			$str.=" ".$k."='".$v."'";
 		$str.=">";
 		for ($i=0; $i < sizeof($this->config->text); $i++){ 
 			$str.="<cell";
 			$name=$this->config->text[$i]["name"];
+			$xmlcontent = false;
 			if (isset($this->cell_attrs[$name])){
 				$cattrs=$this->cell_attrs[$name];
-				foreach ($cattrs as $k => $v)
+				foreach ($cattrs as $k => $v){
 					$str.=" ".$k."='".$this->xmlentities($v)."'";
+					if ($k == "xmlcontent")
+						$xmlcontent = true;
+				}
 			}
 			$value = isset($this->data[$name]) ? $this->data[$name] : '';
-			$str.="><![CDATA[".$value."]]></cell>";
+			if (!$xmlcontent)
+				$str.="><![CDATA[".$value."]]></cell>";
+			else
+				$str.=">".$value."</cell>";
 		}
 		if ($this->userdata !== false)
 			foreach ($this->userdata as $key => $value)