| @@ -260,8 +260,7 @@ | ||
| 260 | 260 | 'depth' => $new_parent['depth'] + 1, | 
| 261 | 261 | 'right_id' => --$new_parent['right_id'], | 
| 262 | 262 | ); | 
| 263 | - } | |
| 264 | - else | |
| 263 | + } else | |
| 265 | 264 |  		{ | 
| 266 | 265 | return array( | 
| 267 | 266 | 'depth' => 0, | 
| @@ -55,8 +55,8 @@ discard block | ||
| 55 | 55 | */ | 
| 56 | 56 | public function get_item_info($item_id = 0) | 
| 57 | 57 |  	{ | 
| 58 | -		$sql = 'SELECT * FROM ' . $this->table_name . ' ' . $this->get_sql_where('WHERE') . | |
| 59 | -			(($item_id) ? " AND {$this->column_item_id} = " . (int) $item_id : ''); | |
| 58 | +		$sql = 'SELECT * FROM '.$this->table_name.' '.$this->get_sql_where('WHERE'). | |
| 59 | +			(($item_id) ? " AND {$this->column_item_id} = ".(int) $item_id : ''); | |
| 60 | 60 | |
| 61 | 61 | $result = $this->db->sql_query($sql); | 
| 62 | 62 | $row = $this->db->sql_fetchrow($result); | 
| @@ -75,8 +75,8 @@ discard block | ||
| 75 | 75 | public function update_item($item_id, array $sql_data) | 
| 76 | 76 |  	{ | 
| 77 | 77 |  		$sql = "UPDATE {$this->table_name} | 
| 78 | -			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . " | |
| 79 | - WHERE $this->column_item_id = " . (int) $item_id; | |
| 78 | +			SET ".$this->db->sql_build_array('UPDATE', $sql_data)." | |
| 79 | + WHERE $this->column_item_id = ".(int) $item_id; | |
| 80 | 80 | $this->db->sql_query($sql); | 
| 81 | 81 | |
| 82 | 82 | return $sql_data; | 
| @@ -109,7 +109,7 @@ discard block | ||
| 109 | 109 | |
| 110 | 110 | // Rather than updating each item individually, we will just delete all items | 
| 111 | 111 | // then add them all over again with new parent_id|left_id|right_id | 
| 112 | -		$this->db->sql_query("DELETE FROM {$this->table_name} " . $this->get_sql_where('WHERE')); | |
| 112 | +		$this->db->sql_query("DELETE FROM {$this->table_name} ".$this->get_sql_where('WHERE')); | |
| 113 | 113 | |
| 114 | 114 | // Now we add it back | 
| 115 | 115 | $sql_data = $this->add_sub_tree($tree, 0); | 
| @@ -158,7 +158,7 @@ discard block | ||
| 158 | 158 | |
| 159 | 159 | if ($depth && !$parent_id) | 
| 160 | 160 |  			{ | 
| 161 | - throw new \RuntimeException($this->message_prefix . 'MALFORMED_TREE'); | |
| 161 | + throw new \RuntimeException($this->message_prefix.'MALFORMED_TREE'); | |
| 162 | 162 | } | 
| 163 | 163 | |
| 164 | 164 | $key = $i + $max_id + 1; | 
| @@ -230,23 +230,23 @@ discard block | ||
| 230 | 230 | foreach ($branch as $i => $row) | 
| 231 | 231 |  		{ | 
| 232 | 232 | $left_id = $right_id + 1; | 
| 233 | - $right_id = $right_id + 2; | |
| 233 | + $right_id = $right_id + 2; | |
| 234 | 234 | |
| 235 | 235 | $sql_data[$i] = $row; | 
| 236 | - $sql_data[$i]['parent_id'] = $parent_id; | |
| 237 | - $sql_data[$i]['left_id'] = $left_id; | |
| 238 | - $sql_data[$i]['right_id'] = $right_id; | |
| 239 | - $sql_data[$i]['depth'] = $depth; | |
| 236 | + $sql_data[$i]['parent_id'] = $parent_id; | |
| 237 | + $sql_data[$i]['left_id'] = $left_id; | |
| 238 | + $sql_data[$i]['right_id'] = $right_id; | |
| 239 | + $sql_data[$i]['depth'] = $depth; | |
| 240 | 240 | |
| 241 | 241 | if ($row['parent_id']) | 
| 242 | 242 |  			{ | 
| 243 | - $left_id = $sql_data[$row['parent_id']]['right_id']; | |
| 244 | - $right_id = $left_id + 1; | |
| 243 | + $left_id = $sql_data[$row['parent_id']]['right_id']; | |
| 244 | + $right_id = $left_id + 1; | |
| 245 | 245 | |
| 246 | - $sql_data[$i]['parent_id'] = $row['parent_id']; | |
| 247 | - $sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1; | |
| 248 | - $sql_data[$i]['left_id'] = $left_id; | |
| 249 | - $sql_data[$i]['right_id'] = $right_id; | |
| 246 | + $sql_data[$i]['parent_id'] = $row['parent_id']; | |
| 247 | + $sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1; | |
| 248 | + $sql_data[$i]['left_id'] = $left_id; | |
| 249 | + $sql_data[$i]['right_id'] = $right_id; | |
| 250 | 250 | |
| 251 | 251 | $this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch); | 
| 252 | 252 | } | 
| @@ -272,7 +272,7 @@ discard block | ||
| 272 | 272 |  				$this->db->sql_transaction('rollback'); | 
| 273 | 273 | $this->lock->release(); | 
| 274 | 274 | |
| 275 | - throw new \RuntimeException($this->message_prefix . 'INVALID_PARENT'); | |
| 275 | + throw new \RuntimeException($this->message_prefix.'INVALID_PARENT'); | |
| 276 | 276 | } | 
| 277 | 277 | |
| 278 | 278 | // adjust items in affected branch | 
| @@ -300,7 +300,7 @@ discard block | ||
| 300 | 300 | protected function get_max_id($column, $use_sql_where = true) | 
| 301 | 301 |  	{ | 
| 302 | 302 | $sql = "SELECT MAX($column) AS $column | 
| 303 | -			FROM {$this->table_name} " . | |
| 303 | +			FROM {$this->table_name} ". | |
| 304 | 304 |  			(($use_sql_where) ? $this->get_sql_where('WHERE') : ''); | 
| 305 | 305 | $result = $this->db->sql_query($sql); | 
| 306 | 306 | $max_id = $this->db->sql_fetchfield($column); | 
| @@ -41,8 +41,7 @@ | ||
| 41 | 41 | if (is_array($message)) | 
| 42 | 42 |  		{ | 
| 43 | 43 | $this->message = (string) $message[0]; | 
| 44 | - } | |
| 45 | - else | |
| 44 | + } else | |
| 46 | 45 |  		{ | 
| 47 | 46 | $this->message = $message; | 
| 48 | 47 | } | 
| @@ -96,10 +96,10 @@ | ||
| 96 | 96 | foreach ($this->message_full as &$message) | 
| 97 | 97 |  		{ | 
| 98 | 98 | // Attempt to translate each portion | 
| 99 | -			$translated_message = $translator->lang('EXCEPTION_' . $message); | |
| 99 | +			$translated_message = $translator->lang('EXCEPTION_'.$message); | |
| 100 | 100 | |
| 101 | 101 | // Check if translating did anything | 
| 102 | - if ($translated_message !== 'EXCEPTION_' . $message) | |
| 102 | + if ($translated_message !== 'EXCEPTION_'.$message) | |
| 103 | 103 |  			{ | 
| 104 | 104 | // It did, so replace message with the translated version | 
| 105 | 105 | $message = $translated_message; | 
| @@ -40,8 +40,7 @@ | ||
| 40 | 40 | if ($this->can_track_by_lastread()) | 
| 41 | 41 |  		{ | 
| 42 | 42 |  			$info = $this->build_tracking_info('get_topic_tracking', $forums, $topics); | 
| 43 | - } | |
| 44 | - else if ($this->can_track_anonymous()) | |
| 43 | + } else if ($this->can_track_anonymous()) | |
| 45 | 44 |  		{ | 
| 46 | 45 |  			$info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics); | 
| 47 | 46 | } | 
| @@ -91,8 +91,8 @@ discard block | ||
| 91 | 91 | */ | 
| 92 | 92 | private function clean_styles() | 
| 93 | 93 |  	{ | 
| 94 | - $routes_ary = $this->manager->get_routes_per_style(); | |
| 95 | - $style_ids = $this->get_style_ids(); | |
| 94 | + $routes_ary = $this->manager->get_routes_per_style(); | |
| 95 | + $style_ids = $this->get_style_ids(); | |
| 96 | 96 | |
| 97 | 97 | $routes = array(); | 
| 98 | 98 | foreach ($routes_ary as $style_id => $style_routes) | 
| @@ -122,7 +122,7 @@ discard block | ||
| 122 | 122 | |
| 123 | 123 | foreach ($routes as $route => $row) | 
| 124 | 124 |  		{ | 
| 125 | - $url = $board_url . '/' . (($row['ext_name']) ? 'app.php' : '') . $row['route']; | |
| 125 | + $url = $board_url.'/'.(($row['ext_name']) ? 'app.php' : '').$row['route']; | |
| 126 | 126 | |
| 127 | 127 | // Route no longer exists => remove all blocks for route | 
| 128 | 128 | if ($this->url_checker->exists($url) !== true) | 
| @@ -185,7 +185,7 @@ discard block | ||
| 185 | 185 | |
| 186 | 186 | if (sizeof($block_ids)) | 
| 187 | 187 |  		{ | 
| 188 | -			$this->db->sql_query('DELETE FROM ' . $this->cblocks_table . ' WHERE ' . $this->db->sql_in_set('block_id', $block_ids)); | |
| 188 | +			$this->db->sql_query('DELETE FROM '.$this->cblocks_table.' WHERE '.$this->db->sql_in_set('block_id', $block_ids)); | |
| 189 | 189 | } | 
| 190 | 190 | } | 
| 191 | 191 | |
| @@ -25,7 +25,7 @@ discard block | ||
| 25 | 25 |  	{ | 
| 26 | 26 | foreach ($data as $name => $value) | 
| 27 | 27 |  		{ | 
| 28 | - $mutator = 'set_' . $name; | |
| 28 | + $mutator = 'set_'.$name; | |
| 29 | 29 | $this->$mutator($value); | 
| 30 | 30 | } | 
| 31 | 31 | } | 
| @@ -65,7 +65,7 @@ discard block | ||
| 65 | 65 | $data = array(); | 
| 66 | 66 | foreach ($attributes as $attribute) | 
| 67 | 67 |  		{ | 
| 68 | - $accessor = 'get_' . $attribute; | |
| 68 | + $accessor = 'get_'.$attribute; | |
| 69 | 69 | $data[$attribute] = $this->$accessor(); | 
| 70 | 70 | } | 
| 71 | 71 | unset($data['db_fields'], $data['required_fields']); | 
| @@ -43,8 +43,7 @@ | ||
| 43 | 43 |  			if ('get' == $match[1]) | 
| 44 | 44 |  			{ | 
| 45 | 45 | return $this->$attribute; | 
| 46 | - } | |
| 47 | - else | |
| 46 | + } else | |
| 48 | 47 |  			{ | 
| 49 | 48 | $this->$attribute = $this->validate_attribute($match[2], $args[0]); | 
| 50 | 49 | return $this; | 
| @@ -59,6 +59,6 @@ | ||
| 59 | 59 | $class_name = get_class($block_instance); | 
| 60 | 60 |  		list($namespace, $extension) = explode('\\', $class_name); | 
| 61 | 61 | |
| 62 | - return $namespace . '/' . $extension; | |
| 62 | + return $namespace.'/'.$extension; | |
| 63 | 63 | } | 
| 64 | 64 | } | 
| @@ -34,7 +34,7 @@ | ||
| 34 | 34 | |
| 35 | 35 | if (isset($allowed_fields[$field])) | 
| 36 | 36 |  		{ | 
| 37 | - $mutator = 'set_' . $field; | |
| 37 | + $mutator = 'set_'.$field; | |
| 38 | 38 | $entity->$mutator($allowed_fields[$field]); | 
| 39 | 39 | $entity = $block_mapper->save($entity); | 
| 40 | 40 | } | 
| @@ -63,7 +63,7 @@ | ||
| 63 | 63 | */ | 
| 64 | 64 | public function create($action) | 
| 65 | 65 |  	{ | 
| 66 | - $action_class = 'blitze\\sitemaker\\services\\blocks\\action\\' . $action; | |
| 66 | + $action_class = 'blitze\\sitemaker\\services\\blocks\\action\\'.$action; | |
| 67 | 67 | |
| 68 | 68 | if (!class_exists($action_class)) | 
| 69 | 69 |  		{ | 
| @@ -38,7 +38,7 @@ | ||
| 38 | 38 | $time = $this->user->create_datetime($this->time); | 
| 39 | 39 | $now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset()); | 
| 40 | 40 | |
| 41 | - $method = 'get_' . $range; | |
| 41 | + $method = 'get_'.$range; | |
| 42 | 42 | $data = array( | 
| 43 | 43 | 'start' => 0, | 
| 44 | 44 | 'stop' => 0, |