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

Issue #6 - LANs: Replace all references to "Comments" with LAN_COMMENTS

Browse Source
This commit is contained in:
Cameron
2015-07-07 18:02:16 -07:00
parent 6b5d95388f
commit af53d2dd3d
29 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
comment.php
View File

@@ -158,7 +158,7 @@ if(e_AJAX_REQUEST) // TODO improve security
require_once(e_HANDLER."news_class.php"); // FIXME shouldn't be here.
require_once(e_HANDLER."comment_class.php");
define("PAGE_NAME", COMLAN_99);
define("PAGE_NAME", LAN_COMMENTS);
if (!e_QUERY)
{
@@ -382,7 +382,7 @@ if ($action == "reply")
break;
}
}
define('e_PAGETITLE', COMLAN_102.$subject.($title ? ' / '.$title : '')." / ".COMLAN_99);
define('e_PAGETITLE', COMLAN_102.$subject.($title ? ' / '.$title : '')." / ".LAN_COMMENTS);
require_once(HEADERF);
}
elseif ($action == 'comment')
@@ -431,7 +431,7 @@ elseif ($action == 'comment')
{
$news = $sql->db_Fetch();
$subject = $tp->toForm($news['news_title']);
define("e_PAGETITLE", "{$subject} - ".COMLAN_100." / ".COMLAN_99);
define("e_PAGETITLE", "{$subject} - ".COMLAN_100." / ".LAN_COMMENTS);
require_once(HEADERF);
ob_start();
$comment_ob_start = TRUE;
@@ -451,7 +451,7 @@ elseif ($action == 'comment')
$row = $sql->db_Fetch();
$comments_poll = $row['poll_comment'];
$subject = $row['poll_title'];
define("e_PAGETITLE", $subject.' - '.COMLAN_101." / ".COMLAN_99);
define("e_PAGETITLE", $subject.' - '.COMLAN_101." / ".LAN_COMMENTS);
$poll_to_show = $id; // Need to pass poll number through to display routine
require_once(HEADERF);
require(e_PLUGIN."poll/poll_menu.php");

2
e107_admin/boot.php
View File

@@ -111,7 +111,7 @@ function admin_purge_related($table, $id)
$num = $_com->delete_comments($table, $id);
if ($num)
{
$msg .= $num." ".ADLAN_114." ".LAN_DELETED."<br />";
$msg .= $num." ".LAN_COMMENTS." ".LAN_DELETED."<br />";
}
// Delete any related ratings

2
e107_admin/cpage.php
View File

@@ -484,7 +484,7 @@ class page_admin_ui extends e_admin_ui
'page_datestamp' => array('title'=> LAN_DATE, 'tab' => 1, 'type' => 'datestamp', 'data'=>'int', 'width' => 'auto','writeParms'=>'auto=1&type=datetime'),
'page_class' => array('title'=> LAN_VISIBILITY, 'tab' => 1, 'type' => 'userclass', 'data'=>'int', 'inline'=>true, 'width' => 'auto', 'filter' => true, 'batch' => true),
'page_rating_flag' => array('title'=> LAN_RATING, 'tab' => 1, 'type' => 'boolean', 'data'=>'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center' ),
'page_comment_flag' => array('title'=> ADLAN_114, 'tab' => 1, 'type' => 'boolean', 'data'=>'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center' ),
'page_comment_flag' => array('title'=> LAN_COMMENTS, 'tab' => 1, 'type' => 'boolean', 'data'=>'int', 'width' => '5%', 'thclass' => 'center', 'class' => 'center' ),
'page_password' => array('title'=> LAN_PASSWORD, 'tab' => 1, 'type' => 'text', 'data'=>'str', 'width' => 'auto', 'writeParms'=>array('password'=>1, 'nomask'=>1, 'size' => 40, 'class' => 'tbox e-password', 'generate' => 1, 'strength' => 1, 'required'=>0)),
'page_sef' => array('title'=> LAN_SEFURL, 'tab' => 1, 'type' => 'text', 'inline'=>true, 'width' => 'auto', 'writeParms'=>'size=xxlarge'),
'page_metakeys' => array('title'=> LAN_KEYWORDS, 'tab' => 1, 'type' => 'tags', 'width' => 'auto'),

2
e107_admin/newspost.php
View File

@@ -404,7 +404,7 @@ class news_admin_ui extends e_admin_ui
'news_class' => array('title' => LAN_VISIBILITY, 'type' => 'userclasses','tab'=>2, 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'batch'=>true, 'filter'=>true),
'news_render_type' => array('title' => LAN_TEMPLATE, 'type' => 'dropdown', 'tab'=>0, 'data'=> 'str', 'inline'=>false, 'width' => 'auto', 'thclass' => 'left', 'class' => 'left', 'nosort' => false, 'batch'=>true, 'filter'=>true),
'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'tab'=>2, 'data' => 'int' , 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'batch'=>true, 'filter'=>true),
'news_allow_comments' => array('title' => NWSLAN_15, 'type' => 'boolean', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'inverse=1'),
'news_allow_comments' => array('title' => LAN_COMMENTS, 'type' => 'boolean', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'inverse=1'),
'news_comment_total' => array('title' => LAN_NEWS_60, 'type' => 'number', 'tab'=>2, 'noedit'=>true, 'width' => '10%', 'thclass' => '', 'class' => null, 'nosort' => false),
// admin_news_notify
'news_email_notify' => array('title' => "Email notification", 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1), 'help'=>'Trigger an email notification when you submit this form.'),

