From e1ecf797f5274b3a95ae6f55f68b5f72e137bb93 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 10 Jun 2015 09:08:10 -0400
Subject: [PATCH] Use double-quotes for setTimeout of UIxJSClose.wox

---
 UI/Contacts/UIxContactEditor.m | 7 +++----
 UI/Contacts/UIxListEditor.m    | 9 +++++----
 UI/SOGoUI/UIxComponent.m       | 4 ++--
 UI/Templates/UIxJSClose.wox    | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 82ad1941e..418945337 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004-2005 SKYRIX Software AG
-  Copyright (C) 2005-2010 Inverse inc.
+  Copyright (C) 2005-2015 Inverse inc.
 
   This file is part of SOGo
 
@@ -378,9 +378,8 @@ static Class SOGoContactGCSEntryK = Nil;
     result = [self redirectToLocation: [self modulePath]];
   else
     {
-      jsRefreshMethod
-        = [NSString stringWithFormat: @"refreshContacts(\"%@\")",
-                    [contact nameInContainer]];
+      jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
+                                  [contact nameInContainer]];
       result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
     }
 
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index 69d63bd21..ea4920b15 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -1,6 +1,6 @@
 /* UIxListEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2008-2014 Inverse inc.
+ * Copyright (C) 2008-2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,8 @@
 #import <NGCards/NGVCardReference.h>
 #import <NGCards/NGVList.h>
 
+#import <SOGo/NSString+Utilities.h>
+
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactGCSFolder.h>
 #import <Contacts/SOGoContactGCSList.h>
@@ -289,9 +291,8 @@
         result = [self redirectToLocation: [self modulePath]];
       else
         {
-          jsRefreshMethod
-            = [NSString stringWithFormat: @"refreshContacts(\"%@\")",
-            [co nameInContainer]];
+          jsRefreshMethod = [NSString stringWithFormat: @"refreshContacts('%@')",
+                                      [co nameInContainer]];
           result = [self jsCloseWithRefreshMethod: jsRefreshMethod];
         }
     }
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 336bd734d..b2a1315af 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2012 Inverse inc.
+  Copyright (C) 2007-2015 Inverse inc.
   Copyright (C) 2004 SKYRIX Software AG
 
   This file is part of SOGo
@@ -452,7 +452,7 @@ static SoProduct      *commonProduct      = nil;
 
   jsClose = [UIxJSClose new];
   [jsClose autorelease];
-  [jsClose setRefreshMethod: methodName];
+  [jsClose setRefreshMethod: [methodName doubleQuotedString]];
 
   return jsClose;
 }
diff --git a/UI/Templates/UIxJSClose.wox b/UI/Templates/UIxJSClose.wox
index 3a4487f5b..f1bdef0ef 100644
--- a/UI/Templates/UIxJSClose.wox
+++ b/UI/Templates/UIxJSClose.wox
@@ -17,7 +17,7 @@
        ><script type="text/javascript"
         ><var:if condition="hasRefreshMethod">
           var p = <var:if condition="singleWindowModeEnabled">parent</var:if><var:if condition="singleWindowModeEnabled" const:negate="YES">window.opener</var:if>;
-          if (p) p.setTimeout('<var:string value="refreshMethod" const:escapeHTML="NO" />;', 50);
+          if (p) p.setTimeout(<var:string value="refreshMethod" const:escapeHTML="NO" />, 50);
         </var:if>
         onCloseButtonClick();
       </script>