@@ -18,11 +18,11 @@ |
||
18 | 18 | 'filename' => '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module', |
19 | 19 | 'title' => 'ACP_DIRECTORY', |
20 | 20 | 'modes' => array( |
21 | - '' => array('title' => 'ACP_DIRECTORY', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('')), |
|
22 | - 'main' => array('title' => 'ACP_DIRECTORY_MAIN', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
23 | - 'settings' => array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
24 | - 'cat' => array('title' => 'ACP_DIRECTORY_CATS', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
25 | - 'val' => array('title' => 'ACP_DIRECTORY_VAL', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
21 | + '' => array('title' => 'ACP_DIRECTORY', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('')), |
|
22 | + 'main' => array('title' => 'ACP_DIRECTORY_MAIN', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
23 | + 'settings' => array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
24 | + 'cat' => array('title' => 'ACP_DIRECTORY_CATS', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
25 | + 'val' => array('title' => 'ACP_DIRECTORY_VAL', 'auth' => 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')), |
|
26 | 26 | ), |
27 | 27 | ); |
28 | 28 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | { |
24 | 24 | return array( |
25 | 25 | 'add_tables' => array( |
26 | - $this->table_prefix . 'directory_cats' => array( |
|
26 | + $this->table_prefix.'directory_cats' => array( |
|
27 | 27 | 'COLUMNS' => array( |
28 | 28 | 'cat_id' => array('UINT', null, 'auto_increment'), |
29 | 29 | 'parent_id' => array('UINT', 0), |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | ), |
58 | 58 | ), |
59 | 59 | |
60 | - $this->table_prefix . 'directory_comments' => array( |
|
60 | + $this->table_prefix.'directory_comments' => array( |
|
61 | 61 | 'COLUMNS' => array( |
62 | 62 | 'comment_id' => array('UINT', null, 'auto_increment'), |
63 | 63 | 'comment_date' => array('TIMESTAMP', 0), |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | 'PRIMARY_KEY' => array('comment_id'), |
74 | 74 | ), |
75 | 75 | |
76 | - $this->table_prefix . 'directory_links' => array( |
|
76 | + $this->table_prefix.'directory_links' => array( |
|
77 | 77 | 'COLUMNS' => array( |
78 | 78 | 'link_id' => array('UINT', null, 'auto_increment'), |
79 | 79 | 'link_time' => array('TIMESTAMP', 0), |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | ), |
111 | 111 | ), |
112 | 112 | |
113 | - $this->table_prefix . 'directory_watch' => array( |
|
113 | + $this->table_prefix.'directory_watch' => array( |
|
114 | 114 | 'COLUMNS' => array( |
115 | 115 | 'cat_id' => array('UINT', 0), |
116 | 116 | 'user_id' => array('UINT', 0), |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | ), |
127 | 127 | |
128 | - $this->table_prefix . 'directory_votes' => array( |
|
128 | + $this->table_prefix.'directory_votes' => array( |
|
129 | 129 | 'COLUMNS' => array( |
130 | 130 | 'vote_id' => array('UINT', null, 'auto_increment'), |
131 | 131 | 'vote_link_id' => array('UINT', 0), |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | { |
149 | 149 | return array( |
150 | 150 | 'drop_tables' => array( |
151 | - $this->table_prefix . 'directory_cats', |
|
152 | - $this->table_prefix . 'directory_comments', |
|
153 | - $this->table_prefix . 'directory_links', |
|
154 | - $this->table_prefix . 'directory_votes', |
|
155 | - $this->table_prefix . 'directory_watch', |
|
151 | + $this->table_prefix.'directory_cats', |
|
152 | + $this->table_prefix.'directory_comments', |
|
153 | + $this->table_prefix.'directory_links', |
|
154 | + $this->table_prefix.'directory_votes', |
|
155 | + $this->table_prefix.'directory_watch', |
|
156 | 156 | ), |
157 | 157 | ); |
158 | 158 | } |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | |
273 | 273 | foreach ($directories as $dir) |
274 | 274 | { |
275 | - if (!file_exists($this->phpbb_root_path . $dir)) |
|
275 | + if (!file_exists($this->phpbb_root_path.$dir)) |
|
276 | 276 | { |
277 | - @mkdir($this->phpbb_root_path . $dir, 0777, true); |
|
278 | - phpbb_chmod($this->phpbb_root_path . $dir, CHMOD_READ | CHMOD_WRITE); |
|
277 | + @mkdir($this->phpbb_root_path.$dir, 0777, true); |
|
278 | + phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE); |
|
279 | 279 | } |
280 | 280 | } |
281 | 281 | } |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | */ |
288 | 288 | public function remove_directories() |
289 | 289 | { |
290 | - $dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/'; |
|
290 | + $dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/'; |
|
291 | 291 | |
292 | 292 | $this->_recursive_rmdir($dir); |
293 | 293 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | public function effectively_installed() |
25 | 25 | { |
26 | 26 | $sql = 'SELECT module_id |
27 | - FROM ' . $this->table_prefix . "modules |
|
27 | + FROM ' . $this->table_prefix."modules |
|
28 | 28 | WHERE module_class = 'acp' |
29 | 29 | AND module_basename = 'acp_directory' |
30 | 30 | AND module_mode = 'main'"; |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | 'module_auth' => 'ext_ernadoo/phpbbdirectory' |
57 | 57 | ); |
58 | 58 | |
59 | - $sql = 'UPDATE ' . $this->table_prefix . 'modules |
|
60 | - SET ' . $this->db->sql_build_array('UPDATE', $module_data) . " |
|
59 | + $sql = 'UPDATE '.$this->table_prefix.'modules |
|
60 | + SET ' . $this->db->sql_build_array('UPDATE', $module_data)." |
|
61 | 61 | WHERE module_basename = 'acp_directory' |
62 | 62 | AND module_mode IN ('main', 'settings', 'cat', 'val')"; |
63 | 63 | $this->db->sql_query($sql); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function effectively_installed() |
25 | 25 | { |
26 | - return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications'); |
|
26 | + return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications'); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | static public function depends_on() |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | public function copy_from_notifications() |
55 | 55 | { |
56 | 56 | $sql = 'SELECT n_user_id, n_cat_id |
57 | - FROM ' . $this->table_prefix . 'directory_notifications'; |
|
57 | + FROM ' . $this->table_prefix.'directory_notifications'; |
|
58 | 58 | $result = $this->db->sql_query($sql); |
59 | 59 | |
60 | 60 | while ($row = $this->db->sql_fetchrow($result)) |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | 'notify_status' => 1, |
66 | 66 | ); |
67 | 67 | |
68 | - $sql = 'INSERT INTO ' . $this->table_prefix . 'directory_watch ' . $this->db->sql_build_array('INSERT', $data); |
|
68 | + $sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data); |
|
69 | 69 | $this->db->sql_query($sql); |
70 | 70 | } |
71 | 71 | $this->db->sql_freeresult($result); |
@@ -155,7 +155,7 @@ |
||
155 | 155 | |
156 | 156 | foreach ($notification_types as $notification_type) |
157 | 157 | { |
158 | - call_user_func(array($phpbb_notifications, $step . '_notifications'), $notification_type); |
|
158 | + call_user_func(array($phpbb_notifications, $step.'_notifications'), $notification_type); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | return 'notifications'; |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | { |
205 | 205 | $selected = ($url == $url_selected) ? 'selected="selected"' : ''; |
206 | 206 | |
207 | - $select_options .= '<option value="' . $url . '" ' . $selected . '>' . parse_url($url, PHP_URL_HOST) . '</option>'; |
|
207 | + $select_options .= '<option value="'.$url.'" '.$selected.'>'.parse_url($url, PHP_URL_HOST).'</option>'; |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | return $select_options; |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | { |
238 | 238 | $selected = ($i == $order_selected) ? 'selected="selected"' : ''; |
239 | 239 | $order_substr = trim(str_replace(' ', '_', $i)); |
240 | - $tpl .= '<option value="' . $i . '" ' . $selected . '>' . $user->lang['DIR_ORDER_' . strtoupper($order_substr)] . '</option>'; |
|
240 | + $tpl .= '<option value="'.$i.'" '.$selected.'>'.$user->lang['DIR_ORDER_'.strtoupper($order_substr)].'</option>'; |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | return ($tpl); |
@@ -254,6 +254,6 @@ discard block |
||
254 | 254 | $value = $filesize['value']; |
255 | 255 | |
256 | 256 | // size and maxlength must not be specified for input of type number |
257 | - return '<input type="number" id="' . $key . '" min="0" max="999999999999999" step="any" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>'; |
|
257 | + return '<input type="number" id="'.$key.'" min="0" max="999999999999999" step="any" name="config['.$key.']" value="'.$value.'" /> <select name="'.$key.'">'.size_select_options($size_var).'</select>'; |
|
258 | 258 | } |
259 | 259 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | { |
46 | 46 | $default_reparser = new $fast_reparsers[0][0]( |
47 | 47 | $this->db, |
48 | - $this->container->getParameter('core.table_prefix') . $fast_reparsers[0][1]); |
|
48 | + $this->container->getParameter('core.table_prefix').$fast_reparsers[0][1]); |
|
49 | 49 | |
50 | 50 | $resume_data = array( |
51 | 51 | 'reparser' => 0, |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | { |
61 | 61 | $reparser = new $fast_reparsers[$resume_data['reparser']][0]( |
62 | 62 | $this->db, |
63 | - $this->container->getParameter('core.table_prefix') . $fast_reparsers[$resume_data['reparser']][1] |
|
63 | + $this->container->getParameter('core.table_prefix').$fast_reparsers[$resume_data['reparser']][1] |
|
64 | 64 | ); |
65 | 65 | |
66 | 66 | // New reparser |
@@ -69,18 +69,18 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\search\fulltext_directory $search, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link) |
71 | 71 | { |
72 | - $this->db = $db; |
|
73 | - $this->config = $config; |
|
72 | + $this->db = $db; |
|
73 | + $this->config = $config; |
|
74 | 74 | $this->language = $language; |
75 | 75 | $this->template = $template; |
76 | 76 | $this->user = $user; |
77 | - $this->helper = $helper; |
|
78 | - $this->request = $request; |
|
77 | + $this->helper = $helper; |
|
78 | + $this->request = $request; |
|
79 | 79 | $this->auth = $auth; |
80 | - $this->pagination = $pagination; |
|
81 | - $this->search = $search; |
|
82 | - $this->categorie = $categorie; |
|
83 | - $this->link = $link; |
|
80 | + $this->pagination = $pagination; |
|
81 | + $this->search = $search; |
|
82 | + $this->categorie = $categorie; |
|
83 | + $this->link = $link; |
|
84 | 84 | |
85 | 85 | $language->add_lang('directory', 'ernadoo/phpbbdirectory'); |
86 | 86 | $language->add_lang('search'); |
@@ -104,24 +104,24 @@ discard block |
||
104 | 104 | throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH'); |
105 | 105 | } |
106 | 106 | |
107 | - $cat_id = $this->request->variable('cat_id', 0); |
|
108 | - $keywords = $this->request->variable('keywords', '', true); |
|
107 | + $cat_id = $this->request->variable('cat_id', 0); |
|
108 | + $keywords = $this->request->variable('keywords', '', true); |
|
109 | 109 | $search_terms = $this->request->variable('terms', 'all'); |
110 | - $search_category = $this->request->variable('cid', array(0)); |
|
111 | - $search_fields = $this->request->variable('sf', 'all'); |
|
110 | + $search_category = $this->request->variable('cid', array(0)); |
|
111 | + $search_fields = $this->request->variable('sf', 'all'); |
|
112 | 112 | $search_child = $this->request->variable('sc', true); |
113 | - $sort_days = $this->request->variable('st', 0); |
|
113 | + $sort_days = $this->request->variable('st', 0); |
|
114 | 114 | $sort_key = $this->request->variable('sk', 't'); |
115 | 115 | $sort_dir = $this->request->variable('sd', 'd'); |
116 | - $start = ($page - 1) * (int) $this->config['dir_show']; |
|
116 | + $start = ($page - 1) * (int) $this->config['dir_show']; |
|
117 | 117 | |
118 | - $default_sort_days = 0; |
|
118 | + $default_sort_days = 0; |
|
119 | 119 | $default_sort_key = (string) substr($this->config['dir_default_order'], 0, 1); |
120 | 120 | $default_sort_dir = (string) substr($this->config['dir_default_order'], 2); |
121 | 121 | |
122 | 122 | // Categorie ordering options |
123 | 123 | $limit_days = array(0 => $this->language->lang('ALL_RESULTS'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR')); |
124 | - $sort_by_text = array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' => $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER')); |
|
124 | + $sort_by_text = array('a' => $this->language->lang('AUTHOR'), 't' => $this->language->lang('POST_TIME'), 'r' => $this->language->lang('DIR_COMMENTS_ORDER'), 's' => $this->language->lang('DIR_NAME_ORDER'), 'v' => $this->language->lang('DIR_NB_CLICKS_ORDER')); |
|
125 | 125 | $sort_by_sql = array('a' => 'u.username_clean', 't' => array('l.link_time', 'l.link_id'), 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'); |
126 | 126 | |
127 | 127 | if ($this->config['dir_activ_pagerank']) |
@@ -170,12 +170,12 @@ discard block |
||
170 | 170 | |
171 | 171 | $u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit))); |
172 | 172 | |
173 | - ($u_hilit) ? $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)) : ''; |
|
174 | - ($search_terms != 'all') ? $u_search['terms'] = $search_terms : ''; |
|
175 | - ($cat_id) ? $u_search['cat_id'] = $cat_id : ''; |
|
176 | - ($search_category) ? $u_search['cid'] = $search_category : ''; |
|
177 | - (!$search_child) ? $u_search['sc'] = 0 : ''; |
|
178 | - ($search_fields != 'all') ? $u_search['sf'] = $search_fields : ''; |
|
173 | + ($u_hilit) ? $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)) : ''; |
|
174 | + ($search_terms != 'all') ? $u_search['terms'] = $search_terms : ''; |
|
175 | + ($cat_id) ? $u_search['cat_id'] = $cat_id : ''; |
|
176 | + ($search_category) ? $u_search['cid'] = $search_category : ''; |
|
177 | + (!$search_child) ? $u_search['sc'] = 0 : ''; |
|
178 | + ($search_fields != 'all') ? $u_search['sf'] = $search_fields : ''; |
|
179 | 179 | |
180 | 180 | $base_url = array( |
181 | 181 | 'routes' => 'ernadoo_phpbbdirectory_search_controller', |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | |
250 | 250 | foreach ($rowset as $data) |
251 | 251 | { |
252 | - $s_banner = $this->link->display_bann($data); |
|
252 | + $s_banner = $this->link->display_bann($data); |
|
253 | 253 | $s_thumb = $this->link->display_thumb($data); |
254 | 254 | $s_flag = $this->link->display_flag($data); |
255 | 255 | |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | |
258 | 258 | if ($hilit) |
259 | 259 | { |
260 | - $data['link_name'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']); |
|
261 | - $data['link_description'] = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']); |
|
260 | + $data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_name']); |
|
261 | + $data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#isu', '<span class="posthilit">$1</span>', $data['link_description']); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | $this->template->assign_block_vars('results', array( |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | private function _get_exclude_categories(&$search_category, $search_child) |
329 | 329 | { |
330 | 330 | $sql = 'SELECT cat_id, parent_id, right_id |
331 | - FROM ' . $this->categories_table . ' |
|
331 | + FROM ' . $this->categories_table.' |
|
332 | 332 | ORDER BY left_id'; |
333 | 333 | $result = $this->db->sql_query($sql); |
334 | 334 |
@@ -80,16 +80,16 @@ discard block |
||
80 | 80 | */ |
81 | 81 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\comment $comment, $root_path, $php_ext) |
82 | 82 | { |
83 | - $this->db = $db; |
|
84 | - $this->config = $config; |
|
83 | + $this->db = $db; |
|
84 | + $this->config = $config; |
|
85 | 85 | $this->language = $language; |
86 | 86 | $this->template = $template; |
87 | 87 | $this->user = $user; |
88 | - $this->helper = $helper; |
|
89 | - $this->request = $request; |
|
88 | + $this->helper = $helper; |
|
89 | + $this->request = $request; |
|
90 | 90 | $this->auth = $auth; |
91 | - $this->pagination = $pagination; |
|
92 | - $this->captcha_factory = $captcha_factory; |
|
91 | + $this->pagination = $pagination; |
|
92 | + $this->captcha_factory = $captcha_factory; |
|
93 | 93 | $this->categorie = $categorie; |
94 | 94 | $this->comment = $comment; |
95 | 95 | $this->root_path = $root_path; |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | $sql = 'SELECT * |
133 | - FROM ' . $this->comments_table . ' |
|
133 | + FROM ' . $this->comments_table.' |
|
134 | 134 | WHERE comment_id = ' . (int) $comment_id; |
135 | 135 | $result = $this->db->sql_query($sql); |
136 | 136 | $value = $this->db->sql_fetchrow($result); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id)); |
148 | 148 | meta_refresh(3, $meta_info); |
149 | 149 | $message = $this->language->lang('DIR_COMMENT_DELETE_OK'); |
150 | - $message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>'); |
|
150 | + $message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>'); |
|
151 | 151 | return $this->helper->message($message); |
152 | 152 | } |
153 | 153 | else |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $this->_check_comments_enable($link_id); |
170 | 170 | |
171 | 171 | $sql = 'SELECT * |
172 | - FROM ' . $this->comments_table . ' |
|
172 | + FROM ' . $this->comments_table.' |
|
173 | 173 | WHERE comment_id = ' . (int) $comment_id; |
174 | 174 | $result = $this->db->sql_query($sql); |
175 | 175 | $value = $this->db->sql_fetchrow($result); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $comment_text = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']); |
183 | 183 | $this->s_comment = $comment_text['text']; |
184 | 184 | |
185 | - $submit = $this->request->is_set_post('update_comment') ? true : false; |
|
185 | + $submit = $this->request->is_set_post('update_comment') ? true : false; |
|
186 | 186 | |
187 | 187 | // If form is done |
188 | 188 | if ($submit) |
@@ -238,15 +238,15 @@ discard block |
||
238 | 238 | $this->_check_comments_enable($link_id); |
239 | 239 | |
240 | 240 | $comment_id = $this->request->variable('c', 0); |
241 | - $view = $this->request->variable('view', ''); |
|
242 | - $start = ($page - 1) * $this->config['dir_comments_per_page']; |
|
241 | + $view = $this->request->variable('view', ''); |
|
242 | + $start = ($page - 1) * $this->config['dir_comments_per_page']; |
|
243 | 243 | |
244 | 244 | $this->s_hidden_fields = array_merge($this->s_hidden_fields, array('page' => $page)); |
245 | 245 | |
246 | 246 | $this->_populate_form($link_id, $mode); |
247 | 247 | |
248 | 248 | $sql = 'SELECT COUNT(comment_id) AS nb_comments |
249 | - FROM ' . $this->comments_table . ' |
|
249 | + FROM ' . $this->comments_table.' |
|
250 | 250 | WHERE comment_link_id = ' . (int) $link_id; |
251 | 251 | $result = $this->db->sql_query($sql); |
252 | 252 | $nb_comments = (int) $this->db->sql_fetchfield('nb_comments'); |
@@ -266,10 +266,10 @@ discard block |
||
266 | 266 | ), |
267 | 267 | array( |
268 | 268 | 'FROM' => array(ZEBRA_TABLE => 'z'), |
269 | - 'ON' => 'z.user_id = ' . $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id' |
|
269 | + 'ON' => 'z.user_id = '.$this->user->data['user_id'].' AND z.zebra_id = a.comment_user_id' |
|
270 | 270 | ) |
271 | 271 | ), |
272 | - 'WHERE' => 'a.comment_link_id = ' . (int) $link_id, |
|
272 | + 'WHERE' => 'a.comment_link_id = '.(int) $link_id, |
|
273 | 273 | 'ORDER_BY' => 'a.comment_date DESC'); |
274 | 274 | $sql = $this->db->sql_build_query('SELECT', $sql_array); |
275 | 275 | $result = $this->db->sql_query_limit($sql, $this->config['dir_comments_per_page'], $start); |
@@ -298,12 +298,12 @@ discard block |
||
298 | 298 | 'S_COMMENT' => generate_text_for_display($comments['comment_text'], $comments['comment_uid'], $comments['comment_bitfield'], $comments['comment_flags']), |
299 | 299 | 'S_ID' => $comments['comment_id'], |
300 | 300 | |
301 | - 'U_EDIT' => ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '', |
|
302 | - 'U_DELETE' => ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '', |
|
301 | + 'U_EDIT' => ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'])) : '', |
|
302 | + 'U_DELETE' => ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', array('link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id'], '_referer' => $this->helper->get_current_url())) : '', |
|
303 | 303 | |
304 | 304 | 'S_IGNORE_POST' => ($comments['foe'] && ($view != 'show' || $comment_id != $comments['comment_id'])) ? true : false, |
305 | 305 | 'L_IGNORE_POST' => ($comments['foe']) ? $this->language->lang('POST_BY_FOE', get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']), '<a href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '', |
306 | - 'L_POST_DISPLAY' => ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="' . $comments['comment_id'] . '" href="' . $this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'] . '&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '', |
|
306 | + 'L_POST_DISPLAY' => ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '<a class="display_post" data-post-id="'.$comments['comment_id'].'" href="'.$this->helper->url('directory/link/'.$link_id.'/comment'.(($page > 1) ? '/'.$page : '').'?c='.(int) $comments['comment_id'].'&view=show#c'.(int) $comments['comment_id']).'">', '</a>') : '', |
|
307 | 307 | |
308 | 308 | 'S_INFO' => $this->auth->acl_get('m_info'), |
309 | 309 | )); |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | |
344 | 344 | if (!function_exists('validate_data')) |
345 | 345 | { |
346 | - include($this->root_path . 'includes/functions_user.' . $this->php_ext); |
|
346 | + include($this->root_path.'includes/functions_user.'.$this->php_ext); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | $error = validate_data( |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $link_id)); |
406 | 406 | meta_refresh(3, $meta_info); |
407 | 407 | $message = $this->language->lang('DIR_'.strtoupper($mode).'_COMMENT_OK'); |
408 | - $message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="' . $meta_info . '">', '</a>'); |
|
408 | + $message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>'); |
|
409 | 409 | return $this->helper->message($message); |
410 | 410 | } |
411 | 411 | else |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | private function _check_comments_enable($link_id) |
429 | 429 | { |
430 | 430 | $sql = 'SELECT link_cat |
431 | - FROM ' . $this->links_table . ' |
|
431 | + FROM ' . $this->links_table.' |
|
432 | 432 | WHERE link_id = ' . (int) $link_id; |
433 | 433 | $result = $this->db->sql_query($sql); |
434 | 434 | $cat_id = (int) $this->db->sql_fetchfield('link_cat'); |
@@ -470,11 +470,11 @@ discard block |
||
470 | 470 | |
471 | 471 | if (!function_exists('generate_smilies')) |
472 | 472 | { |
473 | - include($this->root_path . 'includes/functions_posting.' . $this->php_ext); |
|
473 | + include($this->root_path.'includes/functions_posting.'.$this->php_ext); |
|
474 | 474 | } |
475 | 475 | if (!function_exists('display_custom_bbcodes')) |
476 | 476 | { |
477 | - include($this->root_path . 'includes/functions_display.' . $this->php_ext); |
|
477 | + include($this->root_path.'includes/functions_display.'.$this->php_ext); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | generate_smilies('inline', 0); |
@@ -484,11 +484,11 @@ discard block |
||
484 | 484 | $this->template->assign_vars(array( |
485 | 485 | 'S_AUTH_COMM' => $this->auth->acl_get('u_comment_dir'), |
486 | 486 | |
487 | - 'BBCODE_STATUS' => ($this->config['dir_allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'), |
|
488 | - 'IMG_STATUS' => ($this->config['dir_allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'), |
|
489 | - 'SMILIES_STATUS' => ($this->config['dir_allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'), |
|
490 | - 'URL_STATUS' => ($this->config['dir_allow_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'), |
|
491 | - 'FLASH_STATUS' => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'), |
|
487 | + 'BBCODE_STATUS' => ($this->config['dir_allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'), |
|
488 | + 'IMG_STATUS' => ($this->config['dir_allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'), |
|
489 | + 'SMILIES_STATUS' => ($this->config['dir_allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'), |
|
490 | + 'URL_STATUS' => ($this->config['dir_allow_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'), |
|
491 | + 'FLASH_STATUS' => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'), |
|
492 | 492 | |
493 | 493 | 'L_DIR_REPLY_EXP' => $this->language->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']), |
494 | 494 |