commit e462d0c77a2739b74d75daf8dc8cd30f110a566f from: Tracey Emery date: Thu May 12 19:33:34 2022 UTC unbreak moddate, add phone to members commit - 9fcc5ddfeab1f5592582ca6ad0c9b7df55210045 commit + e462d0c77a2739b74d75daf8dc8cd30f110a566f blob - bee40320eec33d2cff4a95afe92bffec65f4cadf blob + 6257fb74fc7a23bcf4db9b732f3b083ce8247aec --- module/Securitx/src/Controller/SecuritxController.php +++ module/Securitx/src/Controller/SecuritxController.php @@ -208,7 +208,7 @@ ret: } $member->exchangeArray($form->getData()); - + $member->moddate = time(); if ($this->member_table->checkMember($member->email, $member->company_id)) { return new ViewModel([ @@ -680,7 +680,8 @@ skip: r_editor INTEGER, ip_address TEXT, twofa INTEGER, - twofa_moddate INTEGER + twofa_moddate INTEGER, + phone INTEGER ) ', Adapter::QUERY_MODE_EXECUTE); $adapter->query(' @@ -690,8 +691,7 @@ skip: short TEXT NOT NULL, domain TEXT NOT NULL, phone TEXT NOT NULL, - downloads INTEGER, - is_admin INTEGER + downloads INTEGER ) ', Adapter::QUERY_MODE_EXECUTE); $adapter->query(' @@ -847,7 +847,7 @@ skip: } $member->exchangeArray($form->getData()); - + $member->moddate = time(); $validator = new EmailAddress([ 'allow' => Hostname::ALLOW_DNS, 'useMxCheck' => true, @@ -999,7 +999,7 @@ skip: } $member->exchangeArray($form->getData()); - + $member->moddate = time(); if ($this->member_table->checkMember($member->email, $member->company_id)) { return new ViewModel([ blob - c87e25f92167f0c56e2531bb73d60a78c33ff1e1 blob + 02847773dd2463ae51d25668a8e7294ec6673471 --- module/Securitx/src/Form/MemberForm.php +++ module/Securitx/src/Form/MemberForm.php @@ -126,6 +126,13 @@ class MemberForm extends Form { ], ]); $this->add([ + 'name' => 'phone', + 'type' => Element\Tel::class, + 'options' => [ + 'label' => 'Phone Number', + ], + ]); + $this->add([ 'name' => 'email', 'type' => Element\Email::class, 'options' => [ blob - 8a3c160649bf15049c7883500b3eff8516c08cd6 blob + aa791eda2c9893739fca284d5133da9d5a7d5432 --- module/Securitx/src/Model/Company.php +++ module/Securitx/src/Model/Company.php @@ -17,7 +17,6 @@ class Company implements InputFilterAwareInterface { public $domain; public $phone; public $downloads; - public $is_admin; private $inputFilter; @@ -28,7 +27,6 @@ class Company implements InputFilterAwareInterface { $this->phone = !empty($data['phone']) ? $data['phone'] : null; $this->domain = !empty($data['domain']) ? $data['domain'] : null; $this->downloads = !empty($data['downloads']) ? $data['downloads'] : 0; - $this->is_admin = !empty($data['is_admin']) ? $data['is_admin'] : 0; } public function setInputFilter(InputFilterInterface $inputFilter) { blob - 7f7781ccf43502ecb9f417f75902257e2207fd84 blob + e78f5a16ac37c7c03a6024a7ee29984469f50075 --- module/Securitx/src/Model/CompanyTable.php +++ module/Securitx/src/Model/CompanyTable.php @@ -33,7 +33,6 @@ class CompanyTable { 'domain' => $company->domain, 'phone' => $company->phone, 'downloads' => $company->downloads, - 'is_admin' => $company->is_admin, ]; $id = (int)$company->company_id; blob - 895470e6da876a04c6971e23cdca7e96011f6504 blob + 8949808ec9870f4335a572ef8425dbdee19fba47 --- module/Securitx/src/Model/Member.php +++ module/Securitx/src/Model/Member.php @@ -29,6 +29,7 @@ class Member implements InputFilterAwareInterface { public $company_id; public $twofa; public $twofa_moddate; + public $phone; private $inputFilter; @@ -51,6 +52,7 @@ class Member implements InputFilterAwareInterface { $this->company_id = !empty($data['company_id']) ? $data['company_id'] : null; $this->twofa = !empty($data['twofa']) ? $data['twofa'] : null; $this->twofa_moddate = !empty($data['twofa_moddate']) ? $data['twofa_moddate'] : null; + $this->phone = !empty($data['phone']) ? $data['phone'] : null; } public function setInputFilter(InputFilterInterface $inputFilter) { blob - 47270ede993e8f42563fe2adb83515f13eb86229 blob + 88004f2672ed8a2ded98511352c159f97a23f996 --- module/Securitx/src/Model/MemberTable.php +++ module/Securitx/src/Model/MemberTable.php @@ -80,6 +80,7 @@ class MemberTable { 'company_id' => intval($member->company_id), 'twofa' => intval($member->twofa), 'twofa_moddate' => intval($member->twofa_moddate), + 'phone' => intval($member->phone), ]; $id = (int)$member->id; blob - 72503414671ae5cb56cc283c117e8362511a051d blob + a0afcda7386bfd42594f70d17d213fed7cc020b3 --- module/Securitx/view/securitx/index/index.phtml +++ module/Securitx/view/securitx/index/index.phtml @@ -108,6 +108,10 @@ $office->setAttribute('class', 'form-control'); $office->setAttribute('placeholder', 'Office Name'); + $phone = $form->get('phone'); + $phone->setAttribute('class', 'form-control'); + $phone->setAttribute('placeholder', 'Phone Number'); + $email = $form->get('email'); $email->setAttribute('class', 'form-control'); $email->setAttribute('placeholder', 'Email Address'); @@ -141,6 +145,12 @@ ['class' => 'help-block']) ?>
+ formLabel($phone) ?> + formElement($phone) ?> + formElementErrors()->render($phone, + ['class' => 'help-block']) ?> +
+
formLabel($email) ?> formElement($email) ?> formElementErrors()->render($email, blob - 86ccb9b065beddb2d688bdd68a5b02ee785e4165 blob + ead1c1482d613b09d41d6e5d513e851dc65fff99 --- module/Securitx/view/securitx/invite/invite.phtml +++ module/Securitx/view/securitx/invite/invite.phtml @@ -38,6 +38,10 @@ $this->headTitle('SecuritX: Request'); $office->setAttribute('class', 'form-control'); $office->setAttribute('placeholder', 'Office Name'); + $phone = $form->get('phone'); + $phone->setAttribute('class', 'form-control'); + $phone->setAttribute('placeholder', 'Phone Number'); + $email = $form->get('email'); $email->setAttribute('class', 'form-control'); $email->setAttribute('placeholder', 'Email Address'); @@ -77,6 +81,12 @@ $this->headTitle('SecuritX: Request'); ['class' => 'help-block']) ?>
+ formLabel($phone) ?> + formElement($phone) ?> + formElementErrors()->render($phone, + ['class' => 'help-block']) ?> +
+
formLabel($email) ?> formElement($email) ?> formElementErrors()->render($email, blob - 80a084fabd8fd73184f0321f1e265b2278700ac8 blob + 6b56350c5232dc426030515b76a7c6e15283684c --- module/Securitx/view/securitx/request/request.phtml +++ module/Securitx/view/securitx/request/request.phtml @@ -39,6 +39,10 @@ $this->headTitle('SecuritX: Request'); $office->setAttribute('class', 'form-control'); $office->setAttribute('placeholder', 'Office Name'); + $phone = $form->get('phone'); + $phone->setAttribute('class', 'form-control'); + $phone->setAttribute('placeholder', 'Phone Number'); + $email = $form->get('email'); $email->setAttribute('class', 'form-control'); $email->setAttribute('placeholder', 'Email Address'); @@ -81,6 +85,12 @@ $this->headTitle('SecuritX: Request'); ['class' => 'help-block']) ?>
+ formLabel($phone) ?> + formElement($phone) ?> + formElementErrors()->render($phone, + ['class' => 'help-block']) ?> +
+
formLabel($email) ?> formElement($email) ?> formElementErrors()->render($email,