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

Forum SEF Url fixes

Browse Source
This commit is contained in:
Cameron
2016-05-24 12:39:45 -07:00
parent 989fc5ccd1
commit 0b96543a1a
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_plugins/forum/e_url.php
View File

@@ -73,21 +73,23 @@ class forum_url // plugin-folder + '_url'
); );
*/ */
$config['forum'] = array(
'regex' => '^forum/([^\/]*)/?\??([^\/]*)?$',
'sef' => 'forum/{forum_sef}',
'redirect' => '{e_PLUGIN}forum/forum_viewforum.php?sef=$1&$2',
'legacy' => '{e_PLUGIN}forum/forum_viewforum.php?id={forum_id}'
);
$config['index'] = array( $config['index'] = array(
'regex' => '^forum/?$', // matched against url, and if true, redirected to 'redirect' below. 'regex' => '^forum\/?$', // matched against url, and if true, redirected to 'redirect' below.
'sef' => 'forum', // used by e107::url(); to create a url from the db table. 'sef' => 'forum', // used by e107::url(); to create a url from the db table.
'redirect' => '{e_PLUGIN}forum/forum.php', // file-path of what to load when the regex returns true. 'redirect' => '{e_PLUGIN}forum/forum.php', // file-path of what to load when the regex returns true.
); );
$config['forum'] = array(
'regex' => '^forum\/([^\/]*)\/?\??([^\/]*)?$',
'sef' => 'forum/{forum_sef}/',
'redirect' => '{e_PLUGIN}forum/forum_viewforum.php?sef=$1&$2',
'legacy' => '{e_PLUGIN}forum/forum_viewforum.php?id={forum_id}'
);
return $config; return $config;
} }

16
e107_plugins/forum/forum_stats.php
View File

