From 68d2d541002017dae51127aa05af58d19916655b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 16 Jan 2011 14:42:40 -0500
Subject: [PATCH] - Move action files map from index.php to steps' func.inc files
---
index.php | 44 +++-----------------------------------------
1 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/index.php b/index.php
index e142505..244d2f9 100644
--- a/index.php
+++ b/index.php
@@ -194,43 +194,6 @@
}
-// map task/action to a certain include file
-$action_map = array(
- 'mail' => array(
- 'preview' => 'show.inc',
- 'print' => 'show.inc',
- 'moveto' => 'move_del.inc',
- 'delete' => 'move_del.inc',
- 'send' => 'sendmail.inc',
- 'expunge' => 'folders.inc',
- 'purge' => 'folders.inc',
- 'remove-attachment' => 'attachments.inc',
- 'display-attachment' => 'attachments.inc',
- 'upload' => 'attachments.inc',
- 'group-expand' => 'autocomplete.inc',
- ),
-
- 'addressbook' => array(
- 'add' => 'edit.inc',
- 'group-create' => 'groups.inc',
- 'group-rename' => 'groups.inc',
- 'group-delete' => 'groups.inc',
- 'group-addmembers' => 'groups.inc',
- 'group-delmembers' => 'groups.inc',
- ),
-
- 'settings' => array(
- 'folders' => 'folders.inc',
- 'rename-folder' => 'folders.inc',
- 'delete-folder' => 'folders.inc',
- 'subscribe' => 'folders.inc',
- 'unsubscribe' => 'folders.inc',
- 'purge' => 'folders.inc',
- 'folder-size' => 'folders.inc',
- 'add-identity' => 'edit_identity.inc',
- )
-);
-
// include task specific functions
if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/func.inc'))
include_once($incfile);
@@ -238,9 +201,6 @@
// allow 5 "redirects" to another action
$redirects = 0; $incstep = null;
while ($redirects < 5) {
- $stepfile = !empty($action_map[$RCMAIL->task][$RCMAIL->action]) ?
- $action_map[$RCMAIL->task][$RCMAIL->action] : strtr($RCMAIL->action, '-', '_') . '.inc';
-
// execute a plugin action
if ($RCMAIL->plugins->is_plugin_task($RCMAIL->task)) {
$RCMAIL->plugins->exec_action($RCMAIL->task.'.'.$RCMAIL->action);
@@ -251,7 +211,9 @@
break;
}
// try to include the step file
- else if (is_file($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile)) {
+ else if (($stepfile = $RCMAIL->get_action_file())
+ && is_file($incfile = 'program/steps/'.$RCMAIL->task.'/'.$stepfile)
+ ) {
include($incfile);
$redirects++;
}
--
Gitblit v1.9.1