From b58fe0f9ff44cc15a6bbaa3e81ed66cbf95adaf4 Mon Sep 17 00:00:00 2001
From: Oleg Shpynov <oleg.shpynov@jebrains.com>
Date: Thu, 3 Feb 2011 18:47:09 +0300
Subject: [PATCH] More correct escaping when creating new github repos

---
 .../org/jetbrains/plugins/github/GithubShareAction.java  | 9 ++++++++-
 .../src/org/jetbrains/plugins/github/GithubUtil.java     | 3 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index 6cb51c691072..bc27bb0833ba 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -1,5 +1,9 @@
 package org.jetbrains.plugins.github;
 
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationDisplayType;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.Notifications;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
@@ -12,6 +16,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
@@ -113,7 +118,7 @@ public class GithubShareAction extends DumbAwareAction {
     try {
       LOG.info("Creating GitHub repository");
       GithubUtil.doREST(settings.getHost(), settings.getLogin(), settings.getPassword(),
-                        "/repos/create?name=" + name + "&description=" + description + "&public=" + (isPrivate ? "0" : "1"), true);
+                        "/repos/create?name=" + name + "&public=" + (isPrivate ? "0" : "1") + "&description=" + JDOMUtil.escapeText(description, true, true), true);
       LOG.info("Successfully created GitHub repository");
     }
     catch (final Exception e1) {
@@ -121,6 +126,8 @@ public class GithubShareAction extends DumbAwareAction {
       return;
     }
     bindToGithub(project, root, gitDetected, settings.getLogin(), name);
+    Notifications.Bus.notify(new Notification("github", "Success", "Successfully created project ''" + name + "'' on github",
+                                              NotificationType.INFORMATION), NotificationDisplayType.BALLOON_ONLY, null);
   }
 
   private void bindToGithub(final Project project, final VirtualFile root, final boolean gitDetected, final String login, final String name) {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
index 63c775a3c324..9cac56ee2348 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.VcsException;
@@ -94,7 +93,7 @@ public class GithubUtil {
   public static HttpMethod doREST(final String url, final String login, final String password, final String request, final boolean post) throws Exception {
     final HttpClient client = getHttpClient(login, password);
     client.getParams().setContentCharset("UTF-8");
-    final String uri = JDOMUtil.escapeText("https://" + getHostByUrl(url) + API_URL + request, true, true);
+    final String uri = "https://" + getHostByUrl(url) + API_URL + request;
     final HttpMethod method = post ? new PostMethod(uri) : new GetMethod(uri);
     client.executeMethod(method);
     return method;