mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2189 from MikeyGMT/20161223a

Browse Source 
Newsfeeds Lans #6
This commit is contained in:
Cameron
2016-12-27 11:54:29 -08:00
committed by GitHub
parent 5cebf43ce7 f34304398f
commit 79c5bff674
6 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_languages/English/English.php
View File

@@ -72,6 +72,7 @@ define("LAN_ENTER_CODE", "Enter code");
define("LAN_INVALID_CODE", "Incorrect code entered."); define("LAN_INVALID_CODE", "Incorrect code entered.");
define("LAN_SEARCH", "Search"); define("LAN_SEARCH", "Search");
define("LAN_VIEW", "View"); define("LAN_VIEW", "View");
define("LAN_CLICK_TO_VIEW", "Click to View");//TODO elsewhere
define("LAN_SORT", "Sort"); define("LAN_SORT", "Sort");
define("LAN_ORDER_BY", "Order By"); define("LAN_ORDER_BY", "Order By");
define("LAN_ASCENDING", "Ascending"); define("LAN_ASCENDING", "Ascending");

2
e107_languages/English/admin/lan_admin.php
View File

@@ -227,6 +227,7 @@ Below is the list of files that could potentially be malicious:");
define("LAN_CREATE","Create"); define("LAN_CREATE","Create");
define("LAN_MANAGE","Manage"); define("LAN_MANAGE","Manage");
define("LAN_UPDATE","Update"); define("LAN_UPDATE","Update");
define("LAN_LAST_UPDATED","Last Updated");
define("LAN_UPDATE_AVAILABLE","Update Available"); define("LAN_UPDATE_AVAILABLE","Update Available");
define("LAN_ADD", "Add"); define("LAN_ADD", "Add");
define("LAN_SAVE","Save"); define("LAN_SAVE","Save");
@@ -236,6 +237,7 @@ define("LAN_NOCHANGE_NOTSAVED", "Nothing changed - not saved");
define("LAN_CONFIRMDEL","Please confirm you wish to delete"); define("LAN_CONFIRMDEL","Please confirm you wish to delete");
define("LAN_ERRORS", "Errors"); define("LAN_ERRORS", "Errors");
define("LAN_MESSAGES", "Messages"); define("LAN_MESSAGES", "Messages");
define("LAN_DATA", "Data");
define("LAN_OPTIONS","Options"); define("LAN_OPTIONS","Options");
define("LAN_PREFS","Preferences"); define("LAN_PREFS","Preferences");

4
e107_plugins/newsfeed/admin_config.php
View File

