diff --git a/framework/control.class.php b/framework/control.class.php index e5f40b99f0..f15c322e18 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -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') diff --git a/framework/router.class.php b/framework/router.class.php index 64e6d97ce4..f5a0c9dec6 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -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("{$this->lang->flowNotRelease}"); /** * 工作流中配置的标签应该请求browse方法，而某些内置流程本身包含browse方法。在这里处理请求的时候会无法区分是内置的browse方法还是工作 diff --git a/lib/phpmailer/class.smtp.php b/lib/phpmailer/class.smtp.php index e00ad79c4b..304ebc4e7e 100644 --- a/lib/phpmailer/class.smtp.php +++ b/lib/phpmailer/class.smtp.php @@ -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; diff --git a/module/qa/model.php b/module/qa/model.php index 748e442f91..19464d5dd3 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -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';