Peter M. Groen / knowledgetree

Commit 80790675b124327c5a48735cc71567adb0a1fcd5

Authored by Megan Watson
1 parent ea39fd17

KTC-613 

"Error occur when creating a link to a new RSS feed"
Fixed. Removed the javascript for the tinymce editor which isn't used.

Committed by: Megan Watson
Reviewed by: Conrad Vermeulen



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9398 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 11 additions and 37 deletions
plugins/rssplugin/loadFeed.inc.php
  View file @8079067
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 } 48 }
49 49
50 // Check if the feed matches a url 50 // Check if the feed matches a url
51 - if(!preg_match("/^http:\/\/([^\/]+)(.*)$/", $feed, $matches)){ 51 + if(!preg_match("/^http[s]?:\/\/([^\/]+)(.*)$/", $feed, $matches)){
52 // If not, it is an internal feed 52 // If not, it is an internal feed
53 $aRSSArray = KTrss::getInternalFeed($user); 53 $aRSSArray = KTrss::getInternalFeed($user);
54 }else{ 54 }else{
plugins/rssplugin/rss2array.inc.php
  View file @8079067
@@ -7,31 +7,31 @@ @@ -7,31 +7,31 @@
7 * Document Management Made Simple 7 * Document Management Made Simple
8 * Copyright (C) 2008 KnowledgeTree Inc. 8 * Copyright (C) 2008 KnowledgeTree Inc.
9 * Portions copyright The Jam Warehouse Software (Pty) Limited 9 * Portions copyright The Jam Warehouse Software (Pty) Limited
10 - * 10 + *
11 * This program is free software; you can redistribute it and/or modify it under 11 * This program is free software; you can redistribute it and/or modify it under
12 * the terms of the GNU General Public License version 3 as published by the 12 * the terms of the GNU General Public License version 3 as published by the
13 * Free Software Foundation. 13 * Free Software Foundation.
14 - * 14 + *
15 * This program is distributed in the hope that it will be useful, but WITHOUT 15 * This program is distributed in the hope that it will be useful, but WITHOUT
16 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 16 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
17 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 17 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
18 * details. 18 * details.
19 - * 19 + *
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program. If not, see <http://www.gnu.org/licenses/>. 21 * along with this program. If not, see <http://www.gnu.org/licenses/>.
22 - *  
23 - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 22 + *
  23 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
24 * California 94120-7775, or email info@knowledgetree.com. 24 * California 94120-7775, or email info@knowledgetree.com.
25 - * 25 + *
26 * The interactive user interfaces in modified source and object code versions 26 * The interactive user interfaces in modified source and object code versions
27 * of this program must display Appropriate Legal Notices, as required under 27 * of this program must display Appropriate Legal Notices, as required under
28 * Section 5 of the GNU General Public License version 3. 28 * Section 5 of the GNU General Public License version 3.
29 - * 29 + *
30 * In accordance with Section 7(b) of the GNU General Public License version 3, 30 * In accordance with Section 7(b) of the GNU General Public License version 3,
31 * these Appropriate Legal Notices must retain the display of the "Powered by 31 * these Appropriate Legal Notices must retain the display of the "Powered by
32 - * KnowledgeTree" logo and retain the original copyright notice. If the display of the 32 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
33 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices 33 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
34 - * must display the words "Powered by KnowledgeTree" and retain the original 34 + * must display the words "Powered by KnowledgeTree" and retain the original
35 * copyright notice. 35 * copyright notice.
36 * Contributor( s): ______________________________________ 36 * Contributor( s): ______________________________________
37 * 37 *
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 # if the URL looks ok 62 # if the URL looks ok
63 # 63 #
64 64
65 - if(preg_match("/^http:\/\/([^\/]+)(.*)$/", $url, $matches)){ 65 + if(preg_match("/^http[s]?:\/\/([^\/]+)(.*)$/", $url, $matches)){
66 66
67 $host = $matches[1]; 67 $host = $matches[1];
68 $uri = $matches[2]; 68 $uri = $matches[2];
plugins/rssplugin/templates/RSSPlugin/addfeed.smarty
  View file @8079067
1 -{$context->oPage->requireJSResource("thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js")}  
2 -{capture assign=sJS}  
3 -{literal}  
4 -tinyMCE.init({  
5 - mode : "textareas",  
6 - theme : "simple",  
7 -});  
8 -{/literal}  
9 -{/capture}  
10 -{$context->oPage->requireJSStandalone($sJS)}  
11 -  
12 -  
13 -  
14 <h2>{i18n}New RSS Feed{/i18n}</h2> 1 <h2>{i18n}New RSS Feed{/i18n}</h2>
15 2
16 <p class="descriptiveText">{i18n}Create a rss feed which will be displayed on the dashboard{/i18n}</p> 3 <p class="descriptiveText">{i18n}Create a rss feed which will be displayed on the dashboard{/i18n}</p>
plugins/rssplugin/templates/RSSPlugin/editfeed.smarty
  View file @8079067
1 -{$context->oPage->requireJSResource("thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js")}  
2 -{capture assign=sJS}  
3 -{literal}  
4 -tinyMCE.init({  
5 - mode : "textareas",  
6 - theme : "simple",  
7 -});  
8 -{/literal}  
9 -{/capture}  
10 -{$context->oPage->requireJSStandalone($sJS)}  
11 -  
12 -  
13 -  
14 <h2>{i18n}Edit RSS Feed{/i18n}</h2> 1 <h2>{i18n}Edit RSS Feed{/i18n}</h2>
15 2
16 <p class="descriptiveText">{i18n}Edit a RSS feed{/i18n}</p> 3 <p class="descriptiveText">{i18n}Edit a RSS feed{/i18n}</p>