From 960fb3ea401e7b96b3a09eca01a6482322186e04 Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 20 Jun 2008 11:40:05 +0000 Subject: Urlencode mail recipients for storing in session + little code cleanup git-svn-id: https://svn.roundcube.net/trunk@1564 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/main.inc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'roundcubemail/program/include/main.inc') diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index a29978a5e..d84ca896a 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -128,18 +128,7 @@ function rcmail_overwrite_action($action) function rcmail_url($action, $p=array(), $task=null) { $app = rcmail::get_instance(); - - $qstring = ''; - $base = $app->comm_path; - - if ($task && in_array($task, rcmail::$main_tasks)) - $base = ereg_replace('_task=[a-z]+', '_task='.$task, $app->comm_path); - - if (is_array($p)) - foreach ($p as $key => $val) - $qstring .= '&'.urlencode($key).'='.urlencode($val); - - return $base . ($action ? '&_action='.$action : '') . $qstring; + return $app->url((array)$p + array('_action' => $action, 'task' => $task)); } -- cgit v1.2.3