From ff2c2e5c6d33f5d0ee776d822fcb8692236a7bd7 Mon Sep 17 00:00:00 2001 From: Moc Date: Wed, 12 Jun 2013 21:37:54 +0200 Subject: [PATCH] #220 - First batch of forum LAN rewrite: forum, viewforum, viewtopic and post are done. Work in progress! (#6) --- e107_core/bbcodes/hide.bb | 2 +- e107_core/templates/nextprev_template.php | 5 +- e107_handlers/np_class.php | 10 +- e107_languages/English/English.php | 98 ++++--- e107_languages/English/lan_np.php | 5 +- e107_languages/English/lan_search.php | 14 +- .../download/languages/English/download.php | 14 +- e107_plugins/forum/e_admin_events.php | 5 +- e107_plugins/forum/e_emailprint.php | 12 +- e107_plugins/forum/e_frontpage.php | 4 +- e107_plugins/forum/e_latest.php | 2 +- e107_plugins/forum/e_linkgen.php | 10 +- e107_plugins/forum/e_notify.php | 7 +- e107_plugins/forum/e_search.php | 2 +- e107_plugins/forum/e_status.php | 2 +- e107_plugins/forum/forum.php | 105 +++---- e107_plugins/forum/forum_class.php | 6 +- e107_plugins/forum/forum_post.php | 41 +-- e107_plugins/forum/forum_stats.php | 20 +- e107_plugins/forum/forum_uploads.php | 3 +- e107_plugins/forum/forum_viewforum.php | 88 +++--- e107_plugins/forum/forum_viewtopic.php | 86 +++--- e107_plugins/forum/index.php | 6 +- .../forum/languages/English/English_front.php | 272 +++++++++++++++++- .../languages/English/lan_forum_conf.php | 4 + .../languages/English/lan_forum_frontpage.php | 4 +- .../languages/English/lan_forum_post.php | 6 +- .../languages/English/lan_forum_viewforum.php | 6 +- .../languages/English/lan_forum_viewtopic.php | 5 +- .../shortcodes/batch/post_shortcodes.php | 45 +-- .../shortcodes/batch/view_shortcodes.php | 47 +-- .../forum/templates/forum_icons_template.php | 6 +- .../forum/templates/forum_post_template.php | 32 +-- .../forum/templates/forum_template.php | 11 +- .../templates/forum_viewforum_template.php | 24 +- .../templates/forum_viewtopic_template.php | 8 +- e107_plugins/poll/poll_class.php | 91 +++--- 37 files changed, 666 insertions(+), 442 deletions(-) diff --git a/e107_core/bbcodes/hide.bb b/e107_core/bbcodes/hide.bb index a3bbd513e..5b01f2cf9 100644 --- a/e107_core/bbcodes/hide.bb +++ b/e107_core/bbcodes/hide.bb @@ -1,6 +1,6 @@ global $sql, $e_hide_query, $e_hide_hidden, $e_hide_allowed; -if(!$e_hide_allowed || !isset($e_hide_query) || !$sql->db_Select_gen($e_hide_query)) +if(!$e_hide_allowed || !isset($e_hide_query) || !$sql->gen($e_hide_query)) { if(defined('HIDE_TEXT_HIDDEN')) { diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php index 9cf90c2ac..d7417ac28 100644 --- a/e107_core/templates/nextprev_template.php +++ b/e107_core/templates/nextprev_template.php @@ -1,7 +1,6 @@ {caption} '; XXX - awaiting the new front-end themes & templates -$NEXTPREV_TEMPLATE['default_nav_caption'] = NP_3.' '; +$NEXTPREV_TEMPLATE['default_nav_caption'] = LAN_GOPAGE.' '; $NEXTPREV_TEMPLATE['dropdown_nav_first'] = ''; $NEXTPREV_TEMPLATE['dropdown_nav_last'] = ''; diff --git a/e107_handlers/np_class.php b/e107_handlers/np_class.php index 238bf0d71..00c788c53 100644 --- a/e107_handlers/np_class.php +++ b/e107_handlers/np_class.php @@ -2,16 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * - * $Source: /cvs_backup/e107_0.8/e107_handlers/np_class.php,v $ - * $Revision$ - * $Date$ - * $Author$ */ if (!defined('e107_INIT')) { exit; } @@ -44,7 +38,7 @@ class nextprev { } if ($pages) { - $nppage = NP_3." "; + $nppage = LAN_GOPAGE." "; if ($pages > 10) { $current = ($from/$view)+1; diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index fc6b7de57..731c9ad29 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -1,48 +1,44 @@ \ No newline at end of file diff --git a/e107_languages/English/lan_np.php b/e107_languages/English/lan_np.php index 70cbefa4f..3de35a0e2 100644 --- a/e107_languages/English/lan_np.php +++ b/e107_languages/English/lan_np.php @@ -1,14 +1,13 @@ area for a more recent version.'); diff --git a/e107_plugins/forum/e_admin_events.php b/e107_plugins/forum/e_admin_events.php index 34950291d..91842d09d 100755 --- a/e107_plugins/forum/e_admin_events.php +++ b/e107_plugins/forum/e_admin_events.php @@ -2,15 +2,12 @@ /* * e107 website system * -* Copyright (C) 2008-2009 e107 Inc (e107.org) +* Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * Check for admin events being triggered * -* $URL$ -* $Id$ -* */ function plugin_forum_admin_events($type, $parms) { diff --git a/e107_plugins/forum/e_emailprint.php b/e107_plugins/forum/e_emailprint.php index 12d753eda..c2bc40eea 100755 --- a/e107_plugins/forum/e_emailprint.php +++ b/e107_plugins/forum/e_emailprint.php @@ -8,10 +8,10 @@ function print_item($thread_id) include_once(e_PLUGIN.'forum/forum_class.php'); $forum = new e107forum; $thread_info = $forum->thread_get($thread_id,0,999); - $thread_name = $tp -> toHTML($thread_info[0]['thread_name'], TRUE); + $thread_name = $tp->toHTML($thread_info[0]['thread_name'], TRUE); $text = "".$thread_name."
".$thread_info[0]['user_name'].", ".$gen->convert_date($thread_info[0]['thread_datestamp'], "forum")."

- ".$tp -> toHTML($thread_info[0]['thread_thread'], TRUE); + ".$tp->toHTML($thread_info[0]['thread_thread'], TRUE); $count = 1; @@ -21,7 +21,7 @@ function print_item($thread_id) { $text .= "

Re: ".$thread_name."
".$reply['user_name'].", ".$gen->convert_date($reply['thread_datestamp'], "forum")."

- ".$tp -> toHTML($reply['thread_thread'], TRUE); + ".$tp->toHTML($reply['thread_thread'], TRUE); } @@ -37,10 +37,10 @@ function email_item($thread_id) $forum = new e107forum; $thread_info = $forum->thread_get($thread_id,0,999); - $thread_name = $tp -> toHTML($thread_info[0]['thread_name'], TRUE); + $thread_name = $tp->toHTML($thread_info[0]['thread_name'], TRUE); $text = "".$thread_name."
".$thread_info[0]['user_name'].", ".$gen->convert_date($thread_info[0]['thread_datestamp'], "forum")."

