diff --git a/delete.php b/delete.php
index ffc8bf0a..d0631128 100644
--- a/delete.php
+++ b/delete.php
@@ -12,167 +12,39 @@
* @license GNU GPL v2 or later.
*
* File: delete.php
- * Used to delete admins, domains, mailboxes and aliases.
- * Note: if a domain is deleted, all mailboxes and aliases belonging
- * to the domain are also removed.
+ * Used to delete admins, domains, mailboxes, aliases etc.
*
- * Template File: message.tpl
- *
- * Template Variables:
- *
- * none
- *
- * Form POST \ GET Variables:
- *
- * fTable
- * fDelete
- * fDomain
+ * Template File: none
*/
require_once('common.php');
-authentication_require_role('admin');
+$username = authentication_get_username(); # enforce login
-$SESSID_USERNAME = authentication_get_username();
-$error = 0;
+$id = safeget('delete');
+$table = safeget('table');
-$fTable = escape_string (safeget('table') ); # see the if blocks below for valid values
-$fDelete = escape_string (safeget('delete'));
-$fDomain = escape_string (safeget('domain'));
+$handlerclass = ucfirst($table) . 'Handler';
-$error=0;
-
-if ($fTable == "admin")
-{
- authentication_require_role('global-admin');
- $fWhere = 'username';
- $result_admin = db_delete ('admin',$fWhere,$fDelete);
- $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete);
-
- if ($result_admin != 1) {
- flash_error($PALANG['pAdminDelete_admin_error']);
- }
- header ("Location: list-admin.php");
- exit;
-} # ($fTable == "admin")
-elseif ($fTable == "domain")
-{
- authentication_require_role('global-admin');
- $fWhere = 'domain';
- $result_domain_admins = db_delete ('domain_admins',$fWhere,$fDelete);
- $result_alias = db_delete ('alias',$fWhere,$fDelete);
- $result_mailbox = db_delete ('mailbox',$fWhere,$fDelete);
- $result_alias_domain = db_delete('alias_domain','alias_domain',$fDelete);
- $result_log = db_delete ('log',$fWhere,$fDelete);
- if ($CONF['vacation'] == "YES")
- {
- $result_vacation = db_delete ('vacation',$fWhere,$fDelete);
- }
- $result_domain = db_delete ('domain',$fWhere,$fDelete);
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+ die ("Invalid table name given!");
+}
- if (!$result_domain || !domain_postdeletion($fDelete))
- {
- flash_error($PALANG['pAdminDelete_domain_error']);
- }
- header ("Location: list-domain.php");
- exit;
-} # ($fTable == "domain")
-elseif ($fTable == "alias_domain")
-{
- authentication_require_role('global-admin');
- $table_domain_alias = table_by_key('alias_domain');
- $fWhere = 'alias_domain';
- $fDelete = $fDomain;
- if(db_delete('alias_domain',$fWhere,$fDelete) != 1) {
- flash_error($PALANG['pAdminDelete_alias_domain_error']);
- }
- header ("Location: list-domain.php");
- exit;
-} # ($fTable == "alias_domain")
+$handler = new $handlerclass(0, $username);
-elseif ($fTable == "alias" or $fTable == "mailbox")
-{
+$formconf = $handler->webformConfig();
- if (!check_owner ($SESSID_USERNAME, $fDomain))
- {
- $error = 1;
- flash_error($PALANG['pDelete_domain_error'] . "($fDomain)!");
- }
- elseif (!check_alias_owner ($SESSID_USERNAME, $fDelete))
- {
- $error = 1;
- flash_error($PALANG['pDelete_alias_error'] . "($fDelete)!");
- }
- else
- {
- db_begin();
- /* there may be no aliases to delete */
- $result = db_query("SELECT * FROM $table_alias WHERE address = '$fDelete' AND domain = '$fDomain'");
- if($result['rows'] == 1) {
- $result = db_query ("DELETE FROM $table_alias WHERE address='$fDelete' AND domain='$fDomain'");
- db_log ($fDomain, 'delete_alias', $fDelete);
- }
- /* is there a mailbox? if do delete it from orbit; it's the only way to be sure */
- $result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- if ($result['rows'] == 1)
- {
- $result = db_query ("DELETE FROM $table_mailbox WHERE username='$fDelete' AND domain='$fDomain'");
- $postdel_res=mailbox_postdeletion($fDelete,$fDomain);
- if ($result['rows'] != 1 || !$postdel_res)
- {
- $error = 1;
- $deletionMessage = $PALANG['pDelete_delete_error'] . "$fDelete (";
- if ($result['rows']!=1)
- {
- $deletionMessage.='mailbox';
- if (!$postdel_res) $deletionMessage.=', ';
- }
- if (!$postdel_res)
- {
- $deletionMessage.='post-deletion';
- }
- $deletionMessage.=')';
- flash_error($deletionMessage);
- }
- db_log ($fDomain, 'delete_mailbox', $fDelete);
- }
- $result = db_query("SELECT * FROM $table_vacation WHERE email = '$fDelete' AND domain = '$fDomain'");
- if($result['rows'] == 1) {
- db_query ("DELETE FROM $table_vacation WHERE email='$fDelete' AND domain='$fDomain'");
- db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$fDelete' "); /* should be caught by cascade, if PgSQL */
- }
- $result = db_query("SELECT * FROM $table_quota WHERE username='$fDelete'");
- if($result['rows'] >= 1) {
- db_query ("DELETE FROM $table_quota WHERE username='$fDelete'");
- }
- $result = db_query("SELECT * FROM $table_quota2 WHERE username='$fDelete'");
- if($result['rows'] == 1) {
- db_query ("DELETE FROM $table_quota2 WHERE username='$fDelete'");
- }
- }
+authentication_require_role($formconf['required_role']);
- if ($error != 1)
- {
- db_commit();
- } else {
- flash_error($PALANG['pDelete_delete_error'] . "$fDelete (physical mail)!");
- db_rollback();
- }
- header ("Location: list-virtual.php?domain=$fDomain");
- exit;
-}
-else
-{
- flash_error($PALANG['invalid_parameter']);
- header("Location: main.php");
- exit;
+if ($handler->init($id)) { # errors will be displayed as last step anyway, no need for duplicated code ;-)
+ $handler->delete();
}
-# we should most probably never reach this point
-$smarty->assign ('smarty_template', 'message');
-flash_error("If you see this, please open a bugreport and include the exact delete.php parameters.");
-$smarty->display ('index.tpl');
+flash_error($handler->errormsg);
+flash_info($handler->infomsg);
+header ("Location: " . $formconf['listview']);
+exit;
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
diff --git a/templates/list-virtual_alias.tpl b/templates/list-virtual_alias.tpl
index aa0a8283..8242e5c6 100644
--- a/templates/list-virtual_alias.tpl
+++ b/templates/list-virtual_alias.tpl
@@ -40,7 +40,7 @@
| {if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if} |
{$PALANG.edit} |
- {$PALANG.del} |
{else}
{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if} |
diff --git a/templates/list-virtual_alias_domain.tpl b/templates/list-virtual_alias_domain.tpl
index 4646586e..47864fe8 100644
--- a/templates/list-virtual_alias_domain.tpl
+++ b/templates/list-virtual_alias_domain.tpl
@@ -32,7 +32,7 @@
{$item.modified} |
{if $item.active==1}{$PALANG.YES}{else}{$PALANG.NO}{/if} |
{$PALANG.edit} |
- {$PALANG.del} |
+ {$PALANG.del} |
{/foreach}
{/if}
diff --git a/templates/list-virtual_mailbox.tpl b/templates/list-virtual_mailbox.tpl
index 4f2782e3..a99f5644 100644
--- a/templates/list-virtual_mailbox.tpl
+++ b/templates/list-virtual_mailbox.tpl
@@ -87,7 +87,7 @@
{$PALANG.alias} |
{/if}
{$PALANG.edit} |
- {$PALANG.del} |
+ {$PALANG.del} |
{/foreach}