From b8a1c66c4a90716a0a15835b628c8e35a61cacd9 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Sat, 24 Dec 2016 13:13:49 +0000 Subject: [PATCH 1/2] Newsfeeds Lans #6 Newsfeeds Lans #6 --- e107_languages/English/admin/lan_admin.php | 2 + e107_plugins/newsfeed/admin_config.php | 24 +++--- e107_plugins/newsfeed/e_help.php | 2 +- .../newsfeed/languages/English_admin.php | 82 +++++++++---------- e107_plugins/newsfeed/newsfeed_functions.php | 2 +- 5 files changed, 55 insertions(+), 57 deletions(-) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index fcd5b1f80..d6843146f 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -227,6 +227,7 @@ Below is the list of files that could potentially be malicious:"); define("LAN_CREATE","Create"); define("LAN_MANAGE","Manage"); define("LAN_UPDATE","Update"); +define("LAN_LAST_UPDATED","Last Updated"); define("LAN_UPDATE_AVAILABLE","Update Available"); define("LAN_ADD", "Add"); 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_ERRORS", "Errors"); define("LAN_MESSAGES", "Messages"); +define("LAN_DATA", "Data"); define("LAN_OPTIONS","Options"); define("LAN_PREFS","Preferences"); diff --git a/e107_plugins/newsfeed/admin_config.php b/e107_plugins/newsfeed/admin_config.php index 6f67c48df..8ab56a77f 100644 --- a/e107_plugins/newsfeed/admin_config.php +++ b/e107_plugins/newsfeed/admin_config.php @@ -79,22 +79,22 @@ class newsfeed_ui extends e_admin_ui protected $listOrder = 'newsfeed_id DESC'; protected $fields = array ( 'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => null, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ), - '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_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_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_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_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' => 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_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_timestamp' => array ( 'title' => NFLAN_50, 'type' => 'method', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', '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_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', ), - 'newsfeed_showmenu' => array('title'=>NFLAN_45, 'type'=>'method', 'data'=>false, 'class'=>'center', 'thclass'=>'center' ), - 'newsfeed_showmain' => array('title'=>NFLAN_46, 'type'=>'method', 'data'=>false, 'class'=>'center', 'thclass'=>'center'), + 'newsfeed_showmenu' => array ( 'title' => NFLAN_45, 'type'=>'method', 'data'=>false, 'class'=>'center', 'thclass'=>'center' ), + 'newsfeed_showmain' => array ( 'title' => NFLAN_46, 'type'=>'method', 'data'=>false, 'class'=>'center', 'thclass'=>'center'), - 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '8%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), + 'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '8%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); protected $fieldpref = array('newsfeed_name', 'newsfeed_url', 'newsfeed_updateint', 'newsfeed_timestamp', 'newsfeed_active', 'newsfeed_showmenu', 'newsfeed_showmain'); diff --git a/e107_plugins/newsfeed/e_help.php b/e107_plugins/newsfeed/e_help.php index b23842692..020aeacc6 100644 --- a/e107_plugins/newsfeed/e_help.php +++ b/e107_plugins/newsfeed/e_help.php @@ -21,5 +21,5 @@ if (!e107::isInstalled('newsfeed')) } 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) ); ?> \ No newline at end of file diff --git a/e107_plugins/newsfeed/languages/English_admin.php b/e107_plugins/newsfeed/languages/English_admin.php index 18059a516..0b303f4c2 100644 --- a/e107_plugins/newsfeed/languages/English_admin.php +++ b/e107_plugins/newsfeed/languages/English_admin.php @@ -2,41 +2,38 @@ /* * 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 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * Plugin - newsfeeds * - * $URL$ - * $Id$ - * */ //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_03", "Configure newsfeeds"); // 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_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_05", "Edit"); //define("NFLAN_06", "Delete"); -define("NFLAN_07", "Existing Newsfeeds"); -define("NFLAN_08", "Newsfeeds front page"); -define("NFLAN_09", "Create newsfeed"); +//define("NFLAN_07", "Existing Newsfeeds");// not used +//define("NFLAN_08", "Newsfeeds front page");// not used +//define("NFLAN_09", "Create newsfeed");// not used //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_12", "Activation"); -define("NFLAN_13", "Nowhere (inactive)"); +define("NFLAN_13", "Nowhere (inactive)");// not used define("NFLAN_14", "In menu only"); //define("NFLAN_15", "Create 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_19", "e.g. 3600: newsfeed will update every hour"); define("NFLAN_20", "On newsfeed main page only"); 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_24", "Required field(s) left blank."); //define("NFLAN_25", "Newsfeed updated in database."); @@ -51,47 +48,46 @@ define("NFLAN_26", "Update Interval"); //define("NFLAN_34", "not known"); //define("NFLAN_35", "posted by "); //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_39", "Details"); //define("NFLAN_40", "Newsfeed deleted"); -define("NFLAN_41", "No newsfeeds defined yet"); +//define("NFLAN_41", "No newsfeeds defined yet"); -define("NFLAN_42", "» Feed Name: - The identifying name of the feed can be anything you like. -

