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

Fixes #1056 - Forum rules and statistics links added back to template and reworked for bootstrap. thread_sef removed from forum_thread database table and now generated on the fly. More testing required.

Browse Source
This commit is contained in:
Cameron
2015-06-17 20:09:26 -07:00
parent 1e174e2169
commit 56321dfcf7
12 changed files with 753 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_plugins/forum/e_url.php
View File

@@ -25,6 +25,18 @@ class forum_url // plugin-folder + '_url'
{ {
$config = array(); $config = array();
$config['rules'] = array(
'regex' => '^forum/rules/?',
'sef' => 'forum/rules',
'redirect' => '{e_PLUGIN}forum/forum.php?f=rules',
);
$config['stats'] = array(
'regex' => '^forum/stats/?',
'sef' => 'forum/stats',
'redirect' => '{e_PLUGIN}forum/forum_stats.php',
);
$config['post'] = array( $config['post'] = array(
'regex' => '^forum/post/?', 'regex' => '^forum/post/?',
'sef' => 'forum/post/', 'sef' => 'forum/post/',

4
e107_plugins/forum/forum.css
View File

@@ -9,7 +9,7 @@
#forum-viewtopic li.forum-viewtopic-post:nth-child(odd) { background: #F5F5F5 } #forum-viewtopic li.forum-viewtopic-post:nth-child(odd) { background: #F5F5F5 }
#forum-viewtopic li ul.thumbnails { margin-top:15px } #forum-viewtopic li ul.thumbnails { margin-top:15px }
#forum-viewtopic li img.user-avatar { margin-bottom:10px; display:inline-block } #forum-viewtopic li img.user-avatar { margin-bottom:10px; display:inline-block }
#forum, #forum-stats, #forum-rules { min-height: 500px; }
.forum-attachment-file { margin-top:15px; } .forum-attachment-file { margin-top:15px; }
.forum-user-combo { padding-bottom:5px } .forum-user-combo { padding-bottom:5px }

41
e107_plugins/forum/forum.php
View File

@@ -53,6 +53,7 @@ if(isset($_GET['f']))
case 'rules': case 'rules':
include_once(HEADERF); include_once(HEADERF);
forum_rules('show'); forum_rules('show');
include_once(FOOTERF); include_once(FOOTERF);
exit; exit;
@@ -74,6 +75,7 @@ $fVars->NEWIMAGE = IMAGE_new_small;
$fVars->TRACKTITLE = LAN_FORUM_0073; $fVars->TRACKTITLE = LAN_FORUM_0073;
$rules_text = forum_rules('check'); $rules_text = forum_rules('check');
$fVars->USERINFO = "<a href='".e_BASE."top.php?0.top.forum.10'>".LAN_FORUM_0010."</a> | <a href='".e_BASE."top.php?0.active'>".LAN_FORUM_0011."</a>"; $fVars->USERINFO = "<a href='".e_BASE."top.php?0.top.forum.10'>".LAN_FORUM_0010."</a> | <a href='".e_BASE."top.php?0.active'>".LAN_FORUM_0011."</a>";
if(USER) if(USER)
{ {
@@ -83,10 +85,27 @@ if(USER)
$fVars->USERINFO .= " | <a href='".e_PLUGIN."forum/forum_uploads.php'>".LAN_FORUM_0015."</a>"; $fVars->USERINFO .= " | <a href='".e_PLUGIN."forum/forum_uploads.php'>".LAN_FORUM_0015."</a>";
} }
} }
if($rules_text != '') if(!empty($rules_text))
{ {
$fVars->USERINFO .= " | <a href='".$e107->url->create('forum/forum/rules')."'>".LAN_FORUM_0016.'</a>'; $fVars->USERINFO .= " | <a href='".e107::url('forum','rules')."'>".LAN_FORUM_0016.'</a>';
} }
// v2.x --------------------
$uInfo = array();
$uInfo[0] = "<a href='".e107::url('forum','stats')."'>".LAN_FORUM_6013.'</a>';
if(!empty($rules_text))
{
$uInfo[1] = "<a href='".e107::url('forum','rules')."'>".LAN_FORUM_0016.'</a>';
}
$fVars->USERINFOX = implode(" | ",$uInfo);
// -----------
$total_topics = $sql->count("forum_thread", "(*)"); $total_topics = $sql->count("forum_thread", "(*)");
$total_replies = $sql->count("forum_post", "(*)"); $total_replies = $sql->count("forum_post", "(*)");
$total_members = $sql->count("user"); $total_members = $sql->count("user");
@@ -562,7 +581,23 @@ function forum_rules($action = 'check')
{ {
$rules_text = LAN_FORUM_0072; $rules_text = LAN_FORUM_0072;
} }
e107::getRender()->tablerender(LAN_FORUM_0016, "<div style='text-align:center'>{$rules_text}</div>", array('forum', 'forum_rules'));
$text = '';
if(deftrue('BOOTSTRAP'))
{
$breadarray = array(
array('text'=> e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME), 'url' => e107::url('forum','index') ),
array('text'=>LAN_FORUM_0016, 'url'=>null)
);
$text = e107::getForm()->breadcrumb($breadarray);
}
$text .= "<div id='forum-rules'>".$rules_text."</div>";
$text .= "<div class='center'>".e107::getForm()->pagination(e107::url('forum','index'), LAN_BACK)."</div>";
e107::getRender()->tablerender(LAN_FORUM_0016, $text, array('forum', 'forum_rules'));
} }
?> ?>

