From 960fb3ea401e7b96b3a09eca01a6482322186e04 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
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/rcmail.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'roundcubemail/program/include/rcmail.php')

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 7c12ef779..c2ad9cf87 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -830,13 +830,16 @@ class rcmail
   public function url($p)
   {
     if (!is_array($p))
-      $p = array('action' => @func_get_arg(0));
-      
-    $url = $p['task'] ? './?_task=' . $p['task'] : $this->comm_path;
-    unset($p['task']);
+      $p = array('_action' => @func_get_arg(0));
     
+    if ($p['task'] && in_array($p['task'], rcmail::$main_tasks))
+      $url = './?_task='.$p['task'];
+    else
+      $url = $this->comm_path;
+    
+    unset($p['task']);
     foreach ($p as $par => $val)
-      $url .= sprintf('&%s=%s', urlencode($par), urlencode($val));
+      $url .= '&'.urlencode($par).'='.urlencode($val);
     
     return $url;
   }
-- 
cgit v1.2.3