Changeset 815788
- Timestamp:
- 12/06/2013 07:27:51 AM (12 years ago)
- Location:
- rsskingpro
- Files:
-
- 38 added
- 4 edited
-
tags/1.0.4 (added)
-
tags/1.0.4/css (added)
-
tags/1.0.4/css/font-awesome.min.css (added)
-
tags/1.0.4/css/rsskingpro-styles.css (added)
-
tags/1.0.4/css/rsskp_default.css (added)
-
tags/1.0.4/fonts (added)
-
tags/1.0.4/fonts/FontAwesome.otf (added)
-
tags/1.0.4/fonts/fontawesome-webfont.eot (added)
-
tags/1.0.4/fonts/fontawesome-webfont.svg (added)
-
tags/1.0.4/fonts/fontawesome-webfont.ttf (added)
-
tags/1.0.4/fonts/fontawesome-webfont.woff (added)
-
tags/1.0.4/images (added)
-
tags/1.0.4/images/ajax-loader.gif (added)
-
tags/1.0.4/images/kpp-icon_16x16.png (added)
-
tags/1.0.4/images/kpp-icon_16x16_sat.png (added)
-
tags/1.0.4/images/kpp-icon_32x32.png (added)
-
tags/1.0.4/images/kpp-icon_32x32_sat.png (added)
-
tags/1.0.4/images/kpp_akp.jpg (added)
-
tags/1.0.4/images/kpp_dkp.jpg (added)
-
tags/1.0.4/images/kpp_invkp.jpg (added)
-
tags/1.0.4/images/kpp_relkp.jpg (added)
-
tags/1.0.4/images/kpp_rsskp.jpg (added)
-
tags/1.0.4/images/kpp_smtpkp.jpg (added)
-
tags/1.0.4/images/rsskp-icon_16x16.png (added)
-
tags/1.0.4/images/rsskp-icon_16x16_sat.png (added)
-
tags/1.0.4/images/rsskp-icon_32x32.png (added)
-
tags/1.0.4/images/rsskp-icon_32x32_sat.png (added)
-
tags/1.0.4/includes (added)
-
tags/1.0.4/includes/admin_area.php (added)
-
tags/1.0.4/includes/output.php (added)
-
tags/1.0.4/includes/screens (added)
-
tags/1.0.4/includes/screens/kpp.php (added)
-
tags/1.0.4/includes/screens/settings.php (added)
-
tags/1.0.4/includes/widget.php (added)
-
tags/1.0.4/js (added)
-
tags/1.0.4/js/rsskp-functions.js (added)
-
tags/1.0.4/readme.txt (added)
-
tags/1.0.4/rsskingpro.php (added)
-
trunk/includes/output.php (modified) (3 diffs)
-
trunk/includes/screens/settings.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (4 diffs)
-
trunk/rsskingpro.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
rsskingpro/trunk/includes/output.php
r778210 r815788 32 32 $formatsplit = explode('##', $format); 33 33 $formatdef = array('FEEDTITLE','PUBDATE','TITLE','LINK','DESCRIPTION','CONTENT','CATEGORIES','CATEGORY','AUTHORS','AUTHOR','CONTRIBUTORS','CONTRIBUTOR','COPYRIGHT','GUID','UNIQUEKEY'); 34 $feedarray = explode(" ,",$feedaddress);34 $feedarray = explode("|",$feedaddress); 35 35 foreach ($feedarray as &$feedurl) { 36 36 $feedurl = trim($feedurl); 37 37 $rss_urlcheck = stripos($feedurl, 'http'); 38 38 if ($rss_urlcheck !== 0) { $feedurl = 'http://'.$feedurl; } 39 $feedurl = (html_entity_decode ($feedurl));39 $feedurls[] = html_entity_decode($feedurl); 40 40 } 41 41 … … 45 45 46 46 $feed = new SimplePie(); 47 $feed->set_feed_url($feed array);47 $feed->set_feed_url($feedurls); 48 48 $feed->set_cache_location($cachelocation); 49 49 $feed->set_cache_duration('60'); … … 52 52 $feed->handle_content_type(); 53 53 $rss = $feed; 54 if ($rss->error()) { 55 $error_output = ''; 56 foreach ($rss->error() as $err_num=>$error) 57 $error_output .= "[".$err_num."] ".$error."<br />"; 58 return $error_output; 59 } 54 60 $totalitems = $rss->get_item_quantity(); 55 61 if (isset($_GET['rsskppage'])) { -
rsskingpro/trunk/includes/screens/settings.php
r798361 r815788 37 37 <p>There is alot of options you can modify using the shortcode, please see below for all the options. You can define your own settings by:</p> 38 38 <pre>[rsskingpro feedaddress="http://feedurl.com/feed/" display="10"]</pre> 39 <p>Multiple feeds can be pulled in at once:</p> 40 <pre>[rsskingpro feedaddress="http://feedurl.com/feed/|http://feedurl2.com/feed/" display="10"]</pre> 39 41 <p>To add this into a template, just use the "do_shortcode" function:</p> 40 42 <pre><?php … … 44 46 <h3>Shortcode Options</h3> 45 47 <h4>feedaddress</h4> 46 <p style='padding-left: 20px;'><strong>Default - 'no feed'</strong> | This field takes the external web address(es) of the feed you want to pull. To list multiple addresses, separate with commas.</p>48 <p style='padding-left: 20px;'><strong>Default - 'no feed'</strong> | This field takes the external web address(es) of the feed you want to pull. To list multiple addresses, separate with '|'.</p> 47 49 <h4>display</h4> 48 50 <p style='padding-left: 20px;'><strong>Default - '5'</strong> | Number of items to list on output</p> -
rsskingpro/trunk/readme.txt
r811283 r815788 5 5 Requires at least: 3.0.1 6 6 Tested up to: 3.7.1 7 Stable tag: 1.0. 37 Stable tag: 1.0.4 8 8 License: GPLv2 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 58 58 = Shortcode Options = 59 59 * feedaddress 60 `Default - 'no feed'` | This field takes the external web address(es) of the feed you want to pull. To list multiple addresses, separate with commas.60 `Default - 'no feed'` | This field takes the external web address(es) of the feed you want to pull. To list multiple addresses, separate with '|'. 61 61 * display 62 62 `Default - '5'` | Number of items to list on output … … 138 138 == Changelog == 139 139 140 = 1.0.4 = 141 * Addition of error checking and reporting 142 * Fixed ability to add multiple feeds by changing the splitter from ',' to '|' 143 140 144 = 1.0.3 = 141 145 * Update to KPP section with release of new plugin … … 154 158 == Upgrade Notice == 155 159 160 = 1.0.4 = 161 * Addition of error checking and reporting 162 * Fixed ability to add multiple feeds by changing the splitter from ',' to '|' 163 156 164 = 1.0.3 = 157 165 * Update to KPP section with release of new plugin -
rsskingpro/trunk/rsskingpro.php
r811283 r815788 4 4 Plugin URI: http://kingpro.me/plugins/rss-king-pro/ 5 5 Description: RSS King Pro allows you display and format a RSS feed on a page 6 Version: 1.0. 36 Version: 1.0.4 7 7 Author: Ash Durham 8 8 Author URI: http://durham.net.au/ … … 28 28 29 29 global $rsskp_db_version; 30 $rsskp_db_version = "1.0. 3";30 $rsskp_db_version = "1.0.4"; 31 31 32 32 function rsskp_install() {
Note: See TracChangeset
for help on using the changeset viewer.