From a8f10b9f5e57c8d3ae75df82cd39422cd8c5b83a Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 01:32:44 +0000
Subject: [PATCH 01/10] issue #602 - will now take browsers position instead of
 iframe-source. will fail in cascaded framesets

---
 src/static/js/pad_editbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 7e8cf96e8..eab86d75b 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -235,7 +235,7 @@ var padeditbar = (function()
     {
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/"));
+        var basePath = top.location.href.substring(0, top.location.href.indexOf("/p/"));
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
@@ -243,7 +243,7 @@ var padeditbar = (function()
       }
       else
       {
-        var padurl = window.location.href.split("?")[0];
+        var padurl = top.location.href.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
         $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);

From 1545fef0225ff6699143e4587ef3508c54de8203 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 01:54:53 +0000
Subject: [PATCH 02/10] better fix for issue #602

---
 src/static/js/pad_editbar.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index eab86d75b..6be92c9fb 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -233,9 +233,10 @@ var padeditbar = (function()
     },
     setEmbedLinks: function()
     {
+      var padPath = window.parent ? window.parent.location.href : document.location.href;
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = top.location.href.substring(0, top.location.href.indexOf("/p/"));
+        var basePath = padPath.substring(0, padPath.indexOf("/p/"));
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
@@ -243,7 +244,7 @@ var padeditbar = (function()
       }
       else
       {
-        var padurl = top.location.href.split("?")[0];
+        var padurl = padPath.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
         $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);

From 43107909ca12746a11ffd1e69ae62e9e39f6fc59 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 04:49:07 +0200
Subject: [PATCH 03/10] due to browser security-limitations, will now use
 cookie-values of parentUri / parentUriReadOnly if they exist. should fix
 issue #602

---
 src/static/js/pad_editbar.js | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 6be92c9fb..4d7ebe243 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -20,6 +20,7 @@
  * limitations under the License.
  */
 
+var readCookie = require('./pad_utils').readCookie;
 var padutils = require('./pad_utils').padutils;
 var padeditor = require('./pad_editor').padeditor;
 var padsavedrevs = require('./pad_savedrevs');
@@ -233,22 +234,35 @@ var padeditbar = (function()
     },
     setEmbedLinks: function()
     {
-      var padPath = window.parent ? window.parent.location.href : document.location.href;
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = padPath.substring(0, padPath.indexOf("/p/"));
-        var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
-        $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
-        $('#linkinput').val(readonlyLink);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + readonlyLink);
+        if (readCookie("parentUriReadOnly"))
+        {
+          var padLink = decodeURIComponent(readCookie("parentUriReadOnly"));
+          var embedLink = padLink;
+        }
+        else
+        {
+          var padLink = document.location.href.substring(0, document.location.href.indexOf("/p/")) + "/ro/" + clientVars.readOnlyId;
+          var embedLink = padLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false";
+        }
       }
       else
       {
-        var padurl = padPath.split("?")[0];
-        $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
-        $('#linkinput').val(padurl);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);
+        if (readCookie("parentUri"))
+        {
+          var padLink = decodeURIComponent(readCookie("parentUri"));
+          var embedLink = padLink;
+        }
+        else
+        {
+          var padLink = document.location.href.split("?")[0];
+          var embedLink = padLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false";
+        }
       }
+      $('#embedinput').val("<iframe name='embed_readonly' src='" + embedLink + "' width=600 height=400>");
+      $('#linkinput').val(padLink);
+      $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padLink);
     }
   };
   return self;

From 202d09754d8c61cb36e03e4f85e23c1fd060e6d8 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Sat, 7 Apr 2012 00:33:24 +0000
Subject: [PATCH 04/10] Allow disabling Passwords by setting them to an empty
 string

---
 src/node/db/API.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index 09cc95afc..37fd3f161 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -431,7 +431,7 @@ exports.setPassword = function(padID, password, callback)
     if(ERR(err, callback)) return;
     
     //set the password
-    pad.setPassword(password);
+    pad.setPassword(password == "" ? null : password);
     
     callback();
   });

From c5ad98b01ad80104305ec862c8d3aa8e223b7649 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Sat, 7 Apr 2012 15:25:37 +0200
Subject: [PATCH 05/10] bugfix to use the API again

---
 src/node/hooks/express/apicalls.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js
index 8a9751eb5..2f9e4edf3 100644
--- a/src/node/hooks/express/apicalls.js
+++ b/src/node/hooks/express/apicalls.js
@@ -4,7 +4,7 @@ var formidable = require('formidable');
 var apiHandler = require('../../handler/APIHandler');
 
 //This is for making an api call, collecting all post information and passing it to the apiHandler
-exports.apiCaller = function(req, res, fields) {
+var apiCaller = function(req, res, fields) {
   res.header("Content-Type", "application/json; charset=utf-8");
 
   apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields));
@@ -26,6 +26,7 @@ exports.apiCaller = function(req, res, fields) {
   apiHandler.handle(req.params.func, fields, req, res);
 }
 
+exports.apiCaller = apiCaller;
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   //This is a api GET call, collect all post informations and pass it to the apiHandler
@@ -55,4 +56,4 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       res.end("OK");
     });
   });
-}
\ No newline at end of file
+}

From a538cf13e7a0c53df58a81ab8d29625afe26f45e Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 01:32:44 +0000
Subject: [PATCH 06/10] issue #602 - will now take browsers position instead of
 iframe-source. will fail in cascaded framesets

