@@ -214,23 +214,23 @@ |
||
| 214 | 214 | foreach ($branch as $i => $row) |
| 215 | 215 | { |
| 216 | 216 | $left_id = $right_id + 1; |
| 217 | - $right_id = $right_id + 2; |
|
| 217 | + $right_id = $right_id + 2; |
|
| 218 | 218 | |
| 219 | 219 | $sql_data[$i] = $row; |
| 220 | - $sql_data[$i]['parent_id'] = $parent_id; |
|
| 221 | - $sql_data[$i]['left_id'] = $left_id; |
|
| 222 | - $sql_data[$i]['right_id'] = $right_id; |
|
| 223 | - $sql_data[$i]['depth'] = $depth; |
|
| 220 | + $sql_data[$i]['parent_id'] = $parent_id; |
|
| 221 | + $sql_data[$i]['left_id'] = $left_id; |
|
| 222 | + $sql_data[$i]['right_id'] = $right_id; |
|
| 223 | + $sql_data[$i]['depth'] = $depth; |
|
| 224 | 224 | |
| 225 | 225 | if ($row['parent_id']) |
| 226 | 226 | { |
| 227 | - $left_id = $sql_data[$row['parent_id']]['right_id']; |
|
| 228 | - $right_id = $left_id + 1; |
|
| 227 | + $left_id = $sql_data[$row['parent_id']]['right_id']; |
|
| 228 | + $right_id = $left_id + 1; |
|
| 229 | 229 | |
| 230 | - $sql_data[$i]['parent_id'] = $row['parent_id']; |
|
| 231 | - $sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1; |
|
| 232 | - $sql_data[$i]['left_id'] = $left_id; |
|
| 233 | - $sql_data[$i]['right_id'] = $right_id; |
|
| 230 | + $sql_data[$i]['parent_id'] = $row['parent_id']; |
|
| 231 | + $sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1; |
|
| 232 | + $sql_data[$i]['left_id'] = $left_id; |
|
| 233 | + $sql_data[$i]['right_id'] = $right_id; |
|
| 234 | 234 | |
| 235 | 235 | $this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch); |
| 236 | 236 | } |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | */ |
| 78 | 78 | public function update_item($item_id, array $sql_data) |
| 79 | 79 | { |
| 80 | - $sql = "UPDATE {$this->table_name} |
|
| 80 | + $sql = "update {$this->table_name} |
|
| 81 | 81 | SET " . $this->db->sql_build_array('UPDATE', $sql_data) . " |
| 82 | 82 | WHERE $this->column_item_id = " . (int) $item_id; |
| 83 | 83 | $this->db->sql_query($sql); |
@@ -14,12 +14,12 @@ |
||
| 14 | 14 | class nestedset extends builder |
| 15 | 15 | { |
| 16 | 16 | /** |
| 17 | - * Construct |
|
| 18 | - * |
|
| 19 | - * @param \phpbb\db\driver\driver_interface $db Database connection |
|
| 20 | - * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
| 21 | - * @param string $table_name Table name |
|
| 22 | - */ |
|
| 17 | + * Construct |
|
| 18 | + * |
|
| 19 | + * @param \phpbb\db\driver\driver_interface $db Database connection |
|
| 20 | + * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
| 21 | + * @param string $table_name Table name |
|
| 22 | + */ |
|
| 23 | 23 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name) |
| 24 | 24 | { |
| 25 | 25 | parent::__construct( |
@@ -17,8 +17,8 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | public function execute($style_id) |
| 19 | 19 | { |
| 20 | - $name = $this->request->variable('block', ''); |
|
| 21 | - $route = $this->request->variable('route', ''); |
|
| 20 | + $name = $this->request->variable('block', ''); |
|
| 21 | + $route = $this->request->variable('route', ''); |
|
| 22 | 22 | |
| 23 | 23 | if (($block_instance = $this->block_factory->get_block($name)) === null) |
| 24 | 24 | { |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $status = array(); |
| 27 | 27 | $headers = $this->get_headers($url, $curl); |
| 28 | 28 | |
| 29 | - preg_match('/HTTP\/.* ([0-9]+) .*/', $headers , $status); |
|
| 29 | + preg_match('/HTTP\/.* ([0-9]+) .*/', $headers, $status); |
|
| 30 | 30 | |
| 31 | 31 | return ($status[1] == 200) ? true : false; |
| 32 | 32 | } |
@@ -68,9 +68,9 @@ |
||
| 68 | 68 | public function load_permission_language(\phpbb\event\data $event) |
| 69 | 69 | { |
| 70 | 70 | $permissions = $event['permissions']; |
| 71 | - $permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc'); |
|
| 72 | - $permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc'); |
|
| 73 | - $permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc'); |
|
| 71 | + $permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc'); |
|
| 72 | + $permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc'); |
|
| 73 | + $permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc'); |
|
| 74 | 74 | $permissions['a_sm_filemanager'] = array('lang' => 'ACL_A_SM_FILEMANAGER', 'cat' => 'misc'); |
| 75 | 75 | $permissions['u_sm_filemanager'] = array('lang' => 'ACL_U_SM_FILEMANAGER', 'cat' => 'misc'); |
| 76 | 76 | $event['permissions'] = $permissions; |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | $content = $this->request->variable('content', '', true); |
| 86 | 86 | $cblocks = $this->get_custom_blocks(); |
| 87 | 87 | |
| 88 | - $sql_data = $this->get_default_fields($block_id); |
|
| 88 | + $sql_data = $this->get_default_fields($block_id); |
|
| 89 | 89 | $sql_data['block_content'] = $content; |
| 90 | 90 | |
| 91 | 91 | generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, false, true); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $new_list = trim($new_list, ','); |
| 50 | 50 | |
| 51 | 51 | $new_userlist = self::_get_userlist($new_list); |
| 52 | - $current_user =& $new_userlist[$curr_key - 1]; |
|
| 52 | + $current_user = & $new_userlist[$curr_key - 1]; |
|
| 53 | 53 | $settings['current_user'] = (int) $current_user; |
| 54 | 54 | $settings['userlist'] = trim($new_list); |
| 55 | 55 | $settings['last_changed'] = 0; |
@@ -200,7 +200,7 @@ |
||
| 200 | 200 | list($controller_service, $controller_method) = explode(':', $controller); |
| 201 | 201 | $controller_params = $symfony_request->attributes->get('_route_params'); |
| 202 | 202 | $controller_object = $this->phpbb_container->get($controller_service); |
| 203 | - $controller_class = get_class($controller_object); |
|
| 203 | + $controller_class = get_class($controller_object); |
|
| 204 | 204 | |
| 205 | 205 | $r = new \ReflectionMethod($controller_class, $controller_method); |
| 206 | 206 | $class_params = $r->getParameters(); |
@@ -151,7 +151,7 @@ |
||
| 151 | 151 | $vars = array('bulk_options', 'forumslist'); |
| 152 | 152 | extract($this->phpbb_dispatcher->trigger_event('blitze.sitemaker.acp_add_bulk_menu_options', compact($vars))); |
| 153 | 153 | |
| 154 | - $bulk_options['FORUMS'] = $this->get_forums_string($forumslist); |
|
| 154 | + $bulk_options['FORUMS'] = $this->get_forums_string($forumslist); |
|
| 155 | 155 | |
| 156 | 156 | $this->template->assign_var('bulk_options', $bulk_options); |
| 157 | 157 | } |