@@ -365,7 +365,7 @@ class forumStats
{ {
$text_3 .= "<tr> $text_3 .= "<tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td> <td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>".$ma['user_name']."</a></td> <td style='width: 20%;' class='forumheader3'><a href='".e107::url('user/profile/view', $ma)."'>".$ma['user_name']."</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td>
<td style='width: 50%;' class='forumheader3'>".$this->showBar($ma['percentage'])." <td style='width: 50%;' class='forumheader3'>".$this->showBar($ma['percentage'])."
@@ -399,7 +399,7 @@ class forumStats
{ {
$text_4 .= "<tr> $text_4 .= "<tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td> <td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>".$ma['user_name']."</a></td> <td style='width: 20%;' class='forumheader3'><a href='".e107::url('user/profile/view', $ma)."'>".$ma['user_name']."</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td>
<td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($ma['percentage'])."</td> <td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($ma['percentage'])."</td>
@@ -430,7 +430,7 @@ class forumStats
$text_5 .= " $text_5 .= "
<tr> <tr>
<td style='width: 10%; text-align: center;' class='forumheader3'>$count</td> <td style='width: 10%; text-align: center;' class='forumheader3'>$count</td>
<td style='width: 20%;' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', $ma)."'>".$ma['user_name']."</a></td> <td style='width: 20%;' class='forumheader3'><a href='".e107::url('user/profile/view', $ma)."'>".$ma['user_name']."</a></td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['user_forums']."</td>
<td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td> <td style='width: 10%; text-align: center;' class='forumheader3'>".$ma['percentage']."%</td>
<td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($ma['percentage'])."</td> <td style='width: 50%; text-align: center;' class='forumheader3'>".$this->showBar($ma['percentage'])."</td>
@@ -548,7 +548,7 @@ class forumStats
$text .= "<tr> $text .= "<tr>
<td style='width:10%; text-align:center' class='forumheader3'>{$counter}</td> <td style='width:10%; text-align:center' class='forumheader3'>{$counter}</td>
<td style='width:50%' class='forumheader3'><a href='".e107::getUrl()->create('user/profile/view', 'id='.$row['user_id'].'&name='.$row['user_name'])."'>{$row['user_name']}</a></td> <td style='width:50%' class='forumheader3'><a href='".e107::url('user/profile/view', 'id='.$row['user_id'].'&name='.$row['user_name'])."'>{$row['user_name']}</a></td>
<td style='width:10%; text-align:center' class='forumheader3'>{$row['user_plugin_forum_posts']}</td> <td style='width:10%; text-align:center' class='forumheader3'>{$row['user_plugin_forum_posts']}</td>
<td style='width:30%; text-align:center' class='forumheader3'>{$r}</td> <td style='width:30%; text-align:center' class='forumheader3'>{$r}</td>
</tr>"; </tr>";
@@ -619,21 +619,21 @@ class forumStats
{ {
if ($row['user_name']) if ($row['user_name'])
{ {
$POSTER = "<a href='".e107::getUrl()->create('user/profile/view', "name={$row['user_name']}&id={$row['thread_user']}")."'>{$row['user_name']}</a>"; $POSTER = "<a href='".e107::url('user/profile/view', "name={$row['user_name']}&id={$row['thread_user']}")."'>{$row['user_name']}</a>";
} }
else else
{ {
$POSTER = $row['thread_user_anon']; $POSTER = $row['thread_user_anon'];
} }
$LINKTOTHREAD = e107::getUrl()->create('forum/thread/view', array('id' =>$row['thread_id'])); //$e107->url->getUrl('forum', 'thread', "func=view&id={$row['thread_id']}"); $LINKTOTHREAD = e107::url('forum/thread/view', array('id' =>$row['thread_id'])); //$e107->url->getUrl('forum', 'thread', "func=view&id={$row['thread_id']}");
$LINKTOFORUM = e107::getUrl()->create('forum/forum/view', array('id' => $row['thread_forum_id'])); //$e107->url->getUrl('forum', 'forum', "func=view&id={$row['thread_forum_id']}"); $LINKTOFORUM = e107::url('forum/forum/view', array('id' => $row['thread_forum_id'])); //$e107->url->getUrl('forum', 'forum', "func=view&id={$row['thread_forum_id']}");
$lastpost_datestamp = $gen->convert_date($row['thread_lastpost'], 'forum'); $lastpost_datestamp = $gen->convert_date($row['thread_lastpost'], 'forum');
if ($row['user_last']) if ($row['user_last'])
{ {
$LASTPOST = "<a href='".e107::getUrl()->create('user/profile/view', "name={$row['user_last']}&id={$row['thread_lastuser']}")."'>{$row['user_last']}</a><br />".$lastpost_datestamp; $LASTPOST = "<a href='".e107::url('user/profile/view', "name={$row['user_last']}&id={$row['thread_lastuser']}")."'>{$row['user_last']}</a><br />".$lastpost_datestamp;
} }
else else
{ {

7
e107_plugins/forum/forum_viewforum.php
View File

@@ -255,14 +255,13 @@ else
$pages = false; $pages = false;
} }
if ($pages) if ($pages)
{ {
if(strpos($FORUM_VIEW_START, 'THREADPAGES') !== false || strpos($FORUM_VIEW_END, 'THREADPAGES') !== false) if(strpos($FORUM_VIEW_START, 'THREADPAGES') !== false || strpos($FORUM_VIEW_END, 'THREADPAGES') !== false)
{ {
//if(!$page) $page = 1; $url = e107::url('forum','forum',$forumInfo, array('query'=>array('p'=>'[FROM]')));
$urlparms = $forumInfo;
$urlparms['page'] = '[FROM]';
$url = rawurlencode(e107::getUrl()->create('forum/forum/view', $urlparms));
$parms = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off"; $parms = "total={$pages}&type=page&current={$page}&url=".$url."&caption=off";
$fVars->THREADPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}"); $fVars->THREADPAGES = $tp->parseTemplate("{NEXTPREV={$parms}}");
unset($urlparms); unset($urlparms);

5
e107_plugins/forum/forum_viewtopic.php
View File

@@ -525,7 +525,10 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread
// $ajaxInsert = 1; // $ajaxInsert = 1;
// echo "AJAX-INSERT=".$ajaxInsert ."(".$thread->pages." vs ".$thread->page.")"; // echo "AJAX-INSERT=".$ajaxInsert ."(".$thread->pages." vs ".$thread->page.")";
$frm = e107::getForm(); $frm = e107::getForm();
$urlParms = array('f'=>'rp','id'=>$thread->threadInfo['thread_id'], 'post'=>$thread->threadInfo['thread_id']);
$url = e107::url('forum','post', null, array('query'=>$urlParms));; // ."?f=rp&amp;id=".$thread->threadInfo['thread_id']."&amp;post=".$thread->threadInfo['thread_id'];
$tVars->QUICKREPLY = " $tVars->QUICKREPLY = "
<form action='" . $e107->url->create('forum/thread/reply', array('id' => $thread->threadId)) . "' method='post'> <form action='" . $e107->url->create('forum/thread/reply', array('id' => $thread->threadId)) . "' method='post'>
<div class='form-group'> <div class='form-group'>