---
 src/static/js/pad_editbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 95d195058..29ec862e4 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -236,7 +236,7 @@ var padeditbar = (function()
     {
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/"));
+        var basePath = top.location.href.substring(0, top.location.href.indexOf("/p/"));
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
@@ -244,7 +244,7 @@ var padeditbar = (function()
       }
       else
       {
-        var padurl = window.location.href.split("?")[0];
+        var padurl = top.location.href.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
         $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);

From 9815f36a5ab6682b1fdb28aa7cbbc27765983297 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 01:54:53 +0000
Subject: [PATCH 07/10] better fix for issue #602

---
 src/static/js/pad_editbar.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 29ec862e4..658c33eb5 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -234,9 +234,10 @@ var padeditbar = (function()
     },
     setEmbedLinks: function()
     {
+      var padPath = window.parent ? window.parent.location.href : document.location.href;
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = top.location.href.substring(0, top.location.href.indexOf("/p/"));
+        var basePath = padPath.substring(0, padPath.indexOf("/p/"));
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
@@ -244,7 +245,7 @@ var padeditbar = (function()
       }
       else
       {
-        var padurl = top.location.href.split("?")[0];
+        var padurl = padPath.split("?")[0];
         $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
         $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);

From d0df0ff805ec7bcd33206a3004c8cb95766b3269 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Fri, 6 Apr 2012 04:49:07 +0200
Subject: [PATCH 08/10] due to browser security-limitations, will now use
 cookie-values of parentUri / parentUriReadOnly if they exist. should fix
 issue #602

---
 src/static/js/pad_editbar.js | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 658c33eb5..accc9fe6b 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -20,6 +20,7 @@
  * limitations under the License.
  */
 
+var readCookie = require('./pad_utils').readCookie;
 var padutils = require('./pad_utils').padutils;
 var padeditor = require('./pad_editor').padeditor;
 var padsavedrevs = require('./pad_savedrevs');
@@ -234,22 +235,35 @@ var padeditbar = (function()
     },
     setEmbedLinks: function()
     {
-      var padPath = window.parent ? window.parent.location.href : document.location.href;
       if ($('#readonlyinput').is(':checked'))
       {
-        var basePath = padPath.substring(0, padPath.indexOf("/p/"));
-        var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
-        $('#embedinput').val("<iframe name='embed_readonly' src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
-        $('#linkinput').val(readonlyLink);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + readonlyLink);
+        if (readCookie("parentUriReadOnly"))
+        {
+          var padLink = decodeURIComponent(readCookie("parentUriReadOnly"));
+          var embedLink = padLink;
+        }
+        else
+        {
+          var padLink = document.location.href.substring(0, document.location.href.indexOf("/p/")) + "/ro/" + clientVars.readOnlyId;
+          var embedLink = padLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false";
+        }
       }
       else
       {
-        var padurl = padPath.split("?")[0];
-        $('#embedinput').val("<iframe name='embed_readwrite' src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
-        $('#linkinput').val(padurl);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);
+        if (readCookie("parentUri"))
+        {
+          var padLink = decodeURIComponent(readCookie("parentUri"));
+          var embedLink = padLink;
+        }
+        else
+        {
+          var padLink = document.location.href.split("?")[0];
+          var embedLink = padLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false";
+        }
       }
+      $('#embedinput').val("<iframe name='embed_readonly' src='" + embedLink + "' width=600 height=400>");
+      $('#linkinput').val(padLink);
+      $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padLink);
     }
   };
   return self;

From 085c01f5e753a824a9f9cc0afad483a8a385242b Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Sat, 7 Apr 2012 00:33:24 +0000
Subject: [PATCH 09/10] Allow disabling Passwords by setting them to an empty
 string

---
 src/node/db/API.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/db/API.js b/src/node/db/API.js
index 09cc95afc..37fd3f161 100644
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@@ -431,7 +431,7 @@ exports.setPassword = function(padID, password, callback)
     if(ERR(err, callback)) return;
     
     //set the password
-    pad.setPassword(password);
+    pad.setPassword(password == "" ? null : password);
     
     callback();
   });

From f4282d38e5487e2b2a27e3d6b468eea2450d9ed0 Mon Sep 17 00:00:00 2001
From: Patrick Rauscher <prauscher@ohai.su>
Date: Sat, 7 Apr 2012 15:25:37 +0200
Subject: [PATCH 10/10] bugfix to use the API again

---
 src/node/hooks/express/apicalls.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js
index 8a9751eb5..2f9e4edf3 100644
--- a/src/node/hooks/express/apicalls.js
+++ b/src/node/hooks/express/apicalls.js
@@ -4,7 +4,7 @@ var formidable = require('formidable');
 var apiHandler = require('../../handler/APIHandler');
 
 //This is for making an api call, collecting all post information and passing it to the apiHandler
-exports.apiCaller = function(req, res, fields) {
+var apiCaller = function(req, res, fields) {
   res.header("Content-Type", "application/json; charset=utf-8");
 
   apiLogger.info("REQUEST, " + req.params.func + ", " + JSON.stringify(fields));
@@ -26,6 +26,7 @@ exports.apiCaller = function(req, res, fields) {
   apiHandler.handle(req.params.func, fields, req, res);
 }
 
+exports.apiCaller = apiCaller;
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   //This is a api GET call, collect all post informations and pass it to the apiHandler
@@ -55,4 +56,4 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       res.end("OK");
     });
   });
-}
\ No newline at end of file
+}