2
e107_plugins/forum/forum_admin.php
View File

@@ -375,7 +375,7 @@ if(!deftrue('OLD_FORUMADMIN'))
public function beforeUpdate($new_data, $old_data, $id) public function beforeUpdate($new_data, $old_data, $id)
{ {
if(empty($new_data['forum_sef'])) if(empty($new_data['forum_sef']) && !empty($new_data['forum_name']))
{ {
$new_data['forum_sef'] = eHelper::title2sef($new_data['forum_name']); $new_data['forum_sef'] = eHelper::title2sef($new_data['forum_name']);
} }

24
e107_plugins/forum/forum_class.php
View File

@@ -747,7 +747,7 @@ class e107forum
$info = array(); $info = array();
// $info['_FIELD_TYPES'] = $this->fieldTypes['forum_thread']; // $info['_FIELD_TYPES'] = $this->fieldTypes['forum_thread'];
$threadInfo['thread_sef'] = eHelper::title2sef($threadInfo['thread_name']); // $threadInfo['thread_sef'] = eHelper::title2sef($threadInfo['thread_name'],'dashl');
$info['data'] = $threadInfo; $info['data'] = $threadInfo;
@@ -758,6 +758,8 @@ class e107forum
$postInfo['post_thread'] = $newThreadId; $postInfo['post_thread'] = $newThreadId;
$newPostId = $this->postAdd($postInfo, false); $newPostId = $this->postAdd($postInfo, false);
$this->threadMarkAsRead($newThreadId); $this->threadMarkAsRead($newThreadId);
$threadInfo['thread_sef'] = eHelper::title2sef($threadInfo['thread_name'],'dashl');
return array('postid' => $newPostId, 'threadid' => $newThreadId, 'threadsef'=>$threadInfo['thread_sef']); return array('postid' => $newPostId, 'threadid' => $newThreadId, 'threadsef'=>$threadInfo['thread_sef']);
} }
return false; return false;
@@ -783,7 +785,7 @@ class e107forum
else else
{ {
//Replace title //Replace title
$threadTitle = ", thread_name = '{$threadTitle}', thread_sef='".eHelper::title2sef($threadTitle,'dashl')."' "; $threadTitle = ", thread_name = '{$threadTitle}' "; // , thread_sef='".eHelper::title2sef($threadTitle,'dashl')."' ";
} }
} }
@@ -808,7 +810,7 @@ class e107forum
function threadUpdate($threadId, $threadInfo) function threadUpdate($threadId, $threadInfo)
{ {
$info = array(); $info = array();
$threadInfo['thread_sef'] = eHelper::title2sef($threadInfo['thread_name']); // $threadInfo['thread_sef'] = eHelper::title2sef($threadInfo['thread_name'],'dashl');
$info['data'] = $threadInfo; $info['data'] = $threadInfo;
// $info['_FIELD_TYPES'] = $this->fieldTypes['forum_thread']; // $info['_FIELD_TYPES'] = $this->fieldTypes['forum_thread'];
@@ -878,6 +880,9 @@ class e107forum
{ {
$tmp['thread_options'] = unserialize($tmp['thread_options']); $tmp['thread_options'] = unserialize($tmp['thread_options']);
} }
$tmp['thread_sef'] = eHelper::title2sef($tmp['thread_name'],'dashl');
return $tmp; return $tmp;
} }
} }
@@ -898,7 +903,7 @@ class e107forum
if('post' === $start) if('post' === $start)
{ {
$qry = ' $qry = '
SELECT u.user_name, t.thread_active, t.thread_datestamp, t.thread_name, t.thread_sef, t.thread_user, t.thread_id, p.* FROM `#forum_post` AS p SELECT u.user_name, t.thread_active, t.thread_datestamp, t.thread_name, t.thread_user, t.thread_id, p.* FROM `#forum_post` AS p
LEFT JOIN `#forum_thread` AS t ON t.thread_id = p.post_thread LEFT JOIN `#forum_thread` AS t ON t.thread_id = p.post_thread
LEFT JOIN `#user` AS u ON u.user_id = p.post_user LEFT JOIN `#user` AS u ON u.user_id = p.post_user
WHERE p.post_id = '.$id; WHERE p.post_id = '.$id;
@@ -926,6 +931,7 @@ class e107forum
$ret = array(); $ret = array();
while($row = $sql->fetch(MYSQL_ASSOC)) while($row = $sql->fetch(MYSQL_ASSOC))
{ {
$row['thread_sef'] = eHelper::title2sef($row['thread_name'],'dashl');
$ret[] = $row; $ret[] = $row;
} }
} }
@@ -1591,6 +1597,7 @@ class e107forum
{ {
while ($row = $sql->fetch(MYSQL_ASSOC)) while ($row = $sql->fetch(MYSQL_ASSOC))
{ {
// $row['thread_sef'] = eHelper::title2sef($row['thread_name']);
$ret[] = $row; $ret[] = $row;
} }
} }
@@ -1604,7 +1611,7 @@ class e107forum
$sql = e107::getDb(); $sql = e107::getDb();
$id = (int)$id; $id = (int)$id;
$qry = " $qry = "
SELECT p.post_user, p.post_id, p.post_user_anon, p.post_datestamp, p.post_thread, t.thread_sef, u.user_name FROM `#forum_post` AS p SELECT p.post_user, p.post_id, p.post_user_anon, p.post_datestamp, p.post_thread, t.thread_name, u.user_name FROM `#forum_post` AS p
LEFT JOIN `#forum_thread` AS t ON p.post_thread = t.thread_id LEFT JOIN `#forum_thread` AS t ON p.post_thread = t.thread_id
LEFT JOIN `#user` AS u ON u.user_id = p.post_user LEFT JOIN `#user` AS u ON u.user_id = p.post_user
WHERE p.post_thread = {$id} WHERE p.post_thread = {$id}
@@ -1612,7 +1619,9 @@ class e107forum
"; ";
if ($sql->gen($qry)) if ($sql->gen($qry))
{ {
return $sql->fetch(MYSQL_ASSOC); $row = $sql->fetch(MYSQL_ASSOC);
$row['thread_sef'] = eHelper::title2sef($row['thread_name'],'dashl');
return $row;
} }
return false; return false;
} }
@@ -1635,7 +1644,7 @@ class e107forum
$qry = " $qry = "
SELECT t.thread_id, t.thread_sef, f.forum_id, f.forum_sef FROM `#forum_thread` AS t SELECT t.thread_id, t.thread_name, f.forum_id, f.forum_sef FROM `#forum_thread` AS t
LEFT JOIN `#forum` AS f ON t.thread_forum_id = f.forum_id LEFT JOIN `#forum` AS f ON t.thread_forum_id = f.forum_id
WHERE t.thread_forum_id = $forumId WHERE t.thread_forum_id = $forumId
AND t.thread_lastpost {$dir} $lastpost AND t.thread_lastpost {$dir} $lastpost
@@ -1649,6 +1658,7 @@ class e107forum
if ($sql->gen($qry)) if ($sql->gen($qry))
{ {
$row = $sql->fetch(); $row = $sql->fetch();
$row['thread_sef'] = eHelper::title2sef($row['thread_name'],'dashl');
// e107::getMessage()->addInfo(ucfirst($which).print_a($row,true)); // e107::getMessage()->addInfo(ucfirst($which).print_a($row,true));
return $row; return $row;
// return $row['thread_id']; // return $row['thread_id'];

4
e107_plugins/forum/forum_post.php
View File

@@ -824,7 +824,9 @@ class forum_post_handler
$newThreadId = $postResult['threadid']; $newThreadId = $postResult['threadid'];
$this->data['thread_id'] = $newThreadId; $this->data['thread_id'] = $newThreadId;
$this->data['thread_sef'] = $postResult['threadsef']; // $this->data['thread_sef'] = $postResult['threadsef'];
$this->data['thread_sef'] = eHelper::title2sef($threadInfo['thread_name'],'dashl');
if($_POST['email_notify']) if($_POST['email_notify'])

5
e107_plugins/forum/forum_setup.php
View File

@@ -59,6 +59,11 @@ class forum_setup
{ {
return true; // true to trigger an upgrade alert, and false to not. return true; // true to trigger an upgrade alert, and false to not.
} }
if(e107::getDb()->field('forum_thread', 'thread_sef'))
{
e107::getDb()->gen("ALTER TABLE `#forum_thread` DROP `thread_sef` ");
}
} }

