From c8dee90e63bf6745c95e70ad41eee532e3171a77 Mon Sep 17 00:00:00 2001 From: ErnadoO Date: Wed, 22 Aug 2018 17:32:45 +0200 Subject: [PATCH] v2.0.0-RC2 --- adm/style/acp_dir_cat.html | 4 +- .../event/acp_overall_header_head_append.html | 6 +- controller/acp/cat.php | 6 +- controller/acp/main.php | 17 ++---- controller/acp/settings.php | 2 +- controller/acp/validation.php | 7 ++- controller/categories.php | 8 +-- controller/comments.php | 11 ++-- controller/links.php | 2 - controller/search.php | 37 ++++++++---- core/categorie.php | 23 +++---- core/comment.php | 2 - core/cron.php | 60 ++++++------------- core/link.php | 26 ++++---- event/listener.php | 2 +- language/en/directory.php | 13 ++++ language/en/directory_common.php | 38 ------------ language/es/directory.php | 13 ++++ language/es/directory_common.php | 38 ------------ language/fr/directory.php | 13 ++++ language/fr/directory_common.php | 38 ------------ language/nl/directory.php | 13 ++++ language/nl/directory_common.php | 39 ------------ language/ru/directory.php | 13 ++++ language/ru/directory_common.php | 39 ------------ language/sr/directory.php | 13 ++++ language/sr/directory_common.php | 38 ------------ language/sv/directory.php | 13 ++++ language/sv/directory_common.php | 38 ------------ migrations/converter/convert_module.php | 2 +- .../overall_header_breadcrumb_append.html | 2 +- .../overall_header_navigation_prepend.html | 4 +- styles/prosilver/template/recents.html | 4 +- styles/prosilver/template/search_results.html | 2 +- styles/prosilver/template/view_cat.html | 4 +- 35 files changed, 200 insertions(+), 390 deletions(-) delete mode 100644 language/en/directory_common.php delete mode 100644 language/es/directory_common.php delete mode 100644 language/fr/directory_common.php delete mode 100644 language/nl/directory_common.php delete mode 100644 language/ru/directory_common.php delete mode 100644 language/sr/directory_common.php delete mode 100644 language/sv/directory_common.php diff --git a/adm/style/acp_dir_cat.html b/adm/style/acp_dir_cat.html index 26839cd..85e093d 100644 --- a/adm/style/acp_dir_cat.html +++ b/adm/style/acp_dir_cat.html @@ -173,7 +173,7 @@

{{ lang('WARNING') }}

// @@ -194,7 +194,7 @@

{{ lang('DIR_CAT_ADMIN') }}

