Updated to work with recent changes in anyTable.

arnemorken · Mar 23, 2024 · 73c53c5 · 73c53c5
1 parent 68878d1
commit 73c53c5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/data/mysql/anyGetData.php b/data/mysql/anyGetData.php
@@ -78,7 +78,7 @@ function anyGetData($doEcho=false)
             Parameters::get($table->getIdKey()) === "") {
           $data = $table->getData();
           if ($data !== null && !empty($data))
-            $data = $table->prepareData($data);
+            $data = $table->prepareData($type);
         }
         $data["permission"] = $table->getPermission();
         $data["message"]    = $table->getMessage();

diff --git a/data/mysql/db/dbTable.php b/data/mysql/db/dbTable.php
@@ -44,7 +44,7 @@ public function __construct($connection)
   /////////////////////////////////////////////////////////////////
 
   abstract public    function dbSearch();
-  abstract protected function prepareData(&$inData);
+  abstract protected function prepareData($type);
   abstract public    function dbInsert();
   abstract public    function dbUpdate();
   abstract public    function dbUpdateLinkList();

diff --git a/data/mysql/types/document/documentTable.php b/data/mysql/types/document/documentTable.php
@@ -117,9 +117,9 @@ protected function initFilters($filters)
   /////////////////////// Database query fragments ////////////////////////////
   /////////////////////////////////////////////////////////////////////////////
 
-  protected function findListWhere($gid,$linkType=null,$linkId=null)
+  protected function findListWhere($gid,$type=null,$linkType=null,$linkId=null,$grouping=true,$groupType=null,$searchTerm="")
   {
-    $where = parent::findListWhere($gid,$linkType,$linkId);
+    $where = parent::findListWhere($gid,$type,$linkType,$linkId,$grouping,$groupType,$searchTerm);
     return $where;
   } // findListWhere
 

diff --git a/data/mysql/types/event/eventTable.php b/data/mysql/types/event/eventTable.php
@@ -205,9 +205,9 @@ public function hasParentId()
   /////////////////////// Database query fragments ////////////////////////////
   /////////////////////////////////////////////////////////////////////////////
 
-  protected function findListWhere($gid,$linkType=null,$linkId=null)
+  protected function findListWhere($gid,$type=null,$linkType=null,$linkId=null,$grouping=true,$groupType=null,$searchTerm="")
   {
-    $where = parent::findListWhere($gid,$linkType,$linkId);
+    $where = parent::findListWhere($gid,$type,$linkType,$linkId,$grouping,$groupType,$searchTerm);
     $w = "";
     $event_date_start = Parameters::get("event_date_start");
     $event_date_end   = Parameters::get("event_date_end");

diff --git a/data/mysql/types/group/groupTable.php b/data/mysql/types/group/groupTable.php
@@ -150,7 +150,7 @@ protected function dbValidateInsert()
     if (strtolower($name) == "admin" || strtolower($name) == "administrator")
       $this->mError .= $name."' is a reserved name. ";
     else {
-      if (!$this->dbSearchItem($this->mData,$this->mNameKey,$name)) // TODO! Allow for several groups with same name?
+      if (!$this->dbSearchItemByKey("group",$this->mNameKey,$name)) // TODO! Allow for several groups with same name?
         return false;
       if ($this->mData != null)
         $this->mError .= "Group '".$name."' already exists. ";
@@ -209,7 +209,9 @@ protected function dbSearchGroupInfo($type=null,$group_id=null)
       } // while
     } // if group_id
     //vlog("dbSearchGroupInfo,data:",$data);
-    if ($this->mGrouping) {
+    $grouping = Parameters::get("grouping");
+    $grouping = $grouping !== false && $grouping !== "false" && $grouping !== "0";
+    if ($grouping) {
       // Get group tree and append data to it
       $data["group"] = $this->buildDataTree($data["group"]);
     }

diff --git a/data/mysql/types/user/userTable.php b/data/mysql/types/user/userTable.php
@@ -294,7 +294,7 @@ protected function dbValidateDeletePermission()
   private function dbSearchUserByLogin($userLogin)
   {
     $id_name = $this->emailAsLogin ? "user_email" : ANY_DB_USER_LOGIN;
-    $res = $this->dbSearchItem($this->mData,$id_name,$userLogin,true);
+    $res = $this->dbSearchItemByKey("user",$id_name,$userLogin,true);
     return !empty($res);
   } // dbSearchUserByLogin