Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '12.x'

Browse Source
This commit is contained in:
wangyidong
2020-12-11 20:42:10 +08:00
parent a18ac6792e 5dbd8270bb
commit c771e1947c
89 changed files with 1780 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+7 -6
View File
@@ -46,6 +46,7 @@ class commonModel extends model
{
header("Content-Type: text/html; Language={$this->config->charset}");
header("Cache-control: private");
if($this->loadModel('setting')->getItem('owner=system&module=sso&key=turnon'))
{
if(isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on')
@@ -56,7 +57,7 @@ class commonModel extends model
}
else
{
header("X-Frame-Options: SAMEORIGIN");
if(!empty($this->config->xFrameOptions)) header("X-Frame-Options: {$this->config->xFrameOptions}");
}
}
@@ -1519,17 +1520,17 @@ EOD;
/* Set the query condition session. */
if($onlyCondition)
{
$queryCondition = explode('WHERE', $sql);
$queryCondition = explode(' WHERE ', $sql);
$queryCondition = isset($queryCondition[1]) ? $queryCondition[1] : '';
if($queryCondition)
{
$queryCondition = explode('ORDER', $queryCondition);
$queryCondition = explode(' ORDER BY ', $queryCondition);
$queryCondition = str_replace('t1.', '', $queryCondition[0]);
}
}
else
{
$queryCondition = explode('ORDER', $sql);
$queryCondition = explode(' ORDER BY ', $sql);
$queryCondition = $queryCondition[0];
}
$queryCondition = trim($queryCondition);
@@ -1539,11 +1540,11 @@ EOD;
$this->session->set($objectType . 'OnlyCondition', $onlyCondition);
/* Set the query condition session. */
$orderBy = explode('ORDER BY', $sql);
$orderBy = explode(' ORDER BY ', $sql);
$orderBy = isset($orderBy[1]) ? $orderBy[1] : '';
if($orderBy)
{
$orderBy = explode('LIMIT', $orderBy);
$orderBy = explode(' LIMIT ', $orderBy);
$orderBy = $orderBy[0];
if($onlyCondition) $orderBy = str_replace('t1.', '', $orderBy);
}