1
e107_plugins/forum/forum_sql.php
View File

@@ -37,7 +37,6 @@ CREATE TABLE forum_thread (
`thread_lastuser_anon` varchar(30) default NULL, `thread_lastuser_anon` varchar(30) default NULL,
`thread_total_replies` int(10) unsigned NOT NULL default '0', `thread_total_replies` int(10) unsigned NOT NULL default '0',
`thread_options` text, `thread_options` text,
`thread_sef` varchar(250) default NULL,
PRIMARY KEY (`thread_id`), PRIMARY KEY (`thread_id`),
KEY `thread_forum_id` (`thread_forum_id`), KEY `thread_forum_id` (`thread_forum_id`),
KEY `thread_sticky` (`thread_sticky`), KEY `thread_sticky` (`thread_sticky`),

1048
e107_plugins/forum/forum_stats.php
View File

File diff suppressed because it is too large Load Diff

4
e107_plugins/forum/forum_viewforum.php
View File

@@ -469,6 +469,8 @@ function parse_thread($thread_info)
$tVars->LASTPOSTUSER = $thread_info['lastpost_username']; // $lastpost_name; $tVars->LASTPOSTUSER = $thread_info['lastpost_username']; // $lastpost_name;
$thread_info['thread_sef'] = eHelper::title2sef($thread_info['thread_name'],'dashl');
$urlData = array('forum_sef'=>$thread_info['forum_sef'], 'thread_id'=>$thread_info['thread_id'],'thread_sef'=>$thread_info['thread_sef']); $urlData = array('forum_sef'=>$thread_info['forum_sef'], 'thread_id'=>$thread_info['thread_id'],'thread_sef'=>$thread_info['thread_sef']);
$url = e107::url('forum', 'topic', $urlData); $url = e107::url('forum', 'topic', $urlData);
$url .= (strpos($url,'?')!==false) ? '&' : '?'; $url .= (strpos($url,'?')!==false) ? '&' : '?';
@@ -534,6 +536,7 @@ function parse_thread($thread_info)
// $url = e107::getUrl()->create('forum/thread/view', array('id' => $threadId, 'name' => $thread_name)); // $url = e107::getUrl()->create('forum/thread/view', array('id' => $threadId, 'name' => $thread_name));
$thread_info['thread_sef'] = eHelper::title2sef($thread_info['thread_name'],'dashl');
$url = e107::url('forum','topic', $thread_info); $url = e107::url('forum','topic', $thread_info);
$tVars->THREADNAME = "<a {$title} href='".$url."'>{$thread_name}</a>"; $tVars->THREADNAME = "<a {$title} href='".$url."'>{$thread_name}</a>";
@@ -793,6 +796,7 @@ function fpages($thread_info, $replies)
global $forum; global $forum;
$pages = ceil(($replies)/$forum->prefs->get('postspage')); $pages = ceil(($replies)/$forum->prefs->get('postspage'));
$thread_info['thread_sef'] = eHelper::title2sef($thread_info['thread_name'],'dashl');
$urlparms = $thread_info; $urlparms = $thread_info;
if ($pages > 1) if ($pages > 1)

5
e107_plugins/forum/templates/forum_template.php
View File

@@ -86,7 +86,7 @@ $FORUM_TEMPLATE['main-start'] = "{FORUM_BREADCRUMB}
{SEARCH} {SEARCH}
</div> </div>
</div> </div>
<div > <div id='forum' >
<table class='table table-striped table-bordered table-hover'> <table class='table table-striped table-bordered table-hover'>
<colgroup> <colgroup>
<col style='width:3%' /> <col style='width:3%' />
@@ -115,7 +115,8 @@ $FORUM_TEMPLATE['main-forum'] = "<tr>
<td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE}</small></td> <td class='hidden-xs'><small>{LASTPOSTUSER} {LASTPOSTDATE}</small></td>
</tr>"; </tr>";
$FORUM_TEMPLATE['main-end'] = "</table></div>"; $FORUM_TEMPLATE['main-end'] = "</table><div class='center'><small>{USERINFOX}</small></div></div>";
/* /*
$FORUM_TEMPLATE['main-end'] .= " $FORUM_TEMPLATE['main-end'] .= "

32
top.php
View File

@@ -72,18 +72,18 @@ if ($action == 'active')
{$from}, {$view} {$from}, {$view}
"; ";
if ($sql->db_Select_gen($qry)) if ($sql->gen($qry))
{ {
$text = "<div style='text-align:center'>\n<table style='width:auto' class='fborder'>\n"; $text = "<div>\n<table style='width:auto' class='table fborder'>\n";
$gen = e107::getDateConvert(); $gen = e107::gethateConvert();
$text .= "<tr> $text .= "<tr>
<td style='width:5%' class='forumheader'>&nbsp;</td> <th style='width:5%' class='forumheader'>&nbsp;</th>
<td style='width:45%' class='forumheader'>".LAN_1."</td> <th style='width:45%' class='forumheader'>".LAN_1."</th>
<td style='width:15%; text-align:center' class='forumheader'>".LAN_2."</td> <th style='width:15%; text-align:center' class='forumheader'>".LAN_2."</th>
<td style='width:5%; text-align:center' class='forumheader'>".LAN_3."</td> <th style='width:5%; text-align:center' class='forumheader'>".LAN_3."</th>
<td style='width:5%; text-align:center' class='forumheader'>".LAN_4."</td> <th style='width:5%; text-align:center' class='forumheader'>".LAN_4."</th>
<td style='width:25%; text-align:center' class='forumheader'>".LAN_5."</td> <th style='width:25%; text-align:center' class='forumheader'>".LAN_5."</th>
</tr>\n"; </tr>\n";
while ($row = $sql->db_Fetch(MYSQL_ASSOC)) while ($row = $sql->db_Fetch(MYSQL_ASSOC))
@@ -155,17 +155,17 @@ if ($action == 'top')
"; ";
// $top_forum_posters = $sql->db_Select("user", "*", "`user_forums` > 0 ORDER BY user_forums DESC LIMIT ".$from.", ".$view.""); // $top_forum_posters = $sql->db_Select("user", "*", "`user_forums` > 0 ORDER BY user_forums DESC LIMIT ".$from.", ".$view."");
$text = " $text = "
<div style='text-align:center'> <div>
<table style='width:95%' class='fborder'> <table style='width:95%' class='table table-striped fborder'>
<tr> <tr>
<td style='width:10%; text-align:center' class='forumheader3'>&nbsp;</td> <th style='width:10%; text-align:center' class='forumheader3'>&nbsp;</th>
<td style='width:50%' class='forumheader3'>".TOP_LAN_1."</td> <th style='width:50%' class='forumheader3'>".TOP_LAN_1."</th>
<td style='width:10%; text-align:center' class='forumheader3'>".TOP_LAN_2."</td> <th style='width:10%; text-align:center' class='forumheader3'>".TOP_LAN_2."</th>
<td style='width:30%; text-align:center' class='forumheader3'>".TOP_LAN_6."</td> <th style='width:30%; text-align:center' class='forumheader3'>".TOP_LAN_6."</th>
</tr>\n"; </tr>\n";
$counter = 1 + $from; $counter = 1 + $from;
$sql2 = e107::getDb('sql2'); $sql2 = e107::getDb('sql2');
if ($sql2->db_Select_gen($qry)) if ($sql2->gen($qry))
{ {
while ($row = $sql2->db_Fetch(MYSQL_ASSOC)) while ($row = $sql2->db_Fetch(MYSQL_ASSOC))
{ {