{ var close_waitscreen = 0; // no scrollbars... - popup('{{ UA_PROGRESS_BAR|e("js") }}', 400, 240, '_sync'); + popup('{{ U_PROGRESS_BAR|e("js") }}', 400, 240, '_sync'); } // ]]> diff --git a/adm/style/event/acp_overall_header_head_append.html b/adm/style/event/acp_overall_header_head_append.html index fe34cbd..b030c2a 100644 --- a/adm/style/event/acp_overall_header_head_append.html +++ b/adm/style/event/acp_overall_header_head_append.html @@ -1,8 +1,8 @@ diff --git a/controller/acp/cat.php b/controller/acp/cat.php index 04dc397..d90cbf8 100644 --- a/controller/acp/cat.php +++ b/controller/acp/cat.php @@ -361,7 +361,7 @@ public function action_sync() meta_refresh(0, $url); $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => $this->u_action . "&action=progress_bar&start=$links_done&total={$row['cat_links']}", + 'U_PROGRESS_BAR' => $this->u_action . "&action=progress_bar&start=$links_done&total={$row['cat_links']}", 'S_CONTINUE_SYNC' => true, 'L_PROGRESS_EXPLAIN' => $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', $links_done, $row['cat_links'])) ); @@ -373,7 +373,7 @@ public function action_sync() meta_refresh(0, $url); $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', + 'U_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', 'S_CONTINUE_SYNC' => true, 'L_PROGRESS_EXPLAIN' => $this->language->lang('SYNC_IN_PROGRESS_EXPLAIN', 0, $row['cat_links'])) ); @@ -501,7 +501,7 @@ public function display_cats() 'U_SEL_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action . '&parent_id=' . $this->parent_id, - 'UA_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', + 'U_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', )); } diff --git a/controller/acp/main.php b/controller/acp/main.php index 747c799..b664bfb 100644 --- a/controller/acp/main.php +++ b/controller/acp/main.php @@ -188,17 +188,7 @@ public function exec_action($action) switch ($action) { case 'votes': - switch ($this->db->get_sql_layer()) - { - case 'sqlite': - case 'firebird': - $this->db->sql_query('DELETE FROM ' . $this->votes_table); - break; - - default: - $this->db->sql_query('TRUNCATE TABLE ' . $this->votes_table); - break; - } + $this->db->sql_query('DELETE FROM ' . $this->votes_table); $sql = 'UPDATE ' . $this->links_table . ' SET link_vote = 0, link_note = 0'; @@ -289,8 +279,8 @@ private function _orphan_files($delete = false) { $physical_files[] = $img; } - $sql = 'SELECT link_banner FROM ' . $this->links_table . ' - WHERE link_banner <> \'\''; + $sql = 'SELECT link_banner FROM ' . $this->links_table . " + WHERE link_banner <> ''"; $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) @@ -318,5 +308,6 @@ private function _orphan_files($delete = false) @unlink($this->get_banner_path($file)); } } + closedir($dh); } } diff --git a/controller/acp/settings.php b/controller/acp/settings.php index df97045..cc37d9d 100644 --- a/controller/acp/settings.php +++ b/controller/acp/settings.php @@ -229,7 +229,7 @@ private function _generate_config() 'dir_allow_flash' => array('lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'dir_allow_links' => array('lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'dir_allow_smilies' => array('lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'dir_length_comments' => array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true), + 'dir_length_comments' => array('lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false), 'dir_comments_per_page' => array('lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false), 'legend6' => 'DIR_BANN_PARAM', diff --git a/controller/acp/validation.php b/controller/acp/validation.php index 191003e..1bea2b1 100644 --- a/controller/acp/validation.php +++ b/controller/acp/validation.php @@ -23,6 +23,9 @@ class validation extends helper /** @var \phpbb\pagination */ protected $pagination; + /** @var \phpbb\language\language */ + protected $language; + /** @var \phpbb\log\log */ protected $phpbb_log; @@ -369,7 +372,7 @@ private function _action_disapproved() /** * Get informations about links selected * - * @param $mark Website selected for (dis)approval + * @param array $mark Website selected for (dis)approval * @return null */ private function _get_infos_links($mark) @@ -408,7 +411,7 @@ private function _get_infos_links($mark) /** * Notify users which watch categories * - * @param $row Informations about website + * @param array $row Informations about website * @return null */ private function _notify_suscribers($row) diff --git a/controller/categories.php b/controller/categories.php index f40991f..7c7f643 100644 --- a/controller/categories.php +++ b/controller/categories.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use \ernadoo\phpbbdirectory\core\helper; -use E1379\SpeakingUrl\SpeakingUrl; +use \E1379\SpeakingUrl\SpeakingUrl; class categories extends helper { @@ -78,8 +78,6 @@ public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config $this->categorie = $categorie; $this->link = $link; - $language->add_lang('directory', 'ernadoo/phpbbdirectory'); - $template->assign_vars(array( 'S_PHPBB_DIRECTORY' => true, )); @@ -282,7 +280,7 @@ public function view_route($cat_id, $page = 1, $sort_days = 0, $sort_key = '', $ 'ON' => 'l.link_user_id = u.user_id' ), ), - 'WHERE' => "l.link_cat = $cat_id + 'WHERE' => 'l.link_cat = ' . (int) $cat_id . " AND l.link_active = 1 $sql_limit_time", 'ORDER_BY' => $sql_sort_order @@ -360,7 +358,6 @@ public function view_route($cat_id, $page = 1, $sort_days = 0, $sort_key = '', $ 'VOTE_LIST' => ($votes_status) ? $s_vote : '', 'IMG_FLAG' => $s_flag, - 'ON_CLICK' => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $site['link_id']))."'); return false;\"", 'S_NEW_LINK' => (((time() - $site['link_time']) / 86400) <= $this->config['dir_new_time']) ? true : false, @@ -370,6 +367,7 @@ public function view_route($cat_id, $page = 1, $sort_days = 0, $sort_key = '', $ 'U_FORM_VOTE' => ($votes_status) ? $this->helper->route('ernadoo_phpbbdirectory_vote_controller', array('cat_id' => (int) $site['link_cat'], 'link_id' => (int) $site['link_id'])) : '', 'U_LINK' => $site['link_url'], 'U_THUMB' => $s_thumb, + 'U_VIEW' => $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $site['link_id'])) )); } } diff --git a/controller/comments.php b/controller/comments.php index 310e1b2..6b6b9b2 100644 --- a/controller/comments.php +++ b/controller/comments.php @@ -95,9 +95,6 @@ public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config $this->root_path = $root_path; $this->php_ext = $php_ext; - $language->add_lang('directory', 'ernadoo/phpbbdirectory'); - $user->add_lang(array('ucp', 'posting')); - $template->assign_vars(array( 'S_PHPBB_DIRECTORY' => true, 'S_SIMPLE_MESSAGE' => true, @@ -266,7 +263,7 @@ public function view($link_id, $page, $mode = 'new') ), array( 'FROM' => array(ZEBRA_TABLE => 'z'), - 'ON' => 'z.user_id = ' . $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id' + 'ON' => 'z.user_id = ' . (int) $this->user->data['user_id'] . ' AND z.zebra_id = a.comment_user_id' ) ), 'WHERE' => 'a.comment_link_id = ' . (int) $link_id, @@ -302,8 +299,8 @@ public function view($link_id, $page, $mode = 'new') '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())) : '', 'S_IGNORE_POST' => ($comments['foe'] && ($view != 'show' || $comment_id != $comments['comment_id'])) ? true : false, - 'L_IGNORE_POST' => ($comments['foe']) ? $this->language->lang('POST_BY_FOE', get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']), '', '') : '', - 'L_POST_DISPLAY' => ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '', '') : '', + 'L_IGNORE_POST' => ($comments['foe']) ? $this->language->lang('POST_BY_FOE', get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour'])) : '', + 'L_POST_DISPLAY' => ($comments['foe']) ? $this->language->lang('POST_DISPLAY', '', '') : '', 'S_INFO' => $this->auth->acl_get('m_info'), )); @@ -458,6 +455,8 @@ private function _check_comments_enable($link_id) */ private function _populate_form($link_id, $mode) { + $this->user->add_lang(array('ucp', 'posting')); + if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode != 'edit') { $this->s_hidden_fields = array_merge($this->s_hidden_fields, $this->captcha->get_hidden_fields()); diff --git a/controller/links.php b/controller/links.php index 5f48ecc..34523f9 100644 --- a/controller/links.php +++ b/controller/links.php @@ -101,8 +101,6 @@ public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config $this->root_path = $root_path; $this->php_ext = $php_ext; - $language->add_lang('directory', 'ernadoo/phpbbdirectory'); - $template->assign_vars(array( 'S_PHPBB_DIRECTORY' => true, )); diff --git a/controller/search.php b/controller/search.php index 1c6853d..792eedd 100644 --- a/controller/search.php +++ b/controller/search.php @@ -82,9 +82,6 @@ public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config $this->categorie = $categorie; $this->link = $link; - $language->add_lang('directory', 'ernadoo/phpbbdirectory'); - $language->add_lang('search'); - $template->assign_vars(array( 'S_PHPBB_DIRECTORY' => true, )); @@ -104,6 +101,8 @@ public function main($page) throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH'); } + $this->language->add_lang('search'); + $cat_id = $this->request->variable('cat_id', 0); $keywords = $this->request->variable('keywords', '', true); $search_terms = $this->request->variable('terms', 'all'); @@ -164,12 +163,30 @@ public function main($page) $u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit))); - ($u_hilit) ? $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)) : ''; - ($search_terms != 'all') ? $u_search['terms'] = $search_terms : ''; - ($cat_id) ? $u_search['cat_id'] = $cat_id : ''; - ($search_category) ? $u_search['cid'] = $search_category : ''; - (!$search_child) ? $u_search['sc'] = 0 : ''; - ($search_fields != 'all') ? $u_search['sf'] = $search_fields : ''; + if ($u_hilit) + { + $u_search['keywords'] = urlencode(htmlspecialchars_decode($keywords)); + } + if ($search_terms != 'all') + { + $u_search['terms'] = $search_terms; + } + if ($cat_id) + { + $u_search['cat_id'] = $cat_id; + } + if ($search_category) + { + $u_search['cid'] = $search_category; + } + if (!$search_child) + { + $u_search['sc'] = 0; + } + if ($search_fields != 'all') + { + $u_search['sf'] = $search_fields; + } $base_url = array( 'routes' => 'ernadoo_phpbbdirectory_search_controller', @@ -267,13 +284,13 @@ public function main($page) 'THUMB' => ''.$this->language->lang('DIR_THUMB').'', 'IMG_BANNER' => $s_banner, 'IMG_FLAG' => $this->config['dir_activ_flag'] ? $s_flag : '', - 'ON_CLICK' => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $data['link_id']))."'); return false;\"", 'L_DIR_SEARCH_NB_CLICKS' => $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $data['link_view']), 'L_DIR_SEARCH_NB_COMMS' => $this->language->lang('DIR_SEARCH_NB_COMMS', (int) $data['link_comment']), 'U_COMMENT' => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $data['link_id'])), 'U_SITE' => $data['link_url'], + 'U_VIEW' => $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $data['link_id'])), 'LINK_ID' => $data['link_id'], )); } diff --git a/core/categorie.php b/core/categorie.php index 8ccc943..7bacfc1 100644 --- a/core/categorie.php +++ b/core/categorie.php @@ -10,8 +10,6 @@ namespace ernadoo\phpbbdirectory\core; -use \ernadoo\phpbbdirectory\core\helper; - class categorie extends helper { /** @var \phpbb\db\driver\driver_interface */ @@ -441,9 +439,9 @@ public function watch_categorie($mode, &$s_watching, $user_id, $cat_id, $notify_ { if ($mode == 'unwatch') { - $sql = 'DELETE FROM ' . $this->watch_table . " - WHERE cat_id = $cat_id - AND user_id = $user_id"; + $sql = 'DELETE FROM ' . $this->watch_table . ' + WHERE cat_id = ' . (int) $cat_id . ' + AND user_id = ' . (int) $user_id; $this->db->sql_query($sql); $redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id); @@ -464,9 +462,9 @@ public function watch_categorie($mode, &$s_watching, $user_id, $cat_id, $notify_ if ($notify_status != NOTIFY_YES) { $sql = 'UPDATE ' . $this->watch_table . ' - SET notify_status = ' . NOTIFY_YES . " - WHERE cat_id = $cat_id - AND user_id = $user_id"; + SET notify_status = ' . NOTIFY_YES . ' + WHERE cat_id = '. (int) $cat_id . ' + AND user_id = ' . (int) $user_id; $this->db->sql_query($sql); } } @@ -475,8 +473,13 @@ public function watch_categorie($mode, &$s_watching, $user_id, $cat_id, $notify_ { if ($mode == 'watch') { - $sql = 'INSERT INTO ' . $this->watch_table . " (user_id, cat_id, notify_status) - VALUES ($user_id, $cat_id, " . NOTIFY_YES . ')'; + $data = array( + 'user_id' => (int) $user_id, + 'cat_id' => (int) $cat_id, + 'notify_status' => NOTIFY_YES + ); + + $sql = 'INSERT INTO ' . $this->watch_table . ' ' . $this->db->sql_build_array('INSERT', $data); $this->db->sql_query($sql); $redirect_url = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id); diff --git a/core/comment.php b/core/comment.php index 9cc2b10..d4bf965 100644 --- a/core/comment.php +++ b/core/comment.php @@ -10,8 +10,6 @@ namespace ernadoo\phpbbdirectory\core; -use \ernadoo\phpbbdirectory\core\helper; - class comment extends helper { /** @var \phpbb\db\driver\driver_interface $db */ diff --git a/core/cron.php b/core/cron.php index 6022711..5d30fb3 100644 --- a/core/cron.php +++ b/core/cron.php @@ -10,8 +10,6 @@ namespace ernadoo\phpbbdirectory\core; -use \ernadoo\phpbbdirectory\core\helper; - class cron extends helper { /** @var \phpbb\db\driver\driver_interface */ @@ -120,7 +118,7 @@ public function get_cat($cat_id) * After $nb_check verification, website is deleted, otherwise, a notification is send to poster * * @param int $cat_id The category ID - * @param int $nb_check Number of check before demete a website + * @param int $nb_check Number of check before delete a website * @param int $next_prune Date of next auto check * @return null */ @@ -147,7 +145,7 @@ private function _check($cat_id, $nb_check, $next_prune) { if ($this->link->validate_link_back($row['link_back'], false, true) !== false) { - if (!$nb_check || ($row['link_nb_check']+1) >= $nb_check) + if (!$nb_check || ($row['link_nb_check']+1) > $nb_check) { $del_array[] = $row['link_id']; } @@ -184,8 +182,6 @@ private function _update_check($u_array, $next_prune) include($this->root_path . 'includes/functions_messenger.' . $this->php_ext); } - $messenger = new \messenger(false); - // cron.php don't call $user->setup(), so $this->timezone is unset. // We need to define it, because we use user->format_date below $this->user->timezone = new \DateTimeZone($this->config['board_timezone']); @@ -197,43 +193,25 @@ private function _update_check($u_array, $next_prune) foreach ($u_array as $data) { - strip_bbcode($data['link_description']); - - $notification_data = array( - 'cat_name' => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']), - 'link_id' => $data['link_id'], - 'link_user_id' => $data['link_user_id'], - 'link_name' => $data['link_name'], - 'link_url' => $data['link_url'], - 'link_description' => $data['link_description'], - 'next_cron' => $this->user->format_date($next_prune, $data['user_dateformat']), - ); - - if ($data['link_nb_check']) - { - $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data); - } - - // New notification system can't send mail to an anonymous user with an email address stored in another table than phpbb_users - if ($data['link_user_id'] == ANONYMOUS) + if ($data['link_user_id']) { - $username = $email = $data['link_guest_email']; - - $messenger->template('@ernadoo_phpbbdirectory/directory_website_error_cron', $data['user_lang']); - $messenger->to($email, $username); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($username), - 'LINK_NAME' => $data['link_name'], - 'LINK_URL' => $data['link_url'], - 'LINK_DESCRIPTION' => $data['link_description'], - 'NEXT_CRON' => $this->user->format_date($next_prune, $data['user_dateformat']), - )); + strip_bbcode($data['link_description']); + + $notification_data = array( + 'cat_name' => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']), + 'link_id' => $data['link_id'], + 'link_user_id' => $data['link_user_id'], + 'link_name' => $data['link_name'], + 'link_url' => $data['link_url'], + 'link_description' => $data['link_description'], + 'next_cron' => $this->user->format_date($next_prune, $data['user_dateformat']), + ); + + if ($data['link_nb_check']) + { + $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data['link_id']); + } - $messenger->send(NOTIFY_EMAIL); - } - else - { $this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data); } } diff --git a/core/link.php b/core/link.php index 0b97afe..a74f38b 100644 --- a/core/link.php +++ b/core/link.php @@ -10,8 +10,6 @@ namespace ernadoo\phpbbdirectory\core; -use \ernadoo\phpbbdirectory\core\helper; - class link extends helper { /** @var \phpbb\db\driver\driver_interface */ @@ -323,7 +321,7 @@ public function checkurl($url) if ($details['scheme'] == 'https') { $default_port = 443; - $hostname = 'tls://' . $details['host']; + $hostname = 'ssl://' . $details['host']; } if (!isset($details['path'])) @@ -914,16 +912,18 @@ public function recents() } $this->template->assign_block_vars('block.row.col', array( - 'UC_THUMBNAIL' => ''.$row['link_name'].'', - 'NAME' => $row['link_name'], - 'USER' => get_username_string('full', $row['link_user_id'], $row['username'], $row['user_colour']), - 'TIME' => ($row['link_time']) ? $this->user->format_date($row['link_time']) : '', - 'CAT' => $row['cat_name'], - 'COUNT' => $row['link_view'], - 'COMMENT' => $row['link_comment'], - - 'U_CAT' => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']), - 'U_COMMENT' => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])), + 'NAME' => $row['link_name'], + 'USER' => get_username_string('full', $row['link_user_id'], $row['username'], $row['user_colour']), + 'TIME' => ($row['link_time']) ? $this->user->format_date($row['link_time']) : '', + 'CAT' => $row['cat_name'], + 'COUNT' => $row['link_view'], + 'COMMENT' => $row['link_comment'], + + 'U_CAT' => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']), + 'U_COMMENT' => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])), + 'U_LINK' => $row['link_url'], + 'U_THUMB' => $this->display_thumb($row), + 'U_VIEW' => $this->helper->route('ernadoo_phpbbdirectory_view_controller', array('link_id' => (int) $row['link_id'])), 'L_DIR_SEARCH_NB_CLICKS' => $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']), 'L_DIR_SEARCH_NB_COMMS' => $this->language->lang('DIR_SEARCH_NB_COMMS', (int) $row['link_comment']), diff --git a/event/listener.php b/event/listener.php index 82ed6f0..22c7568 100644 --- a/event/listener.php +++ b/event/listener.php @@ -124,7 +124,7 @@ public function load_language_on_setup($event) $lang_set_ext = $event['lang_set_ext']; $lang_set_ext[] = array( 'ext_name' => 'ernadoo/phpbbdirectory', - 'lang_set' => 'directory_common', + 'lang_set' => 'directory', ); $event['lang_set_ext'] = $lang_set_ext; } diff --git a/language/en/directory.php b/language/en/directory.php index 6026e64..b9154f6 100644 --- a/language/en/directory.php +++ b/language/en/directory.php @@ -71,6 +71,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Are you sure you want to delete the website ?', 'DIR_DESCRIPTION' => 'Description', 'DIR_DESCRIPTION_EXP' => 'A short description of your website, %d characters max.', + 'DIR_DIRECTORY' => 'Directory', 'DIR_DISPLAY_LINKS' => 'Show the previous links', 'DIR_EDIT' => 'Edit', 'DIR_EDIT_COMMENT_OK' => 'This comment has been edited successfully', @@ -170,6 +171,18 @@ 'DIRECTORY_TRANSLATION_INFO' => '', + 'NOTIFICATION_DIR_NEW' => '%1$s posted a new website "%2$s" in the categorie "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'PhpBB Directory Notifications', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'The backlink to this forum on one of my links is not found', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'A new website needs approval', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Your website are approved or disapproved by a moderator', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Someone submits a website in a categorie to which you are subscribed', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Your website "%1$s" in the categorie "%2$s" was approved.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Your website "%1$s" in the categorie "%2$s" was disapproved.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'The backlink on "%1$s" in the categorie "%2$s" is not found', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'A new website named "%1$s" was posted by %2$s and needs approval.', + 'RECENT_LINKS' => 'Last websites added', 'TOO_LONG_BACK' => 'Address containing link back is too long (255 characters maximum)', diff --git a/language/en/directory_common.php b/language/en/directory_common.php deleted file mode 100644 index 676814c..0000000 --- a/language/en/directory_common.php +++ /dev/null @@ -1,38 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Directory', - - 'NOTIFICATION_DIR_NEW' => '%1$s posted a new website "%2$s" in the categorie "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'PhpBB Directory Notifications', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'The backlink to this forum on one of my links is not found', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'A new website needs approval', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Your website are approved or disapproved by a moderator', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Someone submits a website in a categorie to which you are subscribed', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Your website "%1$s" in the categorie "%2$s" was approved.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Your website "%1$s" in the categorie "%2$s" was disapproved.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'The backlink on "%1$s" in the categorie "%2$s" is not found', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'A new website named "%1$s" was posted by %2$s and needs approval.', -)); diff --git a/language/es/directory.php b/language/es/directory.php index bf79721..0f1d14d 100644 --- a/language/es/directory.php +++ b/language/es/directory.php @@ -71,6 +71,7 @@ 'DIR_DELETE_SITE_CONFIRM' => '¿Seguro que quieres eliminar el sitio web?', 'DIR_DESCRIPTION' => 'Descripción', 'DIR_DESCRIPTION_EXP' => 'Una breve descripción de su sitio web, %d caracteres max.', + 'DIR_DIRECTORY' => 'Directorio', 'DIR_DISPLAY_LINKS' => 'Mostrar los enlaces anteriores', 'DIR_EDIT' => 'Editar', 'DIR_EDIT_COMMENT_OK' => 'Este comentario ha sido editado correctamente', @@ -170,6 +171,18 @@ 'DIRECTORY_TRANSLATION_INFO' => '', + 'NOTIFICATION_DIR_NEW' => '%1$s publicó un nuevo sitio web "%2$s" en la categoría "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'Notificaciones de Directorio de phpBB', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'El enlace de retroceso a este foro en uno de mis enlaces no se encuentra', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Un nuevo sitio web necesita aprobación', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Su sitio web ha sido aprobado o rechazado por un moderador', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Alguien envía un sitio web en una categoría a la que está suscrito', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Su sitio web "%1$s" en la categoría "%2$s" fue aprobado.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Su sitio web "%1$s" en la categoría "%2$s" fue rechazado.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'El vínculo de retroceso en "%1$s" en la categoría "%2$s" no funciona', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Un nuevo sitio web llamado "%1$s" fue publicado por %2$s y necesita aprobación.', + 'RECENT_LINKS' => 'Últimos sitios web agregados', 'TOO_LONG_BACK' => 'La dirección que contiene el enlace es demasiado larga (255 caracteres como máximo)', diff --git a/language/es/directory_common.php b/language/es/directory_common.php deleted file mode 100644 index 80c1cad..0000000 --- a/language/es/directory_common.php +++ /dev/null @@ -1,38 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Directorio', - - 'NOTIFICATION_DIR_NEW' => '%1$s publicó un nuevo sitio web "%2$s" en la categoría "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'Notificaciones de Directorio de phpBB', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'El enlace de retroceso a este foro en uno de mis enlaces no se encuentra', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Un nuevo sitio web necesita aprobación', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Su sitio web ha sido aprobado o rechazado por un moderador', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Alguien envía un sitio web en una categoría a la que está suscrito', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Su sitio web "%1$s" en la categoría "%2$s" fue aprobado.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Su sitio web "%1$s" en la categoría "%2$s" fue rechazado.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'El vínculo de retroceso en "%1$s" en la categoría "%2$s" no funciona', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Un nuevo sitio web llamado "%1$s" fue publicado por %2$s y necesita aprobación.', -)); diff --git a/language/fr/directory.php b/language/fr/directory.php index 5c310f2..ff92770 100644 --- a/language/fr/directory.php +++ b/language/fr/directory.php @@ -71,6 +71,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Êtes-vous certain de vouloir supprimer le site ?', 'DIR_DESCRIPTION' => 'Description', 'DIR_DESCRIPTION_EXP' => 'Une courte description de votre site, celle-ci ne peut pas dépasser %d caractères.', + 'DIR_DIRECTORY' => 'Annuaire', 'DIR_DISPLAY_LINKS' => 'Afficher les liens précédents', 'DIR_EDIT' => 'Modifier', 'DIR_EDIT_COMMENT_OK' => 'Le commentaire a bien été modifié', @@ -170,6 +171,18 @@ 'DIRECTORY_TRANSLATION_INFO' => '', + 'NOTIFICATION_DIR_NEW' => '%1$s a posté un nouveau lien « %2$s » dans la catégorie « %3$s ».', + 'NOTIFICATION_DIR_UCP' => 'Notifications de phpBB Annuaire', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Le lien retour de l’un de vos sites web n’a pas été trouvé', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Un nouveau site est en attente de validation', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Votre site web a été approuvé ou désapprouvé par un administrateur', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Quelqu’un a soumis un site web dans une catégorie que vous surveillez', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Votre site web « %1$s » posté dans la catégorie « %2$s » a été validé.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Votre site web « %1$s » posté dans la catégorie « %2$s » n’a pas été validé.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Le lien retour sur « %1$s » posté dans la catégorie « %2$s » n’a pas été trouvé.', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Un nouveau site web nommé « %1$s » a été posté par %2$s et nécéssite une validation.', + 'RECENT_LINKS' => 'Derniers sites ajoutés', diff --git a/language/fr/directory_common.php b/language/fr/directory_common.php deleted file mode 100644 index f701912..0000000 --- a/language/fr/directory_common.php +++ /dev/null @@ -1,38 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Annuaire', - - 'NOTIFICATION_DIR_NEW' => '%1$s a posté un nouveau lien « %2$s » dans la catégorie « %3$s ».', - 'NOTIFICATION_DIR_UCP' => 'Notifications de phpBB Annuaire', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Le lien retour de l’un de vos sites web n’a pas été trouvé', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Un nouveau site est en attente de validation', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Votre site web a été approuvé ou désapprouvé par un administrateur', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Quelqu’un a soumis un site web dans une catégorie que vous surveillez', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Votre site web « %1$s » posté dans la catégorie « %2$s » a été validé.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Votre site web « %1$s » posté dans la catégorie « %2$s » n’a pas été validé.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Le lien retour sur « %1$s » posté dans la catégorie « %2$s » n’a pas été trouvé.', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Un nouveau site web nommé « %1$s » a été posté par %2$s et nécéssite une validation.', -)); diff --git a/language/nl/directory.php b/language/nl/directory.php index 67dafa3..e3670df 100644 --- a/language/nl/directory.php +++ b/language/nl/directory.php @@ -72,6 +72,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Weet je zeker dat je de website wilt verwijderen?', 'DIR_DESCRIPTION' => 'Beschrijving', 'DIR_DESCRIPTION_EXP' => 'Een korte beschrijving van de website, max %d tekens.', + 'DIR_DIRECTORY' => 'Directory', 'DIR_DISPLAY_LINKS' => 'Links van vorige weergeven', 'DIR_EDIT' => 'Wijzig', 'DIR_EDIT_COMMENT_OK' => 'De reactie is succesvol gewijzigd', @@ -171,6 +172,18 @@ 'DIRECTORY_TRANSLATION_INFO' => 'Vertaald door dutch-translators', + 'NOTIFICATION_DIR_NEW' => '%1$s plaatste een nieuwe website "%2$s" in de categorie "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'PhpBB Directory Notificatie', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'De terugkoppeling naar dit forum op één van mijn links is niet gevonden', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Een nieuwe website heeft goedkeuring nodig', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Je website is goedgekeurd of afgekeurd door een moderator', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Iemand heeft een website toegevoegd aan de categorie waarop je bent geabonneerd', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Je website "%1$s" in de categorie "%2$s" is goedgekeurd.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Je website "%1$s" in de categorie "%2$s" is afgekeurd.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'De terugkoppeling op "%1$s" in de categorie "%2$s" is niet gevonden', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Een nieuwe website genaamd "%1$s" is geplaatst door %2$s en heeft goedkeuring nodig.', + 'RECENT_LINKS' => 'Laatst toegevoegde website', 'TOO_LONG_BACK' => 'Adres met de link back is te lang (maximum 255 tekens)', diff --git a/language/nl/directory_common.php b/language/nl/directory_common.php deleted file mode 100644 index b6c3bfd..0000000 --- a/language/nl/directory_common.php +++ /dev/null @@ -1,39 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* Dutch translation by Dutch Translators (https://github.com/dutch-translators) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Directory', - - 'NOTIFICATION_DIR_NEW' => '%1$s plaatste een nieuwe website "%2$s" in de categorie "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'PhpBB Directory Notificatie', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'De terugkoppeling naar dit forum op één van mijn links is niet gevonden', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Een nieuwe website heeft goedkeuring nodig', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Je website is goedgekeurd of afgekeurd door een moderator', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Iemand heeft een website toegevoegd aan de categorie waarop je bent geabonneerd', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Je website "%1$s" in de categorie "%2$s" is goedgekeurd.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Je website "%1$s" in de categorie "%2$s" is afgekeurd.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'De terugkoppeling op "%1$s" in de categorie "%2$s" is niet gevonden', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Een nieuwe website genaamd "%1$s" is geplaatst door %2$s en heeft goedkeuring nodig.', -)); diff --git a/language/ru/directory.php b/language/ru/directory.php index e98b807..86d86ac 100644 --- a/language/ru/directory.php +++ b/language/ru/directory.php @@ -72,6 +72,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Вы уверены, что хотите удалить сайт?', 'DIR_DESCRIPTION' => 'Описание', 'DIR_DESCRIPTION_EXP' => 'Краткое описание вашего сайта, Максимальное количество символов %d.', + 'DIR_DIRECTORY' => 'Каталог', 'DIR_DISPLAY_LINKS' => 'Показать сайты за', 'DIR_EDIT' => 'Редактировать', 'DIR_EDIT_COMMENT_OK' => 'Этот комментарий был успешно отредактирован', @@ -177,6 +178,18 @@ 'DIRECTORY_TRANSLATION_INFO' => '', + 'NOTIFICATION_DIR_NEW' => '%1$s добавлен новый сайт "%2$s" в категории "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'Уведомления каталога', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Обратной ссылки на форум в одной ссылке из моих представленных не найдено', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Новый сайт нуждается в одобрении', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Ваш сайт будет одобрены или отклонен модератором после проверки', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Добавлен сайт в категории на которую вы подписаны', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Ваш сайт "%1$s" из категории "%2$s" одобрен.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Ваш сайт "%1$s" из категории "%2$s" был отклонен.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Обратная ссылка на "%1$s" в категории "%2$s" не найдена', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Новое имя сайта "%1$s" было добавлено %2$s и нуждаться в одобрении.', + 'RECENT_LINKS' => 'Последние сайты', 'TOO_LONG_BACK' => 'Адрес содержащий обратную ссылку слишком длинный (255 символов максимум)', diff --git a/language/ru/directory_common.php b/language/ru/directory_common.php deleted file mode 100644 index 20011c7..0000000 --- a/language/ru/directory_common.php +++ /dev/null @@ -1,39 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Каталог', - - 'NOTIFICATION_DIR_NEW' => '%1$s добавлен новый сайт "%2$s" в категории "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'Уведомления каталога', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Обратной ссылки на форум в одной ссылке из моих представленных не найдено', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Новый сайт нуждается в одобрении', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Ваш сайт будет одобрены или отклонен модератором после проверки', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Добавлен сайт в категории на которую вы подписаны', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Ваш сайт "%1$s" из категории "%2$s" одобрен.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Ваш сайт "%1$s" из категории "%2$s" был отклонен.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Обратная ссылка на "%1$s" в категории "%2$s" не найдена', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Новое имя сайта "%1$s" было добавлено %2$s и нуждаться в одобрении.', -)); diff --git a/language/sr/directory.php b/language/sr/directory.php index f58d44c..1d4b29c 100644 --- a/language/sr/directory.php +++ b/language/sr/directory.php @@ -71,6 +71,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Da li ste sigurni da želite da izbrišete vebsajt ?', 'DIR_DESCRIPTION' => 'Opis', 'DIR_DESCRIPTION_EXP' => 'Kratak opis vašeg vebsajta, maksimum %d karaktera.', + 'DIR_DIRECTORY' => 'Direktorijuma', 'DIR_DISPLAY_LINKS' => 'Prikazati prethodne linkove', 'DIR_EDIT' => 'Izmeniti', 'DIR_EDIT_COMMENT_OK' => 'Vaš komentar je uspešno izmenjen', @@ -176,6 +177,18 @@ 'DIRECTORY_TRANSLATION_INFO' => 'Prevod na srpski jezik: Aleksandra KNEZEVIC', + 'NOTIFICATION_DIR_NEW' => '%1$s je objavio novi link "%2$s" u kategoriji "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'Notifikacije PhpBB direktorijuma', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Povratni link jednog od vaših sajtova nije pronadjen', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Jedan novi sajt ceka potvrdu', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Vaš vebsajt je potvrdjen ili nije potvrdjen od strane administratora', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Novi link je objavljen u kategoriji koju pratite', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Vaš vebsajt "%1$s" objavljen u kategoriji "%2$s"je potvrdjen.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Vaš vebsajt "%1$s" objavljen u kategoriji "%2$s"nije potvrdjen.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Povratni link za "%1$s"objavljen u kategoriji "%2$s"nije pronadjen.', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Novi vebsajt pod nazivom "%1$s" je objavljen od strane %2$s i čeka potvrdu.', + 'RECENT_LINKS' => 'Poslednji dodati vebsajtovi', 'TOO_LONG_BACK' => 'Adresa povratnog linka je preduga (maksimum 255 karaktera)', diff --git a/language/sr/directory_common.php b/language/sr/directory_common.php deleted file mode 100644 index 92ce870..0000000 --- a/language/sr/directory_common.php +++ /dev/null @@ -1,38 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Direktorijuma', - - 'NOTIFICATION_DIR_NEW' => '%1$s je objavio novi link "%2$s" u kategoriji "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'Notifikacije PhpBB direktorijuma', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Povratni link jednog od vaših sajtova nije pronadjen', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'Jedan novi sajt ceka potvrdu', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Vaš vebsajt je potvrdjen ili nije potvrdjen od strane administratora', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Novi link je objavljen u kategoriji koju pratite', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Vaš vebsajt "%1$s" objavljen u kategoriji "%2$s"je potvrdjen.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Vaš vebsajt "%1$s" objavljen u kategoriji "%2$s"nije potvrdjen.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Povratni link za "%1$s"objavljen u kategoriji "%2$s"nije pronadjen.', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'Novi vebsajt pod nazivom "%1$s" je objavljen od strane %2$s i čeka potvrdu.', -)); diff --git a/language/sv/directory.php b/language/sv/directory.php index f2dad51..666176a 100644 --- a/language/sv/directory.php +++ b/language/sv/directory.php @@ -71,6 +71,7 @@ 'DIR_DELETE_SITE_CONFIRM' => 'Är du säker på att du vill ta bort hemsidan ?', 'DIR_DESCRIPTION' => 'Beskrivning', 'DIR_DESCRIPTION_EXP' => 'En kort beskrivning av din hemsida, max %d tecken.', + 'DIR_DIRECTORY' => 'Länklista', 'DIR_DISPLAY_LINKS' => 'Visa de föregående länkarna', 'DIR_EDIT' => 'Redigera', 'DIR_EDIT_COMMENT_OK' => 'Denna kommentar har redigerats', @@ -170,6 +171,18 @@ 'DIRECTORY_TRANSLATION_INFO' => '', + 'NOTIFICATION_DIR_NEW' => '%1$s la till en ny hemsida "%2$s" i kategorin "%3$s".', + 'NOTIFICATION_DIR_UCP' => 'PhpBB Länklista Notifieringar', + 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Tillbakalänken till detta forum på en av mina länkar kunde inte hittas', + 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'En ny hemsida behöver godkännande', + 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Din hemsida godkänns (eller godkänns ej) av en moderator', + 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Någon la till en hemsida i en kategori som du prenumererar på', + + 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Din hemsida "%1$s" i kategorin "%2$s" godkändes.', + 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Din hemsida "%1$s" i kategorin "%2$s" godkändes ej.', + 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Tillbakalänken på "%1$s" i kategorin "%2$s" hittades inte', + 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'En ny hemsida med namn "%1$s" blev tillagd av %2$s och behöver godkännande.', + 'RECENT_LINKS' => 'Senast tillagda hemsidor', 'TOO_LONG_BACK' => 'Adressen som innehåller tillbakalänken är för lång (255 tecken max)', diff --git a/language/sv/directory_common.php b/language/sv/directory_common.php deleted file mode 100644 index cd7d920..0000000 --- a/language/sv/directory_common.php +++ /dev/null @@ -1,38 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -*/ - -/** -* DO NOT CHANGE -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -if (empty($lang) || !is_array($lang)) -{ - $lang = array(); -} - -$lang = array_merge($lang, array( - 'DIRECTORY' => 'Länklista', - - 'NOTIFICATION_DIR_NEW' => '%1$s la till en ny hemsida "%2$s" i kategorin "%3$s".', - 'NOTIFICATION_DIR_UCP' => 'PhpBB Länklista Notifieringar', - 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK' => 'Tillbakalänken till detta forum på en av mina länkar kunde inte hittas', - 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE' => 'En ny hemsida behöver godkännande', - 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE' => 'Din hemsida godkänns (eller godkänns ej) av en moderator', - 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE' => 'Någon la till en hemsida i en kategori som du prenumererar på', - - 'NOTIFICATION_DIR_WEBSITE_APPROVED' => 'Din hemsida "%1$s" i kategorin "%2$s" godkändes.', - 'NOTIFICATION_DIR_WEBSITE_DISAPPROVED' => 'Din hemsida "%1$s" i kategorin "%2$s" godkändes ej.', - 'NOTIFICATION_DIR_WEBSITE_ERROR_CHECK' => 'Tillbakalänken på "%1$s" i kategorin "%2$s" hittades inte', - 'NOTIFICATION_DIR_WEBSITE_IN_QUEUE' => 'En ny hemsida med namn "%1$s" blev tillagd av %2$s och behöver godkännande.', -)); diff --git a/migrations/converter/convert_module.php b/migrations/converter/convert_module.php index 782cf3f..8ded3d4 100644 --- a/migrations/converter/convert_module.php +++ b/migrations/converter/convert_module.php @@ -59,7 +59,7 @@ public function rename_old_module() $sql = 'UPDATE ' . $this->table_prefix . 'modules SET ' . $this->db->sql_build_array('UPDATE', $module_data) . " WHERE module_basename = 'acp_directory' - AND module_mode IN ('main', 'settings', 'cat', 'val')"; + AND " . $this->db->sql_in_set('module_mode', array('main', 'settings', 'cat', 'val')); $this->db->sql_query($sql); } } diff --git a/styles/prosilver/template/event/overall_header_breadcrumb_append.html b/styles/prosilver/template/event/overall_header_breadcrumb_append.html index 19408f9..1800b93 100644 --- a/styles/prosilver/template/event/overall_header_breadcrumb_append.html +++ b/styles/prosilver/template/event/overall_header_breadcrumb_append.html @@ -1,5 +1,5 @@ {% if S_PHPBB_DIRECTORY %} - + {% if dir_navlinks %} {% for dir_navlinks in dir_navlinks %}{% endfor %} {% endif %} diff --git a/styles/prosilver/template/event/overall_header_navigation_prepend.html b/styles/prosilver/template/event/overall_header_navigation_prepend.html index 8d3974a..9142583 100644 --- a/styles/prosilver/template/event/overall_header_navigation_prepend.html +++ b/styles/prosilver/template/event/overall_header_navigation_prepend.html @@ -1,5 +1,5 @@
  • - - {{ lang('DIRECTORY') }} + + {{ lang('DIR_DIRECTORY') }}
    • \ No newline at end of file diff --git a/styles/prosilver/template/recents.html b/styles/prosilver/template/recents.html index 36a76c8..17ba72f 100644 --- a/styles/prosilver/template/recents.html +++ b/styles/prosilver/template/recents.html @@ -22,7 +22,9 @@ diff --git a/styles/prosilver/template/search_results.html b/styles/prosilver/template/search_results.html index 8450f1f..294d383 100644 --- a/styles/prosilver/template/search_results.html +++ b/styles/prosilver/template/search_results.html @@ -47,7 +47,7 @@

    {{ SEARCH_MATCHES }}{% if SEARCH_WORDS %}: {{
    {{ result.L_DIR_SEARCH_NB_COMMS }}{{ lang('COLON') }} {{ result.S_COMMENT }}
    -

    {{ result.S_SITE }}

    +

    {{ result.S_SITE }}

    {{ result.S_DESCRIPTION }}
    {% if result.IMG_BANNER %}{% endif %}
    diff --git a/styles/prosilver/template/view_cat.html b/styles/prosilver/template/view_cat.html index 3f144c1..51743c7 100644 --- a/styles/prosilver/template/view_cat.html +++ b/styles/prosilver/template/view_cat.html @@ -49,7 +49,7 @@

    {{ CAT_NAME }}

    -
    {{ lang('DIR_THUMB') }}
    +
    {{ lang('DIR_THUMB') }}
    {% if site.NOTE %}
    {{ lang('DIR_NOTE') }}{{ lang('COLON') }} {{ site.NOTE }}
    ({{ site.NB_VOTE }})
    @@ -76,7 +76,7 @@

    {{ CAT_NAME }}

    {% endif %}
    - {{ col.UC_THUMBNAIL }} + + {{ lang('DIR_THUMB') }} +