mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 21:32:09 +02:00
Code Issues Releases Wiki Activity

Fix for Table alias detection failure when using more than 1 alias character.

Browse Source
This commit is contained in:
Cameron
2020-10-01 18:34:54 -07:00
parent 043bc702e5
commit 80f0899771
2 changed files with 417 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
e107_handlers/admin_ui.php
View File

@@ -2511,6 +2511,7 @@ class e_admin_controller_ui extends e_admin_controller
* @var array UI field data
*/
/** @var string */
protected $listQry;
protected $pid;
@@ -3980,11 +3981,21 @@ class e_admin_controller_ui extends e_admin_controller
return vartrue($tmp[$alias]);
}
function getJoinField($field)
public function getJoinField($field=null)
{
if(empty($field))
{
return $this->joinField;
}
return isset($this->joinField[$field]) ? $this->joinField[$field] : false; // vartrue($this->joinField[$field],false);
}
public function getJoinAlias()
{
return $this->joinAlias;
}
/**
* Parses all available field data, adds internal attributes for handling join requests
* @return e_admin_controller_ui
@@ -3993,7 +4004,7 @@ class e_admin_controller_ui extends e_admin_controller
{
if($this->_alias_parsed) return $this; // already parsed!!!
$this->joinAlias(); // generate Table Aliases from listQry
$this->joinAlias($this->listQry); // generate Table Aliases from listQry
if($this->getJoinData())
{
@@ -4114,11 +4125,11 @@ class e_admin_controller_ui extends e_admin_controller
* Generate array of table names and their alias - auto-detected from listQry;
* eg. $listQry = "SELECT m.*, u.user_id,u.user_name FROM #core_media AS m LEFT JOIN #user AS u ON m.media_author = u.user_id";
*/
protected function joinAlias()
public function joinAlias($listQry=null)
{
if($this->listQry)
if(!empty($listQry))
{
preg_match_all("/`?#([\w-]+)`?\s*(as|AS)\s*([\w-])/im",$this->listQry,$matches);
preg_match_all("/`?#([\w-]+)`?\s*(as|AS)\s*([\w-]+)/im",$listQry,$matches);
$keys = array();
foreach($matches[1] AS $k=>$v)
{
@@ -4129,16 +4140,20 @@ class e_admin_controller_ui extends e_admin_controller
$keys[] = $matches[3][$k];
}
foreach($keys as $alias)
{
preg_match_all("/".$alias."\.([\w]*)/i",$this->listQry,$match);
preg_match_all("/".$alias."\.([\w]*)/i",$listQry,$match);
foreach($match[1] as $k=>$m)
{
if(empty($m))
{
continue;
}
$this->joinField[$m] = $match[0][$k];
}
}
}
elseif($this->tableJoin)
{
@@ -4157,7 +4172,8 @@ class e_admin_controller_ui extends e_admin_controller
}
}
}
}
/**