- ".$tp -> toHTML($thread_info[0]['thread_thread'], TRUE); + ".$tp->toHTML($thread_info[0]['thread_thread'], TRUE); $count = 1; @@ -49,7 +49,7 @@ function email_item($thread_id) { $text .= "

Re: ".$thread_name."
".$reply['user_name'].", ".$gen->convert_date($reply['thread_datestamp'], "forum")."

- ".$tp -> toHTML($reply['thread_thread'], TRUE); + ".$tp->toHTML($reply['thread_thread'], TRUE); } return $text; } diff --git a/e107_plugins/forum/e_frontpage.php b/e107_plugins/forum/e_frontpage.php index 389bd9f78..3ebe7edfa 100644 --- a/e107_plugins/forum/e_frontpage.php +++ b/e107_plugins/forum/e_frontpage.php @@ -2,11 +2,11 @@ if (!defined('e107_INIT')) { exit; } -include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_frontpage.php'); +e107::lan('forum', 'English_front'); /** * @todo - extend array to allow selection of any main forum, as well as the forum front page */ -$front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => FOR_FP_1); +$front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => LAN_FORUM_0001); ?> \ No newline at end of file diff --git a/e107_plugins/forum/e_latest.php b/e107_plugins/forum/e_latest.php index 2b9d2f279..3513bb6a5 100644 --- a/e107_plugins/forum/e_latest.php +++ b/e107_plugins/forum/e_latest.php @@ -7,7 +7,7 @@ class forum_latest // include plugin-folder in the name. function config() { $sql = e107::getDb(); - $reported_posts = $sql->db_Count('generic', '(*)', "WHERE gen_type='reported_post' OR gen_type='Reported Forum Post'"); + $reported_posts = $sql->count('generic', '(*)', "WHERE gen_type='reported_post' OR gen_type='Reported Forum Post'"); $var[0]['icon'] = E_16_FORUM; $var[0]['title'] = ADLAN_LAT_6; diff --git a/e107_plugins/forum/e_linkgen.php b/e107_plugins/forum/e_linkgen.php index 2518cb8ef..9a842618e 100644 --- a/e107_plugins/forum/e_linkgen.php +++ b/e107_plugins/forum/e_linkgen.php @@ -2,14 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * - * $URL$ - * $Id$ */ if (!defined('e107_INIT')) { exit; } @@ -17,9 +13,9 @@ if (!defined('e107_INIT')) { exit; } // Usage: sublink_type[x]['title']. // x should be the same as the plugin folder. -include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php'); +include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php'); // FIXME needs changing after forum lan rewrite -$sublink_type['forum']['title'] = FORLAN_155; // "News Categories"; +$sublink_type['forum']['title'] = FORLAN_155; // "News Categories"; // FIXME needs changing after forum lan rewrite $sublink_type['forum']['table'] = 'forum'; $sublink_type['forum']['query'] = "forum_parent !='0' ORDER BY forum_order ASC"; $sublink_type['forum']['url'] = "{e_PLUGIN}forum/forum_viewforum.php?#"; diff --git a/e107_plugins/forum/e_notify.php b/e107_plugins/forum/e_notify.php index 4daa23977..e816753b2 100644 --- a/e107_plugins/forum/e_notify.php +++ b/e107_plugins/forum/e_notify.php @@ -2,22 +2,19 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * Forum plugin notify configuration * - * $URL$ - * $Id$ - * */ if (!defined('e107_INIT')) { exit; } if(defined('ADMIN_PAGE') && ADMIN_PAGE === true) { - include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_notify.php'); + include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_notify.php'); // FIXME needs changing after forum lan rewrite $config_category = FORUM_NT_1; $config_events = array( 'forum_nt' => FORUM_NT_NEWTHREAD, diff --git a/e107_plugins/forum/e_search.php b/e107_plugins/forum/e_search.php index e2098b3de..72e29d3c0 100644 --- a/e107_plugins/forum/e_search.php +++ b/e107_plugins/forum/e_search.php @@ -1,7 +1,7 @@ e_PLUGIN.'forum/search/search_parser.php', diff --git a/e107_plugins/forum/e_status.php b/e107_plugins/forum/e_status.php index 3dcb5114f..2f4dcb6ac 100644 --- a/e107_plugins/forum/e_status.php +++ b/e107_plugins/forum/e_status.php @@ -7,7 +7,7 @@ class forum_status // include plugin-folder in the name. function config() { $sql = e107::getDb(); - $forum_posts = $sql->db_Count('forum_post'); + $forum_posts = $sql->count('forum_post'); $var[0]['icon'] = E_16_FORUM; $var[0]['title'] = ADLAN_113; diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 27a1ffad3..cec31ed91 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -24,7 +24,7 @@ if (!$e107->isInstalled('forum')) exit; } -// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php'); +// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php'); // using English_front.php now require_once(e_PLUGIN.'forum/forum_class.php'); $forum = new e107forum; @@ -62,42 +62,43 @@ if(isset($_GET['f'])) $fVars = new e_vars; $gen = new convert; -$fVars->FORUMTITLE = LAN_46; -$fVars->THREADTITLE = LAN_47; -$fVars->REPLYTITLE = LAN_48; -$fVars->LASTPOSTITLE = LAN_49; -$fVars->INFOTITLE = LAN_191; +$fVars->FORUMTITLE = LAN_FORUM_0001; +$fVars->THREADTITLE = LAN_FORUM_0002; +$fVars->REPLYTITLE = LAN_FORUM_0003; +$fVars->LASTPOSTITLE = LAN_FORUM_0004; +$fVars->INFOTITLE = LAN_FORUM_0009; $fVars->LOGO = IMAGE_e; -$fVars->NEWTHREADTITLE = LAN_424; -$fVars->POSTEDTITLE = LAN_423; +$fVars->NEWTHREADTITLE = LAN_FORUM_0075; +$fVars->POSTEDTITLE = LAN_FORUM_0074; $fVars->NEWIMAGE = IMAGE_new_small; -$fVars->TRACKTITLE = LAN_397; +$fVars->TRACKTITLE = LAN_FORUM_0073; $rules_text = forum_rules('check'); -$fVars->USERINFO = "".LAN_429." | ".LAN_430.""; +$fVars->USERINFO = "".LAN_FORUM_0010." | ".LAN_FORUM_0011.""; if(USER) { - $fVars->USERINFO .= " | ".LAN_431." | ".LAN_432." | ".LAN_435.""; + $fVars->USERINFO .= " | ".LAN_FORUM_0012." | ".LAN_FORUM_0013." | ".LAN_FORUM_0014.""; if($forum->prefs->get('attach') && (check_class($pref['upload_class']) || getperms('0'))) { - $fVars->USERINFO .= " | ".FORLAN_442.""; + $fVars->USERINFO .= " | ".LAN_FORUM_0015.""; } } if($rules_text != '') { - $fVars->USERINFO .= " | ".LAN_433.''; + $fVars->USERINFO .= " | ".LAN_FORUM_0016.''; } $total_topics = $sql->count("forum_thread", "(*)"); $total_replies = $sql->count("forum_post", "(*)"); $total_members = $sql->count("user"); $newest_member = $sql->select("user", "*", "user_ban='0' ORDER BY user_join DESC LIMIT 0,1"); -list($nuser_id, $nuser_name) = $sql->db_Fetch(); +list($nuser_id, $nuser_name) = $sql->fetch(); // FIXME $nuser_id & $user_name return empty even though print_a($newest_member); returns proper result. + if(!defined('e_TRACKING_DISABLED')) { $member_users = $sql->select("online", "*", "online_location REGEXP('forum.php') AND online_user_id!='0' "); $guest_users = $sql->select("online", "*", "online_location REGEXP('forum.php') AND online_user_id='0' "); $users = $member_users+$guest_users; - $fVars->USERLIST = LAN_426; + $fVars->USERLIST = LAN_FORUM_0036.": "; global $listuserson; $c = 0; if(is_array($listuserson)) @@ -109,30 +110,30 @@ if(!defined('e_TRACKING_DISABLED')) $fVars->USERLIST .= "$oname".($c == MEMBERS_ONLINE ? "." :", "); } } - $fVars->USERLIST .= "
".LAN_427." ".LAN_436; + $fVars->USERLIST .= "
".LAN_FORUM_0037." ".LAN_FORUM_0038; } -$fVars->STATLINK = "".LAN_441."\n"; +$fVars->STATLINK = "".LAN_FORUM_0017."\n"; $fVars->ICONKEY = " \n - + - + - +\n
".IMAGE_new_small."".LAN_79."".LAN_FORUM_0039." ".IMAGE_nonew_small."".LAN_80."".LAN_FORUM_0040." ".IMAGE_closed_small."".LAN_394."".LAN_FORUM_0041."
\n"; $fVars->SEARCH = " -
+ - - + +
\n"; -$fVars->PERMS = (USER == TRUE || ANON == TRUE ? LAN_204." - ".LAN_206." - ".LAN_208 : LAN_205." - ".LAN_207." - ".LAN_209); +$fVars->PERMS = (USER == TRUE || ANON == TRUE ? LAN_FORUM_0043." - ".LAN_FORUM_0045." - ".LAN_FORUM_0047 : LAN_FORUM_0044." - ".LAN_FORUM_0046." - ".LAN_FORUM_0048); $fVars->INFO = ""; if (USER == TRUE) @@ -140,7 +141,7 @@ if (USER == TRUE) $total_new_threads = $sql->count('forum_thread', '(*)', "WHERE thread_datestamp>'".USERLV."' "); if (USERVIEWED != "") { - $tmp = explode(".", USERVIEWED); // List of numbers, separated by single period + $tmp = explode(".", USERVIEWED); // List of numbers, separated by single period $total_read_threads = count($tmp); } else @@ -148,60 +149,62 @@ if (USER == TRUE) $total_read_threads = 0; } - $fVars->INFO = LAN_30." ".USERNAME."
"; + $fVars->INFO = LAN_FORUM_0018." ".USERNAME."
"; $lastvisit_datestamp = $gen->convert_date(USERLV, 'long'); $datestamp = $gen->convert_date(time(), "long"); if (!$total_new_threads) { - $fVars->INFO .= LAN_31; + $fVars->INFO .= LAN_FORUM_0019." "; } elseif($total_new_threads == 1) { - $fVars->INFO .= LAN_32; + $fVars->INFO .= LAN_FORUM_0020; } else { - $fVars->INFO .= LAN_33." ".$total_new_threads." ".LAN_34." "; + $fVars->INFO .= LAN_FORUM_0021." ".$total_new_threads." ".LAN_FORUM_0022." "; } - $fVars->INFO .= LAN_35; + $fVars->INFO .= LAN_FORUM_0023; if ($total_new_threads == $total_read_threads && $total_new_threads != 0 && $total_read_threads >= $total_new_threads) { - $fVars->INFO .= LAN_198; + $fVars->INFO .= LAN_FORUM_0029; $allread = TRUE; } elseif($total_read_threads != 0) { - $fVars->INFO .= " (".LAN_196.$total_read_threads.LAN_197.")"; + $fVars->INFO .= " (".LAN_FORUM_0027." ".$total_read_threads." ".LAN_FORUM_0028.")"; } $fVars->INFO .= "
- ".LAN_36." ".$lastvisit_datestamp."
- ".LAN_37." ".$datestamp; + ".LAN_FORUM_0024." ".$lastvisit_datestamp."
+ ".LAN_FORUM_0025." ".$datestamp; } else { $fVars->INFO .= ''; if (ANON == TRUE) { - $fVars->INFO .= LAN_410.'
'.LAN_44." ".LAN_437." ".LAN_438; + $fVars->INFO .= LAN_FORUM_0049.'
'.LAN_FORUM_0050." ".LAN_FORUM_0051." ".LAN_FORUM_0052; } elseif(USER == FALSE) { - $fVars->INFO .= LAN_410.'
'.LAN_45." ".LAN_439." ".LAN_440; + $fVars->INFO .= LAN_FORUM_0049.'
'.LAN_FORUM_0053." ".LAN_FORUM_0054." ".LAN_FORUM_0055; } } if (USER && vartrue($allread) != TRUE && $total_new_threads && $total_new_threads >= $total_read_threads) { - $fVars->INFO .= "
".LAN_199.''.(e_QUERY != 'new' ? ", ".LAN_421."" : ''); + $fVars->INFO .= "
".LAN_FORUM_0057.''.(e_QUERY != 'new' ? ", ".LAN_FORUM_0058."" : ''); } if (USER && varsettrue($forum->prefs->get('track')) && e_QUERY != 'track') { - $fVars->INFO .= "
".LAN_393.''; + $fVars->INFO .= "
".LAN_FORUM_0030.''; } -$fVars->FORUMINFO = LAN_192.($total_topics+$total_replies).' '.LAN_404." ($total_topics ".($total_topics == 1 ? LAN_411 : LAN_413).", $total_replies ".($total_replies == 1 ? LAN_412 : LAN_414).").".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_415 : LAN_416)." (".$member_users." ".($member_users == 1 ? LAN_417 : LAN_419).", ".$guest_users." ".($guest_users == 1 ? LAN_418 : LAN_420).")
".LAN_42.$total_members."
".LAN_41."".$nuser_name.".\n"); +$fVars->FORUMINFO = +str_replace("[x]", ($total_topics+$total_replies), LAN_FORUM_0031)." ($total_topics ".($total_topics == 1 ? LAN_FORUM_0032 : LAN_FORUM_0033).", $total_replies ".($total_replies == 1 ? LAN_FORUM_0034 : LAN_FORUM_0035).") +".(!defined("e_TRACKING_DISABLED") ? "" : "
".$users." ".($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060)." (".$member_users." ".($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).")
".LAN_FORUM_0066." ".$total_members."
".LAN_FORUM_0065." ".$nuser_name.".\n"); // FIXME cannot find other references to e_TRACKING_DISABLED, use pref? if (!isset($FORUM_MAIN_START)) { @@ -240,7 +243,7 @@ $newflag_list = $forum->forumGetUnreadForums(); if (!$forumList) { - $ns->tablerender(PAGE_NAME, "
".LAN_51.'
', array('forum', '51')); + $ns->tablerender(PAGE_NAME, "
".LAN_FORUM_0067.'
', array('forum', '51')); require_once(FOOTERF); exit; } @@ -256,7 +259,7 @@ foreach ($forumList['parents'] as $parent) $forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT, $pVars); if (!count($forumList['forums'][$parent['forum_id']])) { - $text .= "".LAN_52.""; + $text .= "".LAN_FORUM_0068.""; } else { @@ -265,19 +268,19 @@ foreach ($forumList['parents'] as $parent) { if ($f['forum_class'] == e_UC_ADMIN && ADMIN) { - $forum_string .= parse_forum($f, LAN_406); + $forum_string .= parse_forum($f, LAN_FORUM_0005); } elseif($f['forum_class'] == e_UC_MEMBER && USER) { - $forum_string .= parse_forum($f, LAN_407); + $forum_string .= parse_forum($f, LAN_FORUM_0006); } elseif($f['forum_class'] == e_UC_READONLY) { - $forum_string .= parse_forum($f, LAN_408); + $forum_string .= parse_forum($f, LAN_FORUM_0007); } elseif($f['forum_class'] && check_class($f['forum_class'])) { - $forum_string .= parse_forum($f, LAN_409); + $forum_string .= parse_forum($f, LAN_FORUM_0008); } elseif(!$f['forum_class']) { @@ -295,7 +298,7 @@ function parse_parent($parent) { if(!check_class($parent['forum_postclass'])) { - $status = '( '.LAN_405.' )'; + $status = '('.LAN_FORUM_0056.')'; } return vartrue($status); } @@ -343,7 +346,7 @@ function parse_forum($f, $restricted_string = '') { list($lastpost_datestamp, $lastpost_thread) = explode('.', $f['forum_lastpost_info']); $ret = parse_subs($forumList['subs'][$f['forum_id']], $lastpost_datestamp); - $fVars->FORUMSUBFORUMS = "
".FORLAN_444.": {$ret['text']}
"; + $fVars->FORUMSUBFORUMS = "
".LAN_FORUM_0069.": {$ret['text']}
"; $fVars->THREADS += $ret['threads']; $fVars->REPLIES += $ret['replies']; if(isset($ret['lastpost_info'])) @@ -432,7 +435,7 @@ if (e_QUERY == 'track') $url = $e107->url->create('forum/thread/view', $row); // configs will be able to map thread_* vars to the url $trackVars->TRACKPOSTNAME = "".$tp->toHTML($row['thread_name']).''; - $trackVars->UNTRACK = "".LAN_392.""; + $trackVars->UNTRACK = "".LAN_FORUM_0070.""; $forum_trackstring .= $tp->simpleParse($FORUM_TRACK_MAIN, $trackVars); } } @@ -473,7 +476,7 @@ if (e_QUERY == 'new') if (!$newThreadList) { - $nVars->NEWSPOSTNAME = LAN_198; + $nVars->NEWSPOSTNAME = LAN_FORUM_0029; $forum_newstring = $tp->simpleParse($FORUM_NEWPOSTS_MAIN, $nVars); } @@ -527,9 +530,9 @@ function forum_rules($action = 'check') } else { - $rules_text = FORLAN_441; + $rules_text = LAN_FORUM_0072; } - e107::getRender()->tablerender(LAN_433, "
{$rules_text}
", array('forum', 'forum_rules')); + e107::getRender()->tablerender(LAN_FORUM_0071, "
{$rules_text}
", array('forum', 'forum_rules')); } ?> \ No newline at end of file diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index e04ff4354..d867129d2 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -10,6 +10,8 @@ * */ +// TODO LAN + /* Forum Header File */ if (!defined('e107_INIT')) { exit; } @@ -1556,7 +1558,7 @@ class e107forum $FORUM_CRUMB['sitename']['value'] = str_replace($search, $replace, $FORUM_CRUMB['sitename']['value']); $search = array('{FORUMS_TITLE}', '{FORUMS_HREF}'); - $replace = array(LAN_01, e107::getUrl()->create('forum/forum/main')); + $replace = array(LAN_FORUM_0001, e107::getUrl()->create('forum/forum/main')); $FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']); $search = '{PARENT_TITLE}'; @@ -1591,7 +1593,7 @@ class e107forum else { $dfltsep = ' :: '; - $BREADCRUMB = "".SITENAME."".$dfltsep."".LAN_01."".$dfltsep; + $BREADCRUMB = "".SITENAME."".$dfltsep."".LAN_FORUM_0001."".$dfltsep; if($forumInfo['sub_parent']) { $forum_sub_parent = (substr($forumInfo['sub_parent'], 0, 1) == '*' ? substr($forumInfo['sub_parent'], 1) : $forumInfo['sub_parent']); diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 7e3929828..732b9d280 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -15,6 +15,7 @@ define('NAVIGATION_ACTIVE','forum'); $e107 = e107::getInstance(); $tp = e107::getParser(); $ns = e107::getRender(); +$mes = e107::getMessage(); if (!$e107->isInstalled('forum')) { @@ -73,12 +74,13 @@ switch($action) if (!$forum->checkPerm($forumId, 'post')) { require_once(HEADERF); - $ns->tablerender(LAN_20, "
".LAN_399.'
'); + $mes->addError(LAN_FORUM_3001); + $ns->tablerender(LAN_FORUM_1001, $mes->render()); require_once(FOOTERF); exit; } define('MODERATOR', USER && $forum->isModerator(USERID)); -require_once(e_HANDLER.'ren_help.php'); +require_once(e_HANDLER.'ren_help.php'); // FIXME deprecated //e107::getScBatch('view', 'forum'); //XXX FIXME Conflicting shortcode names. Find a solution without renaming them. $sc = e107::getScBatch('post', 'forum')->setScVar('forum', $forum)->setScVar('threadInfo', vartrue($threadInfo)); @@ -91,13 +93,14 @@ $e107 = e107::getInstance(); if ($action != 'nt' && !$threadInfo['thread_active'] && !MODERATOR) { require_once(HEADERF); - $ns->tablerender(LAN_20, "
".LAN_397.'
'); + $mes->addError(LAN_FORUM_3002); + $ns->tablerender(LAN_FORUM_1001, $mes->render()); require_once(FOOTERF); exit; } $forumInfo['forum_name'] = $tp->toHTML($forumInfo['forum_name'], true); -define('e_PAGETITLE', ($action == 'rp' ? LAN_02.$threadInfo['thread_name'] : LAN_03).' / '.$forumInfo['forum_name'].' / '.LAN_01); +define('e_PAGETITLE', ($action == 'rp' ? LAN_FORUM_3003.": ".$threadInfo['thread_name'] : LAN_FORUM_1018).' / '.$forumInfo['forum_name'].' / '.LAN_FORUM_1001); // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -110,7 +113,7 @@ if($forum->prefs->get('attach')) $max_upload_size = set_max_size($a_filetypes, $max_upload_size); $max_upload_size = $e107->parseMemorySize($max_upload_size, 0); $a_filetypes = array_keys($a_filetypes); - $allowed_filetypes = implode(' | ', $a_filetypes); + $allowed_filetypes = implode(', ', $a_filetypes); } if (isset($_POST['submitpoll'])) @@ -145,7 +148,7 @@ if (isset($_POST['fpreview'])) } else { - $poster = ($_POST['anonname']) ? $_POST['anonname'] : LAN_311; + $poster = ($_POST['anonname']) ? $_POST['anonname'] : LAN_FORUM_3004; } $postdate = $gen->convert_date(time(), "forum"); $tsubject = $tp->post_toHTML($_POST['subject'], true); @@ -176,7 +179,7 @@ if (isset($_POST['fpreview'])) { $ns->tablerender($_POST['poll_title'], $poll_text); } - $ns->tablerender(LAN_323, $text); + $ns->tablerender(LAN_FORUM_3005, $text); $anonname = $tp->post_toHTML($_POST['anonname'], FALSE); $post = $tp->post_toForm($_POST['post']); @@ -313,7 +316,7 @@ if (isset($_POST['newthread']) || isset($_POST['reply'])) if($postResult === -1) //Duplicate post { require_once(HEADERF); - $ns->tablerender('', LAN_FORUM_2); + $ns->tablerender('', LAN_FORUM_3007); require_once(FOOTERF); exit; } @@ -374,14 +377,15 @@ if (isset($_POST['update_thread'])) // exit; if (!$_POST['subject'] || !$_POST['post']) { - $error = "
".LAN_27."
"; + $error = "
".LAN_FORUM_3007."
"; // TODO $mes } else { if (!isAuthor()) { require_once(HEADERF); - $ns->tablerender(LAN_95, "
".LAN_96.'
'); + $mes->addError(LAN_FORUM_3009); + $ns->tablerender(LAN_FORUM_3008, $mes->render()); require_once(FOOTERF); exit; } @@ -418,14 +422,15 @@ if (isset($_POST['update_reply'])) { if (!$_POST['post']) { - $error = "
".LAN_27.'
'; + $error = "
".LAN_FORUM_3007.'
'; // TODO $mes } else { if (!isAuthor()) { require_once(HEADERF); - $ns->tablerender(LAN_95, "
".LAN_96.'
'); + $mes->addError(LAN_FORUM_3009); + $ns->tablerender(LAN_FORUM_3008, $mes->render()); require_once(FOOTERF); exit; } @@ -445,17 +450,17 @@ require_once(HEADERF); if (vartrue($error)) { - $ns->tablerender(LAN_20, $error); + $ns->tablerender(EMESSLAN_TITLE_ERROR, $error); // LAN? } - if ($action == 'edit' || $action == 'quote') { if ($action == 'edit') { if (!isAuthor()) { - $ns->tablerender(LAN_95, "
".LAN_96.'
'); + $mes->addError(LAN_FORUM_3009); + $ns->tablerender(LAN_FORUM_3008, $mes->render()); require_once(FOOTERF); exit; } @@ -544,12 +549,12 @@ function forumjump() { global $forum; $jumpList = $forum->forumGetAllowed('view'); - $text = "

