Redirection - Version 2.2.12

Version Description

  • Cleanup some XSS issues
Download this release

Release Info

Developer johnny5
Plugin Icon 128x128 Redirection
Version 2.2.12
Comparing to
See all releases

Code changes from version 2.2.11 to 2.2.12

fileio/apache.php CHANGED
@@ -32,7 +32,7 @@ class Red_Apache_File extends Red_FileIO
32
  include_once (dirname (__FILE__).'/../models/htaccess.php');
33
 
34
  $this->htaccess = new Red_Htaccess ($module);
35
- $pager = new RE_Pager ($_GET, $_SERVER['REQUEST_URI'], 'name', 'DESC', 'log');
36
 
37
  $pager->per_page = 0;
38
  $this->name = $module->name;
32
  include_once (dirname (__FILE__).'/../models/htaccess.php');
33
 
34
  $this->htaccess = new Red_Htaccess ($module);
35
+ $pager = new RE_Pager ($_GET, admin_url( 'redirection.php' ), 'name', 'DESC', 'log');
36
 
37
  $pager->per_page = 0;
38
  $this->name = $module->name;
fileio/csv.php CHANGED
@@ -4,7 +4,7 @@ class Red_Csv_File extends Red_FileIO
4
  {
5
  function collect ($module)
6
  {
7
- $pager = new RE_Pager ($_GET, $_SERVER['REQUEST_URI'], 'name', 'DESC', 'log');
8
  $pager->per_page = 0;
9
  $this->id = $module->id;
10
 
4
  {
5
  function collect ($module)
6
  {
7
+ $pager = new RE_Pager ($_GET, admin_url( 'redirection.php' ), 'name', 'DESC', 'log');
8
  $pager->per_page = 0;
9
  $this->id = $module->id;
10
 
fileio/rss.php CHANGED
@@ -6,7 +6,7 @@ class Red_Rss_File extends Red_FileIO
6
 
7
  function collect ($module)
8
  {
9
- $pager = new RE_Pager ($_GET, $_SERVER['REQUEST_URI'], 'created', 'DESC', 'log');
10
  $pager->per_page = 100;
11
 
12
  $this->name = $module->name;
6
 
7
  function collect ($module)
8
  {
9
+ $pager = new RE_Pager ($_GET, admin_url( 'redirection.php' ), 'created', 'DESC', 'log');
10
  $pager->per_page = 100;
11
 
12
  $this->name = $module->name;
fileio/xml.php CHANGED
@@ -15,7 +15,7 @@ class Red_Xml_File extends Red_FileIO
15
  $this->groups = Red_Group::get_for_module ($module->id);
16
  if (is_array ($this->groups) && count ($this->groups) > 0)
17
  {
18
- $pager = new RE_Pager ($_GET, $_SERVER['REQUEST_URI'], 'position', 'ASC', 'log');
19
  $pager->per_page = 0;
20
 
21
  foreach ($this->groups AS $pos => $group)
15
  $this->groups = Red_Group::get_for_module ($module->id);
16
  if (is_array ($this->groups) && count ($this->groups) > 0)
17
  {
18
+ $pager = new RE_Pager ($_GET, admin_url( 'redirection.php' ), 'position', 'ASC', 'log');
19
  $pager->per_page = 0;
20
 
21
  foreach ($this->groups AS $pos => $group)
models/pager.php CHANGED
@@ -90,12 +90,6 @@ class RE_Pager
90
  else if (isset ($per_page[get_class ($this)]) && isset ($per_page[get_class ($this)][$this->id]))
91
  $this->per_page = $per_page[get_class ($this)][$this->id];
92
 
93
- if ($orderby != '')
94
- $this->order_by = $orderby;
95
-
96
- if (isset ($data['orderby']))
97
- $this->order_by = $data['orderby'];
98
-
99
  if (!empty ($tags))
100
  {
101
  $this->order_tags = $tags;
@@ -233,14 +227,6 @@ class RE_Pager
233
  if ($group_by)
234
  $sql .= ' '.$group_by.' ';
235
 
236
- if (strlen ($this->order_by) > 0)
237
- {
238
- if (!$this->is_secondary_sort ())
239
- $sql .= " ORDER BY ".$this->order_by.' '.$this->order_direction;
240
- else
241
- $sql .= " ORDER BY ".$this->order_original.' '.$this->order_direction;
242
- }
243
-
244
  if ($this->per_page > 0)
245
  $sql .= $wpdb->prepare( ' LIMIT %d,%d', $this->offset(), $this->per_page );
246
  return $sql;
@@ -361,7 +347,9 @@ class RE_Pager
361
 
362
  function sortable ($column, $text, $image = true)
363
  {
364
- $url = $this->url ($this->current_page, $column);
 
 
365
  $img = '';
366
 
367
  if (isset ($this->order_tags[$column]))
@@ -369,10 +357,7 @@ class RE_Pager
369
 
370
  if ($column == $this->order_by)
371
  {
372
- if (defined ('WP_PLUGIN_URL'))
373
- $dir = WP_PLUGIN_URL.'/'.basename (dirname (dirname (__FILE__)));
374
- else
375
- $dir = get_bloginfo ('wpurl').'/wp-content/plugins/'.basename (dirname (dirname (__FILE__)));
376
 
377
  if (strpos ($url, 'ASC') !== false)
378
  $img = '<img align="bottom" src="'.$dir.'/images/up.gif" alt="dir" width="16" height="7"/>';
90
  else if (isset ($per_page[get_class ($this)]) && isset ($per_page[get_class ($this)][$this->id]))
91
  $this->per_page = $per_page[get_class ($this)][$this->id];
92
 
 
 
 
 
 
 
93
  if (!empty ($tags))
94
  {
95
  $this->order_tags = $tags;
227
  if ($group_by)
228
  $sql .= ' '.$group_by.' ';
229
 
 
 
 
 
 
 
 
 
230
  if ($this->per_page > 0)
231
  $sql .= $wpdb->prepare( ' LIMIT %d,%d', $this->offset(), $this->per_page );
232
  return $sql;
347
 
348
  function sortable ($column, $text, $image = true)
349
  {
350
+ return $text;
351
+ $url = admin_url( add_query_arg( array( 'orderby' => $column ), 'redirection.php' ) );
352
+
353
  $img = '';
354
 
355
  if (isset ($this->order_tags[$column]))
357
 
358
  if ($column == $this->order_by)
359
  {
360
+ $dir = WP_PLUGIN_URL.'/'.basename (dirname (dirname (__FILE__)));
 
 
 
361
 
362
  if (strpos ($url, 'ASC') !== false)
363
  $img = '<img align="bottom" src="'.$dir.'/images/up.gif" alt="dir" width="16" height="7"/>';
plugin.php CHANGED
@@ -339,8 +339,7 @@ class Redirection_Plugin {
339
  }
340
 
341
  function base () {
342
- $parts = explode( '?', basename( $_SERVER['REQUEST_URI'] ) );
343
- return $parts[0];
344
  }
345
 
346
  /**
339
  }
340
 
341
  function base () {
342
+ return admin_url( $this->plugin_name );
 
343
  }
344
 
345
  /**
readme.txt CHANGED
@@ -89,6 +89,9 @@ Full documentation can be found on the [Redirection](http://urbangiraffe.com/plu
89
 
90
  == Changelog ==
91
 
 
 
 
92
  = 2.2.11 =
93
  * Add Lithuanian
94
  * Add Belarusian
89
 
90
  == Changelog ==
91
 
92
+ = 2.2.12 =
93
+ * Cleanup some XSS issues
94
+
95
  = 2.2.11 =
96
  * Add Lithuanian
97
  * Add Belarusian
redirection.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Redirection
4
  Plugin URI: http://urbangiraffe.com/plugins/redirection/
5
  Description: Manage all your 301 redirects and monitor 404 errors
6
- Version: 2.2.11
7
  Author: John Godley
8
  Author URI: http://urbangiraffe.com
9
  ============================================================================================================
@@ -257,16 +257,16 @@ class Redirection extends Redirection_Plugin {
257
 
258
  if ( isset( $_POST['deleteall'] ) && check_admin_referer( 'redirection-process_logs' ) ) {
259
  if ( isset( $_GET['module'] ) )
260
- RE_Log::delete_all( array( 'module_id' => intval( $_GET['module'] ) ), new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'created', 'DESC', 'log' ) );
261
  else if (isset($_GET['group']))
262
- RE_Log::delete_all( array( 'group_id' => intval( $_GET['group'] ) ), new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'created', 'DESC', 'log' ) );
263
  else
264
- RE_Log::delete_all( array(), new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'created', 'DESC', 'log' ) );
265
 
266
  $this->render_message( __( 'Your logs have been deleted', 'redirection' ) );
267
  }
268
 
269
- $pager = new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'created', 'DESC', 'log' );
270
 
271
  if ( isset( $_GET['module'] ) )
272
  $logs = RE_Log::get_by_module( $pager, intval( $_GET['module'] ) );
@@ -296,7 +296,7 @@ class Redirection extends Redirection_Plugin {
296
  if ( $module == 0 )
297
  $module = Red_Module::get_first_id();
298
 
299
- $pager = new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'position', 'ASC' );
300
  $items = Red_Group::get_all( $module, $pager );
301
 
302
  $this->render_admin( 'group_list', array( 'groups' => $items, 'pager' => $pager, 'modules' => Red_Module::get_for_select(), 'module' => Red_Module::get( $module ) ) );
@@ -308,7 +308,7 @@ class Redirection extends Redirection_Plugin {
308
  if ( $group == 0 )
309
  $group = Red_Group::get_first_id();
310
 
311
- $pager = new RE_Pager( $_GET, $_SERVER['REQUEST_URI'], 'position', 'ASC' );
312
  $items = Red_Item::get_by_group( $group, $pager );
313
 
314
  $this->render_admin( 'item_list', array( 'items' => $items, 'pager' => $pager, 'group' => Red_Group::get( $group ), 'groups' => Red_Group::get_for_select(), 'date_format' => get_option( 'date_format' ) ) );
3
  Plugin Name: Redirection
4
  Plugin URI: http://urbangiraffe.com/plugins/redirection/
5
  Description: Manage all your 301 redirects and monitor 404 errors
6
+ Version: 2.2.12
7
  Author: John Godley
8
  Author URI: http://urbangiraffe.com
9
  ============================================================================================================
257
 
258
  if ( isset( $_POST['deleteall'] ) && check_admin_referer( 'redirection-process_logs' ) ) {
259
  if ( isset( $_GET['module'] ) )
260
+ RE_Log::delete_all( array( 'module_id' => intval( $_GET['module'] ) ), new RE_Pager( $_GET, admin_url( add_query_arg( array( 'sub' => 'log' ), 'redirection.php' ) ), 'created', 'DESC', 'log' ) );
261
  else if (isset($_GET['group']))
262
+ RE_Log::delete_all( array( 'group_id' => intval( $_GET['group'] ) ), new RE_Pager( $_GET, admin_url( add_query_arg( array( 'sub' => 'log' ), 'redirection.php' ) ), 'created', 'DESC', 'log' ) );
263
  else
264
+ RE_Log::delete_all( array(), new RE_Pager( $_GET, admin_url( add_query_arg( array( 'sub' => 'log' ), 'redirection.php' ) ), 'created', 'DESC', 'log' ) );
265
 
266
  $this->render_message( __( 'Your logs have been deleted', 'redirection' ) );
267
  }
268
 
269
+ $pager = new RE_Pager( $_GET, admin_url( add_query_arg( array( 'sub' => 'log' ), 'redirection.php' ) ), 'created', 'DESC', 'log' );
270
 
271
  if ( isset( $_GET['module'] ) )
272
  $logs = RE_Log::get_by_module( $pager, intval( $_GET['module'] ) );
296
  if ( $module == 0 )
297
  $module = Red_Module::get_first_id();
298
 
299
+ $pager = new RE_Pager( $_GET, admin_url( add_query_arg( array( 'sub' => 'groups' ), 'redirection.php' ) ), 'position', 'ASC' );
300
  $items = Red_Group::get_all( $module, $pager );
301
 
302
  $this->render_admin( 'group_list', array( 'groups' => $items, 'pager' => $pager, 'modules' => Red_Module::get_for_select(), 'module' => Red_Module::get( $module ) ) );
308
  if ( $group == 0 )
309
  $group = Red_Group::get_first_id();
310
 
311
+ $pager = new RE_Pager( $_GET, admin_url( add_query_arg( array(), 'redirection.php' ) ), 'position', 'ASC' );
312
  $items = Red_Item::get_by_group( $group, $pager );
313
 
314
  $this->render_admin( 'item_list', array( 'items' => $items, 'pager' => $pager, 'group' => Red_Group::get( $group ), 'groups' => Red_Group::get_for_select(), 'date_format' => get_option( 'date_format' ) ) );
view/admin/annoy.php CHANGED
@@ -1,12 +1,11 @@
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <?php
3
  $options = $this->get_options ();
4
- $sub = isset ($_GET['sub']) ? $_GET['sub'] : '';
5
- $url = explode ('&', $_SERVER['REQUEST_URI']);
6
- $url = $url[0];
7
 
8
  if (!$options['support']) :?>
9
- <div style="text-align: center; width: 80px; height: 50px; float: right; margin: 5px 15px 1px 0; padding: 4px 3px 0px 3px;-moz-border-radius: 5px; -webkit-border-radius: 5px;" id="support-annoy">
10
- <a href="<?php echo $this->base(); ?>?page=redirection.php&amp;sub=support"><img src="<?php echo $this->url () ?>/images/donate.gif" alt="support" /></a>
 
 
11
  </div>
12
  <?php endif; ?>
1
  <?php if (!defined ('ABSPATH')) die ('No direct access allowed'); ?>
2
  <?php
3
  $options = $this->get_options ();
 
 
 
4
 
5
  if (!$options['support']) :?>
6
+ <div style="text-align: center; width: 94px; height: 32px; float: right; margin: 5px 15px 1px 0; padding: 4px 3px 0px 3px;-moz-border-radius: 5px; -webkit-border-radius: 5px;" id="support-annoy">
7
+ <a href="<?php echo admin_url( 'page=redirection.php&amp;sub=support' ); ?>">
8
+ <img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" alt="support" />
9
+ </a>
10
  </div>
11
  <?php endif; ?>
view/admin/group_list.php CHANGED
@@ -8,7 +8,7 @@
8
  <?php $this->render_admin( 'submenu' ); ?>
9
 
10
  <div id="pager" class="pager">
11
- <form method="get" action="<?php echo $this->url( $pager->url ) ?>">
12
  <input type="hidden" name="page" value="<?php echo esc_attr( $_GET['page'] ) ?>"/>
13
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page() ?>"/>
14
  <input type="hidden" name="sub" value="<?php echo esc_attr( $_GET['sub'] ) ?>"/>
@@ -33,8 +33,8 @@
33
  <ul id="redirections_header" class="redirections_header">
34
  <li>
35
  <div class="tools" style="width: 6.5em">&nbsp;</div>
36
- <div class="count"><?php echo $pager->sortable( 'redirects', __( 'Hits', 'redirection' ) ) ?></div>
37
- <div class="item"><?php echo $pager->sortable( 'name', __( 'Name', 'redirection' ) ) ?></div>
38
  </li>
39
  </ul>
40
 
@@ -93,7 +93,7 @@
93
  <div class="wrap">
94
  <h2><?php _e( 'Add Group', 'redirection' ); ?></h2>
95
 
96
- <form action="<?php echo $this->url( $_SERVER['REQUEST_URI'] ) ?>" method="post" accept-charset="utf-8">
97
  <?php wp_nonce_field( 'redirection-add_group' ); ?>
98
  <table class="form-table">
99
  <tr>
8
  <?php $this->render_admin( 'submenu' ); ?>
9
 
10
  <div id="pager" class="pager">
11
+ <form method="get" action="">
12
  <input type="hidden" name="page" value="<?php echo esc_attr( $_GET['page'] ) ?>"/>
13
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page() ?>"/>
14
  <input type="hidden" name="sub" value="<?php echo esc_attr( $_GET['sub'] ) ?>"/>
33
  <ul id="redirections_header" class="redirections_header">
34
  <li>
35
  <div class="tools" style="width: 6.5em">&nbsp;</div>
36
+ <div class="count"><?php echo __( 'Hits', 'redirection' ) ?></div>
37
+ <div class="item"><?php echo __( 'Name', 'redirection' ) ?></div>
38
  </li>
39
  </ul>
40
 
93
  <div class="wrap">
94
  <h2><?php _e( 'Add Group', 'redirection' ); ?></h2>
95
 
96
+ <form action="" method="post" accept-charset="utf-8">
97
  <?php wp_nonce_field( 'redirection-add_group' ); ?>
98
  <table class="form-table">
99
  <tr>
view/admin/item_list.php CHANGED
@@ -16,7 +16,7 @@
16
  <?php $this->render_admin( 'submenu' ); ?>
17
 
18
  <div id="pager" class="pager">
19
- <form method="get" action="<?php echo $this->url ($pager->url) ?>">
20
  <input type="hidden" name="page" value="<?php echo $_GET['page'] ?>"/>
21
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page () ?>"/>
22
  <input type="hidden" name="sub" value="<?php echo esc_attr( isset($_GET['sub']) ? $_GET['sub'] : '' )?>"/>
@@ -38,10 +38,10 @@
38
 
39
  <ul id="redirections_header" class="redirections_header">
40
  <li>
41
- <div class="date" style="width: 8em"><?php echo $pager->sortable ('last_access', __ ('Last Access', 'redirection')) ?></div>
42
- <div class="count"><?php echo $pager->sortable ('last_count', __ ('Hits', 'redirection')) ?></div>
43
- <div class="type"><?php echo $pager->sortable ('action_type', __ ('Type', 'redirection')) ?></div>
44
- <div class="item"><?php echo $pager->sortable ('url', __ ('URL', 'redirection')) ?> / <?php echo $pager->sortable ('position', __ ('Position', 'redirection')) ?></div>
45
  </li>
46
  </ul>
47
 
16
  <?php $this->render_admin( 'submenu' ); ?>
17
 
18
  <div id="pager" class="pager">
19
+ <form method="get" action="">
20
  <input type="hidden" name="page" value="<?php echo $_GET['page'] ?>"/>
21
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page () ?>"/>
22
  <input type="hidden" name="sub" value="<?php echo esc_attr( isset($_GET['sub']) ? $_GET['sub'] : '' )?>"/>
38
 
39
  <ul id="redirections_header" class="redirections_header">
40
  <li>
41
+ <div class="date" style="width: 8em"><?php echo __ ('Last Access', 'redirection') ?></div>
42
+ <div class="count"><?php echo __('Hits', 'redirection') ?></div>
43
+ <div class="type"><?php echo __ ('Type', 'redirection') ?></div>
44
+ <div class="item"><?php echo __('URL', 'redirection') ?> / <?php echo __ ('Position', 'redirection') ?></div>
45
  </li>
46
  </ul>
47
 
view/admin/log.php CHANGED
@@ -7,7 +7,7 @@
7
 
8
  <?php $this->render_admin( 'submenu' ); ?>
9
 
10
- <form method="get" action="<?php echo $this->url ($pager->url) ?>">
11
  <input type="hidden" name="page" value="<?php echo esc_attr( $_GET['page'] ) ?>"/>
12
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page () ?>"/>
13
  <input type="hidden" name="sub" value="<?php echo esc_attr( $_GET['sub'] ) ?>"/>
@@ -65,8 +65,8 @@
65
  <input type="checkbox" name="checkall" value=""/>
66
  </th>
67
  <th style="width:9em"<?php $pager->sortable_class ('created') ?>><?php echo $pager->sortable ('created', __ ('Date', 'redirection')) ?></th>
68
- <th><?php echo $pager->sortable ('url', __ ('Source URL', 'redirection')); ?></th>
69
- <th><?php echo $pager->sortable ('referrer', __ ('Referrer', 'redirection')); ?></th>
70
  <th style="width:9em" class="center<?php $pager->sortable_class ('ip', false) ?>"><?php echo $pager->sortable ('ip', __ ('IP', 'redirection')); ?></th>
71
  <th style="width:16px"></th>
72
  </tr>
@@ -94,7 +94,7 @@
94
  <h2><?php _e ('Process Current Logs', 'redirection'); ?></h2>
95
  <p><?php _e ('These actions will affect all currently available logs (i.e. your search phrase will restrict the log items).', 'redirection'); ?></p>
96
 
97
- <form action="<?php echo $this->url ($_SERVER['REQUEST_URI']) ?>" method="post" accept-charset="utf-8">
98
  <?php wp_nonce_field ('redirection-process_logs'); ?>
99
 
100
  <input class="button-primary" type="submit" name="deleteall" value="<?php _e ('Delete Logs', 'redirection'); ?>"/>
7
 
8
  <?php $this->render_admin( 'submenu' ); ?>
9
 
10
+ <form method="get" action="">
11
  <input type="hidden" name="page" value="<?php echo esc_attr( $_GET['page'] ) ?>"/>
12
  <input type="hidden" name="curpage" value="<?php echo $pager->current_page () ?>"/>
13
  <input type="hidden" name="sub" value="<?php echo esc_attr( $_GET['sub'] ) ?>"/>
65
  <input type="checkbox" name="checkall" value=""/>
66
  </th>
67
  <th style="width:9em"<?php $pager->sortable_class ('created') ?>><?php echo $pager->sortable ('created', __ ('Date', 'redirection')) ?></th>
68
+ <th><?php echo __ ('Source URL', 'redirection'); ?></th>
69
+ <th><?php echo __ ('Referrer', 'redirection'); ?></th>
70
  <th style="width:9em" class="center<?php $pager->sortable_class ('ip', false) ?>"><?php echo $pager->sortable ('ip', __ ('IP', 'redirection')); ?></th>
71
  <th style="width:16px"></th>
72
  </tr>
94
  <h2><?php _e ('Process Current Logs', 'redirection'); ?></h2>
95
  <p><?php _e ('These actions will affect all currently available logs (i.e. your search phrase will restrict the log items).', 'redirection'); ?></p>
96
 
97
+ <form action="" method="post" accept-charset="utf-8">
98
  <?php wp_nonce_field ('redirection-process_logs'); ?>
99
 
100
  <input class="button-primary" type="submit" name="deleteall" value="<?php _e ('Delete Logs', 'redirection'); ?>"/>
view/admin/module_list.php CHANGED
@@ -34,7 +34,7 @@
34
  <h2><?php _e( 'Add Module', 'redirection' ); ?></h2>
35
  <p><?php _e( 'A module is a controlling element that determines how redirections are handled. Elements in a WordPress module are handled by WordPress, elements in an Apache module are handled by <code>.htaccess</code>, and elements in a 404 module affect how 404 errors are logged.', 'redirection' ); ?></p>
36
 
37
- <form action="<?php echo $this->url( $_SERVER['REQUEST_URI'] ) ?>" method="post" accept-charset="utf-8">
38
  <?php wp_nonce_field( 'redirection-module_add' ); ?>
39
 
40
  <table class="edit" summary="modules">
34
  <h2><?php _e( 'Add Module', 'redirection' ); ?></h2>
35
  <p><?php _e( 'A module is a controlling element that determines how redirections are handled. Elements in a WordPress module are handled by WordPress, elements in an Apache module are handled by <code>.htaccess</code>, and elements in a 404 module affect how 404 errors are logged.', 'redirection' ); ?></p>
36
 
37
+ <form action="" method="post" accept-charset="utf-8">
38
  <?php wp_nonce_field( 'redirection-module_add' ); ?>
39
 
40
  <table class="edit" summary="modules">
view/admin/options.php CHANGED
@@ -6,7 +6,7 @@
6
  <h2><?php _e( 'Options', 'redirection' ) ?></h2>
7
  <?php $this->render_admin( 'submenu' ); ?>
8
 
9
- <form method="post" action="<?php echo $this->url( $_SERVER['REQUEST_URI'] ) ?>" style="clear: both">
10
 
11
  <?php wp_nonce_field( 'redirection-update_options' ); ?>
12
 
@@ -96,7 +96,7 @@
96
 
97
  <p><?php _e( 'Here you can import redirections from an existing .htaccess file, a CSV file, or a Redirection XML.', 'redirection' ); ?></p>
98
 
99
- <form action="<?php echo $this->url( $_SERVER['REQUEST_URI'] ) ?>" method="post" accept-charset="utf-8" enctype="multipart/form-data">
100
  <?php wp_nonce_field( 'redirection-import' ); ?>
101
 
102
  <input type="file" name="upload" value=""/>
@@ -114,7 +114,7 @@
114
  <h2><?php _e( 'Delete Redirection', 'redirection' ); ?></h2>
115
  <p><?php _e( 'Selecting this option will delete all redirections, all logs, and any options associated with the Redirection plugin. Make sure this is what you want to do.', 'redirection' ); ?></p>
116
 
117
- <form action="<?php echo $this->url( $_SERVER['REQUEST_URI'] ) ?>" method="post" accept-charset="utf-8">
118
  <?php wp_nonce_field( 'redirection-delete_plugin' ); ?>
119
 
120
  <input class="button-primary" type="submit" name="delete" value="<?php _e( 'Delete', 'redirection' ) ?>"/>
6
  <h2><?php _e( 'Options', 'redirection' ) ?></h2>
7
  <?php $this->render_admin( 'submenu' ); ?>
8
 
9
+ <form method="post" action="" style="clear: both">
10
 
11
  <?php wp_nonce_field( 'redirection-update_options' ); ?>
12
 
96
 
97
  <p><?php _e( 'Here you can import redirections from an existing .htaccess file, a CSV file, or a Redirection XML.', 'redirection' ); ?></p>
98
 
99
+ <form action="" method="post" accept-charset="utf-8" enctype="multipart/form-data">
100
  <?php wp_nonce_field( 'redirection-import' ); ?>
101
 
102
  <input type="file" name="upload" value=""/>
114
  <h2><?php _e( 'Delete Redirection', 'redirection' ); ?></h2>
115
  <p><?php _e( 'Selecting this option will delete all redirections, all logs, and any options associated with the Redirection plugin. Make sure this is what you want to do.', 'redirection' ); ?></p>
116
 
117
+ <form action="" method="post" accept-charset="utf-8">
118
  <?php wp_nonce_field( 'redirection-delete_plugin' ); ?>
119
 
120
  <input class="button-primary" type="submit" name="delete" value="<?php _e( 'Delete', 'redirection' ) ?>"/>