refactor multitable connectors

2 files changed, 25 insertions, 15 deletions

diff --git a/codebase/treegridmultitable_connector.php b/codebase/treegridmultitable_connector.php
index 8d16bda..29e0dbd 100644
--- a/codebase/treegridmultitable_connector.php
+++ b/codebase/treegridmultitable_connector.php
@@ -84,19 +84,19 @@ class TreeGridMultitableConnector extends TreeGridConnector{
 		if (!isset($_GET['id'])) {
 			if (isset($_POST['ids'])) {
 				$ids = explode(",",$_POST["ids"]);
-				$id = $this->parseId($ids[0]);
+				$id = $this->parse_id($ids[0]);
 				$this->level--;
 			}
 			$this->request->set_relation(false);
 		} else {
-			$id = $this->parseId($_GET['id']);
+			$id = $this->parse_id($_GET['id']);
 			$_GET['id'] = $id;
 		}
 		return $this->level;
 	}
 
 
-	public function parseId($id, $set_level = true) {
+	public function parse_id($id, $set_level = true) {
 		$result = Array();
 		preg_match('/^(.+)((#)|(%23))/', $id, $result);
 		if ($set_level === true) {
@@ -108,6 +108,11 @@ class TreeGridMultitableConnector extends TreeGridConnector{
 	}
 
 
+	public function level_id($id) {
+		return $this->level.'#'.$id;
+	}
+
+
 	/*! set maximum level of tree
 		@param max_level
 			maximum level
@@ -124,12 +129,12 @@ class TreeGridMultitableConnector extends TreeGridConnector{
 	public function id_translate_before($action) {
 		$this->request->set_relation(false);
 		$id = $action->get_id();
-		$id = $this->parseId($id, false);
+		$id = $this->parse_id($id, false);
 		$action->set_id($id);
 		$action->set_value('gr_id', $id);
 		$action->set_new_id($id);
 		$pid = $action->get_value($this->config->relation_id['db_name']);
-		$pid = $this->parseId($pid, false);
+		$pid = $this->parse_id($pid, false);
 		$action->set_value($this->config->relation_id['db_name'], $pid);
 	}
 
@@ -140,9 +145,9 @@ class TreeGridMultitableConnector extends TreeGridConnector{
 	*/
 	public function id_translate_after($action) {
 		$id = $action->get_id();
-		$action->set_id(($this->level).'%23'.$id);
+		$action->set_id($this->level_id($id));
 		$id = $action->get_new_id();
-		$action->success(($this->level).'%23'.$id);
+		$action->success($this->level_id($id));
 	}
 
 }
diff --git a/codebase/treemultitable_connector.php b/codebase/treemultitable_connector.php
index f081689..0493f4c 100644
--- a/codebase/treemultitable_connector.php
+++ b/codebase/treemultitable_connector.php
@@ -54,7 +54,7 @@ class TreeMultitableConnector extends TreeConnector{
 		$index=0;
 		$records = Array();
 		while ($data=$this->sql->get_next($res)){
-			$data[$this->config->id['name']] = $this->level.'#'.$data[$this->config->id['name']];
+			$data[$this->config->id['name']] = $this->level_id($data[$this->config->id['name']]);
 			$data = new $this->names["item_class"]($data,$this->config,$index);
 			$this->event->trigger("beforeRender",$data);
 			if (($this->max_level !== null)&&($this->level == $this->max_level)) {
@@ -83,19 +83,19 @@ class TreeMultitableConnector extends TreeConnector{
 		if (!isset($_GET['id'])) {
 			if (isset($_POST['ids'])) {
 				$ids = explode(",",$_POST["ids"]);
-				$id = $this->parseId($ids[0]);
+				$id = $this->parse_id($ids[0]);
 				$this->level--;
 			}
 			$this->request->set_relation(false);
 		} else {
-			$id = $this->parseId($_GET['id']);
+			$id = $this->parse_id($_GET['id']);
 			$_GET['id'] = $id;
 		}
 		return $this->level;
 	}
 
 
-	public function parseId($id, $set_level = true) {
+	public function parse_id($id, $set_level = true) {
 		$result = Array();
 		preg_match('/^(.+)#/', $id, $result);
 		if ($set_level === true) {
@@ -111,6 +111,11 @@ class TreeMultitableConnector extends TreeConnector{
 	}
 
 
+	public function level_id($id) {
+		return $this->level.'#'.$id;
+	}
+
+
 	/*! set maximum level of tree
 		@param max_level
 			maximum level
@@ -126,12 +131,12 @@ class TreeMultitableConnector extends TreeConnector{
 	*/
 	public function id_translate_before($action) {
 		$id = $action->get_id();
-		$id = $this->parseId($id, false);
+		$id = $this->parse_id($id, false);
 		$action->set_id($id);
 		$action->set_value('tr_id', $id);
 		$action->set_new_id($id);
 		$pid = $action->get_value($this->config->relation_id['db_name']);
-		$pid = $this->parseId($pid, false);
+		$pid = $this->parse_id($pid, false);
 		$action->set_value($this->config->relation_id['db_name'], $pid);
 	}
 
@@ -142,9 +147,9 @@ class TreeMultitableConnector extends TreeConnector{
 	*/
 	public function id_translate_after($action) {
 		$id = $action->get_id();
-		$action->set_id(($this->level).'#'.$id);
+		$action->set_id($this->level_id($id));
 		$id = $action->get_new_id();
-		$action->success(($this->level).'#'.$id);
+		$action->success($this->level_id($id));
 	}
 
 }