Fix array generation for select

This commit is contained in:
snipe 2016-08-25 21:04:10 -07:00
parent 537ad28a67
commit 4dff58ec26

View file

@ -120,9 +120,11 @@ class CustomField extends Model
public function formatFieldValuesAsArray() { public function formatFieldValuesAsArray() {
$arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values); $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values);
$result[''] = 'Select '.strtolower($this->format);
for ($x = 0; $x < count($arr); $x++) { for ($x = 0; $x < count($arr); $x++) {
$arr_parts = explode('|', $arr[$x]); $arr_parts = explode('|', $arr[$x]);
if ($arr_parts[0]!='') {
if (key_exists('1',$arr_parts)) { if (key_exists('1',$arr_parts)) {
$result[$arr_parts[0]] = $arr_parts[1]; $result[$arr_parts[0]] = $arr_parts[1];
} else { } else {
@ -130,6 +132,20 @@ class CustomField extends Model
} }
} }
}
return $result; return $result;
} }
public function isFieldDecryptable($string) {
if (($this->field_encrypted=='1') && ($string!='')) {
return true;
}
return false;
}
} }