borekon/disposable-mailbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup, add type information

Browse Source
This commit is contained in:
Synox 2018-02-23 21:46:19 +01:00
parent 2a35a1737e
commit 92ee25dbf6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages.php
View File

@ -54,17 +54,17 @@ class DownloadEmailPage extends Page {
class DeleteEmailPage extends Page { class DeleteEmailPage extends Page {
private $email_id; private $email_id;
private $address; private $address;
private $all_domains; private $config_domains;
public function __construct($email_id, $address, $all_domains) { public function __construct($email_id, $address, $config_domains) {
$this->email_id = $email_id; $this->email_id = $email_id;
$this->address = $address; $this->address = $address;
$this->all_domains = $all_domains; $this->config_domains = $config_domains;
} }
function invoke() { function invoke() {
$user = User::parseDomain($this->address); $user = User::parseDomain($this->address);
$this->if_invalid_redirect_to_random($user, $this->all_domains); $this->if_invalid_redirect_to_random($user, $this->config_domains);
$delete_email_id = filter_var($this->email_id, FILTER_SANITIZE_NUMBER_INT); $delete_email_id = filter_var($this->email_id, FILTER_SANITIZE_NUMBER_INT);
delete_email($delete_email_id, $user); delete_email($delete_email_id, $user);
@ -73,14 +73,14 @@ class DeleteEmailPage extends Page {
} }
class RedirectToRandomAddressPage extends Page { class RedirectToRandomAddressPage extends Page {
private $all_domains; private $config_domains;
public function __construct($all_domains) { public function __construct($config_domains) {
$this->all_domains = $all_domains; $this->config_domains = $config_domains;
} }
function invoke() { function invoke() {
redirect_to_random($this->all_domains); redirect_to_random($this->config_domains);
} }
} }

6
src/user.php
View File

@ -5,7 +5,7 @@ class User {
public $username; public $username;
public $domain; public $domain;
public function isInvalid() { public function isInvalid(): bool {
global $config; global $config;
if (empty($this->username) || empty($this->domain)) { if (empty($this->username) || empty($this->domain)) {
return true; return true;
@ -16,7 +16,7 @@ class User {
} }
} }
public static function parseDomain(string $address) { public static function parseDomain(string $address): User {
$clean_address = _clean_address($address); $clean_address = _clean_address($address);
$user = new User(); $user = new User();
$user->username = _clean_username($clean_address); $user->username = _clean_username($clean_address);
@ -25,7 +25,7 @@ class User {
return $user; return $user;
} }
public static function parseUsernameAndDomain(string $username, string $domain) { public static function parseUsernameAndDomain(string $username, string $domain): User {
$user = new User(); $user = new User();
$user->username = _clean_username($username); $user->username = _clean_username($username);
$user->domain = _clean_domain($domain); $user->domain = _clean_domain($domain);