2
e107_admin/search.php
View File

@@ -37,7 +37,7 @@ $search_prefs = $sysprefs -> getArray('search_prefs');
//$search_handlers['news'] = ADLAN_0; // Moved to Plugin
$search_handlers['comments'] = ADLAN_114;
$search_handlers['comments'] = LAN_COMMENTS;
$search_handlers['users'] = SEALAN_7;
//$search_handlers['downloads'] = ADLAN_24; // Moved to Plugin
// $search_handlers['pages'] = SEALAN_39; // Moved to Plugin

2
e107_admin/users.php
View File

@@ -251,7 +251,7 @@ class users_admin_ui extends e_admin_ui
'user_join' => array('title' => LAN_USER_14, 'tab'=>0, 'noedit'=>true, 'type' => 'datestamp', 'width' => 'auto', 'writeParms'=>'readonly=1'),
'user_lastvisit' => array('title' => LAN_USER_15, 'tab'=>0, 'noedit'=>true, 'type' => 'datestamp', 'width' => 'auto'),
'user_currentvisit' => array('title' => LAN_USER_16, 'tab'=>0, 'noedit'=>true, 'type' => 'datestamp', 'width' => 'auto'),
'user_comments' => array('title' => LAN_USER_17, 'tab'=>0, 'noedit'=>true, 'type' => 'int', 'width' => 'auto','thclass'=>'right','class'=>'right'),
'user_comments' => array('title' => LAN_COMMENTS, 'tab'=>0, 'noedit'=>true, 'type' => 'int', 'width' => 'auto','thclass'=>'right','class'=>'right'),
'user_lastpost' => array('title' => 'Last Post', 'tab'=>0, 'noedit'=>true, 'type' => 'datestamp', 'width' => 'auto'),
'user_ip' => array('title' => LAN_USER_18, 'tab'=>0, 'noedit'=>true, 'type' => 'ip', 'width' => 'auto'),
// 'user_prefs' => array('title' => LAN_USER_20, 'type' => 'text', 'width' => 'auto'),

