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

Forum lan fixes. Debug ajax.

Browse Source
This commit is contained in:
Cameron
2013-03-14 01:44:00 -07:00
parent eb51e9640f
commit c4a795ce1c
4 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/forum/forum.php
View File

@@ -24,7 +24,7 @@ if (!$e107->isInstalled('forum'))
exit; exit;
} }
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php'); // include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php');
require_once(e_PLUGIN.'forum/forum_class.php'); require_once(e_PLUGIN.'forum/forum_class.php');
$forum = new e107forum; $forum = new e107forum;

15
e107_plugins/forum/forum_class.php
View File

@@ -10,10 +10,6 @@
* *
*/ */
if (!defined('e107_INIT')) { exit; }
/* Forum Header File */ /* Forum Header File */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -43,7 +39,7 @@ $(document).ready(function()
url: script, url: script,
data: { thread: thread, action: action, post: post, text: text }, data: { thread: thread, action: action, post: post, text: text },
success: function(data) { success: function(data) {
// alert(data); alert(data);
var d = $.parseJSON(data); var d = $.parseJSON(data);
@@ -85,7 +81,7 @@ EON;
e107::js('inline',$jscode,'jquery'); e107::js('inline',$jscode,'jquery');
include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum.php');
@@ -140,9 +136,9 @@ class e107forum
$tmpl = e107::getTemplate('forum','forum_viewtopic','replies'); $tmpl = e107::getTemplate('forum','forum_viewtopic','replies');
//FIXME - send parsed template back to $ret['html'] for inclusion in page. //FIXME - send parsed template back to $ret['html'] for inclusion in page.
// $sc = e107::getScBatch('view', 'forum'); $sc = e107::getScBatch('view', 'forum');
// $ret['msg'] = print_r($sc, true); $ret['msg'] = print_r($sc, true);
// $sc->setScVar('postInfo', $postInfo); $sc->setScVar('postInfo', $postInfo);
// $ret['html'] = $tp->parseTemplate($tmpl, true, vartrue($forum_shortcodes)) . "\n"; // $ret['html'] = $tp->parseTemplate($tmpl, true, vartrue($forum_shortcodes)) . "\n";
$ret['html'] = "<tr><td>Help! I can't pass the template!</td><td colspan='2'>".$tp->toHtml($_POST['text'])."</td></tr>"; $ret['html'] = "<tr><td>Help! I can't pass the template!</td><td colspan='2'>".$tp->toHtml($_POST['text'])."</td></tr>";
@@ -150,6 +146,7 @@ class e107forum
$ret['status'] = 'ok'; $ret['status'] = 'ok';
$ret['msg'] = print_r($postInfo,true); // "You post has been added"; $ret['msg'] = print_r($postInfo,true); // "You post has been added";
echo $ret;
echo json_encode($ret); echo json_encode($ret);
} }

2
e107_plugins/forum/forum_post.php
View File

@@ -153,7 +153,7 @@ if (isset($_POST['fpreview']))
$tsubject = $tp->post_toHTML($_POST['subject'], true); $tsubject = $tp->post_toHTML($_POST['subject'], true);
$tpost = $tp->post_toHTML($_POST['post'], true); $tpost = $tp->post_toHTML($_POST['post'], true);
if ($_POST['poll_title'] != '' && check_class($forum->prefs->get('forum_poll'))) if ($_POST['poll_title'] != '' && check_class($forum->prefs->get('poll')))
{ {
require_once(e_PLUGIN."poll/poll_class.php"); require_once(e_PLUGIN."poll/poll_class.php");
$poll = new poll; $poll = new poll;

64
e107_plugins/forum/languages/English/lan_forum_viewforum.php
View File

@@ -21,51 +21,51 @@ define("LAN_56", "Views");
define("LAN_57", "Latest Post"); define("LAN_57", "Latest Post");
define("LAN_58", "There are no topics in this forum yet."); define("LAN_58", "There are no topics in this forum yet.");
define("LAN_59", "You must be a registered member and logged in to post on this forum. Click on signup or login from the login menu."); define("LAN_59", "You must be a registered member and logged in to post on this forum. Click on signup or login from the login menu.");
define("LAN_79", "New posts"); // define("LAN_79", "New posts");
define("LAN_80", " No new posts"); //define("LAN_80", " No new posts");
define("LAN_81", "Closed thread"); // define("LAN_81", "Closed thread");
define("LAN_180", "Search"); // define("LAN_180", "Search");
define("LAN_199", "Unread post exists"); // define("LAN_199", "Unread post exists");
define("LAN_202", "Sticky"); define("LAN_202", "Sticky");
define("LAN_203", "Sticky/Closed"); define("LAN_203", "Sticky/Closed");
define("LAN_204", "You <b>can</b> start new threads"); //define("LAN_204", "You <b>can</b> start new threads");
define("LAN_205", "You <b>cannot</b> start new threads"); //define("LAN_205", "You <b>cannot</b> start new threads");
define("LAN_206", "You <b>can</b> post replies"); //define("LAN_206", "You <b>can</b> post replies");
define("LAN_207", "You <b>cannot</b> post replies"); //define("LAN_207", "You <b>cannot</b> post replies");
define("LAN_208", "You <b>can</b> edit your posts"); //define("LAN_208", "You <b>can</b> edit your posts");
define("LAN_209", "You <b>cannot</b> edit your posts"); //define("LAN_209", "You <b>cannot</b> edit your posts");
define("LAN_316", "Goto page: "); define("LAN_316", "Goto page: ");
define("LAN_317", "None"); define("LAN_317", "None");
define("LAN_321", "Moderators: "); define("LAN_321", "Moderators: ");
define("LAN_395", "[popular]"); define("LAN_395", "[popular]");
define("LAN_396", "Announcement"); define("LAN_396", "Announcement");
define("LAN_397", "This forum is read only"); //define("LAN_397", "This forum is read only");
define("LAN_398", "Unstick thread"); //define("LAN_398", "Unstick thread");
define("LAN_399", "Lock thread"); //define("LAN_399", "Lock thread");
define("LAN_400", "Unlock thread"); //define("LAN_400", "Unlock thread");
define("LAN_401", "Stick thread"); //define("LAN_401", "Stick thread");
define("LAN_402", "Move thread"); //define("LAN_402", "Move thread");
define("LAN_403", "Jump to forum"); //define("LAN_403", "Jump to forum");
define("LAN_404", "This forum is moderated by"); //define("LAN_404", "This forum is moderated by");
define("LAN_405", "user is browsing this forum at the moment"); //define("LAN_405", "user is browsing this forum at the moment");
define("LAN_406", "users are browsing this forum at the moment"); //define("LAN_406", "users are browsing this forum at the moment");
define("LAN_407", "member"); //define("LAN_407", "member");
define("LAN_408", "guest"); //define("LAN_408", "guest");
define("LAN_409", "members"); //define("LAN_409", "members");
define("LAN_410", "guests"); //define("LAN_410", "guests");
//v.616 //v.616
define("LAN_411", "Important Threads"); //define("LAN_411", "Important Threads");
define("LAN_412", "Forum Threads"); //define("LAN_412", "Forum Threads");
define("LAN_431", "Syndicate this forum: rss 0.92"); //define("LAN_431", "Syndicate this forum: rss 0.92");
define("LAN_432", "Syndicate this forum: rss 2.0"); //define("LAN_432", "Syndicate this forum: rss 2.0");
define("LAN_433", "Syndicate this forum: RDF"); //define("LAN_433", "Syndicate this forum: RDF");
define("LAN_434", "Are you sure you want to delete this thread and any replies?"); //define("LAN_434", "Are you sure you want to delete this thread and any replies?");
define("LAN_435", "Delete thread"); //define("LAN_435", "Delete thread");
//v.617 //v.617
define("FORLAN_CLOSE", "Thread closed."); define("FORLAN_CLOSE", "Thread closed.");