diff options
| -rw-r--r-- | app/controllers/admin/mailqueue.php | 16 | ||||
| -rw-r--r-- | app/views/admin/mailqueue/index.php | 2 | ||||
| -rw-r--r-- | app/views/admin/mailqueue/showoldqueue.php | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/app/controllers/admin/mailqueue.php b/app/controllers/admin/mailqueue.php index bffd31a..1194381 100644 --- a/app/controllers/admin/mailqueue.php +++ b/app/controllers/admin/mailqueue.php @@ -120,7 +120,7 @@ class Admin_MailqueueController extends AuthenticatedController foreach ($this->old_mailqueues as $mailqueue) { $mailqueue->delete(); } - $this->relocate('mailqueue/showqueue'); + $this->relocate('admin/mailqueue/showqueue'); PageLayout::postSuccess('Alle Mailqueue-Einträge, die mindestens ein Jahr alt sind, wurden gelöscht.'); } @@ -130,20 +130,10 @@ class Admin_MailqueueController extends AuthenticatedController { if ($oldornew == 'new') { $this->mailqueues = MailQueueEntry::findBySQL("chdate >= UNIX_TIMESTAMP() - 15768000"); - $filename = FileManager::cleanFileName( - sprintf( - 'mailqueue-export-aktuell.csv', - \Context::getHeaderLine() - ) - ); + $filename = FileManager::cleanFileName('mailqueue-export-aktuell.csv'); } else if ($oldornew == 'old') { $this->mailqueues = MailQueueEntry::findBySQL("chdate < UNIX_TIMESTAMP() - 15768000"); - $filename = FileManager::cleanFileName( - sprintf( - 'mailqueue-export-alt.csv', - \Context::getHeaderLine() - ) - ); + $filename = FileManager::cleanFileName('mailqueue-export-alt.csv'); } $captions = [ diff --git a/app/views/admin/mailqueue/index.php b/app/views/admin/mailqueue/index.php index 52652c0..2a2e984 100644 --- a/app/views/admin/mailqueue/index.php +++ b/app/views/admin/mailqueue/index.php @@ -26,7 +26,7 @@ <td data-sort-value="<?= $queue_entry->last_try ?>"><? if ($queue_entry->last_try != 0) echo htmlReady(date('d.m.Y H:i', $queue_entry->last_try)) ?></td> <td> <? $actionmenu = ActionMenu::get(); ?> - <? $actionmenu->addLink(PluginEngine::getURL('mailqueuevisualisation', array(), "mailqueue/delete_entry/" . $queue_entry->mail_queue_id . "/new"), + <? $actionmenu->addLink($controller->url_for('admin/mailqueue/delete_entry/' . $queue_entry->mail_queue_id . '/new'), _('Eintrag löschen'), Icon::create('trash'), ['data-dialog' => 'size=auto']); ?> diff --git a/app/views/admin/mailqueue/showoldqueue.php b/app/views/admin/mailqueue/showoldqueue.php index f11d923..40b9c50 100644 --- a/app/views/admin/mailqueue/showoldqueue.php +++ b/app/views/admin/mailqueue/showoldqueue.php @@ -29,7 +29,7 @@ <td data-sort-value="<?= $queue_entry->last_try ?>"><? if ($queue_entry->last_try != 0) echo htmlReady(date('d.m.Y H:i', $queue_entry->last_try)) ?></td> <td> <? $actionmenu = ActionMenu::get(); ?> - <? $actionmenu->addLink(PluginEngine::getURL('mailqueuevisualisation', array(), "mailqueue/delete_entry/" . $queue_entry->mail_queue_id . "/old"), + <? $actionmenu->addLink($controller->url_for('mailqueue/delete_entry/' . $queue_entry->mail_queue_id . '/old'), _('Eintrag löschen'), Icon::create('trash'), ['data-dialog' => 'size=auto']); ?> |