Skip to content
Prev Previous commit
Next Next commit
More urlFor in view
  • Loading branch information
beaver-dev committed Sep 7, 2015
commit e83d76bc5dcbe1388d2439f5135a875b9738acee
16 changes: 8 additions & 8 deletions featherbb/Controller/Admin/Plugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ public function index()
)->addTemplate('admin/plugins.php')->display();
}

public function activate()
public function activate($pluginName = null)
{
// The plugin to load should be supplied via GET
$class = $this->request->get('plugin') ? $this->request->get('plugin') : null;
if (!$class) {
// $pluginName = $this->request->get('plugin') ? $this->request->get('plugin') : null;
if (!$pluginName) {
throw new Error(__('Bad request'), 400);
}

// Check if plugin follows PSR-4 conventions and extends base forum plugin
if (!class_exists($class) || !property_exists($class, 'isValidFBPlugin')) {
throw new Error(sprintf(__('No plugin message'), Utils::escape($class)), 400);
if (!class_exists($pluginName) || !property_exists($pluginName, 'isValidFBPlugin')) {
throw new Error(sprintf(__('No plugin message'), Utils::escape($pluginName)), 400);
}

$plugin = new $class;
$plugin = new $pluginName;
try {
$plugin->activate($class);
$plugin->activate($pluginName);
} catch (\Exception $e) {
Url::redirect($this->feather->urlFor('adminPlugins'), $e->getMessage());
}
// Plugin has been activated, confirm and redirect
Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$class::$name.'" activated!');
Url::redirect($this->feather->urlFor('adminPlugins'), 'Plugin "'.$pluginName::$name.'" activated!');
}

public function deactivate()
Expand Down
10 changes: 6 additions & 4 deletions featherbb/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,12 @@

// Moderate routes
$feather->group('/moderate', $isAdmmod, $canReadBoard, function() use ($feather) {
$feather->get('/forum/:id(/:name)(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
$feather->get('/forum/:id(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForum');
$feather->get('/forum/:id(/page/:page)(/)', '\FeatherBB\Controller\Moderate:display')->conditions(array('id' => '[0-9]+', 'page' => '[0-9]+'))->name('moderateForumPage');
$feather->get('/get-host/post/:pid(/)', '\FeatherBB\Controller\Moderate:gethostpost')->conditions(array('pid' => '[0-9]+'))->name('getHostPost');
$feather->get('/get-host/ip/:ip(/)', '\FeatherBB\Controller\Moderate:gethostip')->name('getHostIp');
$feather->map('/topic/:id/forum/:fid/action/:action(/param/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopic');
$feather->map('/topic/:id/forum/:fid/action/:action(/page/:param)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'param' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
$feather->map('/topic/:id/forum/:fid/action/:action(/page/:page)(/)', '\FeatherBB\Controller\Moderate:moderatetopic')->conditions(array('id' => '[0-9]+', 'fid' => '[0-9]+', 'page' => '[0-9]+'))->via('GET', 'POST')->name('moderateTopicPage');
$feather->post('/forum/:fid(/page/:page)(/)', '\FeatherBB\Controller\Moderate:dealposts')->conditions(array('fid' => '[0-9]+', 'page' => '[0-9]+'))->name('dealPosts');
});

Expand Down Expand Up @@ -192,8 +193,9 @@
// Admin plugins
$feather->group('/plugins', function() use ($feather) {
$feather->map('/(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('adminPlugins');
$feather->map('/activate(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
$feather->map('/deactivate(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
$feather->map('/:name(/)', '\FeatherBB\Controller\Admin\Plugins:index')->via('GET', 'POST')->name('infoPlugin');
$feather->map('/activate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:activate')->via('GET')->name('activatePlugin');
$feather->map('/deactivate/:name(/)', '\FeatherBB\Controller\Admin\Plugins:deactivate')->via('GET')->name('deactivatePlugin');
// $feather->map('/loader(/)', '\FeatherBB\Controller\Admin\Plugins:display')->via('GET', 'POST');
});

Expand Down
2 changes: 1 addition & 1 deletion style/themes/FeatherBB/view/admin/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<?php

foreach ($plugins as $plugin_name => $plugin) {
echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.Url::get('admin/loader/?plugin='.$plugin_name).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
echo "\t\t\t\t\t".'<li'.(($page == $plugin_name) ? ' class="isactive"' : '').'><a href="'.$feather->urlFor('infoPlugin', ['name' => $plugin_name]).'">'.str_replace('_', ' ', $plugin).'</a></li>'."\n";
}

?>
Expand Down
2 changes: 1 addition & 1 deletion style/themes/FeatherBB/view/admin/options.php
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@
<label class="conl"><input type="radio" name="form_censoring" value="0"<?php if ($feather->forum_settings['o_censoring'] == '0') {
echo ' checked="checked"';
} ?> />&#160;<strong><?php _e('No') ?></strong></label>
<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.Url::get('admin/censoring/').'">'.__('Censoring').'</a>') ?></span>
<span class="clearb"><?php printf(__('Censor words help'), '<a href="'.$feather->urlFor('adminCensoring').'">'.__('Censoring').'</a>') ?></span>
</td>
</tr>
<tr>
Expand Down
4 changes: 2 additions & 2 deletions style/themes/FeatherBB/view/admin/plugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<strong><?= $class::$name; ?></strong>
<div class="plugin-actions">
<?php if (array_key_exists($class, $activePlugins)) { ?>
<a href="<?= Url::get('/admin/plugins/deactivate?plugin='.$class) ?>">Deactivate</a>
<a href="<?= $feather->urlFor('deactivatePlugin', ['name' => $class]) ?>">Deactivate</a>
<?php } else { ?>
<a href="<?= Url::get('/admin/plugins/activate?plugin='.$class) ?>">Activate</a>
<a href="<?= $feather->urlFor('activatePlugin', ['name' => $class]) ?>">Activate</a>
<?php } ?>
</div>
</td>
Expand Down
27 changes: 18 additions & 9 deletions style/themes/FeatherBB/view/admin/reports.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

use FeatherBB\Core\Url;
use FeatherBB\Core\Utils;
use FeatherBB\Core\AdminUtils;

// Make sure no one attempts to run this script "directly"
if (!defined('FEATHER')) {
Expand All @@ -31,10 +32,14 @@
<div class="infldset">
<table class="aligntop">
<tr>
<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['reported_by']]).'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
<td class="location">
<?= AdminUtils::breadcrumbs_admin(array(
$report['forum_name'] => $feather->urlFor('Forum', ['id' => $report['forum_id'], 'name' => Url::url_friendly($report['forum_name'])]),
$report['subject'] => $feather->urlFor('Forum', ['id' => $report['topic_id'], 'name' => Url::url_friendly($report['subject'])]),
sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid']
)); ?>
</td>
</tr>
<tr>
<th scope="row"><?php _e('Reason') ?><div><input type="submit" name="zap_id[<?= $report['id'] ?>]" value="<?php _e('Zap') ?>" /></div></th>
Expand Down Expand Up @@ -77,14 +82,18 @@
?>
<div class="inform">
<fieldset>
<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.Url::get('user/'.$report['zapped_by_id'].'/').'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
<legend><?php printf(__('Zapped subhead'), $feather->utils->format_time($report['zapped']), ($report['zapped_by'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['zapped_by_id']]).'">'.Utils::escape($report['zapped_by']).'</a>' : __('NA')) ?></legend>
<div class="infldset">
<table class="aligntop">
<tr>
<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.Url::get('users/'.$report['reported_by'].'/').'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
<td class="location"><?= \FeatherBB\Core\AdminUtils::breadcrumbs_admin(array($report['forum_name'] => Url::get('forum/'.$report['forum_id'].'/'.$feather->url->url_friendly($report['forum_name']).'/'),
$report['subject'] => Url::get('forum/'.$report['topic_id'].'/'.$feather->url->url_friendly($report['subject'])),
sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid'])) ?></td>
<th scope="row"><?php printf(__('Reported by'), ($report['reporter'] != '') ? '<a href="'.$feather->urlFor('userProfile', ['id' => $report['reported_by']]).'">'.Utils::escape($report['reporter']).'</a>' : __('Deleted user')) ?></th>
<td class="location">
<?= AdminUtils::breadcrumbs_admin(array(
$report['forum_name'] => $feather->urlFor('Forum', ['id' => $report['forum_id'], 'name' => Url::url_friendly($report['forum_name'])]),
$report['subject'] => $feather->urlFor('Forum', ['id' => $report['topic_id'], 'name' => Url::url_friendly($report['subject'])]),
sprintf(__('Post ID'), $report['pid']) => $feather->urlFor('viewPost', ['pid' => $report['pid']]).'#p'.$report['pid']
)) ?>
</td>
</tr>
<tr>
<th scope="row"><?php _e('Reason') ?></th>
Expand Down
4 changes: 2 additions & 2 deletions style/themes/FeatherBB/view/admin/statistics.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<?php if ($feather->user->g_id == FEATHER_ADMIN): ?> <dt><?php _e('Environment label') ?></dt>
<dd>
<?php printf(__('Environment data OS'), PHP_OS) ?><br />
<?php printf(__('Environment data version'), phpversion(), '<a href="'.Url::get('admin/phpinfo/').'">'.__('Show info').'</a>') ?><br />
<?php printf(__('Environment data version'), phpversion(), '<a href="'.$feather->urlFor('phpinfo').'">'.__('Show info').'</a>') ?><br />
<?php printf(__('Environment data acc')."\n", $php_accelerator) ?>
</dd>
<dt><?php _e('Database label') ?></dt>
Expand All @@ -42,4 +42,4 @@
</div>
</div>
<div class="clearer"></div>
</div>
</div>
4 changes: 2 additions & 2 deletions style/themes/FeatherBB/view/admin/users/ban_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="blockform">
<h2><span><?php _e('Ban users') ?></span></h2>
<div class="box">
<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo Url::get('admin/users') ?>">
<form id="bans2" name="confirm_ban_users" method="post" action="<?php echo $feather->urlFor('adminUsers') ?>">
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
<div class="inform">
Expand Down Expand Up @@ -57,4 +57,4 @@
</div>
</div>
<div class="clearer"></div>
</div>
</div>
4 changes: 2 additions & 2 deletions style/themes/FeatherBB/view/admin/users/delete_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="blockform">
<h2><span><?php _e('Delete users') ?></span></h2>
<div class="box">
<form name="confirm_del_users" method="post" action="<?php echo Url::get('admin/users') ?>">
<form name="confirm_del_users" method="post" action="<?php echo $feather->urlFor('adminUsers') ?>">
<input type="hidden" name="<?php echo $csrf_key; ?>" value="<?php echo $csrf_token; ?>">
<input type="hidden" name="users" value="<?php echo implode(',', $user_ids) ?>" />
<div class="inform">
Expand All @@ -38,4 +38,4 @@
</div>
</div>
<div class="clearer"></div>
</div>
</div>
8 changes: 4 additions & 4 deletions style/themes/FeatherBB/view/admin/users/find_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="linkst">
<div class="inbox crumbsplus">
<ul class="crumbs">
<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
</ul>
Expand Down Expand Up @@ -57,12 +57,12 @@
foreach ($user_data as $user) {
?>
<tr>
<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$user['id'].'/').'">'.Utils::escape($user['username']).'</a>' ?></td>
<td class="tcl"><?php echo '<a href="'.$feather->urlFor('userProfile', ['id' => $user['id']]).'">'.Utils::escape($user['username']).'</a>' ?></td>
<td class="tc2"><a href="mailto:<?php echo Utils::escape($user['email']) ?>"><?php echo Utils::escape($user['email']) ?></a></td>
<td class="tc3"><?php echo $user['user_title'] ?></td>
<td class="tc4"><?php echo Utils::forum_number_format($user['num_posts']) ?></td>
<td class="tc5"><?php echo($user['admin_note'] != '') ? Utils::escape($user['admin_note']) : '&#160;' ?></td>
<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$user['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$user['id']).'">'.__('Results show posts link').'</a>' ?></td>
<td class="tcr"><?php echo '<a href="'.$feather->urlFor('usersIpStats', ['id' => $user['id']]).'">'.__('Results view IP link').'</a> | <a href="'.$feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$user['id'].'">'.__('Results show posts link').'</a>' ?></td>
<?php if ($can_action): ?> <td class="tcmod"><input type="checkbox" name="users[<?php echo $user['id'] ?>]" value="1" /></td>
<?php endif;
?>
Expand Down Expand Up @@ -93,7 +93,7 @@
?>
</div>
<ul class="crumbs">
<li><a href="<?php echo Url::get('admin/index/') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
<li><a href="<?php echo $feather->urlFor('adminIndex') ?>"><?php _e('Admin').' '.__('Index') ?></a></li>
<li><span>»&#160;</span><a href="<?php echo $feather->urlFor('adminUsers') ?>"><?php _e('Users') ?></a></li>
<li><span>»&#160;</span><strong><?php _e('Results head') ?></strong></li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions style/themes/FeatherBB/view/admin/users/search_ip.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
foreach ($ip_data as $ip) {
?>
<tr>
<td class="tcl"><a href="<?php echo Url::get('moderate/get-host/ip/'.Utils::escape($ip['poster_ip']).'/') ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
<td class="tcl"><a href="<?php echo $feather->urlFor('getHostIp', ['ip' => Utils::escape($ip['poster_ip'])]) ?>"><?php echo Utils::escape($ip['poster_ip']) ?></a></td>
<td class="tc2"><?php echo $feather->utils->format_time($ip['last_used']) ?></td>
<td class="tc3"><?php echo $ip['used_times'] ?></td>
<td class="tcr"><a href="<?php echo Url::get('admin/users/show-users/ip/'.$ip['poster_ip'].'/') ?>"><?php _e('Results find more link') ?></a></td>
<td class="tcr"><a href="<?php echo $feather->urlFor('usersIpShow', ['id' => $ip['poster_ip']]) ?>"><?php _e('Results find more link') ?></a></td>
</tr>
<?php

Expand Down Expand Up @@ -79,4 +79,4 @@
</ul>
<div class="clearer"></div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions style/themes/FeatherBB/view/admin/users/show_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
if (isset($info['user_data'][$cur_poster['poster_id']])) {
?>
<tr>
<td class="tcl"><?php echo '<a href="'.Url::get('user/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
<td class="tcl"><?php echo '<a href="'.$feather->urlFor('userProfile', ['id' => $info['user_data'][$cur_poster['poster_id']]['id']]).'">'.Utils::escape($info['user_data'][$cur_poster['poster_id']]['username']).'</a>' ?></td>
<td class="tc2"><a href="mailto:<?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?>"><?php echo Utils::escape($info['user_data'][$cur_poster['poster_id']]['email']) ?></a></td>
<td class="tc3"><?php echo Utils::get_title($info['user_data'][$cur_poster['poster_id']]) ?></td>
<td class="tc4"><?php echo Utils::forum_number_format($info['user_data'][$cur_poster['poster_id']]['num_posts']) ?></td>
<td class="tc5"><?php echo($info['user_data'][$cur_poster['poster_id']]['admin_note'] != '') ? Utils::escape($info['user_data'][$cur_poster['poster_id']]['admin_note']) : '&#160;' ?></td>
<td class="tcr"><?php echo '<a href="'.Url::get('admin/users/ip-stats/id/'.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results view IP link').'</a> | <a href="'.Url::get('search/?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'/').'">'.__('Results show posts link').'</a>' ?></td>
<td class="tcr"><?php echo '<a href="'.$feather->urlFor('usersIpStats', ['id' => $info['user_data'][$cur_poster['poster_id']]['id']]).'">'.__('Results view IP link').'</a> | <a href="'.$feather->urlFor('search').'?action=show_user_posts&amp;user_id='.$info['user_data'][$cur_poster['poster_id']]['id'].'">'.__('Results show posts link').'</a>' ?></td>
</tr>
<?php

Expand Down Expand Up @@ -100,4 +100,4 @@
</ul>
<div class="clearer"></div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion style/themes/FeatherBB/view/delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="inbox">
<ul class="crumbs">
<li><a href="<?= Url::base() ?>"><?php _e('Index') ?></a></li>
<li><span>»&#160;</span><a href="<?= Url::get('forum/'.$cur_post['fid'].'/'.$cur_post['forum_name'].'/') ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
<li><span>»&#160;</span><a href="<?= $feather->urlFor('Forum', ['id' => $cur_post['fid'], 'name' => Url::url_friendly($cur_post['forum_name'])]) ?>"><?= Utils::escape($cur_post['forum_name']) ?></a></li>
<li><span>»&#160;</span><a href="<?= $feather->urlFor('viewPost', ['pid' => $id]).'#p'.$id ?>"><?= Utils::escape($cur_post['subject']) ?></a></li>
<li><span>»&#160;</span><strong><?php _e('Delete post') ?></strong></li>
</ul>
Expand Down
Loading