".LAN_401.": "; foreach($jumpList as $key => $val) { $text .= "\n"; } - $text .= "

"; + $text .= "

"; return $text; } @@ -568,7 +573,7 @@ function process_upload() if(!is_dir($attachmentDir)) { - mkdir($attachmentDir,0755); + mkdir($attachmentDir, 0755); } // $thumbDir = e_PLUGIN.'forum/attachments/thumb/'; diff --git a/e107_plugins/forum/forum_stats.php b/e107_plugins/forum/forum_stats.php index 80e002f49..4f53f5cf5 100644 --- a/e107_plugins/forum/forum_stats.php +++ b/e107_plugins/forum/forum_stats.php @@ -37,14 +37,14 @@ $total_topics = $sql->count('forum_thread'); $total_replies = $total_posts - $total_topics; $total_views = 0; $query = 'SELECT sum(thread_views) AS total FROM `#forum_thread` '; -if ($sql -> db_Select_gen($query)) +if ($sql->gen($query)) { - $row = $sql->db_Fetch(); + $row = $sql->fetch(); $total_views = $row['total']; } -$firstpost = $sql -> db_Select('forum_post', 'post_datestamp', 'post_datestamp > 0 ORDER BY post_datestamp ASC LIMIT 0,1', 'default'); -$fp = $sql->db_Fetch(); +$firstpost = $sql->select('forum_post', 'post_datestamp', 'post_datestamp > 0 ORDER BY post_datestamp ASC LIMIT 0,1', 'default'); +$fp = $sql->fetch(); $open_ds = $fp['post_datestamp']; $open_date = $gen->convert_date($open_ds, 'long'); @@ -74,7 +74,7 @@ WHERE ft.thread_active > 0 AND f.forum_class IN (".USERCLASS_LIST.") ORDER BY ft.thread_total_replies DESC LIMIT 0,10"; $sql->gen($query); -$most_activeArray = $sql -> db_getList(); +$most_activeArray = $sql->db_getList(); $query = " SELECT ft.*, f.forum_class, u.user_name, u.user_id FROM #forum_thread as ft @@ -84,7 +84,7 @@ WHERE f.forum_class IN (".USERCLASS_LIST.") ORDER BY ft.thread_views DESC LIMIT 0,10"; $sql->gen($query); -$most_viewedArray = $sql -> db_getList(); +$most_viewedArray = $sql->db_getList(); /*$sql->db_Select("user", "user_id, user_name, user_forums", "ORDER BY user_forums DESC LIMIT 0, 10", "no_where"); $posters = $sql -> db_getList(); @@ -102,7 +102,7 @@ LEFT JOIN #user AS u ON fp.post_user = u.user_id GROUP BY fp.post_user ORDER BY post_count DESC LIMIT 0,10"; $sql->gen($query); -$top_repliers_data = $sql -> db_getList('ALL', false, false, 'user_id'); +$top_repliers_data = $sql->db_getList('ALL', false, false, 'user_id'); // build top posters meanwhile $top_posters = array(); @@ -122,7 +122,7 @@ LEFT JOIN #user AS u ON ft.thread_user = u.user_id WHERE u.user_id IN ({$ids}) GROUP BY ft.thread_user"; $sql->gen($query); -$top_repliers_data_c = $sql -> db_getList('ALL', false, false, 'user_id'); +$top_repliers_data_c = $sql->db_getList('ALL', false, false, 'user_id'); $top_repliers = array(); foreach($top_repliers_data as $uid => $poster) @@ -150,7 +150,7 @@ LEFT JOIN #user AS u ON ft.thread_user = u.user_id GROUP BY ft.thread_user ORDER BY thread_count DESC LIMIT 0,10"; $sql->gen($query); -$top_topic_starters_data = $sql -> db_getList(); +$top_topic_starters_data = $sql->db_getList(); $top_topic_starters = array(); foreach($top_topic_starters_data as $poster) { @@ -410,9 +410,7 @@ $text .= ' '; - $ns -> tablerender(FSLAN_23, $text); require_once(FOOTERF); - ?> \ No newline at end of file diff --git a/e107_plugins/forum/forum_uploads.php b/e107_plugins/forum/forum_uploads.php index 743cee67e..33c7b395f 100644 --- a/e107_plugins/forum/forum_uploads.php +++ b/e107_plugins/forum/forum_uploads.php @@ -21,6 +21,7 @@ if(!USER) header("location:".e_BASE.$PLUGINS_DIRECTORY."forum/forum.php"); exit; } + include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_uploads.php'); if(is_array($_POST['delete'])) @@ -53,7 +54,7 @@ if($msg) $fi = new e_file; $mask = ".*_".USERID."_FT.*"; $fileList = $fi->get_files(e_UPLOAD, $mask); -if($sql->db_Select('forum_thread','thread_id, thread_thread, thread_parent', "thread_thread REGEXP '.*_".USERID."_FT.*'")) +if($sql->db_Select('forum_thread','thread_id, thread_thread, thread_parent', "thread_thread REGEXP '.*_".USERID."_FT.*'")) // FIXME new forum db structure { $threadList = $sql->db_getList(); } diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index 03e57d818..e7b8ecded 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -2,15 +2,12 @@ /* * e107 website system * -* Copyright (C) 2008-2011 e107 Inc (e107.org) +* Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * View specific forums * -* $URL$ -* $Id$ -* */ require_once('../../class2.php'); @@ -20,13 +17,10 @@ if (!$e107->isInstalled('forum')) header('Location: '.SITEURL); exit; } -include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); +//include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); // now uses English_front.php define('NAVIGATION_ACTIVE','forum'); - - - if (isset($_POST['fjsubmit'])) { // TODO - load from DB and find forum_name @@ -52,11 +46,11 @@ $threadFrom = ($page - 1) * $view; global $forum_info, $FORUM_CRUMB; $fVars = new e_vars; -$fVars->STARTERTITLE = LAN_54; -$fVars->THREADTITLE = LAN_53; -$fVars->REPLYTITLE = LAN_55; -$fVars->LASTPOSTITLE = LAN_57; -$fVars->VIEWTITLE = LAN_56; +$fVars->STARTERTITLE = LAN_FORUM_1004; +$fVars->THREADTITLE = LAN_FORUM_1003; +$fVars->REPLYTITLE = LAN_FORUM_0003; +$fVars->LASTPOSTITLE = LAN_FORUM_0004; +$fVars->VIEWTITLE = LAN_FORUM_1005; $forumId = (int)$_REQUEST['id']; @@ -118,7 +112,7 @@ $forumInfo['forum_name'] = $tp->toHTML($forumInfo['forum_name'], true, 'no_hook, $forumInfo['forum_description'] = $tp->toHTML($forumInfo['forum_description'], true, 'no_hook'); $_forum_name = (substr($forumInfo['forum_name'], 0, 1) == '*' ? substr($forumInfo['forum_name'], 1) : $forumInfo['forum_name']); -define('e_PAGETITLE', $_forum_name.' / '.LAN_01); +define('e_PAGETITLE', $_forum_name.' / '.LAN_FORUM_1001); // SEO - meta description (auto) if(!empty($forumInfo['forum_description'])) @@ -217,11 +211,11 @@ if(substr($forum_info['sub_parent'], 0, 1) == '*') $forum->set_crumb(true, '', $fVars); // set $BREADCRUMB (and $BACKLINK) $fVars->FORUMTITLE = $forumInfo['forum_name']; -$fVars->MODERATORS = LAN_404.': '.implode(', ', $modArray); +$fVars->MODERATORS = LAN_FORUM_1009.': '.implode(', ', $modArray); $fVars->BROWSERS = ''; if(varset($pref['track_online'])) { - $fVars->BROWSERS = $users.' '.($users == 1 ? LAN_405 : LAN_406).' ('.$member_users.' '.($member_users == 1 ? LAN_407 : LAN_409).", ".$guest_users." ".($guest_users == 1 ? LAN_408 : LAN_410).')'; + $fVars->BROWSERS = $users.' '.($users == 1 ? LAN_FORUM_0059 : LAN_FORUM_0060).' ('.$member_users.' '.($member_users == 1 ? LAN_FORUM_0061 : LAN_FORUM_0062).", ".$guest_users." ".($guest_users == 1 ? LAN_FORUM_0063 : LAN_FORUM_0064).')'; } @@ -229,23 +223,23 @@ $fVars->ICONKEY = " - + - + - + - + - + - + - + - +
".IMAGE_new_small."".LAN_79."".LAN_FORUM_0039." ".IMAGE_nonew_small."".LAN_80."".LAN_FORUM_0040." ".IMAGE_sticky_small."".LAN_202."".LAN_FORUM_1011." ".IMAGE_announce_small."".LAN_396."".LAN_FORUM_1013."
".IMAGE_new_popular_small."".LAN_79." ".LAN_395."".LAN_FORUM_0039." ".LAN_FORUM_1010." ".IMAGE_nonew_popular_small."".LAN_80." ".LAN_395."".LAN_FORUM_0040." ".LAN_FORUM_1010." ".IMAGE_stickyclosed_small."".LAN_203."".LAN_FORUM_1012." ".IMAGE_closed_small."".LAN_81."".LAN_FORUM_1014."
"; @@ -253,7 +247,7 @@ $fVars->SEARCH = "

