commit - 3c4dc62cbcbfbfa09e5923a300988ae6b1bb795b
commit + 10d03f4b458339910f7199b6df2a16e5f42a5732
blob - 132a7f73e9bce65b3c2796a979ba73e335ddb8d5
blob + f262f562fe3de434b63a12fa39fccbc4a5d9c19e
--- module/Securitx/src/Controller/SecuritxController.php
+++ module/Securitx/src/Controller/SecuritxController.php
}
private function getMember() {
- $member = new Member('member');
+ $member = new Member();
$id = $this->params()->fromRoute('id');
try {
return($member);
}
private function checkAnyAdmin() {
- $t_member = new Member('admin');
+ $t_member = new Member();
if (file_exists($this->file)) {
if ($t_member = $this->member_table->getAnyValidAdmin())
return 1;
]);
}
- $member = new Member('member');
+ $member = new Member();
+ $member->setFilter(false);
$form->setInputFilter($member->getInputFilter());
$form->setData($request->getPost());
]);
if ($validator->isValid($data['email'])) {
- $member = new Member('member');
+ $member = new Member();
$member = $this->member_table->getMemberByEmail($data['email']);
$url = $this->url()->fromRoute(
'securitx',
}
/* setup admin member */
- $member = new Member('member');
+ $member = new Member();
$member = $this->member_table->getAnyAdmin();
if ($member) {
if (!$member->verified) {
]);
}
- $member = new Member('member');
+ $member = new Member();
+ $member->setFilter(true);
$form->setInputFilter($member->getInputFilter());
$form->setData($request->getPost());
if (!$form->isValid()) {
}
public function twofaAction() {
- $member = new Member('member');
+ $member = new Member();
$id = $this->params()->fromRoute('id');
try {
]);
}
- $member = new Member('member');
+ $member = new Member();
+ $member->setFilter(true);
$form->setInputFilter($member->getInputFilter());
$form->setData($request->getPost());
]);
}
public function verifyAction() {
- $member = new Member('member');
+ $member = new Member();
$id = $this->params()->fromRoute('id');
mkdir($folder, 0755, true);
if ($member->inviter) {
- $inviter = new Member('member');
+ $inviter = new Member();
try {
$inviter =
$this->member_table->getMember(
blob - 1f07e262be13b62724ff334447fc373f8f3e5fc9
blob + 0a65252dd707e2e2a7e231615c23da1f6afa58c0
--- module/Securitx/src/Form/CompanyForm.php
+++ module/Securitx/src/Form/CompanyForm.php
'name' => 'short',
'type' => 'text',
'options' => [
- 'label' => 'Two Letter Short Name',
+ 'label' => 'Short Name (2-5 Letters)',
],
]);
$this->add([
blob - 8949808ec9870f4335a572ef8425dbdee19fba47
blob + 65b538b27fd49c2daeac3835a2f9d94b915beaa5
--- module/Securitx/src/Model/Member.php
+++ module/Securitx/src/Model/Member.php
public $phone;
private $inputFilter;
+ private $val;
public function exchangeArray(array $data) {
$this->id = !empty($data['id']) ? $data['id'] : null;
));
}
+ public function setFilter($val) {
+ $this->val = $val;
+ }
+
public function getInputFilter() {
if ($this->inputFilter) {
return $this->inputFilter;
$inputFilter->add([
'name' => 'office',
- 'required' => true,
+ 'required' => $this->val,
'filters' => [
['name' => StripTags::class],
['name' => StringTrim::class],