diff --git a/include/class-DomainAPI.php b/include/class-DomainAPI.php index f4dd519..f17f614 100644 --- a/include/class-DomainAPI.php +++ b/include/class-DomainAPI.php @@ -1,160 +1,160 @@ . // load dependent traits class_exists( 'PlanAPI' ); /** * Methods related to a Domain class */ trait DomainAPITrait { use PlanAPITrait; /** * Where the domains are editable by me * * @return self */ public function whereDomainIsEditable() { if( ! has_permission( 'edit-domain-all' ) ) { $this->whereDomainUser(); } return $this; } /** * Where the Domain is Active (or not) * * @param boolean $active If you want the active, or the inactive * @return self */ public function whereDomainIsActive( $active = true ) { - return $this->wheerInt( 'domain_active', $active ); + return $this->whereInt( 'domain_active', $active ); } /** * Limit to a certain user (or yourself) * * @param $user_ID int * @return self */ public function whereDomainUser( $user_ID = false ) { if( $user_ID === false ) { $user_ID = get_user( 'user_ID' ); } $this->joinDomainUser(); return $this->whereInt( 'domain_user.user_ID', $user_ID ); } /** * Limit to a certian domain name * * @param $domain_name string * @return self */ public function whereDomainName( $domain_name ) { return $this->whereStr( 'domain_name', $domain_name ); } /** * Constructor from a domain ID * * @param $domain_ID int * @return self */ public function whereDomainID( $domain_ID ) { return $this->whereInt( static::DOMAIN_ID, $domain_ID ); } /** * Constructor from a Domain object * * @param $domain object * @return self */ public function whereDomain( $domain ) { return $this->whereDomainID( $domain->getDomainID() ); } /** * Order by the Domain name * * @param string $direction DESC|ASC * @return self */ public function orderByDomainName( $direction = null ) { return $this->orderBy( 'domain_name', $direction ); } /** * Join domain and users (once) * * @return self */ public function joinDomainUser() { if( empty( $this->joinedDomainUser ) ) { $this->from( 'domain_user' ); $this->equals( 'domain_user.domain_ID', 'domain.domain_ID' ); $this->joinedDomainUser = true; } return $this; } /** * Join whatever table with the domain table * * @return self */ public function joinDomain() { return $this->joinOn( 'INNER', 'domain', static::DOMAIN_ID, 'domain.domain_ID' ); } } /** * Domain API */ class DomainAPI extends Query { use DomainAPITrait; /** * Univoque Domain ID column name */ const DOMAIN_ID = 'domain.domain_ID'; /** * Univoque Plan ID column name */ const PLAN_ID = 'domain.plan_ID'; /** * Constructor * * @param object $db Database (or NULL for the current one) */ public function __construct( $db = null ) { // set database and class name parent::__construct( $db, 'Domain' ); // set database table $this->from( Domain::T ); } } diff --git a/include/class-MailboxAPI.php b/include/class-MailboxAPI.php index 8073fd4..10a4035 100644 --- a/include/class-MailboxAPI.php +++ b/include/class-MailboxAPI.php @@ -1,118 +1,118 @@ . // load dependend traits class_exists( 'DomainAPI' ); /** * Methods for a MailboxAPI class */ trait MailboxAPITrait { use DomainAPITrait; /** * Limit to a specific mailbox * * @param object $mailbox Mailbox * @return self */ public function whereMailbox( $mailbox ) { return $this->whereDomain( $mailbox ) ->whereMaiboxUsername( $mailbox->getMailboxUsername() ); } /** * Filter a specific Mailbox username * * @param string $username Mailbox username (without domain name) * @return self */ public function whereMailboxUsername( $username ) { return $this->whereStr( 'mailbox_username', $username ); } /** * Where the Mailbox is Active (or not) * * @param boolean $active If you want the active, or the inactive * @return self */ public function whereMailboxIsActive( $active = true ) { - return $this->wheerInt( 'mailbox_active', $active ); + return $this->whereInt( 'mailbox_active', $active ); } /** * Join mailboxes and domain (once) * * @return self */ public function joinMailboxDomain() { if( empty( $this->joinedMailboxDomain ) ) { $this->from( 'domain' ); $this->equals( 'domain.domain_ID', 'mailbox.domain_ID' ); $this->joinedMailboxDomain = true; } return $this; } /** * Check if I can edit this mailbox * * Actually it just checks if you can edit the whole domain. * * @return boolean */ public function whereMailboxIsEditable() { return $this->whereDomainIsEditable(); } } /** * Mailbox API */ class MailboxAPI extends Query { use MailboxAPITrait; /** * Univoque Domain ID column name * * Used by DomainAPITrait */ const DOMAIN_ID = 'mailbox.domain_ID'; /** * Univoque Plan ID column name */ const PLAN_ID = 'domain.plan_ID'; /** * Constructor */ public function __construct( $db = null ) { // set database and class name parent::__construct( $db, Mailbox::class ); // set database table $this->from( Mailbox::T ); } }