mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

RSS Menu Lans to Generic Terms #6

Browse Source 
Replace duplicates with common terms in RSS Plugin
This commit is contained in:
MikeyGMT
2016-12-02 20:44:17 +00:00
parent c3df2134e2
commit a16950e9bd
10 changed files with 84 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
<?php
/*
* Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* Copyright (C) 2008-2016 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
*
* Admin Language File
*
@@ -268,6 +268,7 @@ define("LAN_EXISTING","Existing Entries");
define("LAN_CONFDELETE","Confirm Delete");
define("LAN_PLUGIN","Plugin");
define("LAN_PLUGIN_FOLDER","Plugin Folder");
define("LAN_THEMES","Themes");
define("LAN_THEME","Theme");
define("LAN_LATEST_e107_NEWS","Latest e107 News");

58
e107_plugins/rss_menu/admin_prefs.php
View File

@@ -2,7 +2,7 @@
/*
* 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)
*
@@ -55,7 +55,7 @@ class rss_admin extends e_admin_dispatcher
protected $adminMenu = array(
'main/list' => array('caption'=> LAN_MANAGE, 'perm' => 'P'),
'main/import' => array('caption'=> "Add New Feed", 'perm' => 'P'),
'main/import' => array('caption'=> LAN_CREATE, 'perm' => 'P'),
'main/prefs' => array('caption'=> LAN_PREFS, 'perm' => 'P'),
/*
@@ -75,7 +75,7 @@ class rss_admin extends e_admin_dispatcher
{
if(E107_DEBUG_LEVEL > 0)
{
$this->adminMenu['main/create'] = array('caption'=> "Add Custom Feed", 'perm' => 'P');
$this->adminMenu['main/create'] = array('caption'=> LAN_CREATE, 'perm' => 'P');
}
}
}
@@ -97,14 +97,14 @@ class rss_ui extends e_admin_ui
'checkboxes' => array ( 'title' => '', 'type' => null, 'data' => false, 'width' => '5%', 'thclass' => 'center', 'forced' => '1', 'class' => 'center', 'toggle' => 'e-multiselect', ),
'rss_id' => array ( 'title' => LAN_ID, 'data' => 'int', 'width' => '5%', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_name' => array ( 'title' => LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_path' => array ( 'title' => 'Plugin-Dir', 'type' => 'text', 'data' => 'str', 'readonly'=>1, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_path' => array ( 'title' => LAN_PLUGIN_FOLDER,'type' => 'text', 'data' => 'str', 'readonly'=>1, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_url' => array ( 'title' => LAN_URL, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_topicid' => array ( 'title' => 'Topic id', 'type' => 'text', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'rss_topicid' => array ( 'title' => LAN_ID, 'type' => 'text', 'data' => 'int', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'rss_text' => array ( 'title' => 'Text', 'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'rss_text' => array ( 'title' => LAN_DESCRIPTION,'type' => 'textarea', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'center', 'thclass' => 'center', ),
'rss_datestamp' => array ( 'title' => LAN_DATESTAMP, 'type' => 'datestamp', 'data' => 'int', 'readonly'=>true, 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_class' => array ( 'title' => LAN_VISIBILITY, 'type' => 'dropdown', 'data' => 'int', 'width' => 'auto', 'batch' => true, 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => array('optArray'=> array(RSS_LAN_ADMIN_21,RSS_LAN_ADMIN_22,RSS_LAN_ADMIN_23),'size'=>'xlarge'), 'class' => 'left', 'thclass' => 'left', ),
'rss_limit' => array ( 'title' => 'Limit', 'type' => 'number', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'rss_limit' => array ( 'title' => LAN_LIMIT, 'type' => 'number', 'data' => 'int', 'inline'=>true, 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ),
'options' => array ( 'title' => LAN_OPTIONS, 'type' => null, 'data' => '', 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ),
);
@@ -178,12 +178,12 @@ class rss_ui extends e_admin_ui
<table class='table table-striped adminlist'>
<thead>
<tr>
<th class='center' style='width:5%'>Add</td>
<th class='center' style='width:5%'>".LAN_SELECT."</td>
<th>".LAN_NAME."</td>
<th>".RSS_LAN_ADMIN_3."</td>
<th>".LAN_PLUGIN_FOLDER."</td>
<th>".RSS_LAN_ADMIN_5."</td>
<th>".RSS_LAN_ADMIN_12."</td>
<th>".LAN_URL."</td>
<th>".LAN_ID."</td>
</tr>
</thead><tbody>";
}
@@ -192,7 +192,7 @@ class rss_ui extends e_admin_ui
$RSS_ADMIN_IMPORT_TABLE = "
<tr>
<td class='first center'>{RSS_ADMIN_IMPORT_CHECK}</td>
<td>{RSS_ADMIN_IMPORT_NAME}<small>{RSS_ADMIN_IMPORT_TEXT}</small></td>
<td>{RSS_ADMIN_IMPORT_NAME} - {RSS_ADMIN_IMPORT_TEXT}</td>
<td>{RSS_ADMIN_IMPORT_PATH}</td>
<td>{RSS_ADMIN_IMPORT_URL}</td>
@@ -499,12 +499,12 @@ if(!isset($RSS_ADMIN_LIST_HEADER))
<table class='table adminlist'>
<thead>
<tr>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=id,RSS_LAN_ADMIN_2}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=name,RSS_LAN_ADMIN_4}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=path,RSS_LAN_ADMIN_3}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=url,RSS_LAN_ADMIN_5}</th>
<th style='white-space:nowrap;'>".RSS_LAN_ADMIN_12."</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=limit,RSS_LAN_ADMIN_7}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=id,LAN_ID}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=name,LAN_NAME}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=path,LAN_PLUGIN_FOLDER}</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=url,LAN_URL}</th>
<th style='white-space:nowrap;'>".LAN_ID."</th>
<th style='white-space:nowrap;'>{RSS_ADMIN_CAPTION=limit,LAN_LIMIT}</th>
<th style='white-space:nowrap;'>".LAN_OPTIONS."</th>
</tr>
</thead>
@@ -548,27 +548,27 @@ if(!isset($RSS_ADMIN_CREATE_TABLE))
<td>{RSS_ADMIN_FORM_NAME}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_5."</td>
<td>".LAN_URL."</td>
<td>{RSS_ADMIN_FORM_URL}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_12."</td>
<td>".LAN_ID."</td>
<td>{RSS_ADMIN_FORM_TOPICID}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_3."</td>
<td>".LAN_PLUGIN_FOLDER."</td>
<td>{RSS_ADMIN_FORM_PATH}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_6."</td>
<td>".LAN_DESCRIPTION."</td>
<td>{RSS_ADMIN_FORM_TEXT}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_7."</td>
<td>".LAN_LIMIT."</td>
<td>{RSS_ADMIN_FORM_LIMIT}</td>
</tr>
<tr>
<td>".RSS_LAN_ADMIN_8."</td>
<td>".LAN_VISIBILITY."</td>
<td>{RSS_ADMIN_FORM_CLASS}</td>
</tr>
@@ -619,10 +619,10 @@ if(!isset($RSS_ADMIN_IMPORT_HEADER))
<table class='table adminform'>
<tr>
<th>".RSS_LAN_ADMIN_16."</td>
<th>".RSS_LAN_ADMIN_3."</td>
<th>".LAN_PLUGIN_FOLDER."</td>
<th>".LAN_NAME."</td>
<th>".RSS_LAN_ADMIN_5."</td>
<th>".RSS_LAN_ADMIN_12."</td>
<th>".LAN_URL."</td>
<th>".LAN_ID."</td>
</tr>";
}
if(!isset($RSS_ADMIN_IMPORT_TABLE))
@@ -911,7 +911,7 @@ class rss
if(!$render)
{
$this->show_message(RSS_LAN_ADMIN_11, RSS_LAN_ERROR_6);
$this->show_message(RSS_LAN_ADMIN_11, LAN_DESCRIPTION);
}
else
{
@@ -1045,7 +1045,7 @@ class rss
}
else
{
return RSS_LAN_ADMIN_28;
return LAN_NOCHANGE_NOTSAVED;
}
}
} // End class rss

2
e107_plugins/rss_menu/e_meta.php
View File

@@ -3,7 +3,7 @@
+ ----------------------------------------------------------------------------+
| e107 website system
|
| Copyright (C) 2008-2009 e107 Inc (e107.org)
| Copyright (C) 2008-2016 e107 Inc (e107.org)
| http://e107.org
|
|

2
e107_plugins/rss_menu/e_url.php
View File

@@ -2,7 +2,7 @@
/*
* e107 Bootstrap CMS
*
* Copyright (C) 2008-2014 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)

39
e107_plugins/rss_menu/languages/English_admin_rss_menu.php
View File

@@ -1,10 +1,13 @@
<?php
/*
+ ----------------------------------------------------------------------------+
| e107 website system - Language File.
|
+----------------------------------------------------------------------------+
*/
* e107 website system
*
* 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)
*
* e107 website system - Language File.
*/
define("RSS_LAN05","Number of items (0=inactive)");
@@ -33,9 +36,9 @@ define("RSS_DL", "Downloads");
//define("RSS_PLUGIN_LAN_2", "RSS Feeds from your site");
define("RSS_PLUGIN_LAN_6", "Feed Links");
define("RSS_PLUGIN_LAN_7", "The rss feed of the news");
define("RSS_PLUGIN_LAN_8", "The rss feed of the downloads");
define("RSS_PLUGIN_LAN_9", "The rss feed of the comments");
define("RSS_PLUGIN_LAN_7", "The rss feed of news");
define("RSS_PLUGIN_LAN_8", "The rss feed of downloads");
define("RSS_PLUGIN_LAN_9", "The rss feed of comments");
define("RSS_PLUGIN_LAN_10", "The rss feed of news category:");
define("RSS_PLUGIN_LAN_11", "The rss feed of download category:");
@@ -54,20 +57,20 @@ define("RSS_LAN_ERROR_6", "There are no rss feeds to import");
define("RSS_LAN_ERROR_7", "Some required fields are missing.");
define("RSS_LAN_ADMIN_1", "Existing RSS feeds");
define("RSS_LAN_ADMIN_2", "Id");
define("RSS_LAN_ADMIN_3", "Path");
//define("RSS_LAN_ADMIN_4", "Name");
define("RSS_LAN_ADMIN_5", "Url");
define("RSS_LAN_ADMIN_6", "Text");
define("RSS_LAN_ADMIN_7", "Limit");
define("RSS_LAN_ADMIN_8", "Visibility");
//define("RSS_LAN_ADMIN_2", "Id");//LAN_ID
//define("RSS_LAN_ADMIN_3", "Path");//LAN_PLUGIN_FOLDER
//define("RSS_LAN_ADMIN_4", "Name");//LAN_NAME
//define("RSS_LAN_ADMIN_5", "Url");//LAN_URL
//define("RSS_LAN_ADMIN_6", "Text");//LAN_DESCRIPTION
//define("RSS_LAN_ADMIN_7", "Limit");//LAN_LIMIT
//define("RSS_LAN_ADMIN_8", "Visibility");//LAN_VISIBILITY
//define("RSS_LAN_ADMIN_9", "Type");
define("RSS_LAN_ADMIN_10", "rss feed create entry");
define("RSS_LAN_ADMIN_11", "rss feed import feeds");
define("RSS_LAN_ADMIN_12", "Topic id");
//define("RSS_LAN_ADMIN_12", "Topic id");//LAN_ID
define("RSS_LAN_ADMIN_13", "Include Other-news items in News Feed?");
define("RSS_LAN_ADMIN_14", "Enable");
//define("RSS_LAN_ADMIN_14", "Enable");//LAN_ENABLE
define("RSS_LAN_ADMIN_15", "Tick links to mark them for import ...");
define("RSS_LAN_ADMIN_16", "import?");
define("RSS_LAN_ADMIN_17", "import ticked links");
@@ -80,7 +83,7 @@ define("RSS_LAN_ADMIN_23", "inactive");
define("RSS_LAN_ADMIN_26", "Check All");
define("RSS_LAN_ADMIN_27", "Uncheck All");
define("RSS_LAN_ADMIN_28", "Nothing changed - not saved");
//define("RSS_LAN_ADMIN_28", "Nothing changed - not saved");//LAN_NOCHANGE_NOTSAVED
define("RSS_LAN_ADMIN_31", "rss entries limits updated");
define("RSS_LAN_ADMIN_32", "");