2
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1113,7 +1113,7 @@ class admin_shortcodes
if(empty($pref['comments_disabled']) && varset($pref['comments_engine'],'e107') == 'e107')
{
$oldconfigs['e-comments'][0] = array('icon'=>E_16_COMMENT, 'title'=>ADLAN_114, 'url'=> e_ADMIN_ABS."comment.php", 'total'=>$comments);
$oldconfigs['e-comments'][0] = array('icon'=>E_16_COMMENT, 'title'=>LAN_COMMENTS, 'url'=> e_ADMIN_ABS."comment.php", 'total'=>$comments);
}
if($flo = $sql->count('generic', '(*)', "WHERE gen_type='failed_login'"))
{

2
e107_core/shortcodes/batch/comment_shortcodes.php
View File

@@ -157,7 +157,7 @@ class comment_shortcodes extends e_shortcode
function sc_comments($parm='')
{
global $COMMENTS;
return (isset($this->var['user_id']) && $this->var['user_id'] ? COMLAN_99.": ".$this->var['user_comments'] : COMLAN_194)."<br />";
return (isset($this->var['user_id']) && $this->var['user_id'] ? LAN_COMMENTS.": ".$this->var['user_comments'] : COMLAN_194)."<br />";
}

9
e107_core/shortcodes/batch/news_shortcodes.php
View File

@@ -119,7 +119,7 @@ class news_shortcodes extends e_shortcode
if($param['current_action'] == 'extend')
{
return LAN_NEWS_99.' ('.$news_item['news_comment_total'].')';
return LAN_COMMENTS.' ('.$news_item['news_comment_total'].')';
}
if (vartrue($pref['multilanguage']))
@@ -330,13 +330,14 @@ class news_shortcodes extends e_shortcode
if (ADMIN && getperms('H'))
{
//TODO - discuss - a pref for 'new browser window' loading, or a parm or leave 'new browser window' as default?
$default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('icon-edit',false) : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='".LAN_NEWS_25."' class='icon' />";
$default = (deftrue('BOOTSTRAP')) ? $tp->toGlyph('icon-edit',false) : "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt=\"".LAN_EDIT."\" class='icon' />";
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt='".LAN_NEWS_25."' class='icon' />" : $default);
$adop_icon = (file_exists(THEME."images/newsedit.png") ? "<img src='".THEME_ABS."images/newsedit.png' alt=\"".LAN_EDIT."\" class='icon' />" : $default);
$class = varset($parm['class']);
return "<a class='e-tip ".$class."' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_NEWS_25."\">".$adop_icon."</a>\n";
return "<a class='e-tip ".$class."' rel='external' href='".e_ADMIN_ABS."newspost.php?action=edit&amp;id=".$this->news_item['news_id']."' title=\"".LAN_EDIT."\">".$adop_icon."</a>\n";
}
else
{

4
e107_handlers/comment_class.php
View File

@@ -1094,7 +1094,7 @@ class comment
if ($tablerender)
{
echo $ns->tablerender("<span id='e-comment-total'>".$this->totalComments."</span> ".COMLAN_99, $TEMPL, 'comment', TRUE);
echo $ns->tablerender("<span id='e-comment-total'>".$this->totalComments."</span> ".LAN_COMMENTS, $TEMPL, 'comment', TRUE);
}
else
{
@@ -1110,7 +1110,7 @@ class comment
$ret['comment'] = $text;
$ret['comment_form'] = $comment;
$ret['caption'] = "<span id='e-comment-total'>".$this->totalComments."</span> ".COMLAN_99;
$ret['caption'] = "<span id='e-comment-total'>".$this->totalComments."</span> ".LAN_COMMENTS;
return (!$return) ? "" : $ret;
}

2
e107_handlers/user_handler.php
View File

@@ -106,7 +106,7 @@ class UserHandler
'user_join' => LAN_USER_14,
'user_lastvisit' => LAN_USER_15,
'user_currentvisit' => LAN_USER_16,
'user_comments' => LAN_USER_17,
'user_comments' => LAN_COMMENTS,
'user_ip' => LAN_USER_18,
'user_ban' => LAN_USER_19,
'user_prefs' => LAN_USER_20,

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

@@ -116,7 +116,7 @@ define("ADLAN_110", "Registered members");
define("ADLAN_111", "Unverified members");
define("ADLAN_112", "Banned users");
// define("ADLAN_113", "Forum posts"); // should already be loaded from forum global language file.
define("ADLAN_114", "Comments");
// define("ADLAN_114", "Comments");
// define("ADLAN_115", "Chatbox posts");
define("ADLAN_116", "Admin log ...");
define("ADLAN_117", "Show all entries");

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

@@ -91,7 +91,7 @@ define("RL_LAN_094", "Detailed timing analysis");
define("RL_LAN_096", "Diff (s)");
// define("RL_LAN_097", "Time");
define("RL_LAN_098", "Source");
define("RL_LAN_099", "Comments");
// define("RL_LAN_099", "Comments");
define("RL_LAN_100", "CID"); // Comment ID field
define("RL_LAN_101", "PID");
//define("RL_LAN_102", "ID");//LAN_ID

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

@@ -19,7 +19,7 @@ define("NWSLAN_10", "No news categories");
//define("NWSLAN_12", "Title");
define("NWSLAN_13", "Body");
define("NWSLAN_14", "Extended");
define("NWSLAN_15", "Comments");
// define("NWSLAN_15", "Comments");
// define("NWSLAN_16", "Enabled"); // deprecated see lan_admin.php
// define("NWSLAN_17", "Disabled"); // deprecated see lan_admin.php
define("NWSLAN_18", "Allow comments to be posted to this news item");

2
e107_languages/English/lan_comment.php
View File

@@ -24,7 +24,7 @@ define("COMLAN_10", "Administrator");
define("COMLAN_11", "Was unable to enter your comment into the database - please retype leaving out any non-standard characters.");
define("COMLAN_12", "User");
define("COMLAN_16", "Username: ");
define("COMLAN_99", "Comments");
// define("COMLAN_99", "Comments");
define("COMLAN_100", "News");
define("COMLAN_101", "Poll");
define("COMLAN_102", "Replying to: ");

4
e107_languages/English/lan_news.php
View File

@@ -34,7 +34,7 @@ define("LAN_NEWS_19", "Now");
// define("LAN_NEWS_22", "Go to page: ");
define("LAN_NEWS_23", "News Categories");
define("LAN_NEWS_24", "create pdf of this news item");
define("LAN_NEWS_25", "Edit");
// define("LAN_NEWS_25", "Edit");
define("LAN_NEWS_31", "Sticky news item"); // Added
define("LAN_NEWS_82", "News - Category");
define("LAN_NEWS_83", "No news items at the moment - please check back soon.");
@@ -45,7 +45,7 @@ define("LAN_NEWS_87", "Newer News");
define("LAN_NEWS_462", "No news items for specified month");
// Following used by alt_news
define("LAN_NEWS_99", "Comments");
// define("LAN_NEWS_99", "Comments");
define("LAN_NEWS_100", "On");
define("LAN_NEWS_307", "Total posts in this category: ");

2
e107_languages/English/lan_online.php
View File

@@ -31,7 +31,7 @@ define("ONLINE_EL16", "Information not available");
define("CLASSRESTRICTED", "Class Restricted Page");
//define("ARTICLEPAGE", "Article/Review");
define("CHAT", "Chat");
define("COMMENT", "Comments");
// define("COMMENT", "Comments");
define("DOWNLOAD", "Downloads");
define("EMAIL", "email.php");
define("FORUM", "Main Forum Index");

2
e107_languages/English/lan_search.php
View File

@@ -110,7 +110,7 @@ define("LAN_SEARCH_77", "Posted on profile page of");
// Following formerly LAN_nnn - renamed to avoid clashes
define("LAN_SEARCH_98", "News");
define("LAN_SEARCH_99", "Comments");
// define("LAN_SEARCH_99", "Comments");
//define("LAN_SEARCH_200", "Categories:"); // Redundant LAN?
define("LAN_SEARCH_201", "Please redefine your search query");

2
e107_languages/English/lan_top.php
View File

@@ -14,7 +14,7 @@ define("TOP_LAN_0", "Top Forum Posters");
define("TOP_LAN_1", "User Name");
define("TOP_LAN_2", "Posts");
define("TOP_LAN_3", "Top Comment Posters");
define("TOP_LAN_4", "Comments");
// define("TOP_LAN_4", "Comments");
define("TOP_LAN_5", "Top Chatbox Posters");
define("TOP_LAN_6", "Site Rating");

2
e107_languages/English/lan_user.php
View File

@@ -47,7 +47,7 @@ define("LAN_USER_13","ID");
define("LAN_USER_14","Join Date");
define("LAN_USER_15","Last Visit");
define("LAN_USER_16","Current Visit");
define("LAN_USER_17","Comments");
// define("LAN_USER_17","Comments");
define("LAN_USER_18","IP Address");
define("LAN_USER_19","Ban");
define("LAN_USER_20","Prefs");

2
e107_languages/English/lan_userposts.php
View File

@@ -24,7 +24,7 @@ define("UP_LAN_9", " on ");
define("UP_LAN_10", "Re");
define("UP_LAN_11", "Posted on");
define("UP_LAN_12", "Search");
define("UP_LAN_13", "Comments");
// define("UP_LAN_13", "Comments");
define("UP_LAN_14", "Forum Posts");
define("UP_LAN_15", "Re");
define("UP_LAN_16", "IP Address");

2
e107_plugins/faqs/faqs.php
View File

@@ -600,7 +600,7 @@ class faq
}
if (!$pref['nested_comments'])
{
$ns->tablerender("Comments", $text);
$ns->tablerender(LAN_COMMENTS, $text);
}
if (ADMIN && getperms("B"))
{

2
e107_plugins/import/admin_import.php
View File

@@ -103,7 +103,7 @@ class import_main_ui extends e_admin_ui
'forumpost' => array('message' => "Forum Posts", 'classfile' => 'import_forum_class.php', 'classname' => 'forumpost_import', 'nolist'=>true),
'forumtrack' => array('message' => "Forum Track", 'classfile' => 'import_forum_class.php', 'classname' => 'forumtrack_import', 'nolist'=>true),
// 'forumpost' => array('message' => "Media", 'classfile' => 'import_media_class.php', 'classname' => 'media_import'),
'comments' => array('message'=> "Comments"),
'comments' => array('message'=> LAN_COMMENTS),
// 'forumdefs' => array('message' => LAN_CONVERT_26),
// 'forumposts' => array('message' => LAN_CONVERT_48),
// 'polls' => array('message' => LAN_CONVERT_27)

2
e107_plugins/poll/languages/English.php
View File

@@ -51,7 +51,7 @@ define("POLLAN_23", "Create Poll");
define("POLLAN_24", "Preview");
define("POLLAN_25", "Clear form");
define("POLLAN_26", "votes");
define("POLLAN_27", "Comments");
// define("POLLAN_27", "Comments");
define("POLLAN_28", "Previous polls");
define("POLLAN_29", "posted by");
define("POLLAN_30", "Submit");

2
e107_plugins/poll/poll_class.php
View File

@@ -450,7 +450,7 @@ class poll
$VOTE_TOTAL = POLLAN_31.": ".$voteTotal;
$COMMENTS = ($pollArray['poll_comment'] ? " <a href='".e_HTTP."comment.php?comment.poll.".$pollArray['poll_id']."'>".POLLAN_27.": ".$comment_total."</a>" : "");
$COMMENTS = ($pollArray['poll_comment'] ? " <a href='".e_HTTP."comment.php?comment.poll.".$pollArray['poll_id']."'>".LAN_COMMENTS.": ".$comment_total."</a>" : "");
$poll_count = $sql->count("polls", "(*)", "WHERE poll_id <= '".$pollArray['poll_id']."'");

4
e107_plugins/rss_menu/admin_prefs.php
View File

@@ -277,7 +277,7 @@ class rss_ui extends e_admin_ui
//
// Comments
$feed['name'] = RSS_PLUGIN_LAN_14;
$feed['name'] = LAN_COMMENTS;
$feed['url'] = 'comments';
$feed['topic_id'] = '';
$feed['path'] = 'comments';
@@ -851,7 +851,7 @@ class rss
}
*/
// Comments
$feed['name'] = RSS_PLUGIN_LAN_14;
$feed['name'] = LAN_COMMENTS;
$feed['url'] = 'comments';
$feed['topic_id'] = '';
$feed['path'] = 'comments';

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

@@ -39,7 +39,7 @@ define("RSS_PLUGIN_LAN_9", "The rss feed of the comments");
define("RSS_PLUGIN_LAN_10", "The rss feed of news category:");
define("RSS_PLUGIN_LAN_11", "The rss feed of download category:");
define("RSS_PLUGIN_LAN_14", "Comments");
// define("RSS_PLUGIN_LAN_14", "Comments");
define("RSS_LAN_ADMINMENU_1", "RSS Options");
define("RSS_LAN_ADMINMENU_2", "Listing");

2
search.php
View File

@@ -520,7 +520,7 @@ class search extends e_shortcode
*/
if(e107::getConfig('core')->get('comments_disabled')!=1) // Only when comments are enabled.
{
if ($search_info['comments'] = $this->search_info('comments', 'core', false, array('sfile' => e_HANDLER.'search/search_comment.php', 'qtype' => LAN_SEARCH_99, 'refpage' => 'comment.php', 'advanced' => e_HANDLER.'search/advanced_comment.php', 'id' => 'comment'))) {
if ($search_info['comments'] = $this->search_info('comments', 'core', false, array('sfile' => e_HANDLER.'search/search_comment.php', 'qtype' => LAN_COMMENTS, 'refpage' => 'comment.php', 'advanced' => e_HANDLER.'search/advanced_comment.php', 'id' => 'comment'))) {
// $search_id++;
} else {
unset($search_info['comments']);

4
top.php
View File

@@ -217,13 +217,13 @@ if ($action == 'top')
<tr>
<td style='width:10%; text-align:center' class='forumheader3'>&nbsp;</td>
<td style='width:50%' class='forumheader3'>".TOP_LAN_1."</td>
<td style='width:10%; text-align:center' class='forumheader3'>".TOP_LAN_4."</td>
<td style='width:10%; text-align:center' class='forumheader3'>".LAN_COMMENTS."</td>
<td style='width:30%; text-align:center' class='forumheader3'>".TOP_LAN_6."</td>
</tr>\n";
$counter = 1;
if($top_forum_posters)
{
while ($row = $sql->db_Fetch())
while ($row = $sql->fetch())
{
// TODO - Custom ranking (comments), LANs
$ldata = $rank->getRanks($row);