[Vtigercrm-commits] [vtiger-commits] r6903 - in /vtigercrm/trunk: Smarty/templates/Rss.tpl include/magpierss/extlib/Snoopy.class.inc modules/Rss/ListView.php modules/Rss/Popup.php modules/Rss/Rss.php schema/DatabaseSchema.xml
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue Jun 6 05:39:18 EDT 2006
Author: don
Date: Tue Jun 6 03:39:08 2006
New Revision: 6903
Log:
rsscategory has been removed
Modified:
vtigercrm/trunk/Smarty/templates/Rss.tpl
vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
vtigercrm/trunk/modules/Rss/ListView.php
vtigercrm/trunk/modules/Rss/Popup.php
vtigercrm/trunk/modules/Rss/Rss.php
vtigercrm/trunk/schema/DatabaseSchema.xml
Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun 6 03:39:08 2006
@@ -54,8 +54,7 @@
var ajaxObj = new VtigerAjax(ajaxRssSaveResponse);
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&rsscategory='+category+'&rssurl='+rssurl;
+ var urlstring = 'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rssurl='+rssurl;
ajaxObj.process("index.php?",urlstring);
}
function ajaxRssSaveResponse(response)
@@ -168,10 +167,6 @@
<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
</tr>
- <tr>
- <td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
- <td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
- </tr>
<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;"> </td></tr>
<tr>
<td colspan="2" align="center">
Modified: vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc
==============================================================================
--- vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc (original)
+++ vtigercrm/trunk/include/magpierss/extlib/Snoopy.class.inc Tue Jun 6 03:39:08 2006
@@ -43,8 +43,8 @@
var $host = "www.php.net"; // host name we are connecting to
var $port = 80; // port we are connecting to
- var $proxy_host = ""; // proxy host to use
- var $proxy_port = ""; // proxy port to use
+ var $proxy_host = "192.168.4.158"; // proxy host to use
+ var $proxy_port = "80"; // proxy port to use
var $agent = "Snoopy v1.0"; // agent we masquerade as
var $referer = ""; // referer info to pass
var $cookies = array(); // array of cookies to pass
@@ -63,8 +63,8 @@
// NOTE: this currently does not respect
// dates, domains or paths.
- var $user = ""; // user for http authentication
- var $pass = ""; // password for http authentication
+ var $user = "jerijohn"; // user for http authentication
+ var $pass = "jerijohn"; // password for http authentication
// http accept types
var $accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
@@ -427,10 +427,11 @@
$headers .= "Accept-encoding: gzip\r\n";
}
else {
- trigger_error(
+ //commented to supress the warning
+ /*trigger_error(
"use_gzip is on, but PHP was built without zlib support.".
" Requesting file(s) without gzip encoding.",
- E_USER_NOTICE);
+ E_USER_NOTICE);*/
}
}
Modified: vtigercrm/trunk/modules/Rss/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/ListView.php (original)
+++ vtigercrm/trunk/modules/Rss/ListView.php Tue Jun 6 03:39:08 2006
@@ -81,7 +81,6 @@
require_once("modules/".$currentModule."/Forms.php");
if (function_exists('get_rssfeeds_form'))
{
- $rss_form->assign("RSSCATEG", $oRss->getRsscategory_html());
$rss_form->assign("RSSFEEDS", get_rssfeeds_form());
}
}
Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun 6 03:39:08 2006
@@ -28,12 +28,11 @@
elseif(isset($_REQUEST["rssurl"]))
{
$newRssUrl = str_replace('##amp##','&',$_REQUEST["rssurl"]);
- $rsscategory = $_REQUEST["rsscategory"];
$setstarred = 0;
$oRss = new vtigerRSS();
if($oRss->setRSSUrl($newRssUrl))
{
- $result = $oRss->saveRSSUrl($newRssUrl,$setstarred,$rsscategory);
+ $result = $oRss->saveRSSUrl($newRssUrl,$setstarred);
if($result == false)
{
echo "Unable to save the RSS Feed URL" ;
Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 6 03:39:08 2006
@@ -96,15 +96,13 @@
}
/** Function to save the Rss Feeds
- * This Function accepts the RssURl,RssCategory,Starred Status as arguments and
+ * This Function accepts the RssURl,Starred Status as arguments and
* returns true on sucess
* returns false if fails
*/
- function saveRSSUrl($url,$makestarred=0,$rsscategory='')
- {
- global $adb;
- if($rsscategory == '')
- $rsscategory = 'vtiger Discussions';
+ function saveRSSUrl($url,$makestarred=0)
+ {
+ global $adb;
if ($url != "")
{
@@ -114,8 +112,8 @@
$rsstitle = $url;
}
$genRssId = $adb->getUniqueID("rss");
- $sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED,RSSCATEGORY) values (".$genRssId.",'".addslashes($url);
- $sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.",'".addslashes($rsscategory)."')";
+ $sSQL = "insert into rss (RSSID,RSSURL,RSSTITLE,RSSTYPE,STARRED) values (".$genRssId.",'".addslashes($url);
+ $sSQL .= "','".addslashes($rsstitle)."',0,".$makestarred.")";
$result = $adb->query($sSQL);
if($result)
{
@@ -355,27 +353,11 @@
{
global $adb;
global $image_path;
- $sSQL = "select * from rsscategory where presence = 1 order by sortorderid";
- $result = $adb->query($sSQL);
-
- while($categoryrow = $adb->fetch_array($result))
- {
$shtml .= "<tr>
- <td width=\"15\">
- <div align=\"center\"><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\"><img id=\"".$categoryrow["sortorderid"]."_toggle\" src=\"".$image_path."plus.gif\" border=\"0\"></a></div>
- </td>
- <td width=\"20\">
- <div align=\"center\"><img id=\"".$categoryrow["sortorderid"]."_folder\" src=\"".$image_path."rss_folder_cls.gif\"></div>
- </td>
- <td nowrap><a href=\"javascript:;\" onClick=\"toggleRSSFolder('".$categoryrow["sortorderid"]."')\" class=\"rssFolder\">".$categoryrow["rsscategory"]."</a>
- </td>
- </tr>
- <tr>
<td colspan=\"3\">
- <div id=\"".$categoryrow["sortorderid"]."_feeds\" style=\"display:none\"><table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory($categoryrow["rsscategory"])."</table></div>
+ <table width=\"100%\" border=\"0\" cellspacing=\"2\" cellpadding=\"2\" style=\"margin:5 0 0 35\">".$this->getRssFeedsbyCategory()."</table>
</td>
</tr>";
- }
return $shtml;
}
@@ -384,13 +366,13 @@
* This Function accepts the RssCategory as argument
* and returns the html string for the Rss feeds lists
*/
- function getRssFeedsbyCategory($rsscategory)
- {
-
- global $adb;
- global $image_path;
-
- $sSQL = "select * from rss where rsscategory='".$rsscategory."'";
+ function getRssFeedsbyCategory()
+ {
+
+ global $adb;
+ global $image_path;
+
+ $sSQL = "select * from rss";
$result = $adb->query($sSQL);
while($allrssrow = $adb->fetch_array($result))
{
Modified: vtigercrm/trunk/schema/DatabaseSchema.xml
==============================================================================
--- vtigercrm/trunk/schema/DatabaseSchema.xml (original)
+++ vtigercrm/trunk/schema/DatabaseSchema.xml Tue Jun 6 03:39:08 2006
@@ -3181,33 +3181,6 @@
<field name="starred" type="I" size="1">
<default value="0" />
</field>
- <field name="rsscategory" type="C" size="100">
- <default value="" />
- </field>
- </table>
-
- <table name="rsscategory">
- <field name="rsscategoryid" type="I" size="19">
- <key />
- <autoincrement />
- </field>
- <field name="rsscategory" type="C" size="200">
- <notnull />
- </field>
- <field name="sortorderid" type="I" size="19">
- <notnull />
- <default value="0" />
- </field>
- <field name="presence" type="I" size="1">
- <notnull />
- <default value="1" />
- </field>
-
- <index name="rsscategory_rsscategory">
- <col>rsscategory</col>
- <unique />
- </index>
- <opt platform="mysql">Type=InnoDB</opt>
</table>
<table name="vendorcf">
More information about the vtigercrm-commits
mailing list