10
e107_plugins/rss_menu/languages/English_global.php
View File

@@ -1,5 +1,13 @@
<?php
/*
* e107 website system
*
* 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)
*
* e107 website system - Language File.
*/
define("LAN_PLUGIN_RSS_NAME", "RSS");
define("LAN_PLUGIN_RSS_DESCRIPTION", "RSS Feeds from your site.");
define("LAN_PLUGIN_RSS_SUBSCRIBE", "Subscribe");

2
e107_plugins/rss_menu/rss.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2013 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)
*

2
e107_plugins/rss_menu/rss_menu.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2015 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)

4
e107_plugins/rss_menu/rss_setup.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (c) 2008-2013 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)
*
@@ -40,7 +40,7 @@ class rss_menu_setup
// $mes->addInfo(print_a($insert,true));
$status = ($sql->insert('rss', $insert)) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
$mes->add("Adding Default table data to table: rss",$status); //TODO Generic LAN "LAN_DEFAULT_TABLE_DATA"
$mes->add(LAN_DEFAULT_TABLE_DATA.": rss",$status);
}

13
e107_plugins/rss_menu/rss_shortcodes.php
View File

@@ -1,5 +1,14 @@
<?php
// $Id$
/*
* e107 website system
*
* 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)
*
* e107 website system - Shortcodes
*/
if (!defined('e107_INIT')) { exit; }
include_once(e_HANDLER.'shortcode_handler.php');
@@ -148,7 +157,7 @@ class rss_menu_shortcodes extends e_shortcode
$delid = $row['rss_id'];
$options = "
<a href='".e_SELF."?create.edit.".$row['rss_id']."' >".ADMIN_EDIT_ICON."</a>
<input type='image' title=\"".LAN_DELETE."\" name='delete[{$delid}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL ." [".RSS_LAN_ADMIN_2.": ".$delid." : ".$delname."]\\n\\n")."')\"/>";
<input type='image' title=\"".LAN_DELETE."\" name='delete[{$delid}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL ." [".LAN_ID.": ".$delid." : ".$delname."]\\n\\n")."')\"/>";
return $options;
}
@@ -161,7 +170,7 @@ class rss_menu_shortcodes extends e_shortcode
function sc_rss_admin_form_url()
{
global $row,$PLUGINS_DIRECTORY;
return SITEURL.$PLUGINS_DIRECTORY."rss_menu/rss.php?".e_LANQRY." <input class='tbox' type='text' name='rss_url' size='10' value=\"".$row['rss_url']."\" maxlength='50' /> .{".LAN_TYPE."}.{".RSS_LAN_ADMIN_12."}";
return SITEURL.$PLUGINS_DIRECTORY."rss_menu/rss.php?".e_LANQRY." <input class='tbox' type='text' name='rss_url' size='10' value=\"".$row['rss_url']."\" maxlength='50' /> .{".LAN_TYPE."}.{".LAN_ID."}";
}
function sc_rss_admin_form_topicid()