diff --git a/plugins/rssplugin/loadFeed.inc.php b/plugins/rssplugin/loadFeed.inc.php index 1fc89d2..12dd838 100644 --- a/plugins/rssplugin/loadFeed.inc.php +++ b/plugins/rssplugin/loadFeed.inc.php @@ -48,7 +48,7 @@ } // Check if the feed matches a url - if(!preg_match("/^http:\/\/([^\/]+)(.*)$/", $feed, $matches)){ + if(!preg_match("/^http[s]?:\/\/([^\/]+)(.*)$/", $feed, $matches)){ // If not, it is an internal feed $aRSSArray = KTrss::getInternalFeed($user); }else{ diff --git a/plugins/rssplugin/rss2array.inc.php b/plugins/rssplugin/rss2array.inc.php index 2d76129..5213541 100644 --- a/plugins/rssplugin/rss2array.inc.php +++ b/plugins/rssplugin/rss2array.inc.php @@ -7,31 +7,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ * @@ -62,7 +62,7 @@ # if the URL looks ok # - if(preg_match("/^http:\/\/([^\/]+)(.*)$/", $url, $matches)){ + if(preg_match("/^http[s]?:\/\/([^\/]+)(.*)$/", $url, $matches)){ $host = $matches[1]; $uri = $matches[2]; diff --git a/plugins/rssplugin/templates/RSSPlugin/addfeed.smarty b/plugins/rssplugin/templates/RSSPlugin/addfeed.smarty index 265e9c0..d3c5508 100644 --- a/plugins/rssplugin/templates/RSSPlugin/addfeed.smarty +++ b/plugins/rssplugin/templates/RSSPlugin/addfeed.smarty @@ -1,16 +1,3 @@ -{$context->oPage->requireJSResource("thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js")} -{capture assign=sJS} -{literal} -tinyMCE.init({ - mode : "textareas", - theme : "simple", -}); -{/literal} -{/capture} -{$context->oPage->requireJSStandalone($sJS)} - - -

{i18n}New RSS Feed{/i18n}

{i18n}Create a rss feed which will be displayed on the dashboard{/i18n}

diff --git a/plugins/rssplugin/templates/RSSPlugin/editfeed.smarty b/plugins/rssplugin/templates/RSSPlugin/editfeed.smarty index 30c22ae..8ae155a 100644 --- a/plugins/rssplugin/templates/RSSPlugin/editfeed.smarty +++ b/plugins/rssplugin/templates/RSSPlugin/editfeed.smarty @@ -1,16 +1,3 @@ -{$context->oPage->requireJSResource("thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js")} -{capture assign=sJS} -{literal} -tinyMCE.init({ - mode : "textareas", - theme : "simple", -}); -{/literal} -{/capture} -{$context->oPage->requireJSStandalone($sJS)} - - -

{i18n}Edit RSS Feed{/i18n}

{i18n}Edit a RSS feed{/i18n}