@@ -13,8 +13,8 @@ |
||
13 | 13 | { |
14 | 14 | public function execute($style_id) |
15 | 15 | { |
16 | - $name = $this->request->variable('block', ''); |
|
17 | - $route = $this->request->variable('route', ''); |
|
16 | + $name = $this->request->variable('block', ''); |
|
17 | + $route = $this->request->variable('route', ''); |
|
18 | 18 | |
19 | 19 | if (($block_instance = $this->block_factory->get_block($name)) === null) |
20 | 20 | { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | $headers = $headers[0]; |
30 | 30 | } |
31 | 31 | |
32 | - preg_match('/HTTP\/.* ([0-9]+) .*/', $headers , $status); |
|
32 | + preg_match('/HTTP\/.* ([0-9]+) .*/', $headers, $status); |
|
33 | 33 | |
34 | 34 | return ($status[1] == 200) ? true : false; |
35 | 35 | } |
@@ -121,7 +121,7 @@ |
||
121 | 121 | { |
122 | 122 | $this->_entities = array_filter( |
123 | 123 | $this->_entities, |
124 | - function ($v) use ($key) |
|
124 | + function($v) use ($key) |
|
125 | 125 | { |
126 | 126 | return $v !== $key; |
127 | 127 | } |
@@ -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']); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public function save(\blitze\sitemaker\model\entity_interface $entity) |
87 | 87 | { |
88 | - $accessor = 'get_' . $this->entity_pkey; |
|
88 | + $accessor = 'get_'.$this->entity_pkey; |
|
89 | 89 | if (is_null($entity->$accessor())) |
90 | 90 | { |
91 | 91 | $entity = $this->insert($entity); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | { |
108 | 108 | if ($condition instanceof $this->entity_class) |
109 | 109 | { |
110 | - $accessor = 'get_' . $this->entity_pkey; |
|
110 | + $accessor = 'get_'.$this->entity_pkey; |
|
111 | 111 | $condition = array($this->entity_pkey, '=', $condition->$accessor()); |
112 | 112 | } |
113 | 113 | else |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | $sql_where = $this->get_sql_condition($condition); |
120 | - $this->db->sql_query('DELETE FROM ' . $this->entity_table . (sizeof($sql_where) ? ' WHERE ' . join(' AND ', $sql_where) : '')); |
|
120 | + $this->db->sql_query('DELETE FROM '.$this->entity_table.(sizeof($sql_where) ? ' WHERE '.join(' AND ', $sql_where) : '')); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | */ |
137 | 137 | protected function insert(\blitze\sitemaker\model\entity_interface $entity) |
138 | 138 | { |
139 | - $this->db->sql_query('INSERT INTO ' . $this->entity_table . ' ' . $this->db->sql_build_array('INSERT', $entity->to_db())); |
|
139 | + $this->db->sql_query('INSERT INTO '.$this->entity_table.' '.$this->db->sql_build_array('INSERT', $entity->to_db())); |
|
140 | 140 | |
141 | - $mutator = 'set_' . $this->entity_pkey; |
|
141 | + $mutator = 'set_'.$this->entity_pkey; |
|
142 | 142 | $entity->$mutator((int) $this->db->sql_nextid()); |
143 | 143 | |
144 | 144 | return $entity; |
@@ -152,11 +152,11 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function update(\blitze\sitemaker\model\entity_interface $entity) |
154 | 154 | { |
155 | - $accessor = 'get_' . $this->entity_pkey; |
|
155 | + $accessor = 'get_'.$this->entity_pkey; |
|
156 | 156 | |
157 | - return $this->db->sql_query('UPDATE ' . $this->entity_table . ' |
|
158 | - SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()) . ' |
|
159 | - WHERE ' . $this->entity_pkey . ' = ' . (int) $entity->$accessor()); |
|
157 | + return $this->db->sql_query('UPDATE '.$this->entity_table.' |
|
158 | + SET ' . $this->db->sql_build_array('UPDATE', $entity->to_db()).' |
|
159 | + WHERE ' . $this->entity_pkey.' = '.(int) $entity->$accessor()); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | */ |
166 | 166 | protected function find_sql(array $sql_where) |
167 | 167 | { |
168 | - return 'SELECT * FROM ' . $this->entity_table . |
|
169 | - (sizeof($sql_where) ? ' WHERE ' . join(' AND ', $sql_where) : ''); |
|
168 | + return 'SELECT * FROM '.$this->entity_table. |
|
169 | + (sizeof($sql_where) ? ' WHERE '.join(' AND ', $sql_where) : ''); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | { |
183 | 183 | list($field, $operator, $value) = $info; |
184 | 184 | |
185 | - $callable = 'get_sql_where_' . gettype($value); |
|
185 | + $callable = 'get_sql_where_'.gettype($value); |
|
186 | 186 | if (is_callable(array($this, $callable))) |
187 | 187 | { |
188 | 188 | $sql_where[] = call_user_func_array(array($this, $callable), array($field, $value, $operator)); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function get_sql_where_string($field, $value, $operator) |
222 | 222 | { |
223 | - return $field . " $operator '" . $this->db->sql_escape($value) . "'"; |
|
223 | + return $field." $operator '".$this->db->sql_escape($value)."'"; |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | protected function get_sql_where_integer($field, $value, $operator) |
233 | 233 | { |
234 | - return $field . " $operator " . (int) $value; |
|
234 | + return $field." $operator ".(int) $value; |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -70,8 +70,8 @@ |
||
70 | 70 | */ |
71 | 71 | protected function find_sql(array $sql_where) |
72 | 72 | { |
73 | - return 'SELECT * FROM ' . $this->entity_table . |
|
74 | - ((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . ' |
|
73 | + return 'SELECT * FROM '.$this->entity_table. |
|
74 | + ((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').' |
|
75 | 75 | ORDER BY route ASC'; |
76 | 76 | } |
77 | 77 | } |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | */ |
26 | 26 | protected function find_sql(array $sql_where) |
27 | 27 | { |
28 | - return 'SELECT * FROM ' . $this->entity_table . |
|
29 | - ((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . ' |
|
28 | + return 'SELECT * FROM '.$this->entity_table. |
|
29 | + ((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').' |
|
30 | 30 | ORDER BY position, weight ASC'; |
31 | 31 | } |
32 | 32 | |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | // move blocks up for position |
41 | 41 | if ($condition instanceof $this->entity_class) |
42 | 42 | { |
43 | - $this->db->sql_query('UPDATE ' . $this->entity_table . ' |
|
43 | + $this->db->sql_query('UPDATE '.$this->entity_table.' |
|
44 | 44 | SET weight = weight - 1 |
45 | - WHERE weight > ' . (int) $condition->get_weight() . ' |
|
46 | - AND style = ' . (int) $condition->get_style() . ' |
|
47 | - AND route_id = ' . (int) $condition->get_route_id() . " |
|
48 | - AND position = '" . $this->db->sql_escape($condition->get_position()) . "'"); |
|
45 | + WHERE weight > ' . (int) $condition->get_weight().' |
|
46 | + AND style = ' . (int) $condition->get_style().' |
|
47 | + AND route_id = ' . (int) $condition->get_route_id()." |
|
48 | + AND position = '" . $this->db->sql_escape($condition->get_position())."'"); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity) |
66 | 66 | { |
67 | 67 | /** @type \blitze\sitemaker\model\blocks\entity\block $entity */ |
68 | - $sql = 'UPDATE ' . $this->entity_table . ' |
|
68 | + $sql = 'UPDATE '.$this->entity_table.' |
|
69 | 69 | SET weight = weight + 1 |
70 | - WHERE weight >= ' . (int) $entity->get_weight() . ' |
|
71 | - AND route_id = ' . (int) $entity->get_route_id() . ' |
|
70 | + WHERE weight >= ' . (int) $entity->get_weight().' |
|
71 | + AND route_id = ' . (int) $entity->get_route_id().' |
|
72 | 72 | AND style = ' . (int) $entity->get_style(); |
73 | 73 | $this->db->sql_query($sql); |
74 | 74 | } |
@@ -141,7 +141,7 @@ |
||
141 | 141 | */ |
142 | 142 | public function set_class($class) |
143 | 143 | { |
144 | - $this->class = ($class) ? ' ' . $class : ''; |
|
144 | + $this->class = ($class) ? ' '.$class : ''; |
|
145 | 145 | return $this; |
146 | 146 | } |
147 | 147 |