Page Menu
Home
GitPull.it
Search
Configure Global Search
Log In
Files
F15187226
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Authored By
Unknown
Size
12 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/include/class-Domain.php b/include/class-Domain.php
index 2ad7f22..4a3f3e7 100644
--- a/include/class-Domain.php
+++ b/include/class-Domain.php
@@ -1,235 +1,235 @@
<?php
-# Copyright (C) 2018, 2019 Valerio Bozzolan
+# Copyright (C) 2018, 2019, 2020 Valerio Bozzolan
# Boz Libre Hosting Panel
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
// load Plan trait
class_exists( 'Plan' );
/**
* Methods for a Domain class
*/
trait DomainTrait {
use PlanTrait;
/**
* Count of the Domain's Mailboxes
*
* This is a kind of cache
*
* @var int
*/
private $domainMailboxCount = null;
/**
* Count of the Domain's FTP accounts
*
* This is a kind of cache
*
* @var int
*/
private $domainFTPAccountCount = null;
/**
* Get domain ID
*
* @return int
*/
public function getDomainID() {
return $this->get( 'domain_ID' );
}
/*
* Get domain name
*
* @return string
*/
public function getDomainName() {
return $this->get( 'domain_name' );
}
/**
* Get the domain edit URl
*
* @param boolean $absolute True for an absolute URL
* @return string
*/
public function getDomainPermalink( $absolute = false ) {
return Domain::permalink( $this->get( 'domain_name' ), $absolute );
}
/**
* Check if you can create a new Mailbox for this Domain
*
* The Domain must have Plan informations.
*
* @return boolean
*/
public function canCreateMailboxInDomain() {
return $this->getPlanMailboxes() > $this->getDomainMailboxCount()
||
has_permission( 'edit-email-all' );
}
/**
* Check if you can create a new FTP account for this Domain
*
* The Domain must have Plan informations.
*
* The Domain must have Plan informations.
*/
public function canCreateFTPAccountForDomain() {
return $this->getPlanFTPUsers() > $this->getDomainFTPAccountCount()
||
has_permission( 'edit-ftp-all' );
}
/**
* Factory mailbox from this domain
*
* @return MailboxFullAPI
*/
public function factoryMailbox() {
return ( new MailboxFullAPI() )->whereDomain( $this );
}
/**
* Factory e-mail forward from this domain
*
* @return MailforwardFullAPI
*/
public function factoryMailforwardfrom() {
- return ( new MailforwardfromAPI() )->whereDomain( $this );
+ return ( new MailforwardfromQuery() )->whereDomain( $this );
}
/**
* Set a count of Domain's Mailboxes
*
* This method should not be used directly.
*
* @param $count int
* @return self
*/
public function setDomainMailboxCount( $count ) {
$this->domainMailboxCount = $count;
}
/**
* Get the number of Mailboxes of this Domain
*
* This method has a layer of cache.
*
* @return int
*/
public function getDomainMailboxCount() {
// check if we already know the count
if( !isset( $this->domainMailboxCount ) ) {
// count the number of mailboxes associated to this Domain
$count = $this->factoryMailbox()
->select( 'COUNT(*) count' )
->queryValue( 'count' );
// save in cache
$this->domainMailboxCount = (int) $count;
}
return $this->domainMailboxCount;
}
/**
* Get the number of FTP accounts of this Domain
*
* This method has a layer of cache.
*
* @return int
*/
public function getDomainFTPAccountCount() {
// check if we already know the count
if( !isset( $this->domainFTPAccountCount ) ) {
// count the number of mailboxes associated to this Domain
$count = $this->factoryFTP()
->select( 'COUNT(*) count' )
->queryValue( 'count' );
// save in cache
$this->domainFTPAccountCount = (int) $count;
}
return $this->domainFTPAccountCount;
}
/**
* Factory FTP users from this domain
*
* @return FTPAPI
*/
public function factoryFTP() {
return ( new FTPAPI() )->whereDomain( $this );
}
/**
* Normalize a Domain object after being retrieved from database
*/
protected function normalizeDomain() {
$this->integers( 'domain_ID' );
$this->booleans( 'domain_active' );
$this->dates( 'domain_born', 'domain_expiration' );
$this->normalizePlan();
}
}
/**
* Describe the 'domain' table
*/
class Domain extends Queried {
use DomainTrait;
/**
* Table name
*/
const T = 'domain';
const UID = 'domain_name';
/**
* Constructor
*/
public function __construct() {
$this->normalizeDomain();
}
/**
* Get the domain permalink
*
* @param string $domain_name Domain name
* @param boolean $absolute True for an absolute URL
*/
public static function permalink( $domain_name = null, $absolute = false ) {
$url = 'domain.php';
if( $domain_name ) {
$url .= _ . $domain_name;
}
return site_page( $url, $absolute );
}
}
diff --git a/include/class-MailforwardfromAPI.php b/include/class-MailforwardfromQuery.php
similarity index 87%
rename from include/class-MailforwardfromAPI.php
rename to include/class-MailforwardfromQuery.php
index be7c8eb..98e5642 100644
--- a/include/class-MailforwardfromAPI.php
+++ b/include/class-MailforwardfromQuery.php
@@ -1,43 +1,43 @@
<?php
-# Copyright (C) 2019 Valerio Bozzolan
+# Copyright (C) 2019, 2020 Valerio Bozzolan
# Boz Libre Hosting Panel
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-class_exists( 'MailforwardfromAPI', true );
-class_exists( 'DomainAPI', true );
-
-class MailforwardfromAPI extends DomainAPI {
+/**
+ * Execute query againsts a Mailforwardfrom
+ */
+class MailforwardfromQuery extends DomainAPI {
/**
* Construct
*/
public function __construct() {
parent::__construct();
$this->from( 'mailforwardfrom' );
$this->equals( 'mailforwardfrom.domain_ID', 'domain.domain_ID' );
$this->defaultClass( 'Mailforwardfrom' );
}
/**
* Filter to a specific mailforward username
*
* @param $username string
* @return self
*/
public function whereMailforwardfromUsername( $username ) {
return $this->whereStr( 'mailforwardfrom_username', $username );
}
}
diff --git a/www/mailforward.php b/www/mailforward.php
index ad2e2a6..351d3f1 100644
--- a/www/mailforward.php
+++ b/www/mailforward.php
@@ -1,183 +1,183 @@
<?php
-# Copyright (C) 2018, 2019 Valerio Bozzolan
+# Copyright (C) 2018, 2019, 2020 Valerio Bozzolan
# Boz Libre Hosting Panel
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
/*
* This is the single e-mail forwarding edit page
*/
// load framework
require '../load.php';
// wanted informations
$domain = null;
$mailforwardfrom = null;
// URL paramenters (maximum both domain and mailforward source, minimum just domain)
list( $domain_name, $mailforwardfrom_username ) = url_parts( 2, 1 );
// eventually retrieve mailforward from database
if( $mailforwardfrom_username ) {
- $mailforwardfrom = ( new MailforwardfromAPI )
+ $mailforwardfrom = ( new MailforwardfromQuery() )
->select( [
'domain.domain_ID',
'domain_name',
'mailforwardfrom.mailforwardfrom_ID',
'mailforwardfrom_username',
] )
->whereDomainName( $domain_name )
->whereMailforwardfromUsername( $mailforwardfrom_username )
->whereDomainIsEditable()
->queryRow();
// 404
$mailforwardfrom or PageNotFound::spawn();
// recycle the mailforward object that has domain informations
$domain = $mailforwardfrom;
}
// eventually retrieve domain from database
if( ! $domain ) {
$domain = ( new DomainAPI() )
->select( [
'domain.domain_ID',
'domain.domain_name',
] )
->whereDomainName( $domain_name )
->whereDomainIsEditable()
->queryRow();
// 404
$domain or PageNotFound::spawn();
}
// save destination action
if( is_action( 'mailforward-save' ) ) {
// save source only during creation
if( ! $mailforwardfrom ) {
// sanitize
if( ! isset( $_POST[ 'mailforwardfrom_username' ] ) ) {
BadRequest::spawn( __( "missing parameter" ) );
}
$username = luser_input( $_POST[ 'mailforwardfrom_username' ], 128 );
if( ! validate_mailbox_username( $username ) ) {
BadRequest::spawn( __( "invalid mailbox name" ) );
}
// check existence
- $mailforwardfrom_exists = ( new MailforwardfromAPI )
+ $mailforwardfrom_exists = ( new MailforwardfromQuery() )
->select( 1 )
->whereDomain( $domain )
->whereMailforwardfromUsername( $username )
->queryRow();
// die if exists
if( $mailforwardfrom_exists ) {
BadRequest::spawn( __( "e-mail forwarding already existing" ) );
}
// insert as new row
insert_row( 'mailforwardfrom', [
new DBCol( 'domain_ID', $domain->getDomainID(), 'd' ),
new DBCol( 'mailforwardfrom_username', $username, 's' ),
] );
// POST/redirect/GET
http_redirect( Mailforwardfrom::permalink(
$domain->getDomainName(),
$username,
true
), 303 );
}
}
// delete action
if( $mailforwardfrom ) {
// action fired when deleting a whole mailforward
if( is_action( 'mailforward-delete' ) ) {
// drop th
query( sprintf(
"DELETE FROM %s WHERE domain_ID = %d AND mailforwardfrom_username = '%s'",
T( 'mailforwardfrom' ),
$mailforwardfrom->getDomainID(),
$mailforwardfrom->getMailforwardfromUsername()
) );
// POST/redirect/GET
http_redirect( $domain->getDomainPermalink( true ), 303 );
}
// action fired when adding/removing a mailforward
if( ( is_action( 'mailforwardto-add' ) || is_action( 'mailforwardto-remove' ) ) && isset( $_POST[ 'address' ] ) ) {
$address = require_email( $_POST[ 'address' ] );
if( $address === $mailforwardfrom->getMailforwardfromAddress() ) {
BadRequest::spawn( __( "do not try to create a loop" ) );
}
$existing_address =
( new MailforwardtoAPI() )
->whereMailforwardfrom( $mailforwardfrom )
->whereMailforwardtoAddress( $address )
->queryRow();
// action fired when removing a mailforward
if( is_action( 'mailforwardto-remove' ) && $existing_address ) {
query( sprintf(
"DELETE FROM %s WHERE mailforwardfrom_ID = %d and mailforwardto_address = '%s'",
T( 'mailforwardto' ),
$mailforwardfrom->getMailforwardfromID(),
esc_sql( $address )
) );
}
// action fired when adding a mailforward
if( is_action( 'mailforwardto-add' ) && ! $existing_address ) {
insert_row( 'mailforwardto', [
new DBCol( 'mailforwardfrom_ID', $mailforwardfrom->getMailforwardfromID(), 'd' ),
new DBCol( 'mailforwardto_address', $address, 's' ),
] );
}
}
}
// spawn header
Header::spawn( [
'uid' => false,
'title-prefix' => __( "E-mail forwarding" ),
'title' => $mailforwardfrom
? $mailforwardfrom->getMailforwardfromAddress()
: __( "create" ),
'breadcrumb' => [
new MenuEntry( null, $domain->getDomainPermalink(), $domain->getDomainName() ),
],
] );
// spawn the page content
template( 'mailforward', [
'domain' => $domain,
'mailforwardfrom' => $mailforwardfrom,
] );
// spawn the footer
Footer::spawn();
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Thu, Nov 19, 09:45 (5 m, 33 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2265664
Default Alt Text
(12 KB)
Attached To
Mode
R3 KISS Libre Hosting Panel
Attached
Detach File
Event Timeline