[ticket/269] Fix codesniffer complaints

B3P-269
This commit is contained in:
Marc Alexander
2014-06-27 17:38:00 +02:00
parent 03509a3195
commit 4a7f5e6ed8
17 changed files with 22 additions and 1728 deletions

View File

@@ -9,11 +9,6 @@
namespace board3\portal\acp;
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* @package module_install
*/

View File

@@ -9,14 +9,6 @@
namespace board3\portal\acp;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
class portal_module
{
public $u_action;
@@ -396,19 +388,19 @@ class portal_module
{
$this->move_module_up($module_id);
}
elseif ($action == 'move_down')
else if ($action == 'move_down')
{
$this->move_module_down($module_id);
}
elseif($action == 'move_right')
else if($action == 'move_right')
{
$this->move_module_right($module_id);
}
elseif($action == 'move_left')
else if($action == 'move_left')
{
$this->move_module_left($module_id);
}
elseif ($action == 'delete')
else if ($action == 'delete')
{
$this->module_delete($id, $mode, $action, $module_id);
}
@@ -429,7 +421,7 @@ class portal_module
{
$submit = $this->can_move_module(array('left', 'right'), $module_classname);
}
elseif (in_array($column_string, array('center', 'top', 'bottom')))
else if (in_array($column_string, array('center', 'top', 'bottom')))
{
$submit = $this->can_move_module(array('center', 'top', 'bottom'), $module_classname);
}
@@ -519,7 +511,7 @@ class portal_module
continue;
}
}
elseif (in_array($column_string, array('center', 'top', 'bottom')))
else if (in_array($column_string, array('center', 'top', 'bottom')))
{
// does the module already exist in the center columns?
if (!$this->can_move_module(array('center', 'top', 'bottom'), $module_class))
@@ -956,7 +948,7 @@ class portal_module
{
$move_action = 1; // we move 1 column to the left
}
elseif($this->c_class->columns & column_string_const(column_num_string($module_data['module_column'] - 2)) && $module_data['module_column'] != 2)
else if($this->c_class->columns & column_string_const(column_num_string($module_data['module_column'] - 2)) && $module_data['module_column'] != 2)
{
$move_action = 2; // we move 2 columns to the left
}
@@ -980,7 +972,7 @@ class portal_module
{
trigger_error($this->user->lang['UNABLE_TO_MOVE'] . adm_back_link($this->u_action));
}
elseif ($column_string == 'center' && !$this->can_move_module(array('top', 'center', 'bottom'), $module_data['module_classname']))
else if ($column_string == 'center' && !$this->can_move_module(array('top', 'center', 'bottom'), $module_data['module_classname']))
{
// we are moving from the right to the center column so we should move to the left column instead
$move_action = 2;
@@ -1051,7 +1043,7 @@ class portal_module
{
$move_action = 1; // we move 1 column to the right
}
elseif($this->c_class->columns & column_string_const(column_num_string($module_data['module_column'] + 2)) && $module_data['module_column'] != 2)
else if($this->c_class->columns & column_string_const(column_num_string($module_data['module_column'] + 2)) && $module_data['module_column'] != 2)
{
$move_action = 2; // we move 2 columns to the right
}
@@ -1075,7 +1067,7 @@ class portal_module
{
trigger_error($this->user->lang['UNABLE_TO_MOVE'] . adm_back_link($this->u_action));
}
elseif ($column_string == 'center' && !$this->can_move_module(array('top', 'center', 'bottom'), $module_data['module_classname']))
else if ($column_string == 'center' && !$this->can_move_module(array('top', 'center', 'bottom'), $module_data['module_classname']))
{
// we are moving from the left to the center column so we should move to the right column instead
$move_action = 2;
@@ -1264,7 +1256,7 @@ class portal_module
$submit = false;
}
}
elseif (in_array($target_column, array('center', 'top', 'bottom')))
else if (in_array($target_column, array('center', 'top', 'bottom')))
{
// does the module already exist in the center columns?
if (isset($this->module_column[$module_class]) &&