* Merge lib dao code.
This commit is contained in:
@@ -42,6 +42,8 @@ class control extends baseControl
|
||||
/* Code for task #9224. Set requiredFields for workflow. */
|
||||
if($this->dbh and (defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE == 'api')))
|
||||
{
|
||||
$this->checkRequireFlowField();
|
||||
|
||||
if(isset($this->config->{$this->moduleName}) and strpos($this->methodName, 'export') !== false)
|
||||
{
|
||||
if(isset($this->config->{$this->moduleName}->exportFields) or isset($this->config->{$this->moduleName}->list->exportFields))
|
||||
@@ -409,4 +411,112 @@ class control extends baseControl
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check require with flow field when post data.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function checkRequireFlowField()
|
||||
{
|
||||
if($this->config->edition == 'open') return false;
|
||||
if(empty($_POST)) return false;
|
||||
|
||||
$action = $this->dao->select('*')->from(TABLE_WORKFLOWACTION)->where('module')->eq($this->moduleName)->andWhere('action')->eq($this->methodName)->fetch();
|
||||
if(empty($action)) return false;
|
||||
if($action->extensionType == 'none' and $action->buildin == 1) return false;
|
||||
|
||||
$flow = $this->dao->select('*')->from(TABLE_WORKFLOW)->where('module')->eq($this->moduleName)->fetch();
|
||||
$fields = $this->loadModel('workflowaction')->getFields($this->moduleName, $this->methodName);
|
||||
$layouts = $this->loadModel('workflowlayout')->getFields($this->moduleName, $this->methodName);
|
||||
$rules = $this->dao->select('*')->from(TABLE_WORKFLOWRULE)->orderBy('id_desc')->fetchAll('id');
|
||||
|
||||
$requiredFields = '';
|
||||
$mustPostFields = '';
|
||||
$numberFields = '';
|
||||
$message = array();
|
||||
foreach($fields as $field)
|
||||
{
|
||||
if(!empty($field->buildin)) continue;
|
||||
if(empty($field->show)) continue;
|
||||
if(!isset($layouts[$field->field])) continue;
|
||||
|
||||
$fieldRules = explode(',', trim($field->rules, ','));
|
||||
$fieldRules = array_unique($fieldRules);
|
||||
foreach($fieldRules as $ruleID)
|
||||
{
|
||||
if(!isset($rules[$ruleID])) continue;
|
||||
if(!empty($_POST[$field->field]) and !is_string($_POST[$field->field])) continue;
|
||||
|
||||
$rule = $rules[$ruleID];
|
||||
if($rule->type == 'system' and $rule->rule == 'notempty')
|
||||
{
|
||||
$requiredFields .= ",{$field->field}";
|
||||
if($field->control == 'radio' or $field->control == 'checkbox') $mustPostFields .= ",{$field->field}";
|
||||
if(strpos($field->type, 'int') !== false and $field->control == 'select') $numberFields .= ",{$field->field}";
|
||||
}
|
||||
elseif($rule->type == 'system' and isset($_POST[$field->field]))
|
||||
{
|
||||
$pass = true;
|
||||
if($rule->rule == 'unique')
|
||||
{
|
||||
if(!empty($_POST[$field->field]))
|
||||
{
|
||||
$sqlClass = new sql();
|
||||
$sql = "SELECT COUNT(*) AS count FROM $flow->table WHERE `$field->field` = " . $sqlClass->quote(fixer::input('post')->get($field->field));
|
||||
if(isset($_POST['id'])) $sql .= ' AND `id` != ' . (int)$_POST['id'];
|
||||
|
||||
$row = $this->dbh->query($sql)->fetch();
|
||||
if($row->count != 0) $pass = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$checkFunc = 'check' . $rule->rule;
|
||||
if(validater::$checkFunc($_POST[$field->field]) === false) $pass = false;
|
||||
}
|
||||
|
||||
if(!$pass)
|
||||
{
|
||||
$error = zget($this->lang->error, $rule->rule, '');
|
||||
if($rule->rule == 'unique') $error = sprintf($error, $field->name, $_POST[$field->field]);
|
||||
if($error) $error = sprintf($error, $field->name);
|
||||
if(empty($error)) $error = sprintf($this->lang->error->reg, $field->name, $rule->rule);
|
||||
|
||||
$message[$field->field][] = $error;
|
||||
}
|
||||
}
|
||||
elseif($rule->type == 'regex' and isset($_POST[$field->field]))
|
||||
{
|
||||
if(validater::checkREG($_POST[$field->field], $rule->rule) === false) $message[$field->field][] = sprintf($this->lang->error->reg, $field->name, $rule->rule);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if($requiredFields)
|
||||
{
|
||||
if(isset($this->config->{$this->moduleName}->{$this->methodName}->requiredFields)) $requiredFields .= ',' . $this->config->{$this->moduleName}->{$this->methodName}->requiredFields;
|
||||
|
||||
foreach(explode(',', $requiredFields) as $requiredField)
|
||||
{
|
||||
if(empty($requiredField)) continue;
|
||||
if(!isset($fields[$requiredField])) continue;
|
||||
if(isset($_POST[$requiredField]) and $_POST[$requiredField] === '')
|
||||
{
|
||||
$message[$requiredField][] = sprintf($this->lang->error->notempty, $fields[$requiredField]->name);
|
||||
}
|
||||
elseif(strpos(",{$numberFields},", ",{$requiredField},") !== false and empty($_POST[$requiredField]))
|
||||
{
|
||||
$message[$requiredField][] = sprintf($this->lang->error->notempty, $fields[$requiredField]->name);
|
||||
}
|
||||
elseif(strpos(",{$mustPostFields},", ",{$requiredField},") !== false and !isset($_POST[$requiredField]))
|
||||
{
|
||||
$message[$requiredField][] = sprintf($this->lang->error->notempty, $fields[$requiredField]->name);
|
||||
}
|
||||
}
|
||||
}
|
||||
if($message) $this->send(array('result' => 'fail', 'message' => $message));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user