- +

@@ -261,11 +255,11 @@ $fVars->SEARCH = " if($forum->checkPerm($forumId, 'post')) { - $fVars->PERMS = LAN_204.' - '.LAN_206.' - '.LAN_208; + $fVars->PERMS = LAN_FORUM_0043.' - '.LAN_FORUM_0045.' - '.LAN_FORUM_0047; } else { - $fVars->PERMS = LAN_205.' - '.LAN_207.' - '.LAN_209; + $fVars->PERMS = LAN_FORUM_0044.' - '.LAN_FORUM_0046.' - '.LAN_FORUM_0048; } $sticky_threads = 0; @@ -313,7 +307,7 @@ if (count($threadList) ) } else { - $forum_view_forum .= " ".LAN_411.""; + $forum_view_forum .= " ".LAN_FORUM_1006.""; } $stuck = true; } @@ -329,7 +323,7 @@ if (count($threadList) ) } else { - $forum_view_forum .= " ".LAN_412.""; + $forum_view_forum .= " ".LAN_FORUM_1007.""; } $unstuck = true; } @@ -338,11 +332,11 @@ if (count($threadList) ) } else { - $forum_view_forum .= "".LAN_58.""; + $forum_view_forum .= "".LAN_FORUM_1008.""; } $fVars->FORUMJUMP = forumjump(); -$fVars->TOPLINK = "".LAN_02.''; +$fVars->TOPLINK = "".LAN_GOTO.''; // FIXME - TOPLINK not used anymore? if($container_only) { @@ -366,7 +360,7 @@ else echo ""; @@ -411,8 +405,8 @@ function parse_thread($thread_info) } else { - $tVars->LASTPOST = FORLAN_19; - $tVars->LASTPOSTUSER = FORLAN_19; + $tVars->LASTPOST = LAN_FORUM_1015; + $tVars->LASTPOSTUSER = LAN_FORUM_1015; } } $tVars->LASTPOST .= '
'.$lastpost_datestamp; @@ -435,12 +429,12 @@ function parse_thread($thread_info) if ($thread_info['thread_sticky'] == 1) { $tVars->ICON = ($thread_info['thread_active'] ? IMAGE_sticky : IMAGE_stickyclosed); - $tVars->THREADTYPE = '['.LAN_202.']
'; + $tVars->THREADTYPE = '['.LAN_FORUM_1011.']
'; } elseif($thread_info['thread_sticky'] == 2) { $tVars->ICON = IMAGE_announce; - $tVars->THREADTYPE = '['.LAN_396.']
'; + $tVars->THREADTYPE = '['.LAN_FORUM_1013.']
'; } elseif(!$thread_info['thread_active']) { @@ -450,7 +444,7 @@ function parse_thread($thread_info) $thread_name = strip_tags($tp->toHTML($thread_info['thread_name'], false, 'no_hook, emotes_off')); if(isset($thread_info['thread_options']['poll'])) { - $thread_name = '['.FORLAN_23.'] ' . $thread_name; + $thread_name = '['.LAN_FORUM_1016.'] ' . $thread_name; } // if (strtoupper($THREADTYPE) == strtoupper(substr($thread_name, 0, strlen($THREADTYPE)))) // { @@ -509,7 +503,7 @@ function parse_thread($thread_info) $tVars->PAGES .= "{$aa}"; } } - $tVars->PAGES = LAN_316.' [ '.$tVars->PAGES.' ]'; + $tVars->PAGES = LAN_GOTO.' [ '.$tVars->PAGES.' ]'; } else { @@ -551,13 +545,13 @@ function parse_thread($thread_info) } else { - $tVars->POSTER = FORLAN_19; + $tVars->POSTER = LAN_FORUM_1015; } } if (!$tVars->REPLIES) { - $tVars->REPLIES = LAN_317; // 'None' + $tVars->REPLIES = '0'; $tVars->REPLIESX = "0"; $tVars->LASTPOST = ' - '; $tVars->LASTPOSTDATE = ' - '; @@ -659,12 +653,12 @@ function forumjump() { global $forum; $jumpList = $forum->forumGetAllowed('view'); - $text = "

".LAN_403.": "; foreach($jumpList as $key => $val) { $text .= "\n"; } - $text .= "

