@@ -172,6 +172,6 @@ |
||
| 172 | 172 | */ |
| 173 | 173 | protected function get_sql_where($menu_id) |
| 174 | 174 | { |
| 175 | - return '%smenu_id = ' . (int) $menu_id; |
|
| 175 | + return '%smenu_id = '.(int) $menu_id; |
|
| 176 | 176 | } |
| 177 | 177 | } |
@@ -141,7 +141,7 @@ |
||
| 141 | 141 | */ |
| 142 | 142 | public function set_class($class) |
| 143 | 143 | { |
| 144 | - $this->class = ($class) ? ' ' . trim($class) : ''; |
|
| 144 | + $this->class = ($class) ? ' '.trim($class) : ''; |
|
| 145 | 145 | return $this; |
| 146 | 146 | } |
| 147 | 147 | |
@@ -39,8 +39,8 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function create($type) |
| 41 | 41 | { |
| 42 | - $mapper_class = 'blitze\\sitemaker\\model\\mapper\\' . $type; |
|
| 43 | - $collection = 'blitze\\sitemaker\\model\\collections\\' . $type; |
|
| 42 | + $mapper_class = 'blitze\\sitemaker\\model\\mapper\\'.$type; |
|
| 43 | + $collection = 'blitze\\sitemaker\\model\\collections\\'.$type; |
|
| 44 | 44 | |
| 45 | 45 | return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type], $this->config); |
| 46 | 46 | } |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | $this->ptemplate->assign_vars(array( |
| 78 | 78 | 'S_SHOW_HIDE_ME' => ($settings['show_hide_me']) ? true : false, |
| 79 | 79 | 'S_AUTOLOGIN_ENABLED' => ($settings['allow_autologin']) ? true : false, |
| 80 | - 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=login'), |
|
| 81 | - 'U_REGISTER' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=register'), |
|
| 82 | - 'U_SEND_PASSWORD' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=sendpassword'), |
|
| 80 | + 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=login'), |
|
| 81 | + 'U_REGISTER' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=register'), |
|
| 82 | + 'U_SEND_PASSWORD' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=sendpassword'), |
|
| 83 | 83 | 'U_REDIRECT' => reapply_sid(ltrim(rtrim(build_url(array('edit_mode')), '?'), './../')) |
| 84 | 84 | )); |
| 85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | private function hide_quicklogin() |
| 105 | 105 | { |
| 106 | 106 | $current_page = $this->user->page['page_name']; |
| 107 | - if ($current_page === 'index.' . $this->php_ext) |
|
| 107 | + if ($current_page === 'index.'.$this->php_ext) |
|
| 108 | 108 | { |
| 109 | 109 | $this->template->assign_var('S_USER_LOGGED_IN', true); |
| 110 | 110 | } |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | { |
| 128 | 128 | $this->entities = array_filter( |
| 129 | 129 | $this->entities, |
| 130 | - function ($v) use ($key) |
|
| 130 | + function($v) use ($key) |
|
| 131 | 131 | { |
| 132 | 132 | return $v !== $key; |
| 133 | 133 | } |
@@ -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\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 | } |
@@ -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 | $sql_where[] = $this->$callable($field, $value, $operator); |
| 187 | 187 | } |
| 188 | 188 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | protected function get_sql_where_string($field, $value, $operator) |
| 225 | 225 | { |
| 226 | - return $field . " $operator '" . $this->db->sql_escape($value) . "'"; |
|
| 226 | + return $field." $operator '".$this->db->sql_escape($value)."'"; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | */ |
| 235 | 235 | protected function get_sql_where_integer($field, $value, $operator) |
| 236 | 236 | { |
| 237 | - return $field . " $operator " . (int) $value; |
|
| 237 | + return $field." $operator ".(int) $value; |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | { |
| 109 | 109 | $this->set_display_fields(); |
| 110 | 110 | |
| 111 | - $view = 'S_' . strtoupper($this->settings['template']); |
|
| 111 | + $view = 'S_'.strtoupper($this->settings['template']); |
|
| 112 | 112 | $post_data = $this->get_post_data($topic_data); |
| 113 | 113 | $topic_data = array_values($topic_data); |
| 114 | 114 | |
@@ -156,10 +156,10 @@ discard block |
||
| 156 | 156 | 'VIEWS' => (int) $row['topic_views'], |
| 157 | 157 | 'S_UNREAD_TOPIC' => $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']), |
| 158 | 158 | |
| 159 | - 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 160 | - 'U_VIEWFORUM' => append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"), |
|
| 161 | - 'U_NEW_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread', |
|
| 162 | - 'U_LAST_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], |
|
| 159 | + 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 160 | + 'U_VIEWFORUM' => append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"), |
|
| 161 | + 'U_NEW_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread', |
|
| 162 | + 'U_LAST_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'], |
|
| 163 | 163 | )); |
| 164 | 164 | unset($topic_data[$i], $post_data[$topic_id]); |
| 165 | 165 | } |
@@ -45,9 +45,9 @@ |
||
| 45 | 45 | public function display(array $settings, $edit_mode = false) |
| 46 | 46 | { |
| 47 | 47 | $content = ''; |
| 48 | - $content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />'; |
|
| 49 | - $content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />'; |
|
| 50 | - $content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />'; |
|
| 48 | + $content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />'; |
|
| 49 | + $content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />'; |
|
| 50 | + $content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />'; |
|
| 51 | 51 | $content .= $this->translator->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])); |
| 52 | 52 | |
| 53 | 53 | $this->template->assign_var('NEWEST_USER', false); |