@@ -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 | } |
@@ -51,12 +51,12 @@ discard block |
||
| 51 | 51 | */ |
| 52 | 52 | public function __construct(\phpbb\config\config $config, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user) |
| 53 | 53 | { |
| 54 | - $this->config = $config; |
|
| 54 | + $this->config = $config; |
|
| 55 | 55 | $this->language = $language; |
| 56 | - $this->log = $log; |
|
| 56 | + $this->log = $log; |
|
| 57 | 57 | $this->template = $template; |
| 58 | - $this->user = $user; |
|
| 59 | - $this->request = $request; |
|
| 58 | + $this->user = $user; |
|
| 59 | + $this->request = $request; |
|
| 60 | 60 | |
| 61 | 61 | $this->_generate_config(); |
| 62 | 62 | } |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | else if ($vars['explain']) |
| 97 | 97 | { |
| 98 | - $l_explain = $this->language->lang($vars['lang'] . '_EXPLAIN'); |
|
| 98 | + $l_explain = $this->language->lang($vars['lang'].'_EXPLAIN'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | $this->template->assign_block_vars('options', array( |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public function process() |
| 119 | 119 | { |
| 120 | - $submit = ($this->request->is_set_post('submit')) ? true : false; |
|
| 120 | + $submit = ($this->request->is_set_post('submit')) ? true : false; |
|
| 121 | 121 | |
| 122 | 122 | $this->new_config = $this->config; |
| 123 | 123 | $cfg_array = ($this->request->is_set('config')) ? $this->request->variable('config', array('' => ''), true) : $this->new_config; |
@@ -158,12 +158,12 @@ discard block |
||
| 158 | 158 | { |
| 159 | 159 | $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS'); |
| 160 | 160 | |
| 161 | - trigger_error($this->language->lang('CONFIG_UPDATED') . adm_back_link($this->u_action)); |
|
| 161 | + trigger_error($this->language->lang('CONFIG_UPDATED').adm_back_link($this->u_action)); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | $this->template->assign_vars(array( |
| 165 | 165 | 'L_TITLE' => $this->language->lang($this->display_vars['title']), |
| 166 | - 'L_TITLE_EXPLAIN' => $this->language->lang($this->display_vars['title'] . '_EXPLAIN'), |
|
| 166 | + 'L_TITLE_EXPLAIN' => $this->language->lang($this->display_vars['title'].'_EXPLAIN'), |
|
| 167 | 167 | |
| 168 | 168 | 'S_ERROR' => (sizeof($error)) ? true : false, |
| 169 | 169 | 'ERROR_MSG' => implode('<br />', $error), |
@@ -199,45 +199,45 @@ discard block |
||
| 199 | 199 | 'dir_banner_width' => '', |
| 200 | 200 | 'dir_banner_height' => '', |
| 201 | 201 | |
| 202 | - 'dir_mail' => array('lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 203 | - 'dir_activ_checkurl' => array('lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 204 | - 'dir_activ_flag' => array('lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 205 | - 'dir_activ_rss' => array('lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 206 | - 'dir_activ_pagerank' => array('lang' => 'DIR_ACTIV_PAGERANK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 207 | - 'dir_show' => array('lang' => 'DIR_SHOW', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false), |
|
| 208 | - 'dir_length_describe' => array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 209 | - 'dir_new_time' => array('lang' => 'DIR_NEW_TIME', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true), |
|
| 210 | - 'dir_default_order' => array('lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')), |
|
| 202 | + 'dir_mail' => array('lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 203 | + 'dir_activ_checkurl' => array('lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 204 | + 'dir_activ_flag' => array('lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 205 | + 'dir_activ_rss' => array('lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 206 | + 'dir_activ_pagerank' => array('lang' => 'DIR_ACTIV_PAGERANK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 207 | + 'dir_show' => array('lang' => 'DIR_SHOW', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false), |
|
| 208 | + 'dir_length_describe' => array('lang' => 'DIR_MAX_DESC', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 209 | + 'dir_new_time' => array('lang' => 'DIR_NEW_TIME', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true), |
|
| 210 | + 'dir_default_order' => array('lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_order_list', 'params' => array('{CONFIG_VALUE}')), |
|
| 211 | 211 | |
| 212 | 212 | 'legend2' => 'DIR_RECENT_GUEST', |
| 213 | - 'dir_recent_block' => array('lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 214 | - 'dir_recent_rows' => array('lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 215 | - 'dir_recent_columns' => array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 216 | - 'dir_recent_exclude' => array('lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true), |
|
| 213 | + 'dir_recent_block' => array('lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 214 | + 'dir_recent_rows' => array('lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 215 | + 'dir_recent_columns' => array('lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), |
|
| 216 | + 'dir_recent_exclude' => array('lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true), |
|
| 217 | 217 | |
| 218 | 218 | 'legend3' => 'DIR_ADD_GUEST', |
| 219 | - 'dir_visual_confirm' => array('lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 220 | - 'dir_visual_confirm_max_attempts' => array('lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true), |
|
| 219 | + 'dir_visual_confirm' => array('lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 220 | + 'dir_visual_confirm_max_attempts' => array('lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true), |
|
| 221 | 221 | |
| 222 | 222 | 'legend4' => 'DIR_THUMB_PARAM', |
| 223 | - 'dir_activ_thumb' => array('lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 224 | - 'dir_activ_thumb_remote' => array('lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 225 | - 'dir_thumb_service' => array('lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')), |
|
| 226 | - 'dir_thumb_service_reverse' => array('lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 223 | + 'dir_activ_thumb' => array('lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 224 | + 'dir_activ_thumb_remote' => array('lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 225 | + 'dir_thumb_service' => array('lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => array('{CONFIG_VALUE}')), |
|
| 226 | + 'dir_thumb_service_reverse' => array('lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 227 | 227 | |
| 228 | 228 | 'legend5' => 'DIR_COMM_PARAM', |
| 229 | - 'dir_allow_bbcode' => array('lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 230 | - 'dir_allow_flash' => array('lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 231 | - 'dir_allow_links' => array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 232 | - 'dir_allow_smilies' => array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 233 | - 'dir_length_comments' => array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true), |
|
| 234 | - 'dir_comments_per_page' => array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false), |
|
| 229 | + 'dir_allow_bbcode' => array('lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 230 | + 'dir_allow_flash' => array('lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 231 | + 'dir_allow_links' => array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 232 | + 'dir_allow_smilies' => array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 233 | + 'dir_length_comments' => array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true), |
|
| 234 | + 'dir_comments_per_page' => array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false), |
|
| 235 | 235 | |
| 236 | 236 | 'legend6' => 'DIR_BANN_PARAM', |
| 237 | - 'dir_activ_banner' => array('lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 238 | - 'dir_banner' => array('lang' => 'DIR_MAX_BANN', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $this->user->lang['PIXEL']), |
|
| 239 | - 'dir_banner_filesize' => array('lang' => 'DIR_MAX_SIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true), |
|
| 240 | - 'dir_storage_banner' => array('lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 237 | + 'dir_activ_banner' => array('lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |
|
| 238 | + 'dir_banner' => array('lang' => 'DIR_MAX_BANN', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']), |
|
| 239 | + 'dir_banner_filesize' => array('lang' => 'DIR_MAX_SIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true), |
|
| 240 | + 'dir_storage_banner' => array('lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), |
|
| 241 | 241 | ) |
| 242 | 242 | ); |
| 243 | 243 | } |
@@ -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 | |