[Vtigercrm-commits] [vtiger-commits] r5263 - in /vtigercrm/trunk: Smarty/templates/Rss.tpl modules/Rss/Popup.php modules/Rss/Rss.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Apr 24 09:21:13 EDT 2006
Author: don
Date: Mon Apr 24 07:21:03 2006
New Revision: 5263
Log:
issue truncation of Rss url has been fixed Ticket Id 700
Modified:
vtigercrm/trunk/Smarty/templates/Rss.tpl
vtigercrm/trunk/modules/Rss/Popup.php
vtigercrm/trunk/modules/Rss/Rss.php
Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Mon Apr 24 07:21:03 2006
@@ -1,4 +1,7 @@
<script language="JavaScript" type="text/javascript" src="modules/Rss/Rss.js"></script>
+<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
+<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
+<script language="JavaScript" type="text/javascript" src="include/js/ajax.js"></script>
<script>
{literal}
@@ -6,7 +9,6 @@
{
hide('status');
getrssfolders();
- //window.location = "index.php?module=Rss&action=ListView&record="+response.responseText;
}
function GetRssFeedList(id)
{
@@ -33,9 +35,10 @@
{
show('status');
var ajaxObj = new Ajax(ajaxRssSaveResponse);
- var rssurl = document.getElementById('rssurl').value;
+ rssurl = document.getElementById('rssurl').value;
+ rssurl = rssurl.replace(/&/gi,"##amp##");
var category = document.getElementById('rsscategory')[document.getElementById('rsscategory').selectedIndex].value;
- var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl+'&rsscategory='+category;
+ var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl;
ajaxObj.process("index.php?",urlstring);
}
function ajaxRssSaveResponse(response)
@@ -51,8 +54,7 @@
GetRssFeedList(response.responseText);
getrssfolders();
document.getElementById('rssurl').value = '';
- fninvsh('PopupLay');
- //window.location = "index.php?module=Rss&action=ListView&record="+response.responseText;
+ Effect.Puff('PopupLay');
}
}
Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Mon Apr 24 07:21:03 2006
@@ -27,9 +27,8 @@
}
elseif(isset($_REQUEST["rssurl"]))
{
- $newRssUrl = $_REQUEST["rssurl"];
+ $newRssUrl = str_replace('##amp##','&',$_REQUEST["rssurl"]);
$rsscategory = $_REQUEST["rsscategory"];
-
$setstarred = 0;
$oRss = new vtigerRSS();
if($oRss->setRSSUrl($newRssUrl))
Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Mon Apr 24 07:21:03 2006
@@ -122,28 +122,6 @@
}
}
}
-/*
- function getStarredRssFolder()
- {
-
- global $adb;
- global $image_path;
-
- $sSQL = "select * from rss where starred=1";
- $result = $adb->query($sSQL);
- while($allrssrow = $adb->fetch_array($result))
- {
- $shtml .= "<tr id='feed_".$allrssrow[rssid]."'>";
- $shtml .= "<td width=\"15\">
- <img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','0')\"></td>";
- $shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".substr($allrssrow['rsstitle'],0,15)."...</a></td><td><a href=\"javascript:DeleteRssFeeds('$allrssrow[rssid]');\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td>";
- $shtml .= "</tr>";
- }
- return $shtml;
-
- }
-*/
-
function getCRMRssFeeds()
{
global $adb;
@@ -157,11 +135,11 @@
if($allrssrow["starred"] == 1)
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','0')\"></td>";
+ <img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
}else
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','1')\"></td>";
+ <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
}
$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
@@ -185,11 +163,11 @@
if($allrssrow["starred"] == 1)
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','0')\"></td>";
+ <img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
}else
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','1')\"></td>";
+ <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
}
$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"index.php?module=Rss&action=Delete&return_module=Rss&return_action=index&record=$allrssrow[rssid]\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td>";
$shtml .= "</tr>";
@@ -418,10 +396,10 @@
$shtml .= "<td width=\"15\">";
if($allrssrow["starred"] == 1)
{
- $shtml .= "<img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','1')\">";
+ $shtml .= "<img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
}else
{
- $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onclick=\"star('$allrssrow[rssid]','1')\">";
+ $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
}
$shtml .= "</td>";
$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td><a href=\"javascript:DeleteRssFeeds('$allrssrow[rssid]');\"><img src=\"".$image_path."del.gif\" border=\"0\" align=\"absmiddle\"></a></td>";
More information about the vtigercrm-commits
mailing list