Updated connectors for cake, yii frameworks.

5 files changed, 34 insertions, 31 deletions

diff --git a/codebase/Dhtmlx/Connector/Connector.php b/codebase/Dhtmlx/Connector/Connector.php
index b537925..ec8ae9a 100644..100755
--- a/codebase/Dhtmlx/Connector/Connector.php
+++ b/codebase/Dhtmlx/Connector/Connector.php
@@ -158,7 +158,7 @@ class Connector {
                 $id = $info["key"];
         }
         $this->config->init($id,$fields,$extra,$relation_id);
-        if (strpos(trim($table), " ")!==false)
+        if(is_string($table) && strpos(trim($table), " ")!==false)
             $this->request->parse_sql($table);
         else
             $this->request->set_source($table);
diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPCake2DBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPCake2DBDataWrapper.php
index 7b31f77..c619817 100755
--- a/codebase/Dhtmlx/Connector/DataStorage/PHPCake2DBDataWrapper.php
+++ b/codebase/Dhtmlx/Connector/DataStorage/PHPCake2DBDataWrapper.php
@@ -8,11 +8,11 @@ class PHPCake2DBDataWrapper extends ArrayDBDataWrapper {
         if (is_array($source))	//result of find

             $res = $source;

         else

-            $res = $this->connection->find("all");

+            $res = $source->get_source()->find("all");

 

         $temp = array();

         if (sizeof($res)){

-            $name = get_class($this->connection);

+            $name = get_class($source->get_source());

             for ($i=sizeof($res)-1; $i>=0; $i--)

                 $temp[]=&$res[$i][$name];

         }

@@ -29,15 +29,15 @@ class PHPCake2DBDataWrapper extends ArrayDBDataWrapper {
     }

 

     public function insert($data,$source){

-        $name = get_class($this->connection);

+        $name = get_class($source->get_source());

         $save = array();

         $temp_data = $data->get_data();

         unset($temp_data[$this->config->id['db_name']]);

         unset($temp_data["!nativeeditor_status"]);

         $save[$name] = $temp_data;

 

-        if ($this->connection->save($save)){

-            $data->success($this->connection->getLastInsertID());

+        if ($source->get_source()->save($save)){

+            $data->success($source->get_source()->getLastInsertID());

         } else {

             $data->set_response_attribute("details", $this->getErrorMessage());

             $data->invalid();

@@ -45,15 +45,15 @@ class PHPCake2DBDataWrapper extends ArrayDBDataWrapper {
     }

     public function delete($data,$source){

         $id = $data->get_id();

-        $this->connection->delete($id);

+        $source->get_source()->delete($id);

         $data->success();

     }

     public function update($data,$source){

-        $name = get_class($this->connection);

+        $name = get_class($source->get_source());

         $save = array();

         $save[$name] = &$data->get_data();

 

-        if ($this->connection->save($save)){

+        if ($source->get_source()->save($save)){

             $data->success();

         } else {

             $data->set_response_attribute("details", $this->getErrorMessage());

diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPCakeDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPCakeDBDataWrapper.php
index 6c368e3..b7e2cbc 100755
--- a/codebase/Dhtmlx/Connector/DataStorage/PHPCakeDBDataWrapper.php
+++ b/codebase/Dhtmlx/Connector/DataStorage/PHPCakeDBDataWrapper.php
@@ -5,11 +5,12 @@ use \Exception;
 

 class PHPCakeDBDataWrapper extends ArrayDBDataWrapper {

 

-    public function select($sql) {

-        if(is_array($this->connection))	//result of findAll

-            $query = $this->connection;

+    public function select($source) {

+        $sourceData = $source->get_source();

+        if(is_array($sourceData))	//result of find

+            $query = $sourceData;

         else

-            $query = $this->connection->find("all");

+            $query = $sourceData->find("all");

 

         $temp = array();

         foreach($query as $row)

@@ -31,14 +32,14 @@ class PHPCakeDBDataWrapper extends ArrayDBDataWrapper {
         $table = TableRegistry::get($source->get_source());

         $obj = $table->newEntity();

         $obj = $this->fillModel($obj, $data);

-        $savedResult = $this->connection->save($obj);

+        $savedResult = $source->get_source()->save($obj);

         $data->success($savedResult->get($this->config->id["db_name"]));

     }

 

     public function delete($data, $source) {

         $table = TableRegistry::get($source->get_source());

         $obj = $table->get($data->get_id());

-        $this->connection->delete($obj);

+        $source->get_source()->delete($obj);

     }

 

     public function update($data, $source) {

diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php
index d22afa5..8a64f5a 100644..100755
--- a/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php
+++ b/codebase/Dhtmlx/Connector/DataStorage/PHPYii1DBDataWrapper.php
@@ -4,11 +4,12 @@ use \Exception;
 
 class PHPYii1DBDataWrapper extends ArrayDBDataWrapper {
 
-	public function select($sql) {
-		if(is_array($this->connection))	//result of findAll
-			$res = $this->connection;
-		else
-			$res = $this->connection->find()->all();
+	public function select($source) {
+        $sourceData = $source->get_source();
+        if(is_array($sourceData))	//result of find
+            $res = $sourceData;
+        else
+            $res = $sourceData->find()->all();
 
 		$temp = array();
 		if(sizeof($res)) {
@@ -29,13 +30,13 @@ class PHPYii1DBDataWrapper extends ArrayDBDataWrapper {
 	}
 
 	public function insert($data, $source) {
-		$name = get_class($this->connection);
+        $name = get_class($source->get_source());
 		$obj = new $name();
 		$this->fill_model_and_save($obj, $data);
 	}
 
 	public function delete($data, $source){
-		$obj = $this->connection->findOne($data->get_id());
+		$obj = $source->get_source()->findOne($data->get_id());
 		if($obj->delete()) {
 			$data->success();
 			$data->set_new_id($obj->getPrimaryKey());
@@ -46,7 +47,7 @@ class PHPYii1DBDataWrapper extends ArrayDBDataWrapper {
 		}
 	}
 	public function update($data, $source) {
-		$obj = $this->connection->findOne($data->get_id());
+		$obj = $source->get_source()->findOne($data->get_id());
 		$this->fill_model_and_save($obj, $data);
 	}
 
diff --git a/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php b/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php
index f76ce0f..487b7ce 100644..100755
--- a/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php
+++ b/codebase/Dhtmlx/Connector/DataStorage/PHPYiiDBDataWrapper.php
@@ -4,11 +4,12 @@ use \Exception;
 
 class PHPYiiDBDataWrapper extends ArrayDBDataWrapper {
 
-	public function select($sql) {
-		if(is_array($this->connection))	//result of findAll
-			$res = $this->connection;
-		else
-			$res = $this->connection->find()->all();
+	public function select($source) {
+        $sourceData = $source->get_source();
+        if(is_array($sourceData))	//result of find
+            $res = $sourceData;
+        else
+            $res = $sourceData->find()->all();
 
 		$temp = array();
 		if(sizeof($res)) {
@@ -27,13 +28,13 @@ class PHPYiiDBDataWrapper extends ArrayDBDataWrapper {
 		return implode("\n", $text);
 	}
 	public function insert($data, $source) {
-		$name = get_class($this->connection);
+		$name = get_class($source->get_source());
 		$obj = new $name();
 		$this->fill_model_and_save($obj, $data);
 	}
 
 	public function delete($data, $source) {
-		$obj = $this->connection->findOne($data->get_id());
+		$obj = $source->get_source()->findOne($data->get_id());
 		if($obj->delete()) {
 			$data->success();
 			$data->set_new_id($obj->getPrimaryKey());
@@ -45,7 +46,7 @@ class PHPYiiDBDataWrapper extends ArrayDBDataWrapper {
 	}
 
 	public function update($data, $source) {
-		$obj = $this->connection->findOne($data->get_id());
+		$obj = $source->get_source()->findOne($data->get_id());
 		$this->fill_model_and_save($obj, $data);
 	}