@@ -82,12 +82,12 @@ class newsfeed_ui extends e_admin_ui
'newsfeed_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_name' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'required'=>true, 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_name' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'required'=>true, 'width' => 'auto', 'inline' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_url' => array ( 'title' => LAN_URL, 'type' => 'url', 'data' => 'str', 'required'=>true, 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_url' => array ( 'title' => LAN_URL, 'type' => 'url', 'data' => 'str', 'required'=>true, 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('size'=>'xxlarge'), 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_data' => array ( 'title' => 'Data', 'type' => null, 'data' => false, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_data' => array ( 'title' => LAN_DATA, 'type' => null, 'data' => false, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'textarea', 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_description' => array ( 'title' => LAN_DESCRIPTION, 'type' => 'textarea', 'data' => 'str', 'width' => '40%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_image' => array ( 'title' => NFLAN_11, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => LAN_OPTIONAL, 'readParms' => 'thumb=80x80', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_image' => array ( 'title' => NFLAN_11, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => LAN_OPTIONAL, 'readParms' => 'thumb=80x80', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_updateint' => array ( 'title' => NFLAN_18, 'type' => 'text', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('default'=>3600), 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_updateint' => array ( 'title' => NFLAN_18, 'type' => 'text', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('default'=>3600), 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_timestamp' => array ( 'title' => NFLAN_50, 'type' => 'method', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_timestamp' => array ( 'title' => LAN_LAST_UPDATED, 'type' => 'method', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'newsfeed_active' => array ( 'title' => NFLAN_12, 'type' => 'radio', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('default'=>3, 'optArray'=>array(NFLAN_13,NFLAN_14,NFLAN_20,NFLAN_21)), 'class' => 'left', 'thclass' => 'left', ), 'newsfeed_active' => array ( 'title' => NFLAN_12, 'type' => 'radio', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => array('default'=>3, 'optArray'=>array(NFLAN_13,NFLAN_14,NFLAN_20,NFLAN_21)), 'class' => 'left', 'thclass' => 'left', ),

2
e107_plugins/newsfeed/e_help.php
View File

@@ -21,5 +21,5 @@ if (!e107::isInstalled('newsfeed'))
} }
include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_admin_newsfeed.php'); include_lan(e_PLUGIN.'newsfeed/languages/'.e_LANGUAGE.'_admin_newsfeed.php');
$ns->tablerender(NFLAN_43, NFLAN_42); $ns->tablerender(NFLAN_43, e107::getParser()->toHTML(NFLAN_42, true) );
?> ?>

82
e107_plugins/newsfeed/languages/English_admin.php
View File

@@ -2,41 +2,38 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2009 e107 Inc (e107.org) * Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
* Plugin - newsfeeds * Plugin - newsfeeds
* *
* $URL$
* $Id$
*
*/ */
//define("NFLAN_01", "Newsfeeds"); //define("NFLAN_01", "Newsfeeds");
//define("NFLAN_02", "This plugin will retrieve rss feeds from other websites and display them according to your preferences"); //define("NFLAN_02", "This plugin will retrieve rss feeds from other websites and display them according to your preferences");
define("NFLAN_03", "Configure newsfeeds"); // FIX USE GENERIC //define("NFLAN_03", "Configure newsfeeds"); // not used
define("NFLAN_04", "Newsfeeds plugin has been successfully installed. To add newsfeeds and configure, return to the main admin page and click on the newsfeeds icon in the plugin section."); // FIX USE GENERIC //define("NFLAN_04", "Newsfeeds plugin has been successfully installed. To add newsfeeds and configure, return to the main admin page and click on the newsfeeds icon in the plugin section."); // FIX USE GENERIC
//define("NFLAN_05", "Edit"); //define("NFLAN_05", "Edit");
//define("NFLAN_06", "Delete"); //define("NFLAN_06", "Delete");
define("NFLAN_07", "Existing Newsfeeds"); //define("NFLAN_07", "Existing Newsfeeds");// not used
define("NFLAN_08", "Newsfeeds front page"); //define("NFLAN_08", "Newsfeeds front page");// not used
define("NFLAN_09", "Create newsfeed"); //define("NFLAN_09", "Create newsfeed");// not used
//define("NFLAN_10", "URL to rss feed"); //define("NFLAN_10", "URL to rss feed");
define("NFLAN_10", "URL to the RSS feed."); //define("NFLAN_10", "URL to the RSS feed.");// not used
define("NFLAN_11", "Path to image"); define("NFLAN_11", "Path to image");
define("NFLAN_12", "Activation"); define("NFLAN_12", "Activation");
define("NFLAN_13", "Nowhere (inactive)"); define("NFLAN_13", "Nowhere (inactive)");// not used
define("NFLAN_14", "In menu only"); define("NFLAN_14", "In menu only");
//define("NFLAN_15", "Create Newsfeed"); //define("NFLAN_15", "Create Newsfeed");
//define("NFLAN_16", "Update Newsfeed"); //define("NFLAN_16", "Update Newsfeed");
define("NFLAN_17", "Enter 'default' to use the image defined in the feed. To use your own image, enter full path. Leave blank for no image."); //define("NFLAN_17", "Enter 'default' to use the image defined in the feed. To use your own image, enter full path. Leave blank for no image.");
define("NFLAN_18", "Update interval in seconds"); define("NFLAN_18", "Update interval in seconds");
define("NFLAN_19", "e.g. 3600: newsfeed will update every hour"); define("NFLAN_19", "e.g. 3600: newsfeed will update every hour");
define("NFLAN_20", "On newsfeed main page only"); define("NFLAN_20", "On newsfeed main page only");
define("NFLAN_21", "In both menu and newsfeed page"); define("NFLAN_21", "In both menu and newsfeed page");
define("NFLAN_22", "Choose where you want the newsfeed displayed."); //define("NFLAN_22", "Choose where you want the newsfeed displayed.");
//define("NFLAN_23", "Newsfeed added to database."); //define("NFLAN_23", "Newsfeed added to database.");
//define("NFLAN_24", "Required field(s) left blank."); //define("NFLAN_24", "Required field(s) left blank.");
//define("NFLAN_25", "Newsfeed updated in database."); //define("NFLAN_25", "Newsfeed updated in database.");
@@ -51,47 +48,46 @@ define("NFLAN_26", "Update Interval");
//define("NFLAN_34", "not known"); //define("NFLAN_34", "not known");
//define("NFLAN_35", "posted by "); //define("NFLAN_35", "posted by ");
//define("NFLAN_36", "Description"); //define("NFLAN_36", "Description");
define("NFLAN_37", "Short description of feed. Enter 'default' to use the description defined in the feed"); //define("NFLAN_37", "Short description of feed. Enter 'default' to use the description defined in the feed");
//define("NFLAN_38", "Headlines"); //define("NFLAN_38", "Headlines");
//define("NFLAN_39", "Details"); //define("NFLAN_39", "Details");
//define("NFLAN_40", "Newsfeed deleted"); //define("NFLAN_40", "Newsfeed deleted");
define("NFLAN_41", "No newsfeeds defined yet"); //define("NFLAN_41", "No newsfeeds defined yet");
define("NFLAN_42", "<b>&raquo;</b> <u>Feed Name:</u> define("NFLAN_43", "Newsfeed Help");
The identifying name of the feed can be anything you like. define("NFLAN_42", "[h=4]Newsfeed Title[/h]
<br /><br /> Enter a name to identify the newsfeed accurately.
<b>&raquo;</b> <u>URL to rss feed:</u> [h=4]URL to RSS Feed[/h]
The address of the rss feed The RSS provider will give you a web address (URL) for the newsfeed.
<br /><br /> [h=4]Path to Image[/h]
<b>&raquo;</b> <u>Path to image:</u> If the provider specifies an image to use, enter 'default' to use it or choose use your own image by entering the immage address. Leave blank to use no image at all.
If the feed has an image defined in it, enter 'default' to use it. To use your own image, enter the full path to it. Leave blank to use no image at all. [h=4]Description[/h]
<br /><br /> Enter a short description for the feed, or 'default' to use the description defined in the feed (if there is one).
<b>&raquo;</b> <u>Description:</u> [h=4]Update Interval[/h]
Enter a short description of the feed, or 'default' to use the description defined in the feed (if there is one). Enter the number of seconds before the feed is updated.
<br /><br /> For example, 1800 = 30 Minutes, 3600 = 1 Hour, 86400 = 1 Day.
<b>&raquo;</b> <u>Update interval in seconds:</u> [h=4]Activation[/h]
The amount of seconds that elapse before the feed is updated, for example, 1800: 30 minutes, 3600: an hour. Newsfeeds can be displayed in the menu only or on the newsfeed page. Enter the details where feeds should be displayed. To see newsfeeds in e107 menus you will need to activate the [b]Newsfeeds Menu[b/] in [link=".e_ADMIN."menus.php]Menu Manager[/link].
<br /><br /> [h=4]Tip[/h]
<b>&raquo;</b> <u>Activation:</u> There are many feed direcotries on the web, try [link=https://www.dmoz.org/Computers/Internet/On_the_Web/Syndication_and_Feeds/RSS/Directories/ external]dmoz[/link] or [link=http://www.feedster.com/ external]feedster.com[/link]");
Where you want the feed results to be displayed, to see menu feeds you will need to activate the newsfeeds menu on the <a href='".e_ADMIN."menus.php'>menus page</a>.
<br /><br />For a good list of available feeds, see <a href='http://www.syndic8.com/' rel='external'>syndic8.com</a> or <a href='http://feedfinder.feedster.com/index.php' rel='external'>feedster.com</a>");
define("NFLAN_43", "Newsfeed help"); //define("NFLAN_44", "click to view");LAN_CLICK_TO_VIEW
define("NFLAN_44", "click to view");
define("NFLAN_45", "Number of items to show in menu"); define("NFLAN_45", "Number of items to show in menu");
define("NFLAN_46", "Number of items to show on main page"); define("NFLAN_46", "Number of items to show on main page");
define("NFLAN_47", "0 or blank to show all"); //define("NFLAN_47", "0 or blank to show all");//not used
//define("NFLAN_48", "Unable to save raw data in database."); //define("NFLAN_48", "Unable to save raw data in database.");
define("NFLAN_49", "Unable to unserialize rss data - uses non-standard syntax"); //define("NFLAN_49", "Unable to unserialize rss data - uses non-standard syntax");//not used
//define("NFLAN_50", "Write to database failed: "); //define("NFLAN_50", "Write to database failed: ");
// Admin log messages // Admin log messages
//=================== //===================
define("LAN_AL_NEWSFD_01","News Feed created"); //define("LAN_AL_NEWSFD_01","News Feed created");//not used
define("LAN_AL_NEWSFD_02","News Feed updated"); //define("LAN_AL_NEWSFD_02","News Feed updated");//not used
define("LAN_AL_NEWSFD_03","News Feed deleted"); //define("LAN_AL_NEWSFD_03","News Feed deleted");//not used
define("LAN_AL_NEWSFD_04",""); //define("LAN_AL_NEWSFD_04","");//not used
define("LAN_AL_NEWSFD_05",""); //define("LAN_AL_NEWSFD_05","");//not used
define("NFLAN_50", "Last Refresh"); //define("NFLAN_50", "Last Refresh");//LAN_LAST_UPDATED

2
e107_plugins/newsfeed/newsfeed_functions.php
View File

@@ -378,7 +378,7 @@ class newsfeedClass
"; ";
$vars['FEEDITEMTEXT'] = preg_replace("/&#091;.*]/", "", $tp -> toHTML($item['description'], FALSE))." $vars['FEEDITEMTEXT'] = preg_replace("/&#091;.*]/", "", $tp -> toHTML($item['description'], FALSE))."
<br /><br /><a href='".$item['link']."' rel='external'>".NFLAN_44."</a><br /><br /> <br /><br /><a href='".$item['link']."' rel='external'>".LAN_CLICK_TO_VIEW."</a><br /><br />
</div>"; </div>";
} }
else else