[ticket/382] More code clean up

B3P-382
This commit is contained in:
Marc Alexander
2014-10-31 07:40:44 +01:00
parent 7e6ba60948
commit b402df024d
3 changed files with 17 additions and 22 deletions

View File

@@ -213,6 +213,10 @@ class leaders extends module_base
{ {
$which_row = 'b3p_moderators'; $which_row = 'b3p_moderators';
} }
else
{
continue;
}
if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id']) if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id'])
{ {

View File

@@ -106,7 +106,6 @@ class links extends module_base
*/ */
public function get_template_side($module_id) public function get_template_side($module_id)
{ {
$links = array();
$portal_config = obtain_portal_config(); $portal_config = obtain_portal_config();
$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]); $links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
@@ -243,8 +242,6 @@ class links extends module_base
$link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach $link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach
$portal_config = obtain_portal_config(); $portal_config = obtain_portal_config();
$links = array();
$links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]); $links = $this->utf_unserialize($portal_config['board3_links_array_' . $module_id]);
$u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&mode=config&module_id=' . $module_id); $u_action = append_sid('index.' . $this->php_ext, 'i=\board3\portal\acp\portal_module&mode=config&module_id=' . $module_id);
@@ -430,8 +427,6 @@ class links extends module_base
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
return; return;
break;
} }
for ($i = 0; $i < sizeof($links); $i++) for ($i = 0; $i < sizeof($links); $i++)

View File

@@ -107,7 +107,6 @@ class main_menu extends module_base
*/ */
public function get_template_side($module_id) public function get_template_side($module_id)
{ {
$links = array();
$portal_config = obtain_portal_config(); $portal_config = obtain_portal_config();
$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]); $links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
@@ -175,6 +174,7 @@ class main_menu extends module_base
{ {
// get the correct group IDs from the database // get the correct group IDs from the database
$in_ary = array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA'); $in_ary = array('GUESTS', 'REGISTERED', 'REGISTERED_COPPA');
$groups_ary = array();
$sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . ' WHERE ' . $this->db->sql_in_set('group_name', $in_ary); $sql = 'SELECT group_id, group_name FROM ' . GROUPS_TABLE . ' WHERE ' . $this->db->sql_in_set('group_name', $in_ary);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
@@ -298,8 +298,6 @@ class main_menu extends module_base
$link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach $link_id = $this->request->variable('id', 99999999); // 0 will trigger unwanted behavior, therefore we set a number we should never reach
$portal_config = obtain_portal_config(); $portal_config = obtain_portal_config();
$links = array();
$links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]); $links = $this->utf_unserialize($portal_config['board3_menu_array_' . $module_id]);
$u_action = append_sid('index.' . $this->php_ext, 'i=%5Cboard3%5Cportal%5Cacp%5Cportal_module&amp;mode=config&amp;module_id=' . $module_id); $u_action = append_sid('index.' . $this->php_ext, 'i=%5Cboard3%5Cportal%5Cacp%5Cportal_module&amp;mode=config&amp;module_id=' . $module_id);
@@ -492,8 +490,6 @@ class main_menu extends module_base
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
return; return;
break;
} }
for ($i = 0; $i < sizeof($links); $i++) for ($i = 0; $i < sizeof($links); $i++)