mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-13 17:09:46 +01:00
Code Issues Releases Wiki Activity

Forum: URL config refactoring; 'top' link removed from Jump box; markup error fix

Browse Source
This commit is contained in:
secretr 2011-12-06 16:08:06 +00:00
parent 6cf1f90711
commit 5324df60b2
6 changed files with 7 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
e107_plugins/forum/e_url/forum.php
View File

@ -1,35 +0,0 @@
<?php
// $Id$
// DEPRECATED - subject of removal
function url_forum_forum($parms)
{
$amp = isset($parms['raw']) ? '&' : '&amp;';
switch($parms['func'])
{
case 'view':
$page = (varset($parms['page']) ? $amp.'p='.$parms['page'] : '');
return e_PLUGIN_ABS."forum/forum_viewforum.php?id={$parms['id']}{$page}";
break;
case 'track':
return e_PLUGIN_ABS.'forum/forum.php?track';
break;
case 'main':
return e_PLUGIN_ABS.'forum/forum.php';
break;
case 'post':
return e_PLUGIN_ABS."forum/forum_post.php?f={$parms['type']}}id={$parms['id']}";
break;
case 'rules':
return e_PLUGIN_ABS.'forum/forum.php?f=rules';
break;
case 'mfar':
return e_PLUGIN_ABS.'forum/forum.php?f=mfar'.$amp.'id='.$parms['id'];
break;
}
}

73
e107_plugins/forum/e_url/thread.php
View File

@ -1,73 +0,0 @@
<?php
// $Id$
// DEPRECATED - subject of removal
function url_forum_thread($parms)
{
$amp = isset($parms['raw']) ? '&' : '&amp;';
switch($parms['func'])
{
case 'nt':
return e_PLUGIN_ABS."forum/forum_post.php?f=nt{$amp}id={$parms['id']}";
break;
case 'rp':
return e_PLUGIN_ABS."forum/forum_post.php?f=rp{$amp}id={$parms['id']}";
break;
case 'view':
$page = (varset($parms['page']) ? $amp.'p='.$parms['page'] : '');
return e_PLUGIN_ABS."forum/forum_viewtopic.php?id={$parms['id']}{$page}";
break;
case 'last':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?id={$parms['id']}{$amp}last=1";
break;
case 'post':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=post{$amp}id={$parms['id']}";
break;
case 'report':
$page = (isset($parms['page']) ? (int)$parms['page'] : 0 );
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=report{$amp}id={$parms['id']}{$amp}post={$parms['post']}{$amp}p={$page}";
break;
case 'edit':
return e_PLUGIN_ABS."forum/forum_post.php?f=edit{$amp}id={$parms['id']}";
break;
case 'move':
return e_PLUGIN_ABS."forum/forum_conf.php?f=move{$amp}id={$parms['id']}";
break;
case 'split':
return e_PLUGIN_ABS."forum/forum_conf.php?f=split{$amp}id={$parms['id']}";
break;
case 'quote':
return e_PLUGIN_ABS."forum/forum_post.php?f=quote{$amp}id={$parms['id']}";
break;
case 'next':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=next{$amp}id={$parms['id']}";
break;
case 'prev':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=prev{$amp}id={$parms['id']}";
break;
case 'track':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=track{$amp}id={$parms['id']}";
break;
case 'untrack':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=untrack{$amp}id={$parms['id']}";
break;
case 'track_toggle':
return e_PLUGIN_ABS."forum/forum_viewtopic.php?f=track_toggle{$amp}id={$parms['id']}";
break;
}
}

2
e107_plugins/forum/forum_viewforum.php
View File

@ -575,7 +575,7 @@ function forumjump()
{
$text .= "\n<option value='".$key."'>".$val."</option>";
}
$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='".LAN_03."' />&nbsp;&nbsp;&nbsp;&nbsp;<a href='".e_SELF."?".$_SERVER['QUERY_STRING']."#top'>".LAN_02."</a></p></form>";
$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='".LAN_03."' /></form>";
return $text;
}

2
e107_plugins/forum/forum_viewtopic.php
View File

@ -378,7 +378,7 @@ function forumjump()
{
$text .= "\n<option value='" . $key . "'>" . $val . "</option>";
}
$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='" . LAN_03 . "' />&nbsp;&nbsp;&nbsp;&nbsp;<a href='" . e_SELF . "?" . e_QUERY . "#top' onclick=\"window.scrollTo(0,0);\">" . LAN_10 . "</a></p></form>";
$text .= "</select> <input class='button' type='submit' name='fjsubmit' value='" . LAN_03 . "' /></form>";
return $text;
}

0
e107_plugins/forum/url/rewrite/e_url.php → e107_plugins/forum/url/rewrite_url.php
View File

10
e107_plugins/forum/e_url.php → e107_plugins/forum/url/url.php
View File

@ -1,11 +1,11 @@
<?php
/*
* Copyright (C) 2008-2011 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$
*
* Forum Default URL configuration
* TODO - SEF URL configuration
* Copyright (C) 2008-2011 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$
*
* Forum Default URL configuration
* TODO - SEF URL configuration
*/
class plugin_forum_url extends eUrlConfig
{