From 3c971bea8b6ffea93852cbb132a2c8d52f0514ba Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 5 Oct 2006 23:30:29 +0000 Subject: [PATCH] Monotone-Parent: de6b8b0e44a423af67a24ac06e1f5a54ff0f06b6 Monotone-Revision: fefaafed986a915928894d60a2029a6c2099cf60 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-05T23:30:29 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.js | 2 ++ UI/WebServerResources/generic.js | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index bb916a786..6fef6eb5d 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -13,6 +13,8 @@ function newEvent(sender) { day = currentDay; var hour = sender.getAttribute("hour"); + if (!hour) + hour = '0800'; var urlstr = (ApplicationBaseURL + "new" + "?day=" + day + "&hm=" + hour); diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 304409288..03b9d14f1 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -126,22 +126,22 @@ function extractEmailAddress(mailTo) { } function extractEmailName(mailTo) { - var name = ""; + var emailName = ""; - var namere = /(\w[\w\ _-]+)\ (<|<)/; - if (namere.test(mailTo)) { - namere.exec(mailTo); - name = RegExp.$1; + var emailNamere = /(\w[\w\ _-]+)\ (<|<)/; + if (emailNamere.test(mailTo)) { + emailNamere.exec(mailTo); + emailName = RegExp.$1; } } function sanitizeMailTo(dirtyMailTo) { - var name = extractEmailName(dirtyMailTo); + var emailName = extractEmailName(dirtyMailTo); var email = extractEmailAddress(dirtyMailTo); var mailto = ""; - if (name.length > 0) - mailto = name + ' <' + email + '>'; + if (emailName.length > 0) + mailto = emailName + ' <' + email + '>'; else mailto = email; @@ -294,6 +294,7 @@ function getQueryParaArray(s) { if (s.charAt(0) == "?") s = s.substr(1, s.length - 1); return s.split("&"); } + function getQueryParaValue(s, name) { var t;