From 741ff8f405a8556c6c8be360a10a71b735b7ce41 Mon Sep 17 00:00:00 2001
From: Thomas Renard <cybaer42@web.de>
Date: Thu, 27 Dec 2012 13:35:24 +0100
Subject: OWNCLOUD_URL-parameter out of config.php-dist Comment in
 plugins/owncloud/owncloud.php

---
 plugins/owncloud/owncloud.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index e63ff959c..d7007e0f0 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -1,4 +1,10 @@
 <?php
+// This plugin creates ReadLater bookmarks in your owncloud.
+// The plugin needs a 
+// define('OWNCLOUD_URL','http(s)://your.serv.er/owncloud'); 
+// in your config.php. The parameter is actually global. user_pref
+// with editable parameter in future versions.
+
 require_once "config.php";
 
 class OwnCloud extends Plugin {
-- 
cgit v1.2.3


From 4a0a3ca93ce2e1c360e3416fbddb0d666499baa8 Mon Sep 17 00:00:00 2001
From: Thomas Renard <cybaer42@web.de>
Date: Thu, 27 Dec 2012 13:41:29 +0100
Subject: the '/' is needed for some servers

---
 plugins/owncloud/owncloud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index d7007e0f0..99b7a37bd 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -1,7 +1,7 @@
 <?php
 // This plugin creates ReadLater bookmarks in your owncloud.
 // The plugin needs a 
-// define('OWNCLOUD_URL','http(s)://your.serv.er/owncloud'); 
+// define('OWNCLOUD_URL','http(s)://your.serv.er/owncloud/'); 
 // in your config.php. The parameter is actually global. user_pref
 // with editable parameter in future versions.
 
-- 
cgit v1.2.3


From 7e8b6f32cb70b546a960a82f12c1d1e526202eb1 Mon Sep 17 00:00:00 2001
From: Thomas Renard <cybaer42@web.de>
Date: Thu, 27 Dec 2012 19:57:24 +0100
Subject: Preferences panel for owncloud (not tested yet)

---
 plugins/owncloud/owncloud.php | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index 99b7a37bd..06aeda705 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -22,12 +22,58 @@ class OwnCloud extends Plugin {
     $this->host = $host;
 
     $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+    $host->add_hook($host::HOOK_PREFS_TAB, $this);
+  }
+
+  function save() {
+    $owncloud_url = db_escape_string($_POST["owncloud_url"]);
+    $this->host->set($this, "owncloud", $owncloud_url);
+    echo "Value set to $owncloud_url";
   }
 
   function get_js() {
     return file_get_contents(dirname(__FILE__) . "/owncloud.js");
   }
 
+  function hook_prefs_tab($args) {
+    if ($args != "prefPrefs") return;
+
+    print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Owncloud Pane")."\">";
+
+    print "<br/>";
+
+    $value = $this->host->get($this, "owncloud");
+    print "<form dojoType=\"dijit.form.Form\">";
+
+    print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+           evt.prefentDefault();
+           if (this.validate()) {
+               console.log(dojo.objectToQuery(this.getValiues()));
+               new Ajax.Request('backend.php', {
+                                    parameters: dojo.objectToQuery(this.getValues()),
+                                    onComplete: function(transport) {
+                                         notify_info(transport.responseText);
+                                    }
+                                });
+           }
+           </script>";
+    
+    print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
+    print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
+    print "<input dojoType=\"dijit.from.TextBox\" style=\"display : none\" name=\"plugin\" value=\"owncloud\">";
+    print "<table width=\"100%\" class=\"prefPrefsList\">";
+        print "<tr><td width=\"40%\">".__("Owncloud url")."</td>";
+	print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"owncloud_url\" value=\"$value\"></td></tr>";
+    print "</table>";
+    print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+      __("Set value")."</button>";
+    
+    print "</form>";
+    
+    print "</div>"; #pane
+
+  }
+
   function hook_article_button($line) {
     return "<img src=\"".theme_image($this->link, "plugins/owncloud/owncloud.png")."\"
              style=\"cursor : pointer\" style=\"cursor : pointer\"
-- 
cgit v1.2.3


From 7278dc0edf3b7b06edb5e3abd301da588f12d128 Mon Sep 17 00:00:00 2001
From: Thomas Renard <cybaer42@web.de>
Date: Fri, 28 Dec 2012 00:57:36 +0100
Subject: save owncloud url as plugin pref

---
 plugins/owncloud/owncloud.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index 06aeda705..6643d0ae4 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -38,7 +38,7 @@ class OwnCloud extends Plugin {
   function hook_prefs_tab($args) {
     if ($args != "prefPrefs") return;
 
-    print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Owncloud Pane")."\">";
+    print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__("Owncloud")."\">";
 
     print "<br/>";
 
@@ -46,9 +46,9 @@ class OwnCloud extends Plugin {
     print "<form dojoType=\"dijit.form.Form\">";
 
     print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-           evt.prefentDefault();
+           evt.preventDefault();
            if (this.validate()) {
-               console.log(dojo.objectToQuery(this.getValiues()));
+               console.log(dojo.objectToQuery(this.getValues()));
                new Ajax.Request('backend.php', {
                                     parameters: dojo.objectToQuery(this.getValues()),
                                     onComplete: function(transport) {
@@ -60,13 +60,12 @@ class OwnCloud extends Plugin {
     
     print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
     print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
-    print "<input dojoType=\"dijit.from.TextBox\" style=\"display : none\" name=\"plugin\" value=\"owncloud\">";
+    print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"owncloud\">";
     print "<table width=\"100%\" class=\"prefPrefsList\">";
         print "<tr><td width=\"40%\">".__("Owncloud url")."</td>";
 	print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"owncloud_url\" value=\"$value\"></td></tr>";
     print "</table>";
-    print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-      __("Set value")."</button>";
+    print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Set value")."</button>";
     
     print "</form>";
     
@@ -94,10 +93,7 @@ class OwnCloud extends Plugin {
       $article_link = db_fetch_result($result, 0, 'link');
     }
     
-    $own_url = "";
-    if (defined('OWNCLOUD_URL')) {
-      $own_url = OWNCLOUD_URL;
-    }
+    $own_url = $this->host->get($this, "owncloud");
 
     print json_encode(array("title" => $title, "link" => $article_link,
 			    "id" => $id, "ownurl" => $own_url));
-- 
cgit v1.2.3


From eafce79191034936eb18120d97131ae980c192bb Mon Sep 17 00:00:00 2001
From: Thomas Renard <cybaer42@web.de>
Date: Fri, 28 Dec 2012 01:00:44 +0100
Subject: remove comments

---
 plugins/owncloud/owncloud.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index 6643d0ae4..85ba35805 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -1,10 +1,4 @@
 <?php
-// This plugin creates ReadLater bookmarks in your owncloud.
-// The plugin needs a 
-// define('OWNCLOUD_URL','http(s)://your.serv.er/owncloud/'); 
-// in your config.php. The parameter is actually global. user_pref
-// with editable parameter in future versions.
-
 require_once "config.php";
 
 class OwnCloud extends Plugin {
-- 
cgit v1.2.3


From 0ed86aa12e3ccb268a71593b2c66e13f334d2f46 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 28 Dec 2012 09:32:55 +0400
Subject: owncloud: validate prefs value as an URL

---
 plugins/owncloud/owncloud.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index 85ba35805..0aaf5ae40 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -51,18 +51,18 @@ class OwnCloud extends Plugin {
                                 });
            }
            </script>";
-    
+
     print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
     print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
     print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"owncloud\">";
     print "<table width=\"100%\" class=\"prefPrefsList\">";
         print "<tr><td width=\"40%\">".__("Owncloud url")."</td>";
-	print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"owncloud_url\" value=\"$value\"></td></tr>";
+	print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"owncloud_url\" regExp='^(http|https)://.*' value=\"$value\"></td></tr>";
     print "</table>";
     print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Set value")."</button>";
-    
+
     print "</form>";
-    
+
     print "</div>"; #pane
 
   }
@@ -76,17 +76,17 @@ class OwnCloud extends Plugin {
 
   function getOwnCloud() {
     $id = db_escape_string($_REQUEST['id']);
-    
+
     $result = db_query($this->link, "SELECT title, link
 		      FROM ttrss_entries, ttrss_user_entries
 		      WHERE id = '$id' AND ref_id = id AND owner_uid = " .$_SESSION['uid']);
-    
+
     if (db_num_rows($result) != 0) {
       $title = truncate_string(strip_tags(db_fetch_result($result, 0, 'title')),
 			       100, '...');
       $article_link = db_fetch_result($result, 0, 'link');
     }
-    
+
     $own_url = $this->host->get($this, "owncloud");
 
     print json_encode(array("title" => $title, "link" => $article_link,
-- 
cgit v1.2.3


From e236d8763e6b1c16794668d5897dc797938cd41f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 28 Dec 2012 09:33:18 +0400
Subject: owncloud: rename placeholder Set value

---
 plugins/owncloud/owncloud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/owncloud.php
index 0aaf5ae40..b846241b8 100644
--- a/plugins/owncloud/owncloud.php
+++ b/plugins/owncloud/owncloud.php
@@ -59,7 +59,7 @@ class OwnCloud extends Plugin {
         print "<tr><td width=\"40%\">".__("Owncloud url")."</td>";
 	print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"owncloud_url\" regExp='^(http|https)://.*' value=\"$value\"></td></tr>";
     print "</table>";
-    print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Set value")."</button>";
+    print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".__("Save")."</button>";
 
     print "</form>";
 
-- 
cgit v1.2.3