- » URL to rss feed: - The address of the rss feed -

- » Path to image: - 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. -

- » Description: - Enter a short description of the feed, or 'default' to use the description defined in the feed (if there is one). -

- » Update interval in seconds: - The amount of seconds that elapse before the feed is updated, for example, 1800: 30 minutes, 3600: an hour. -

- » Activation: - Where you want the feed results to be displayed, to see menu feeds you will need to activate the newsfeeds menu on the menus page. -

For a good list of available feeds, see syndic8.com or feedster.com"); -define("NFLAN_43", "Newsfeed help"); -define("NFLAN_44", "click to view"); +define("NFLAN_43", "Newsfeed Help"); +define("NFLAN_42", "[h=4]Newsfeed Title[/h] + Enter a name to identify the newsfeed accurately. + [h=4]URL to RSS Feed[/h] + The RSS provider will give you a web address (URL) for the newsfeed. + [h=4]Path to Image[/h] + 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. + [h=4]Description[/h] + Enter a short description for the feed, or 'default' to use the description defined in the feed (if there is one). + [h=4]Update Interval[/h] + Enter the number of seconds before the feed is updated. + For example, 1800 = 30 Minutes, 3600 = 1 Hour, 86400 = 1 Day. + [h=4]Activation[/h] + 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]. + [h=4]Tip[/h] + 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]"); + + + //define("NFLAN_44", "click to view");LAN_CLICK_TO_VIEW define("NFLAN_45", "Number of items to show in menu"); 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_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: "); // Admin log messages //=================== -define("LAN_AL_NEWSFD_01","News Feed created"); -define("LAN_AL_NEWSFD_02","News Feed updated"); -define("LAN_AL_NEWSFD_03","News Feed deleted"); -define("LAN_AL_NEWSFD_04",""); -define("LAN_AL_NEWSFD_05",""); +//define("LAN_AL_NEWSFD_01","News Feed created");//not used +//define("LAN_AL_NEWSFD_02","News Feed updated");//not used +//define("LAN_AL_NEWSFD_03","News Feed deleted");//not used +//define("LAN_AL_NEWSFD_04","");//not used +//define("LAN_AL_NEWSFD_05","");//not used -define("NFLAN_50", "Last Refresh"); +//define("NFLAN_50", "Last Refresh");//LAN_LAST_UPDATED diff --git a/e107_plugins/newsfeed/newsfeed_functions.php b/e107_plugins/newsfeed/newsfeed_functions.php index 71a32e2b8..ce554eb28 100644 --- a/e107_plugins/newsfeed/newsfeed_functions.php +++ b/e107_plugins/newsfeed/newsfeed_functions.php @@ -378,7 +378,7 @@ class newsfeedClass "; $vars['FEEDITEMTEXT'] = preg_replace("/[.*]/", "", $tp -> toHTML($item['description'], FALSE))." -

".NFLAN_44."

+

".LAN_CLICK_TO_VIEW."

"; } else From f34304398f73501d97d59bc17154ecfc05e63d10 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Sat, 24 Dec 2016 13:14:32 +0000 Subject: [PATCH 2/2] Newsfeeds Lans #6 also Newsfeeds Lans #6 also --- e107_languages/English/English.php | 1 + 1 file changed, 1 insertion(+) diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index 439d3ac9e..d4b411a9b 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -72,6 +72,7 @@ define("LAN_ENTER_CODE", "Enter code"); define("LAN_INVALID_CODE", "Incorrect code entered."); define("LAN_SEARCH", "Search"); define("LAN_VIEW", "View"); +define("LAN_CLICK_TO_VIEW", "Click to View");//TODO elsewhere define("LAN_SORT", "Sort"); define("LAN_ORDER_BY", "Order By"); define("LAN_ASCENDING", "Ascending");