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

* fix bug for less than php5.6 for search.

Browse Source
This commit is contained in:
wangyidong
2020-01-13 14:22:53 +08:00
parent e2efd30948
commit 0222add8d5
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/model.php
+1 -1
View File
@@ -77,7 +77,7 @@ class backupModel extends model
$file = trim(str_replace($appRoot, '', $codeFile), DS);
if(is_dir($codeFile))
{
if(!is_dir($backupFile . DS . $flle)) mkdir($backupFile . DS . $flle, 0777, true);
if(!is_dir($backupFile . DS . $file)) mkdir($backupFile . DS . $file, 0777, true);
$zfile->copyDir($codeFile, $backupFile . DS . $file);
}
else
module/repo/control.php
-1
View File
@@ -625,6 +625,5 @@ class repo extends control
$commits = $this->repo->updateLatestCommit($repo);
if($commits > 0) die('finished');
}
die('finished');
}
}
module/search/control.php
+6 -6
View File
@@ -26,12 +26,12 @@ class search extends control
{
$module = empty($module) ? $this->session->searchParams['module'] : $module;
$searchParams = $module . 'searchParams';
$queryID = (empty($module) and empty($queryID)) ? $this->session->$searchParams['queryID'] : $queryID;
$searchFields = empty($searchFields) ? json_decode($this->session->$searchParams['searchFields'], true) : $searchFields;
$fieldParams = empty($fieldParams) ? json_decode($this->session->$searchParams['fieldParams'], true) : $fieldParams;
$actionURL = empty($actionURL) ? $this->session->$searchParams['actionURL'] : $actionURL;
$style = isset($_SESSION[$searchParams]['style']) ? $this->session->$searchParams['style'] : '';
$onMenuBar = isset($_SESSION[$searchParams]['onMenuBar']) ? $this->session->$searchParams['onMenuBar'] : '';
$queryID = (empty($module) and empty($queryID)) ? $_SESSION[$searchParams]['queryID'] : $queryID;
$searchFields = empty($searchFields) ? json_decode($_SESSION[$searchParams]['searchFields'], true) : $searchFields;
$fieldParams = empty($fieldParams) ? json_decode($_SESSION[$searchParams]['fieldParams'], true) : $fieldParams;
$actionURL = empty($actionURL) ? $_SESSION[$searchParams]['actionURL'] : $actionURL;
$style = isset($_SESSION[$searchParams]['style']) ? $_SESSION[$searchParams]['style'] : '';
$onMenuBar = isset($_SESSION[$searchParams]['onMenuBar']) ? $_SESSION[$searchParams]['onMenuBar'] : '';
$_SESSION['searchParams']['module'] = $module;
$this->search->initSession($module, $searchFields, $fieldParams);
module/search/model.php
+5 -5
View File
@@ -82,7 +82,7 @@ class searchModel extends model
$groupAndOr = strtoupper($this->post->groupAndOr);
$module = $this->session->searchParams['module'];
$searchParams = $module . 'searchParams';
$fieldParams = json_decode($this->session->$searchParams['fieldParams']);
$fieldParams = json_decode($_SESSION[$searchParams]['fieldParams']);
$scoreNum = 0;
if($groupAndOr != 'AND' and $groupAndOr != 'OR') $groupAndOr = 'AND';
@@ -186,7 +186,7 @@ class searchModel extends model
public function initSession($module, $fields, $fieldParams)
{
$formSessionName = $module . 'Form';
if($this->session->$formSessionName != false) return;
if(isset($_SESSION[$formSessionName]) and $_SESSION[$formSessionName] != false) return;
for($i = 1; $i <= $this->config->search->groupItems * 2; $i ++)
{
@@ -287,7 +287,7 @@ class searchModel extends model
$_POST = $query->form;
$this->buildQuery();
$querySessionName = $query->form['module'] . 'Query';
$query->sql = $this->session->$querySessionName;
$query->sql = $_SESSION[$querySessionName];
}
return $query;
}
@@ -302,12 +302,12 @@ class searchModel extends model
{
$sqlVar = $this->post->module . 'Query';
$formVar = $this->post->module . 'Form';
$sql = $this->session->$sqlVar;
$sql = $_SESSION[$sqlVar];
if(!$sql) $sql = ' 1 = 1 ';
$query = fixer::input('post')
->add('account', $this->app->user->account)
->add('form', serialize($this->session->$formVar))
->add('form', serialize($_SESSION[$formVar]))
->add('sql', $sql)
->skipSpecial('sql,form')
->remove('onMenuBar')
module/search/view/buildform.html.php
+1 -1
View File
@@ -89,7 +89,7 @@ foreach($fieldParams as $fieldName => $param)
<tbody>
<?php
$formSessionName = $module . 'Form';
$formSession = $this->session->$formSessionName;
$formSession = $_SESSION[$formSessionName];
$fieldNO = 1;
for($i = 1; $i <= $groupItems; $i ++)