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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
sgm0422
2020-07-16 09:03:07 +08:00
parent 5b6f1a03e9 b2033343b1
commit 2fd9dd2290
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/control.class.php
+2 -2
View File
@@ -38,7 +38,7 @@ class control extends baseControl
if(!isset($this->config->bizVersion)) return false;
/* Code for task #9224. Set requiredFields for workflow. */
if($this->dbh or defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api'))
if($this->dbh and (defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')))
{
$this->checkRequireFlowField();
@@ -319,7 +319,7 @@ class control extends baseControl
foreach($fieldRules as $ruleID)
{
if(!isset($rules[$ruleID])) continue;
if(!is_string($_POST[$field->field])) continue;
if(!empty($_POST[$field->field]) and !is_string($_POST[$field->field])) continue;
$rule = $rules[$ruleID];
if($rule->type == 'system' and $rule->rule == 'notempty')
framework/router.class.php
+1
View File
@@ -354,6 +354,7 @@ class router extends baseRouter
/* Check if the requested module is defined in workflow. */
$flow = $this->dbh->query("SELECT * FROM " . TABLE_WORKFLOW . " WHERE `module` = '$this->moduleName'")->fetch();
if(!$flow) return parent::setControlFile($exitIfNone);
if($flow->status != 'normal') die("<html><head><meta charset='utf-8'></head><body>{$this->lang->flowNotRelease}</body></html>");
/**
* 工作流中配置的标签应该请求browse方法，而某些内置流程本身包含browse方法。在这里处理请求的时候会无法区分是内置的browse方法还是工作
lib/phpmailer/class.smtp.php
+1 -1
View File
@@ -481,7 +481,7 @@ class SMTP {
$max_line_length = 998; // used below; set here for ease in change
while(list(,$line) = each($lines)) {
foreach($lines as $line) {
$lines_out = null;
if($line == "" && $in_headers) {
$in_headers = false;
module/qa/model.php
+3 -2
View File
@@ -17,13 +17,14 @@ class qaModel extends model
* @param array $products
* @param int $productID
* @param int $branch
* @param string $extra
* @access public
* @return void
*/
public function setMenu($products, $productID, $branch = 0)
public function setMenu($products, $productID, $branch = 0, $extra = '')
{
$this->loadModel('product')->setMenu($products, $productID, $branch);
$selectHtml = $this->product->select($products, $productID, 'qa', 'index', '', $branch);
$selectHtml = $this->product->select($products, $productID, 'qa', 'index', $extra, $branch);
$productIndex = '';
$isMobile = $this->app->viewType == 'mhtml';