"; + $text .= " "; return $text; } @@ -732,7 +726,7 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } $text .= ' ... '; for($a = $pages-3; $a <= $pages-1; $a++) @@ -741,7 +735,7 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } } else @@ -752,7 +746,7 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } } @@ -782,7 +776,7 @@ function newthreadjump($url) global $forum; $jumpList = $forum->forumGetAllowed('view'); $text = '
- New Thread + '.LAN_FORUM_1018.' @@ -791,7 +785,7 @@ function newthreadjump($url) foreach($jumpList as $key => $val) { - $text .= '
  • Go to: '.$val.'
    • '; + $text .= '
  • '.LAN_FORUM_1017.': '.$val.'
    • '; } $text .= ' diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index df08e80d4..8234623b7 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -38,8 +38,6 @@ if (!e_QUERY) - -// include_lan(e_PLUGIN . 'forum/languages/'.e_LANGUAGE.'/lan_forum_viewtopic.php'); include_once (e_PLUGIN . 'forum/forum_class.php'); @@ -108,7 +106,7 @@ if (USER && (USERID != $thread->threadInfo['thread_user'] || $thread->threadInfo $forum->threadIncview($thread->threadInfo['thread_id']); } -define('e_PAGETITLE', strip_tags($tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off')).' / '.$tp->toHTML($thread->threadInfo['forum_name'], true, 'no_hook, emotes_off').' / '.LAN_01); +define('e_PAGETITLE', strip_tags($tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off')).' / '.$tp->toHTML($thread->threadInfo['forum_name'], true, 'no_hook, emotes_off').' / '.LAN_FORUM_1001); $forum->modArray = $forum->forumGetMods($thread->threadInfo['forum_moderators']); define('MODERATOR', (USER && $forum->isModerator(USERID))); @@ -119,7 +117,7 @@ e107::getScBatch('view', 'forum')->setScVar('forum', $forum); if (MODERATOR && isset($_POST['mod'])) { - require_once (e_PLUGIN . 'forum/forum_mod.php'); + require_once(e_PLUGIN."forum/forum_mod.php"); $thread->message = forum_thread_moderate($_POST); $thread->threadInfo = $forum->threadGet($thread->threadId); } @@ -200,9 +198,9 @@ $forum->set_crumb(true, '', $tVars); // Set $BREADCRUMB (and BACKLINK) //$tVars->BACKLINK = $tVars->BREADCRUMB; //$tVars->FORUM_CRUMB = $crumbs['forum_crumb']; $tVars->THREADNAME = $tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off'); -$tVars->NEXTPREV = " $thread->threadId)) . "'>« " . LAN_389 . ""; -// $tVars->NEXTPREV .= ' | '; -$tVars->NEXTPREV .= " $thread->threadId)) . "'>" . LAN_390 . " »"; +$tVars->NEXTPREV = " $thread->threadId)) . "'>« " . LAN_FORUM_2001 . ""; +$tVars->NEXTPREV .= ' | '; // enabled to make it look better on v1 templates +$tVars->NEXTPREV .= " $thread->threadId)) . "'>" . LAN_FORUM_2002 . " »"; if ($forum->prefs->get('track') && USER) { @@ -230,9 +228,9 @@ if ($forum->prefs->get('track') && USER) } -$tVars->MODERATORS = LAN_321 . implode(', ', $forum->modArray); +$tVars->MODERATORS = LAN_FORUM_2003.": ". implode(', ', $forum->modArray); -$tVars->THREADSTATUS = (!$thread->threadInfo['thread_active'] ? LAN_66 : ''); +$tVars->THREADSTATUS = (!$thread->threadInfo['thread_active'] ? LAN_FORUM_2004 : ''); if ($thread->pages > 1) { @@ -268,15 +266,15 @@ function forumbuttons($thread) if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active']) { - $replyUrl = " $thread->threadId)) . "'>Post a Reply"; + $replyUrl = " $thread->threadId))."'>".LAN_FORUM_2006.""; } if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'thread')) { - $options[] = " $thread->threadInfo['thread_forum_id'])) . "'>Create New Thread"; + $options[] = " $thread->threadInfo['thread_forum_id']))."'>".LAN_FORUM_2005.""; } - $options[] = " $thread->threadId)) . "'>Go to " . LAN_389 . ""; //FIXME LAN - $options[] = " $thread->threadId)) . "'>Go to " . LAN_390 . ""; //FIXME LAN + $options[] = " $thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2001.""; + $options[] = " $thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2002.""; @@ -300,7 +298,7 @@ function forumbuttons($thread) foreach($jumpList as $key=>$val) { - $text .= '
  • Go to '.$val.'
    • '; + $text .= '
  • '.LAN_FORUM_1017." ".$val.'
    • '; } $text .= ' @@ -341,7 +339,7 @@ foreach ($postList as $postInfo) //TODO: Look into fixing this, to limit to a single query per pageload $threadId = $thread->threadInfo['thread_id']; $e_hide_query = "SELECT post_id FROM `#forum_post` WHERE (`post_thread` = {$threadId} AND post_user= " . USERID . ' LIMIT 1'; - $e_hide_hidden = FORLAN_HIDDEN; + $e_hide_hidden = LAN_FORUM_2008; $e_hide_allowed = USER; if ($tnum > 1) @@ -381,14 +379,14 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread $tVars->QUICKREPLY = "
    $thread->threadId)) . "' method='post'> - +
    - +
    "; - // Preview should be reserved for the full 'Post reply' page.   + // Preview should be reserved for the full 'Post reply' page.   } else { @@ -414,7 +412,7 @@ require_once (HEADERF); if ($forum->prefs->get('enclose')) { - $ns->tablerender(LAN_01, $forumstring, $mes->render(). array('forum_viewtopic', 'main')); + $ns->tablerender(LAN_FORUM_1001, $forumstring, $mes->render(). array('forum_viewtopic', 'main')); } else { @@ -426,9 +424,9 @@ else echo ""; @@ -479,12 +477,12 @@ function forumjump() { global $forum; $jumpList = $forum->forumGetAllowed(); - $text = "

    " . LAN_65 . ": "; foreach ($jumpList as $key => $val) { $text .= "\n"; } - $text .= "

    "; + $text .= "

    "; return $text; } @@ -699,7 +697,7 @@ class e107ForumThread header("location: {$url}"); exit; } - $this->message = LAN_405; + $this->message = LAN_FORUM_2013; break; case 'prev': // FIXME - nextprev thread detection not working @@ -710,7 +708,7 @@ class e107ForumThread header("location: {$url}"); exit; } - $this->message = LAN_404; + $this->message = LAN_FORUM_2012; break; case 'report': @@ -724,51 +722,45 @@ class e107ForumThread if ($forum->prefs->get('reported_post_email')) { require_once (e_HANDLER . 'mail.php'); - $report = LAN_422 . SITENAME . " : " . (substr(SITEURL, -1) == "/" ? SITEURL : SITEURL . "/") . $e107->getFolder('plugins') . "forum/forum_viewtopic.php?" . $this->threadId . ".post\n" . LAN_425 . USERNAME . "\n" . $report_add; - $subject = LAN_421 . " " . SITENAME; + $report = LAN_FORUM_2018." ".SITENAME." : ".(substr(SITEURL, -1) == "/" ? SITEURL : SITEURL."/") . $e107->getFolder('plugins') . "forum/forum_viewtopic.php?" . $this->threadId . ".post\n + ".LAN_FORUM_2019.": ".USERNAME. "\n" . $report_add; + $subject = LAN_FORUM_2020." ". SITENAME; sendemail(SITEADMINEMAIL, $subject, $report); } // no reference of 'head' $threadInfo['head']['thread_name'] $sql->insert('generic', "0, 'reported_post', " . time() . ", '" . USERID . "', '{$this->threadInfo['thread_name']}', " . intval($this->threadId) . ", '{$report_add}'"); - define('e_PAGETITLE', LAN_01 . " / " . LAN_428); + define('e_PAGETITLE', LAN_FORUM_1001 . " / " . LAN_FORUM_2021); $url = $e107->url->create('forum/thread/post', array('id' => $postId, 'name' => $postInfo['thread_name'], 'thread' => $threadId)); // both post info and thread info contain thread name - $text = LAN_424 . "

    " . LAN_429 . ''; - return $ns->tablerender(LAN_414, $text, array('forum_viewtopic', 'report'), true); + $text = LAN_FORUM_2021 . "

    ".LAN_FORUM_2022.''; + return $ns->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report'), true); } else { $thread_name = e107::getParser()->toHTML($postInfo['thread_name'], true, 'no_hook, emotes_off'); - define('e_PAGETITLE', LAN_01 . ' / ' . LAN_426 . ' ' . $thread_name); + define('e_PAGETITLE', LAN_FORUM_1001.' / '.LAN_FORUM_2024.': '.$thread_name); $url = $e107->url->create('forum/thread/post', array('id' => $postId, 'name' => $postInfo['thread_name'], 'thread' => $threadId)); $actionUrl = $e107->url->create('forum/thread/report', "id={$threadId}&post={$postId}"); $text = "
    - - + + - + - + - +
    - " . LAN_415 . ': ' . $thread_name . " " . LAN_420 . " - - - + ".LAN_FORUM_2025.': '.$thread_name." ".LAN_FORUM_2026." +
    " . LAN_417 . "
    " . LAN_418 . " -     		".LAN_FORUM_2027."
    ".str_replace(array('[', ']'), array('', ''), LAN_FORUM_2028)."
    - -

    - -
    "; - return e107::getRender()->tablerender(LAN_414, $text, array('forum_viewtopic', 'report2'), true); + return e107::getRender()->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report2'), true); } -// require_once (FOOTERF); + exit; break; diff --git a/e107_plugins/forum/index.php b/e107_plugins/forum/index.php index a262c1dd6..1c38c8764 100644 --- a/e107_plugins/forum/index.php +++ b/e107_plugins/forum/index.php @@ -2,14 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * - * $URL$ - * $Id$ */ header("location: forum.php"); diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php index eacef6b42..558e7c403 100644 --- a/e107_plugins/forum/languages/English/English_front.php +++ b/e107_plugins/forum/languages/English/English_front.php @@ -1,19 +1,263 @@ forum.php +- 1xxx => forum_viewforum.php +- 2xxx => forum_viewtopic.php +- 3xxx => forum_post.php + +This is done to offer flexibility when changing or adding in new LAN defines. + +vf, vt, etc. in the comments refer to the LAN defined in the previously separate language files: +vf = viewforum, vt = viewtopic, p = post, etc. +*/ + +define("e_PAGETITLE", "Forum"); + +// forum.php (forum_template) +define("LAN_FORUM_0001", "Forum"); // LAN_46 +define("LAN_FORUM_0002", "Topics"); // LAN_47 / FORLAN_21 +define("LAN_FORUM_0003", "Replies"); // LAN_48 / LAN_55 +define("LAN_FORUM_0004", "Last Post"); // LAN_49 / FORLAN_22 / LAN_57 + +define("LAN_FORUM_0005", "This forum is restricted to administrators only"); // LAN_406 +define("LAN_FORUM_0006", "This forum is restricted to members only"); // LAN_407 +define("LAN_FORUM_0007", "This is a read-only forum"); // LAN_408 +define("LAN_FORUM_0008", "This is a class restricted forum"); // LAN_409 + +define("LAN_FORUM_0009", "Information"); // LAN_191 +define("LAN_FORUM_0010", "Top Posters"); // LAN_429 +define("LAN_FORUM_0011", "Most Active Topics"); // LAN_430 +define("LAN_FORUM_0012", "My Posts"); // LAN_431 +define("LAN_FORUM_0013", "My Settings"); // LAN_432 +define("LAN_FORUM_0014", "My Profile"); // LAN_435 +define("LAN_FORUM_0015", "My Uploads"); // FORLAN_442 +define("LAN_FORUM_0016", "Forum Rules"); // LAN_433 +define("LAN_FORUM_0017", "View forum statistics"); // LAN_441 + +define("LAN_FORUM_0018", "Welcome"); // LAN_30 +define("LAN_FORUM_0019", "There are no new posts"); // LAN_31 +define("LAN_FORUM_0020", "There is one new post "); // LAN_32 +define("LAN_FORUM_0021", "There are"); // LAN_33 +define("LAN_FORUM_0022", "new posts"); // LAN_34 +define("LAN_FORUM_0023", "since your last visit."); // LAN_35 +define("LAN_FORUM_0024", "You last visited at "); // LAN_36 +define("LAN_FORUM_0025", "It is now"); // LAN_37 +//define("LAN_FORUM_0026", ", all times are "); // LAN_38 +define("LAN_FORUM_0027", "You have read"); // LAN_196 +define("LAN_FORUM_0028", "of these posts."); // LAN_197 +define("LAN_FORUM_0029", "All new posts have been read."); // LAN_198 +define("LAN_FORUM_0030", "List tracked topics"); // LAN_393 + +define("LAN_FORUM_0031", "The users of this forum have made a total of [x] posts."); // LAN_192 and LAN_404 +define("LAN_FORUM_0032", "topic"); // LAN_411 +define("LAN_FORUM_0033", "topics"); // LAN_413 +define("LAN_FORUM_0034", "reply"); // LAN_412 +define("LAN_FORUM_0035", "replies"); // LAN_414 + +define("LAN_FORUM_0036", "Who's Online"); // LAN_426 +define("LAN_FORUM_0037", "View detailed list"); // LAN_427 +define("LAN_FORUM_0038", "(Will open in a new window)"); // LAN_436 + +define("LAN_FORUM_0039", "New posts"); // LAN_79 // LAN_79 (vf) +define("LAN_FORUM_0040", "No new posts"); // LAN_80 / LAN_80 (vf) +define("LAN_FORUM_0041", "Closed forum"); // LAN_394 +//define("LAN_FORUM_0042", "Search"); /// LAN_180 => Generic term, moved to e107_languages/English.php LAN_SEARCH +define("LAN_FORUM_0043", "You can start new topics"); // LAN_204 // FIXME "can / cannot" in bold? 0043-0048 +define("LAN_FORUM_0044", "You cannot start new topics"); // LAN_205 +define("LAN_FORUM_0045", "You can post replies"); // LAN_206 +define("LAN_FORUM_0046", "You cannot post replies"); // LAN_207 +define("LAN_FORUM_0047", "You can edit your posts"); // LAN_208 +define("LAN_FORUM_0048", "You cannot edit your posts"); // LAN_209 + +// FIXME LAN - check if this section (0049 - 0055) could use some LAN optimization +define("LAN_FORUM_0049", "Welcome guest"); // LAN_410 +define("LAN_FORUM_0050", "These forums can be used by non-registered users, but please be aware that your IP address will be logged if you make a post.
    To access the full features of this forum you will need to"); // LAN_44 // FIXME
    +define("LAN_FORUM_0051", "register"); // LAN_437 +define("LAN_FORUM_0052", "and login."); // LAN_438 +define("LAN_FORUM_0053", "These forums can only be posted to by registered and logged in members, please click"); // LAN_45 +define("LAN_FORUM_0054", "here"); // LAN_438 +define("LAN_FORUM_0055", "to go to the registration page."); // LAN_440 + +define("LAN_FORUM_0056", "Restricted Access"); // LAN_405 + +define("LAN_FORUM_0057", "Mark all posts as read"); // LAN_199 +define("LAN_FORUM_0058", "Show new posts"); // LAN_421 + +// FIXME LAN - check if this section (0059 - 0064) could use some LAN optimization +define("LAN_FORUM_0059", "user is browsing the forums at the moment"); // LAN_415 / LAN_405 (vf) +define("LAN_FORUM_0060", "users are browsing the forums at the moment"); //LAN_416 / LAN_406 (vf) +define("LAN_FORUM_0061", "member"); // LAN_417 / LAN_407 (vf) +define("LAN_FORUM_0062", "members"); // LAN_419 / LAN_409 (vf) +define("LAN_FORUM_0063", "guest"); // LAN_418 / LAN_408 (vf) +define("LAN_FORUM_0064", "guests"); // LAN_420 / LAN_410 (vf) + +define("LAN_FORUM_0065", "Newest member:"); // LAN_41 +define("LAN_FORUM_0066", "Registered members:"); // LAN_42 + +define("LAN_FORUM_0067", "No forums yet, please check back soon."); // LAN_51 +define("LAN_FORUM_0068", "No forums in this section yet, please check back soon."); // LAN_52 +define('LAN_FORUM_0069', 'Sub-forums'); // FORLAN_444 + +define("LAN_FORUM_0070", "Cancel Topic Tracking"); // LAN_392 +define("LAN_FORUM_0071", "Forum Rules"); // LAN_433 +define("LAN_FORUM_0072", "No rules defined."); // FORLAN_441 +define("LAN_FORUM_0073", "Tracked topics"); // LAN_397 +define("LAN_FORUM_0074", "Posted by"); // LAN_423 +define("LAN_FORUM_0075", "New topics"); // LAN_424 + + +// starting at LAN_FORUM_1xxx => forum_viewforum.php +define("LAN_FORUM_1001", "Forums"); // LAN_01 + +define("LAN_FORUM_1002", "Sub-forum"); // FORLAN_20 +define("LAN_FORUM_1003", "Topic"); // LAN_55 +define("LAN_FORUM_1004", "Starter"); // LAN_54 +define("LAN_FORUM_1005", "Views"); // LAN_56 + +define("LAN_FORUM_1006", "Important Topics"); // LAN_411 (vf) +define("LAN_FORUM_1007", "Forum Topics"); // LAN_412 (vf) +define("LAN_FORUM_1008", "There are no topics in this forum yet."); // LAN_58 +define("LAN_FORUM_1009", "This forum is moderated by"); // LAN_404 +define("LAN_FORUM_1010", "[popular]"); // LAN_395 (vf) +define("LAN_FORUM_1011", "Sticky"); // LAN_202 +define("LAN_FORUM_1012", "Sticky/Closed"); // LAN_203 +define("LAN_FORUM_1013", "Announcement"); // LAN_396 +define("LAN_FORUM_1014", "Closed thread"); // LAN_81 +define("LAN_FORUM_1015", "[user deleted]"); // FORLAN_19 (vf) +define("LAN_FORUM_1016", "Poll"); // FORLAN_23 + +define("LAN_FORUM_1017", "Go to"); // LAN_401 (p?) +define("LAN_FORUM_1018", "New topic"); + +define("LAN_FORUM_1019", "Are you sure?"); // new + +// starting at LAN_FORUM_2xxx => forum_viewtopic.php +define("LAN_FORUM_2001", "Previous topic"); // LAN_389 +define("LAN_FORUM_2002", "Next topic"); // LAN_390 +define("LAN_FORUM_2003", "Moderator(s)"); // LAN_321 +define("LAN_FORUM_2004", "This topic is now closed"); // LAN_66 + +define("LAN_FORUM_2005", "Create a new topic"); // new +define("LAN_FORUM_2006", "Post a reply"); // new +define("LAN_FORUM_2007", "Post a quick reply"); // new + +define("LAN_FORUM_2008", "HIDDEN - LOGIN AND REPLY TO REVEAL"); // FORLAN_HIDDEN - used in [hide] bbcode? + +define("LAN_FORUM_2009", "Are you sure you want to delete this topic and any replies?"); // LAN_409 +define("LAN_FORUM_2010", "Are you sure you want to delete this reply?"); // LAN_410 +//define("LAN_FORUM_2011", "posted by"); // LAN_410 // LAN_FORUM_0074 + +define("LAN_FORUM_2012", "No previous topic"); // LAN_404 (vt) +define("LAN_FORUM_2013", "No next topic"); // LAN_405 (vt) + +define("LAN_FORUM_2014", "Author"); // LAN_402 (vt) +define("LAN_FORUM_2015", "Post"); // LAN_403 (vt) +define("LAN_FORUM_2016", "Edited"); // LAN_29 +define("LAN_FORUM_2017", "by"); // FORLAN_BY + +define("LAN_FORUM_2018", "This post has been reported from site"); // LAN_422 (vt) +define("LAN_FORUM_2019", "Message from"); // LAN_425 (vt) +define("LAN_FORUM_2020", "Forum topic report from"); // LAN_421 (vt) + +define("LAN_FORUM_2021", "Post has been reported"); // LAN_428 +define("LAN_FORUM_2022", "Click here to return to the forum"); // LAN_429 +define("LAN_FORUM_2023", "Report this topic to a moderator"); // LAN_414 (vt) + +define("LAN_FORUM_2024", "Reporting post in topic"); // LAN_426 +define("LAN_FORUM_2025", "Topic title"); // LAN_415 +define("LAN_FORUM_2026", "Click to view post"); // LAN_420 +define("LAN_FORUM_2027", "The moderator(s) will be made aware of this topic. You may post a message explaining what you found to be objectionable."); // LAN_417 +define("LAN_FORUM_2028", "[Do not] use this form to contact the admin for any other reason."); // LAN_418 - [ and ] are replaced by +define("LAN_FORUM_2029", "Send Report"); // LAN_419 + +// shortcodes/bach/view_shortcodes.php +define("LAN_FORUM_2030", "Back to top"); // LAN_10 + +define("LAN_FORUM_2031", "Joined"); // LAN_06 +define("LAN_FORUM_2032", "Posts"); // LAN_67 +define("LAN_FORUM_2033", "Visits to site since registration"); // LAN_09 +define("LAN_FORUM_2034", "Website"); // LAN_08 +define("LAN_FORUM_2035", "Registered Member"); // LAN_195 +define("LAN_FORUM_2036", "Send Private Message"); // new / LAN_399 + +define("LAN_FORUM_2037", "Post deleted on"); // new +define("LAN_FORUM_2038", "Reason"); // new + +define("LAN_FORUM_2039", "Edit"); // LAN_400 +define("LAN_FORUM_2040", "Delete"); // LAN_435 (vf)? +define("LAN_FORUM_2041", "Quote"); // LAN_401 +define("LAN_FORUM_2042", "Move"); // FORCONF_25 ? +define("LAN_FORUM_2043", "Split"); // new +define("LAN_FORUM_2044", "Email"); // FORLAN_101 +define("LAN_FORUM_2045", "Print"); // FORLAN_102 +define("LAN_FORUM_2046", "Report"); // LAN_413 + + +// starting at LAN_FORUM_3xxx => forum_post.php +define("LAN_FORUM_3001", "You are not authorized to post to this forum."); // LAN_399 (p) +define("LAN_FORUM_3002", "This topic is locked."); // LAN_397 +define("LAN_FORUM_3003", "Replying to"); // LAN_02 (p) + +define("LAN_FORUM_3004", "Anonymous"); // LAN_311 +define("LAN_FORUM_3005", "Preview"); // LAN_323 +define("LAN_FORUM_3006", "Duplicate post"); // LAN_FORUM_2 +define("LAN_FORUM_3007", "You left required field(s) blank"); // LAN_27 +define("LAN_FORUM_3008", "Unauthorised"); // LAN_95 +define("LAN_FORUM_3009", "You are not authorised to edit this forum post."); //LAN_96 + +define("LAN_FORUM_3010", "Your name"); // LAN_61 +define("LAN_FORUM_3011", "Subject"); // LAN_62 +define("LAN_FORUM_3012", "Attach file / image"); // LAN_390 +define("LAN_FORUM_3013", "Attach file"); // LAN_416 +define("LAN_FORUM_3014", "File to attach"); // LAN_392 +define("LAN_FORUM_3015", "[Please note]"); // LAN_393 1st half - [ and ] are replaced by +define("LAN_FORUM_3016", "Allowed file types"); // LAN_393 2nd half +define("LAN_FORUM_3017", "Any other file types uploaded will be instantly deleted."); // LAN_394 +define("LAN_FORUM_3018", "Maximum file size"); // LAN_395 +define("LAN_FORUM_3019", "bytes"); // LAN_396 +define("LAN_FORUM_3020", "Add another attachment"); // LAN_417 +define("LAN_FORUM_3021", "Uploads disabled: [x] directory is not writable"); // LAN_FORUM_1 - [x] will be replaced automatically +define("LAN_FORUM_3022", "Latest [y] replies"); // LAN_101 and LAN_102 - [y] will be replaced automatically + +// shortcodes/bach/post_shortcodes.php +define("LAN_FORUM_3023", "Update topic"); // LAN_77 +define("LAN_FORUM_3024", "Update reply"); // LAN_78 +define("LAN_FORUM_3025", "Type"); // new +define("LAN_FORUM_3026", "Post topic as"); // LAN_400 (p) +//define("LAN_FORUM_3027", "Type"); // new + +// poll - partly in e107_plugins/poll/poll_class.php +define("LAN_FORUM_3028", "Add Poll"); // new +define("LAN_FORUM_3029", "If you do not wish to add a poll to your topic, leave the fields blank."); // LAN_386 +define("LAN_FORUM_3030", "Poll question"); // LAN_5 +define("LAN_FORUM_3031", "Poll answer"); // LAN_391 +define("LAN_FORUM_3032", "Add another answer"); // LAN_6 +define("LAN_FORUM_3033", "Allow multiple choices?"); // LAN_506 +define("LAN_FORUM_3034", "Vote storage method"); // POLLAN_16 +define("LAN_FORUM_3035", "Cookie"); // POLLAN_17 +define("LAN_FORUM_3036", "IP address"); // POLLAN_18 +define("LAN_FORUM_3037", "User ID (only members can vote)"); // POLLAN_19 + +define("LAN_FORUM_3038", "Normal"); // LAN_1 +define("LAN_FORUM_3039", "Sticky"); // LAN_2 +define("LAN_FORUM_3040", "Announcement"); // LAN_3 + +define("LAN_FORUM_3041", "Deactivate emoticons for this post"); // LAN_FORUMPOST_EMOTES +define("LAN_FORUM_3042", "Enable email tracking (email sent when reply is posted)"); // LAN_380 + + +/* THIS WILL BE DELETED ONCE THE REWRITE IS DONE +================================================== define("LAN_01", "Forums"); define("LAN_02", "Go to page"); define("LAN_03", "Go"); @@ -157,7 +401,7 @@ define("LAN_402", "This forum is read only"); define("LAN_403", "No posts yet"); define("LAN_404", "posts"); -define("LAN_405", "Restricted Access"); + define("LAN_406", "This forum is restricted to administrators only"); define("LAN_407", "This forum is restricted to members only"); @@ -315,6 +559,6 @@ define("LAN_FORUM_1", "Uploads disabled: ".e_FILE."public directory is not writa define("LAN_FORUM_2", "Duplicate post"); define('LAN_FORUMPOST_EMOTES', 'Deactivate emoticons for this post'); - +*/ ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_conf.php b/e107_plugins/forum/languages/English/lan_forum_conf.php index 635b01d21..2f8ad6ee4 100644 --- a/e107_plugins/forum/languages/English/lan_forum_conf.php +++ b/e107_plugins/forum/languages/English/lan_forum_conf.php @@ -9,6 +9,9 @@ | $Author$ +----------------------------------------------------------------------------+ */ +// DEPRECATED, SUBJECT TO REMOVAL + + define("FORCONF_5", "Poll deleted."); define("FORCONF_6", "Thread deleted"); define("FORCONF_7", "replies deleted"); @@ -41,4 +44,5 @@ define("FORCONF_31", "Rename to:"); define("FORCONF_32", "Rename thread options:"); + ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_frontpage.php b/e107_plugins/forum/languages/English/lan_forum_frontpage.php index c587f0e79..070298702 100644 --- a/e107_plugins/forum/languages/English/lan_forum_frontpage.php +++ b/e107_plugins/forum/languages/English/lan_forum_frontpage.php @@ -10,6 +10,8 @@ +----------------------------------------------------------------------------+ */ -define("FOR_FP_1", "Forum"); +// DEPRECATED - up for removal + +//define("FOR_FP_1", "Forum"); ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_post.php b/e107_plugins/forum/languages/English/lan_forum_post.php index f7409f53a..1d9196d78 100644 --- a/e107_plugins/forum/languages/English/lan_forum_post.php +++ b/e107_plugins/forum/languages/English/lan_forum_post.php @@ -9,6 +9,10 @@ | $Author$ +----------------------------------------------------------------------------+ */ + +// DEPRECATED, SUBJECT TO REMOVAL + +/* define("PAGE_NAME", "Forum"); define("LAN_01", "Forums"); @@ -112,5 +116,5 @@ define("LAN_FORUM_1", "Uploads disabled: ".e_FILE."public directory is not writa define("LAN_FORUM_2", "Duplicate post"); define('LAN_FORUMPOST_EMOTES', 'Deactivate emoticons for this post'); - +*/ ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_viewforum.php b/e107_plugins/forum/languages/English/lan_forum_viewforum.php index e36fa0e60..060233b1d 100644 --- a/e107_plugins/forum/languages/English/lan_forum_viewforum.php +++ b/e107_plugins/forum/languages/English/lan_forum_viewforum.php @@ -9,9 +9,10 @@ | $Author$ +----------------------------------------------------------------------------+ */ +// DEPRECATED, MOVED TO ENGLISH_FRONT.PHP - THIS WILL BE REMOVED SOON! +/* define("PAGE_NAME", "Forum"); - // define("LAN_79", "New posts"); //define("LAN_80", " No new posts"); // define("LAN_81", "Closed thread"); @@ -58,6 +59,7 @@ define("LAN_396", "Announcement"); //define("LAN_435", "Delete thread"); //v.617 + define("FORLAN_CLOSE", "Thread closed."); define("FORLAN_OPEN", "Thread reopened."); define("FORLAN_STICK", "Thread made sticky."); @@ -81,5 +83,5 @@ define('FORLAN_20', 'Sub-forum'); define('FORLAN_21', 'Threads'); define('FORLAN_22', 'Last Post'); define('FORLAN_23', 'Poll'); - +*/ ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_viewtopic.php b/e107_plugins/forum/languages/English/lan_forum_viewtopic.php index f2e8fbe87..a6ba73a2e 100644 --- a/e107_plugins/forum/languages/English/lan_forum_viewtopic.php +++ b/e107_plugins/forum/languages/English/lan_forum_viewtopic.php @@ -1,5 +1,5 @@ diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index 8465231c6..8d4d129b8 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -1,4 +1,11 @@ "; + $ret = " "; if ($action != 'nt') { - $ret .= ($eaction ? "" : ""); + $ret .= ($eaction ? "" : ""); } else { - $ret .= ($eaction ? "" : ""); + $ret .= ($eaction ? "" : ""); } return $ret; } @@ -121,7 +128,7 @@ class plugin_forum_post_shortcodes extends e_shortcode { if(!$fileattach_alert) { - $fileattach_alert = "".(e107::getPref('image_post') ? LAN_390 : LAN_416)."".LAN_FORUM_1."\n"; + $fileattach_alert = "".(e107::getPref('image_post') ? LAN_FORUM_3012 : LAN_FORUM_3013)."".str_replace('[x]', e_FILE."public", LAN_FORUM_3021)."\n"; } return $fileattach_alert; } @@ -137,19 +144,17 @@ class plugin_forum_post_shortcodes extends e_shortcode //.
    ".($pref['image_post'] ? "Attach file / image" : "Attach file")."
    - $tooltip = "Allowed file types | ".vartrue($allowed_filetypes).". Any other file type will be deleted instantly. - Maximum file size: ".(vartrue($max_upload_size) ? $max_upload_size."bytes" : ini_get('upload_max_filesize')); - + //$tooltip = "Allowed file types | ".vartrue($allowed_filetypes).". Any other file type will be deleted instantly. Maximum file size: ".(vartrue($max_upload_size) ? $max_upload_size."bytes" : ini_get('upload_max_filesize')); + $tooltip = LAN_FORUM_3016.": ".vartrue($allowed_filetypes)."
    ".LAN_FORUM_3017."
    ".LAN_FORUM_3018.": ".(vartrue($max_upload_size) ? $max_upload_size." ".LAN_FORUM_3019 : ini_get('upload_max_filesize')); // FIXME
    in tooltip, no value $allowed_filetypes on v2/bootstrap + $fileattach = " - -
    - +
    "; @@ -169,17 +174,17 @@ class plugin_forum_post_shortcodes extends e_shortcode $text = "
    - +
    ".$type."
    @@ -236,7 +241,7 @@ class plugin_forum_post_shortcodes extends e_shortcode } - return "Add Poll + return "".LAN_FORUM_3028." "; } @@ -252,7 +257,7 @@ class plugin_forum_post_shortcodes extends e_shortcode { $thread_sticky = (isset($_POST['threadtype']) ? $_POST['threadtype'] : vartrue($threadInfo['thread_sticky'],0)); // no reference of 'head' $threadInfo['head']['thread_sticky'] - $opts = array(0 => "Normal", 1 => "Sticky", 2 => "Announcement"); + $opts = array(0 => LAN_FORUM_3038, 1 => LAN_FORUM_3039, 2 => LAN_FORUM_3038); return e107::getForm()->radio('threadtype',$opts, $thread_sticky); @@ -267,14 +272,14 @@ class plugin_forum_post_shortcodes extends e_shortcode global $forum, $threadInfo, $eaction, $action; $_tmp = new e_vars(); // no reference of 'head' $threadInfo['head']['thread_name'] - $forum->set_crumb(true, ($action == 'nt' ? ($eaction ? LAN_77 : LAN_60) : ($eaction ? LAN_78 : LAN_406.' '.$threadInfo['thread_name'])), $_tmp); + $forum->set_crumb(true, ($action == 'nt' ? ($eaction ? LAN_FORUM_3023 : LAN_FORUM_1018) : ($eaction ? LAN_FORUM_3024 : $threadInfo['thread_name'])), $_tmp); return $_tmp->BREADCRUMB; } function sc_noemotes() { if(vartrue($eaction) == true) { return ; } - return " ".LAN_FORUMPOST_EMOTES.''; + return " ".LAN_FORUM_3041.''; } function sc_emailnotify() @@ -304,7 +309,7 @@ class plugin_forum_post_shortcodes extends e_shortcode $chk = ($pref['notify_on'] ? "checked='checked'" : ''); } } - return "
     ".LAN_380.""; + return "
     ".LAN_FORUM_3042.""; } return ''; } diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index c872d3514..086de663f 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -1,4 +1,11 @@ " : LAN_10; + $text = ($parm == 'caret') ? "" : LAN_FORUM_2030; return "".$text.''; } @@ -25,7 +32,7 @@ class plugin_forum_view_shortcodes extends e_shortcode $gen = e107::getDate(); if ($this->postInfo['post_user']) { - return LAN_06.': '.$gen->convert_date($this->postInfo['user_join'], 'forum').'
    '; + return LAN_FORUM_2031.': '.$gen->convert_date($this->postInfo['user_join'], 'forum').'
    '; } } @@ -73,8 +80,8 @@ class plugin_forum_view_shortcodes extends e_shortcode { $info = unserialize($this->postInfo['post_options']); return " - Post delete on: {$info['deldate']}
    - reason: {$info['delreason']} + ".LAN_FORUM_2037.": {$info['deldate']}
    + ".LAN_FORUM_2038.": {$info['delreason']} "; $ret = '
    '.print_r($info, true).'
    '; } @@ -206,7 +213,7 @@ class plugin_forum_view_shortcodes extends e_shortcode { if($this->postInfo['thread_start']) { - return e107::getParser()->parseTemplate("{EMAIL_ITEM=".FORLAN_101."^plugin:forum.{$this->postInfo['post_thread']}}"); + return e107::getParser()->parseTemplate("{EMAIL_ITEM=".LAN_FORUM_2044."^plugin:forum.{$this->postInfo['post_thread']}}"); } } @@ -214,7 +221,7 @@ class plugin_forum_view_shortcodes extends e_shortcode { if($this->postInfo['thread_start']) { - return e107::getParser()->parseTemplate("{PRINT_ITEM=".FORLAN_102."^plugin:forum.{$this->postInfo['post_thread']}}"); + return e107::getParser()->parseTemplate("{PRINT_ITEM=".LAN_FORUM_2045."^plugin:forum.{$this->postInfo['post_thread']}}"); } } @@ -252,7 +259,7 @@ class plugin_forum_view_shortcodes extends e_shortcode { if ($this->postInfo['post_user']) { - return LAN_67.': '.(int)$this->postInfo['user_plugin_forum_posts'].'
    '; + return LAN_FORUM_2032.': '.(int)$this->postInfo['user_plugin_forum_posts'].'
    '; } } @@ -260,7 +267,7 @@ class plugin_forum_view_shortcodes extends e_shortcode { if ($this->postInfo['user_name']) { - return LAN_09.': '.$this->postInfo['user_visits'].'
    '; + return LAN_FORUM_2033.': '.$this->postInfo['user_visits'].'
    '; } } @@ -275,7 +282,7 @@ class plugin_forum_view_shortcodes extends e_shortcode function sc_website() { if ($this->postInfo['user_homepage']) { - return LAN_08.': '.$this->postInfo['user_homepage'].'
    '; + return LAN_FORUM_2034.': '.$this->postInfo['user_homepage'].'
    '; } } @@ -319,7 +326,7 @@ class plugin_forum_view_shortcodes extends e_shortcode function sc_memberid() { if (!$this->postInfo['post_user']) { return FALSE; } - return "".LAN_195.' #'.$this->postInfo['post_user'].''; + return "".LAN_FORUM_2035.' #'.$this->postInfo['post_user'].''; } function sc_level($parm) @@ -436,7 +443,7 @@ class plugin_forum_view_shortcodes extends e_shortcode if(plugInstalled('pm') && ($this->postInfo['post_user'] > 0)) { - $text .= "
  • Send Private Message
    • "; + $text .= "
  • ".LAN_FORUM_2036."
    • "; } if($website = $this->sc_website()) @@ -468,24 +475,24 @@ class plugin_forum_view_shortcodes extends e_shortcode
      '; - $text .= "
    • ".FORLAN_101."
      • "; - $text .= "
    • Print
      • "; + $text .= "
    • ".LAN_FORUM_2044."
      • "; + $text .= "
    • ".LAN_FORUM_2045."
      • "; // FIXME if (USER) // Report { - $text .= "
    • postInfo['post_thread']}&post={$this->postInfo['post_id']}")."'>Report
      • "; + $text .= "
    • postInfo['post_thread']}&post={$this->postInfo['post_id']}")."'>".LAN_FORUM_2046."
      • "; } // Edit if ( (USER && $this->postInfo['post_user'] == USERID && $this->thread->threadInfo['thread_active'])) { - $text .= "
    • $this->postInfo['post_id']))."'>Edit
      • "; + $text .= "
    • $this->postInfo['post_id']))."'>".LAN_FORUM_2039."
      • "; } if($this->forum->checkperm($this->postInfo['post_forum'], 'post')) { - $text .= "
    • $this->postInfo['post_id']))."'>Quote
      • "; + $text .= "
    • $this->postInfo['post_id']))."'>".LAN_FORUM_2041."
      • "; } @@ -496,18 +503,18 @@ class plugin_forum_view_shortcodes extends e_shortcode if ((USER && $this->postInfo['post_user'] != USERID && $this->thread->threadInfo['thread_active'])) { - $text .= "
    • $this->postInfo['post_id']))."'>Edit
      • "; + $text .= "
    • $this->postInfo['post_id']))."'>".LAN_FORUM_2039."
      • "; } - $text .= "
    • Delete (fixme)
      • "; + $text .= "
    • ".LAN_FORUM_2040." (fixme)
      • "; // FIXME if ($type == 'thread') { - $text .= "
    • $this->postInfo['post_id']))."'>Move
      • "; + $text .= "
    • $this->postInfo['post_id']))."'>".LAN_FORUM_2042."
      • "; } else { - $text .= "
    • $this->postInfo['post_id']))."'>Split
      • "; + $text .= "
    • $this->postInfo['post_id']))."'>".LAN_FORUM_2043."
      • "; } } diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php index 19e828c19..83c9b1850 100644 --- a/e107_plugins/forum/templates/forum_icons_template.php +++ b/e107_plugins/forum/templates/forum_icons_template.php @@ -2,19 +2,17 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * * Forum icons template - default * - * $URL$ - * $Id$ */ if ( ! defined('e107_INIT')) { exit(); } -// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); +// include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_viewforum.php'); // now uses English_front.php // Thread info diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php index c15d963ae..e706ceb12 100644 --- a/e107_plugins/forum/templates/forum_post_template.php +++ b/e107_plugins/forum/templates/forum_post_template.php @@ -2,13 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * $URL$ - * $Id$ */ if (!defined('e107_INIT')) { exit; } @@ -19,7 +16,7 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); } if(!vartrue($userbox)) { $userbox = " -".LAN_61." +".LAN_FORUM_3010." @@ -29,7 +26,7 @@ $userbox = " if(!vartrue($subjectbox)) { $subjectbox = " -".LAN_62." +".LAN_FORUM_3011." @@ -51,18 +48,18 @@ if(!vartrue($fileattach)) { $fileattach = " - ".($pref['image_post'] ? LAN_390 : LAN_416)." + ".($pref['image_post'] ? LAN_FORUM_3012 : LAN_FORUM_3013)." - ".LAN_392." - ".LAN_393." | ".vartrue($allowed_filetypes)." |
      ".LAN_394."
      ".LAN_395.": ".(vartrue($max_upload_size) ? $max_upload_size.LAN_396 : ini_get('upload_max_filesize'))." + ".LAN_FORUM_3014." + ".str_replace(array('[', ']'), array('', ''), LAN_FORUM_3015)."
      ".LAN_FORUM_3016.": ".vartrue($allowed_filetypes)."
      ".LAN_FORUM_3017."
      ".LAN_FORUM_3018.": ".(vartrue($max_upload_size) ? $max_upload_size." ".LAN_FORUM_3019 : ini_get('upload_max_filesize'))."
      - + "; @@ -74,10 +71,10 @@ if(!vartrue($fileattach_alert)) { $fileattach_alert = " - ".($pref['image_post'] ? LAN_390 : LAN_416)." + ".($pref['image_post'] ? LAN_FORUM_3012 : LAN_FORUM_3013)." - ".LAN_FORUM_1." + ".str_replace('[x]', e_FILE."public", LAN_FORUM_3021)." \n"; } // ------------ @@ -181,9 +178,7 @@ if(!vartrue($LATESTPOSTS_START)) $LATESTPOSTS_START = " - +"; } @@ -193,7 +188,7 @@ $LATESTPOSTS_POST = " @@ -212,12 +207,13 @@ if(!vartrue($THREADTOPIC_REPLY)) $THREADTOPIC_REPLY = "
      ". -LAN_101."{LATESTPOSTSCOUNT}".LAN_102." -".str_replace('[y]', "{LATESTPOSTSCOUNT}", LAN_FORUM_3022)."
      {POSTER} -
      ".IMAGE_post2." ".LAN_322."{THREADDATESTAMP}
      +
      ".IMAGE_post2." {THREADDATESTAMP}
      {POST}
      - +
      ".LAN_100."".LAN_FORUM_1003."
      {POSTER} -
      ".IMAGE_post2." ".LAN_322."{THREADDATESTAMP}
      {POST} +
      ".IMAGE_post2." {THREADDATESTAMP}
      + {POST}
      diff --git a/e107_plugins/forum/templates/forum_template.php b/e107_plugins/forum/templates/forum_template.php index c1cb315e7..a090cac34 100644 --- a/e107_plugins/forum/templates/forum_template.php +++ b/e107_plugins/forum/templates/forum_template.php @@ -2,13 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * $URL$ - * $Id$ */ if (!defined('e107_INIT')) { exit; } @@ -102,9 +99,9 @@ $FORUM_TEMPLATE['main-start'] = "
      $FORUM_TEMPLATE['main-parent'] = " {PARENTNAME} {PARENTSTATUS} - ".LAN_55." - ".FORLAN_21." - ".FORLAN_22." + ".LAN_FORUM_0003." + ".LAN_FORUM_0002." + ".LAN_FORUM_0004." "; diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index cd584efb9..d06ceed6f 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -2,13 +2,10 @@ /* * e107 website system * - * Copyright (C) 2008-2011 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * - * - * $URL$ - * $Id$ */ if (!defined('e107_INIT')) { exit; } @@ -219,10 +216,10 @@ if (!$FORUM_VIEW_SUB_START) - - - - + + + + "; } @@ -249,11 +246,12 @@ if (!$FORUM_VIEW_SUB_END) { } if (!$FORUM_IMPORTANT_ROW) { - $FORUM_IMPORTANT_ROW = ""; + $FORUM_IMPORTANT_ROW = ""; } + if (!$FORUM_NORMAL_ROW) { - $FORUM_NORMAL_ROW = ""; + $FORUM_NORMAL_ROW = ""; } @@ -304,7 +302,7 @@ $FORUM_VIEWFORUM_TEMPLATE['item-sticky'] = $FORUMVIEW['item'] ; // "\n"; -$FORUM_VIEWFORUM_TEMPLATE['sub-header'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['sub-header'] = ""; $FORUM_VIEWFORUM_TEMPLATE['sub-item'] = " @@ -315,8 +313,8 @@ $FORUM_VIEWFORUM_TEMPLATE['sub-item'] = " $FORUM_VIEWFORUM_TEMPLATE['sub-footer'] = ""; -$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; -$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-important'] = ""; +$FORUM_VIEWFORUM_TEMPLATE['divider-normal'] = ""; $FORUM_VIEWFORUM_TEMPLATE['footer'] = "
       ".FORLAN_20."".FORLAN_21."".LAN_55."".FORLAN_22."".LAN_FORUM_1002."".LAN_FORUM_0002."".LAN_FORUM_0003."".LAN_FORUM_0004."
       ".LAN_411."
       ".LAN_FORUM_1006."
       ".LAN_412."
       ".LAN_FORUM_1007."
      {T $FORUM_VIEWFORUM_TEMPLATE['item-announce'] = $FORUMVIEW['item'] ; // "
      {THREADNAME}
      ".FORLAN_20."".LAN_55."".FORLAN_21."".FORLAN_22."
      ".LAN_FORUM_1002."".LAN_FORUM_0003."".LAN_FORUM_0002."".LAN_FORUM_0004."
      {NEWFLAG}
      {SUB_FORUMTITLE}
      {SUB_DESCRIPTION}      		 {SUB_REPLIESX}
      {NEWFLAG}
      ".LAN_411."".LAN_55."".LAN_56."".LAN_57."
      ".LAN_412."".LAN_55."".LAN_56."".LAN_57."
      ".LAN_FORUM_1006."".LAN_FORUM_0003."".LAN_FORUM_1005."".LAN_FORUM_0004."
      ".LAN_FORUM_1007."".LAN_FORUM_0003."".LAN_FORUM_1005."".LAN_FORUM_0004."
      diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index 4c0c920d2..89161b27d 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -11,9 +11,9 @@ if (!defined('e107_INIT')) { exit; } if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%;margin-left:auto;margin-right:auto"); } -$sc_style['LASTEDIT']['pre'] = LAN_29.' '; +$sc_style['LASTEDIT']['pre'] = LAN_FORUM_2016.' '; -$sc_style['LASTEDITBY']['pre'] = ' '.FORLAN_BY.' '; +$sc_style['LASTEDITBY']['pre'] = ' '.LAN_FORUM_2017.' '; $sc_style['LASTEDITBY']['post'] = ''; $sc_style['LEVEL']['pre'] = ""; @@ -89,10 +89,10 @@ $FORUMSTART = "
      "; diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index cd704fd2e..6ab5e84af 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -596,18 +596,19 @@ class poll // echo "MODE=".$mode; //XXX New v2.x default for front-end. Currently used by forum-post in bootstrap mode. + // TODO Moc - Needs a more generic LAN rewrite when used on another area than forum if ($mode == 'front') { $text = "
      - ".LAN_386." + ".LAN_FORUM_3029."
      - +
      "; $option_count = vartrue($_POST['poll_option']) ? count($_POST['poll_option']) : 2; @@ -621,25 +622,25 @@ class poll // break; } $opt = ($count==1) ? "id='pollopt' class='btn-group input-append' " : ""; - $text .=""; + $text .=""; $text .= "
      "; } $text .="
      -
      +
      "; //FIXME - get this looking good with Bootstrap CSS only. - $opts = array(1=> "yes", 0=> "no"); + $opts = array(1 => LAN_YES, 0=> LAN_NO); // Set to IP address.. Can add a pref to Poll admin for 'default front-end storage method' if demand is there for it. $text .= "
      - +
      ". $frm->radio('multipleChoice',$opts, vartrue($_POST['multipleChoice'], 0) ).$frm->hidden('storageMethod',1)."
      @@ -681,52 +682,54 @@ class poll //TODO Hardcoded FORUM code needs to be moved somewhere. if ($mode == 'forum') { - $text = "
      - + $text = " + + - - - "; + + + "; $option_count = (count(vartrue($_POST['poll_option'])) ? count($_POST['poll_option']) : 1); - $text .= " - - - - + $text .= " - - + + + + + - - - + + + ";
      - ".LAN_402." + ".LAN_FORUM_2014." - ".LAN_403." + ".LAN_FORUM_2015."
      ".LAN_4."
      ".LAN_FORUM_3029."
      - ".LAN_386." -
      ".LAN_5."
      ".LAN_FORUM_3030.":
      ".LAN_391." -
      "; - - for($count = 1; $count <= $option_count; $count++) - { - if ($count != 1 && $_POST['poll_option'][($count-1)] =="") - { - break; - } - $opt = ($count==1) ? "id='pollopt'" : ""; - $text .=""; - $text .= "
      "; - } - - $text .="

      -
      ".POLL_506." - ".POLL_507."   - ".POLL_508." + ".LAN_FORUM_3031." +
      "; + + for($count = 1; $count <= $option_count; $count++) + { + if ($count != 1 && $_POST['poll_option'][($count-1)] =="") + { + break; + } + + $opt = ($count==1) ? "id='pollopt'" : ""; + $text .=""; + $text .= "
      "; + } + + $text .=" +
      +
      +
      ".LAN_FORUM_3033." + ".LAN_YES."   + ".LAN_NO."
      ".POLLAN_16." - ".POLLAN_17."
      - ".POLLAN_18."
      - ".POLLAN_19." -
      ".LAN_FORUM_3034." + ".LAN_FORUM_3035."
      + ".LAN_FORUM_3036."
      + ".LAN_FORUM_3037." +