ErnadoO / ext-phpbb-directory

controller/comments.php

Doc Comments +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
      *
      * @throws \phpbb\exception\http_exception
      *
-     * @return null
+     * @return \Symfony\Component\HttpFoundation\Response|null
      */
     public function new_comment($link_id)
     {

Indentation +463 added lines, -463 removed lines

@@ -9,475 +9,475 @@
 
 class comments
 {
-    private $captcha;
-    private $s_comment;
-    private $s_hidden_fields = [];
-
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \phpbb\controller\helper */
-    protected $helper;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\auth\auth */
-    protected $auth;
-
-    /** @var \phpbb\pagination */
-    protected $pagination;
-
-    /** @var \phpbb\captcha\factory */
-    protected $captcha_factory;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\comment */
-    protected $comment;
-
-    /** @var string phpBB root path */
-    protected $root_path;
-
-    /** @var string phpEx */
-    protected $php_ext;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface      $db              Database object
-     * @param \phpbb\config\config                   $config          Config object
-     * @param \phpbb\template\template               $template        Template object
-     * @param \phpbb\user                            $user            User object
-     * @param \phpbb\controller\helper               $helper          Controller helper object
-     * @param \phpbb\request\request                 $request         Request object
-     * @param \phpbb\auth\auth                       $auth            Auth object
-     * @param \phpbb\pagination                      $pagination      Pagination object
-     * @param \phpbb\captcha\factory                 $captcha_factory Captcha object
-     * @param \ernadoo\phpbbdirectory\core\categorie $categorie       PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\comment   $comment         PhpBB Directory extension comment object
-     * @param string                                 $root_path       phpBB root path
-     * @param string                                 $php_ext         phpEx
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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)
-    {
-        $this->db = $db;
-        $this->config = $config;
-        $this->template = $template;
-        $this->user = $user;
-        $this->helper = $helper;
-        $this->request = $request;
-        $this->auth = $auth;
-        $this->pagination = $pagination;
-        $this->captcha_factory = $captcha_factory;
-        $this->categorie = $categorie;
-        $this->comment = $comment;
-        $this->root_path = $root_path;
-        $this->php_ext = $php_ext;
-
-        $this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
-        $user->add_lang(['ucp', 'posting']);
-
-        $this->template->assign_vars([
-            'S_PHPBB_DIRECTORY'                => true,
-            'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
-            'S_SIMPLE_MESSAGE'                 => true,
-        ]);
-
-        // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
-            $this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
-            $this->captcha->init(CONFIRM_POST);
-        }
-    }
-
-    /**
-     * Populate form when an error occurred.
-     *
-     * @param int $link_id    The link ID
-     * @param int $comment_id The comment ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function delete_comment($link_id, $comment_id)
-    {
-        $this->_check_comments_enable($link_id);
-
-        if ($this->request->is_set_post('cancel')) {
-            $redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
-            redirect($redirect);
-        }
-
-        $sql = 'SELECT *
+	private $captcha;
+	private $s_comment;
+	private $s_hidden_fields = [];
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\pagination */
+	protected $pagination;
+
+	/** @var \phpbb\captcha\factory */
+	protected $captcha_factory;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\comment */
+	protected $comment;
+
+	/** @var string phpBB root path */
+	protected $root_path;
+
+	/** @var string phpEx */
+	protected $php_ext;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface      $db              Database object
+	 * @param \phpbb\config\config                   $config          Config object
+	 * @param \phpbb\template\template               $template        Template object
+	 * @param \phpbb\user                            $user            User object
+	 * @param \phpbb\controller\helper               $helper          Controller helper object
+	 * @param \phpbb\request\request                 $request         Request object
+	 * @param \phpbb\auth\auth                       $auth            Auth object
+	 * @param \phpbb\pagination                      $pagination      Pagination object
+	 * @param \phpbb\captcha\factory                 $captcha_factory Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie $categorie       PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\comment   $comment         PhpBB Directory extension comment object
+	 * @param string                                 $root_path       phpBB root path
+	 * @param string                                 $php_ext         phpEx
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->helper = $helper;
+		$this->request = $request;
+		$this->auth = $auth;
+		$this->pagination = $pagination;
+		$this->captcha_factory = $captcha_factory;
+		$this->categorie = $categorie;
+		$this->comment = $comment;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+
+		$this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
+		$user->add_lang(['ucp', 'posting']);
+
+		$this->template->assign_vars([
+			'S_PHPBB_DIRECTORY'                => true,
+			'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
+			'S_SIMPLE_MESSAGE'                 => true,
+		]);
+
+		// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
+		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+			$this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
+			$this->captcha->init(CONFIRM_POST);
+		}
+	}
+
+	/**
+	 * Populate form when an error occurred.
+	 *
+	 * @param int $link_id    The link ID
+	 * @param int $comment_id The comment ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function delete_comment($link_id, $comment_id)
+	{
+		$this->_check_comments_enable($link_id);
+
+		if ($this->request->is_set_post('cancel')) {
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
+			redirect($redirect);
+		}
+
+		$sql = 'SELECT *
 			FROM '.DIR_COMMENT_TABLE.'
 			WHERE comment_id = '.(int) $comment_id;
-        $result = $this->db->sql_query($sql);
-        $value = $this->db->sql_fetchrow($result);
-
-        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_delete_comment_dir') && (!$this->auth->acl_get('u_delete_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        if (confirm_box(true)) {
-            $this->comment->del($link_id, $comment_id);
-
-            $meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
-            meta_refresh(3, $meta_info);
-            $message = $this->user->lang['DIR_COMMENT_DELETE_OK'];
-            $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
-
-            return $this->helper->message($message);
-        } else {
-            confirm_box(false, 'DIR_COMMENT_DELETE');
-        }
-    }
-
-    /**
-     * Edit a comment.
-     *
-     * @param int $link_id    The category ID
-     * @param int $comment_id The comment ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function edit_comment($link_id, $comment_id)
-    {
-        $this->_check_comments_enable($link_id);
-
-        $sql = 'SELECT *
+		$result = $this->db->sql_query($sql);
+		$value = $this->db->sql_fetchrow($result);
+
+		if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_delete_comment_dir') && (!$this->auth->acl_get('u_delete_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		if (confirm_box(true)) {
+			$this->comment->del($link_id, $comment_id);
+
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
+			meta_refresh(3, $meta_info);
+			$message = $this->user->lang['DIR_COMMENT_DELETE_OK'];
+			$message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
+
+			return $this->helper->message($message);
+		} else {
+			confirm_box(false, 'DIR_COMMENT_DELETE');
+		}
+	}
+
+	/**
+	 * Edit a comment.
+	 *
+	 * @param int $link_id    The category ID
+	 * @param int $comment_id The comment ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function edit_comment($link_id, $comment_id)
+	{
+		$this->_check_comments_enable($link_id);
+
+		$sql = 'SELECT *
 			FROM '.DIR_COMMENT_TABLE.'
 			WHERE comment_id = '.(int) $comment_id;
-        $result = $this->db->sql_query($sql);
-        $value = $this->db->sql_fetchrow($result);
-
-        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_edit_comment_dir') && (!$this->auth->acl_get('u_edit_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $comment_text = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']);
-        $this->s_comment = $comment_text['text'];
-
-        $submit = $this->request->is_set_post('update_comment') ? true : false;
-
-        // If form is done
-        if ($submit) {
-            return $this->_data_processing($link_id, $comment_id, 'edit');
-        }
-
-        return $this->view($link_id, 1, 'edit');
-    }
-
-    /**
-     * Post a new comment.
-     *
-     * @param int $link_id The category ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null
-     */
-    public function new_comment($link_id)
-    {
-        $this->_check_comments_enable($link_id);
-
-        if (!$this->auth->acl_get('u_comment_dir')) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $submit = $this->request->is_set_post('submit_comment') ? true : false;
-        $refresh = $this->request->is_set_post('refresh_vc') ? true : false;
-
-        // If form is done
-        if ($submit || $refresh) {
-            return $this->_data_processing($link_id);
-        } else {
-            $redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
-            redirect($redirect);
-        }
-    }
-
-    /**
-     * Display popup comment.
-     *
-     * @param int    $link_id The category ID
-     * @param int    $page    Page number taken from the URL
-     * @param string $mode    add|edit
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function view($link_id, $page, $mode = 'new')
-    {
-        $this->_check_comments_enable($link_id);
-
-        $comment_id = $this->request->variable('c', 0);
-        $view = $this->request->variable('view', '');
-        $start = ($page - 1) * $this->config['dir_comments_per_page'];
-
-        $this->s_hidden_fields = array_merge($this->s_hidden_fields, ['page' => $page]);
-
-        $this->_populate_form($link_id, $mode);
-
-        $sql = 'SELECT COUNT(comment_id) AS nb_comments
+		$result = $this->db->sql_query($sql);
+		$value = $this->db->sql_fetchrow($result);
+
+		if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_edit_comment_dir') && (!$this->auth->acl_get('u_edit_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$comment_text = generate_text_for_edit($value['comment_text'], $value['comment_uid'], $value['comment_flags']);
+		$this->s_comment = $comment_text['text'];
+
+		$submit = $this->request->is_set_post('update_comment') ? true : false;
+
+		// If form is done
+		if ($submit) {
+			return $this->_data_processing($link_id, $comment_id, 'edit');
+		}
+
+		return $this->view($link_id, 1, 'edit');
+	}
+
+	/**
+	 * Post a new comment.
+	 *
+	 * @param int $link_id The category ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null
+	 */
+	public function new_comment($link_id)
+	{
+		$this->_check_comments_enable($link_id);
+
+		if (!$this->auth->acl_get('u_comment_dir')) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$submit = $this->request->is_set_post('submit_comment') ? true : false;
+		$refresh = $this->request->is_set_post('refresh_vc') ? true : false;
+
+		// If form is done
+		if ($submit || $refresh) {
+			return $this->_data_processing($link_id);
+		} else {
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
+			redirect($redirect);
+		}
+	}
+
+	/**
+	 * Display popup comment.
+	 *
+	 * @param int    $link_id The category ID
+	 * @param int    $page    Page number taken from the URL
+	 * @param string $mode    add|edit
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function view($link_id, $page, $mode = 'new')
+	{
+		$this->_check_comments_enable($link_id);
+
+		$comment_id = $this->request->variable('c', 0);
+		$view = $this->request->variable('view', '');
+		$start = ($page - 1) * $this->config['dir_comments_per_page'];
+
+		$this->s_hidden_fields = array_merge($this->s_hidden_fields, ['page' => $page]);
+
+		$this->_populate_form($link_id, $mode);
+
+		$sql = 'SELECT COUNT(comment_id) AS nb_comments
 			FROM '.DIR_COMMENT_TABLE.'
 			WHERE comment_link_id = '.(int) $link_id;
-        $result = $this->db->sql_query($sql);
-        $nb_comments = (int) $this->db->sql_fetchfield('nb_comments');
-        $this->db->sql_freeresult($result);
-
-        // Make sure $start is set to the last page if it exceeds the amount
-        $start = $this->pagination->validate_start($start, $this->config['dir_comments_per_page'], $nb_comments);
-
-        $sql_array = [
-            'SELECT'      => 'a.comment_id, a.comment_user_id, a. comment_user_ip, a.comment_date, a.comment_text, a.comment_uid, a.comment_bitfield, a.comment_flags, u.username, u.user_id, u.user_colour, z.foe',
-            'FROM'        => [
-                    DIR_COMMENT_TABLE    => 'a', ],
-            'LEFT_JOIN'    => [
-                    [
-                        'FROM'    => [USERS_TABLE => 'u'],
-                        'ON'      => 'a.comment_user_id = u.user_id',
-                    ],
-                    [
-                        'FROM'    => [ZEBRA_TABLE => 'z'],
-                        'ON'      => 'z.user_id = '.$this->user->data['user_id'].' AND z.zebra_id = a.comment_user_id',
-                    ],
-            ],
-            'WHERE'        => 'a.comment_link_id = '.(int) $link_id,
-            'ORDER_BY'     => 'a.comment_date DESC', ];
-        $sql = $this->db->sql_build_query('SELECT', $sql_array);
-        $result = $this->db->sql_query_limit($sql, $this->config['dir_comments_per_page'], $start);
-
-        $have_result = false;
-
-        while ($comments = $this->db->sql_fetchrow($result)) {
-            $have_result = true;
-
-            $edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_comment_dir') || (
-                $this->user->data['user_id'] == $comments['comment_user_id'] &&
-                $this->auth->acl_get('u_edit_comment_dir')
-            )));
-
-            $delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_comment_dir') || (
-                $this->user->data['user_id'] == $comments['comment_user_id'] &&
-                $this->auth->acl_get('u_delete_comment_dir')
-            )));
-
-            $this->template->assign_block_vars('comment', [
-                'MINI_POST_IMG'        => $this->user->img('icon_post_target', 'POST'),
-                'S_USER'               => get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']),
-                'S_USER_IP'            => $comments['comment_user_ip'],
-                'S_DATE'               => $this->user->format_date($comments['comment_date']),
-                'S_COMMENT'            => generate_text_for_display($comments['comment_text'], $comments['comment_uid'], $comments['comment_bitfield'], $comments['comment_flags']),
-                'S_ID'                 => $comments['comment_id'],
-
-                'U_EDIT'              => ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', ['link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id']]) : '',
-                'U_DELETE'            => ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', ['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->user->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>') : '',
-                'L_POST_DISPLAY'       => ($comments['foe']) ? $this->user->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>') : '',
-
-                'S_INFO'            => $this->auth->acl_get('m_info'),
-            ]);
-        }
-
-        $base_url = [
-            'routes'    => 'ernadoo_phpbbdirectory_comment_view_controller',
-            'params'    => ['link_id' => (int) $link_id],
-        ];
-
-        $this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $nb_comments, $this->config['dir_comments_per_page'], $start);
-
-        $this->template->assign_vars([
-            'TOTAL_COMMENTS'       => $this->user->lang('DIR_NB_COMMS', (int) $nb_comments),
-            'S_HAVE_RESULT'        => $have_result ? true : false,
-        ]);
-
-        return $this->helper->render('comments.html', $this->user->lang['DIR_COMMENT_TITLE']);
-    }
-
-    /**
-     * Routine.
-     *
-     * @param int    $link_id    The link ID
-     * @param int    $comment_id The comment ID
-     * @param string $mode       new|edit
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    private function _data_processing($link_id, $comment_id = 0, $mode = 'new')
-    {
-        if (!check_form_key('dir_form_comment')) {
-            return $this->helper->message('FORM_INVALID');
-        }
-
-        $this->s_comment = $this->request->variable('message', '', true);
-
-        if (!function_exists('validate_data')) {
-            include $this->root_path.'includes/functions_user.'.$this->php_ext;
-        }
-
-        $error = validate_data(
-            [
-                'reply' => $this->s_comment, ],
-            [
-                'reply' => [
-                    ['string', false, 1, $this->config['dir_length_comments']],
-                ],
-            ]
-        );
-
-        $error = array_map([$this->user, 'lang'], $error);
-
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
-            $vc_response = $this->captcha->validate();
-            if ($vc_response !== false) {
-                $error[] = $vc_response;
-            }
-
-            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
-                $error[] = $this->user->lang['TOO_MANY_ADDS'];
-            }
-        }
-
-        if (!$error) {
-            $uid = $bitfield = $flags = '';
-            generate_text_for_storage($this->s_comment, $uid, $bitfield, $flags, (bool) $this->config['dir_allow_bbcode'], (bool) $this->config['dir_allow_links'], (bool) $this->config['dir_allow_smilies']);
-
-            $data_edit = [
-                'comment_text'         => $this->s_comment,
-                'comment_uid'          => $uid,
-                'comment_flags'        => $flags,
-                'comment_bitfield'     => $bitfield,
-            ];
-
-            if ($mode == 'edit') {
-                $this->comment->edit($data_edit, $comment_id);
-            } else {
-                $data_add = [
-                    'comment_link_id'     => (int) $link_id,
-                    'comment_date'        => time(),
-                    'comment_user_id'     => $this->user->data['user_id'],
-                    'comment_user_ip'     => $this->user->ip,
-                ];
-
-                $data_add = array_merge($data_edit, $data_add);
-
-                $this->comment->add($data_add);
-            }
-
-            $meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
-            meta_refresh(3, $meta_info);
-            $message = $this->user->lang['DIR_'.strtoupper($mode).'_COMMENT_OK'];
-            $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
-
-            return $this->helper->message($message);
-        } else {
-            $this->template->assign_vars([
-                'ERROR'    => (count($error)) ? implode('<br />', $error) : '',
-            ]);
-
-            return $this->view($link_id, $this->request->variable('page', 1), $mode);
-        }
-    }
-
-    /**
-     * Check if comments are enable in a category.
-     *
-     * @param int $link_id The link ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null Retun null if comments are allowed, http_exception if not
-     */
-    private function _check_comments_enable($link_id)
-    {
-        $sql = 'SELECT link_cat
+		$result = $this->db->sql_query($sql);
+		$nb_comments = (int) $this->db->sql_fetchfield('nb_comments');
+		$this->db->sql_freeresult($result);
+
+		// Make sure $start is set to the last page if it exceeds the amount
+		$start = $this->pagination->validate_start($start, $this->config['dir_comments_per_page'], $nb_comments);
+
+		$sql_array = [
+			'SELECT'      => 'a.comment_id, a.comment_user_id, a. comment_user_ip, a.comment_date, a.comment_text, a.comment_uid, a.comment_bitfield, a.comment_flags, u.username, u.user_id, u.user_colour, z.foe',
+			'FROM'        => [
+					DIR_COMMENT_TABLE    => 'a', ],
+			'LEFT_JOIN'    => [
+					[
+						'FROM'    => [USERS_TABLE => 'u'],
+						'ON'      => 'a.comment_user_id = u.user_id',
+					],
+					[
+						'FROM'    => [ZEBRA_TABLE => 'z'],
+						'ON'      => 'z.user_id = '.$this->user->data['user_id'].' AND z.zebra_id = a.comment_user_id',
+					],
+			],
+			'WHERE'        => 'a.comment_link_id = '.(int) $link_id,
+			'ORDER_BY'     => 'a.comment_date DESC', ];
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $this->config['dir_comments_per_page'], $start);
+
+		$have_result = false;
+
+		while ($comments = $this->db->sql_fetchrow($result)) {
+			$have_result = true;
+
+			$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_comment_dir') || (
+				$this->user->data['user_id'] == $comments['comment_user_id'] &&
+				$this->auth->acl_get('u_edit_comment_dir')
+			)));
+
+			$delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_comment_dir') || (
+				$this->user->data['user_id'] == $comments['comment_user_id'] &&
+				$this->auth->acl_get('u_delete_comment_dir')
+			)));
+
+			$this->template->assign_block_vars('comment', [
+				'MINI_POST_IMG'        => $this->user->img('icon_post_target', 'POST'),
+				'S_USER'               => get_username_string('full', $comments['comment_user_id'], $comments['username'], $comments['user_colour']),
+				'S_USER_IP'            => $comments['comment_user_ip'],
+				'S_DATE'               => $this->user->format_date($comments['comment_date']),
+				'S_COMMENT'            => generate_text_for_display($comments['comment_text'], $comments['comment_uid'], $comments['comment_bitfield'], $comments['comment_flags']),
+				'S_ID'                 => $comments['comment_id'],
+
+				'U_EDIT'              => ($edit_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_edit_controller', ['link_id' => (int) $link_id, 'comment_id' => (int) $comments['comment_id']]) : '',
+				'U_DELETE'            => ($delete_allowed) ? $this->helper->route('ernadoo_phpbbdirectory_comment_delete_controller', ['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->user->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>') : '',
+				'L_POST_DISPLAY'       => ($comments['foe']) ? $this->user->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>') : '',
+
+				'S_INFO'            => $this->auth->acl_get('m_info'),
+			]);
+		}
+
+		$base_url = [
+			'routes'    => 'ernadoo_phpbbdirectory_comment_view_controller',
+			'params'    => ['link_id' => (int) $link_id],
+		];
+
+		$this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $nb_comments, $this->config['dir_comments_per_page'], $start);
+
+		$this->template->assign_vars([
+			'TOTAL_COMMENTS'       => $this->user->lang('DIR_NB_COMMS', (int) $nb_comments),
+			'S_HAVE_RESULT'        => $have_result ? true : false,
+		]);
+
+		return $this->helper->render('comments.html', $this->user->lang['DIR_COMMENT_TITLE']);
+	}
+
+	/**
+	 * Routine.
+	 *
+	 * @param int    $link_id    The link ID
+	 * @param int    $comment_id The comment ID
+	 * @param string $mode       new|edit
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	private function _data_processing($link_id, $comment_id = 0, $mode = 'new')
+	{
+		if (!check_form_key('dir_form_comment')) {
+			return $this->helper->message('FORM_INVALID');
+		}
+
+		$this->s_comment = $this->request->variable('message', '', true);
+
+		if (!function_exists('validate_data')) {
+			include $this->root_path.'includes/functions_user.'.$this->php_ext;
+		}
+
+		$error = validate_data(
+			[
+				'reply' => $this->s_comment, ],
+			[
+				'reply' => [
+					['string', false, 1, $this->config['dir_length_comments']],
+				],
+			]
+		);
+
+		$error = array_map([$this->user, 'lang'], $error);
+
+		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+			$vc_response = $this->captcha->validate();
+			if ($vc_response !== false) {
+				$error[] = $vc_response;
+			}
+
+			if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
+				$error[] = $this->user->lang['TOO_MANY_ADDS'];
+			}
+		}
+
+		if (!$error) {
+			$uid = $bitfield = $flags = '';
+			generate_text_for_storage($this->s_comment, $uid, $bitfield, $flags, (bool) $this->config['dir_allow_bbcode'], (bool) $this->config['dir_allow_links'], (bool) $this->config['dir_allow_smilies']);
+
+			$data_edit = [
+				'comment_text'         => $this->s_comment,
+				'comment_uid'          => $uid,
+				'comment_flags'        => $flags,
+				'comment_bitfield'     => $bitfield,
+			];
+
+			if ($mode == 'edit') {
+				$this->comment->edit($data_edit, $comment_id);
+			} else {
+				$data_add = [
+					'comment_link_id'     => (int) $link_id,
+					'comment_date'        => time(),
+					'comment_user_id'     => $this->user->data['user_id'],
+					'comment_user_ip'     => $this->user->ip,
+				];
+
+				$data_add = array_merge($data_edit, $data_add);
+
+				$this->comment->add($data_add);
+			}
+
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
+			meta_refresh(3, $meta_info);
+			$message = $this->user->lang['DIR_'.strtoupper($mode).'_COMMENT_OK'];
+			$message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
+
+			return $this->helper->message($message);
+		} else {
+			$this->template->assign_vars([
+				'ERROR'    => (count($error)) ? implode('<br />', $error) : '',
+			]);
+
+			return $this->view($link_id, $this->request->variable('page', 1), $mode);
+		}
+	}
+
+	/**
+	 * Check if comments are enable in a category.
+	 *
+	 * @param int $link_id The link ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null Retun null if comments are allowed, http_exception if not
+	 */
+	private function _check_comments_enable($link_id)
+	{
+		$sql = 'SELECT link_cat
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $link_id;
-        $result = $this->db->sql_query($sql);
-        $cat_id = (int) $this->db->sql_fetchfield('link_cat');
-        $this->db->sql_freeresult($result);
-
-        if ($cat_id) {
-            $this->categorie->get($cat_id);
-
-            if (!$this->categorie->data['cat_allow_comments']) {
-                throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-            }
-        } else {
-            throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
-        }
-    }
-
-    /**
-     * Populate form when an error occurred.
-     *
-     * @param int    $link_id The link ID
-     * @param string $mode    add|edit
-     *
-     * @return null
-     */
-    private function _populate_form($link_id, $mode)
-    {
-        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());
-
-            $this->template->assign_vars([
-                'S_CONFIRM_CODE'          => true,
-                'CAPTCHA_TEMPLATE'        => $this->captcha->get_template(),
-            ]);
-        }
-
-        if (!function_exists('generate_smilies')) {
-            include $this->root_path.'includes/functions_posting.'.$this->php_ext;
-        }
-        if (!function_exists('display_custom_bbcodes')) {
-            include $this->root_path.'includes/functions_display.'.$this->php_ext;
-        }
-
-        generate_smilies('inline', 0);
-        display_custom_bbcodes();
-        add_form_key('dir_form_comment');
-
-        $this->template->assign_vars([
-            'S_AUTH_COMM'        => $this->auth->acl_get('u_comment_dir'),
-
-            'BBCODE_STATUS'        => ($this->config['dir_allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
-            'IMG_STATUS'           => ($this->config['dir_allow_bbcode']) ? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
-            'SMILIES_STATUS'       => ($this->config['dir_allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
-            'URL_STATUS'           => ($this->config['dir_allow_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
-            'FLASH_STATUS'         => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
-
-            'L_DIR_REPLY_EXP'    => $this->user->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']),
-
-            'S_COMMENT'        => isset($this->s_comment) ? $this->s_comment : '',
-
-            'S_BBCODE_ALLOWED'    => (bool) $this->config['dir_allow_bbcode'],
-            'S_BBCODE_IMG'        => (bool) $this->config['dir_allow_bbcode'],
-            'S_BBCODE_FLASH'      => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? true : false,
-            'S_BBCODE_QUOTE'      => true,
-            'S_LINKS_ALLOWED'     => (bool) $this->config['dir_allow_links'],
-            'S_SMILIES_ALLOWED'   => (bool) $this->config['dir_allow_smilies'],
-
-            'S_HIDDEN_FIELDS'      => build_hidden_fields($this->s_hidden_fields),
-            'S_BUTTON_NAME'        => ($mode == 'edit') ? 'update_comment' : 'submit_comment',
-            'S_POST_ACTION'        => ($mode == 'edit') ? '' : $this->helper->route('ernadoo_phpbbdirectory_comment_new_controller', ['link_id' => (int) $link_id]),
-        ]);
-    }
+		$result = $this->db->sql_query($sql);
+		$cat_id = (int) $this->db->sql_fetchfield('link_cat');
+		$this->db->sql_freeresult($result);
+
+		if ($cat_id) {
+			$this->categorie->get($cat_id);
+
+			if (!$this->categorie->data['cat_allow_comments']) {
+				throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+			}
+		} else {
+			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
+		}
+	}
+
+	/**
+	 * Populate form when an error occurred.
+	 *
+	 * @param int    $link_id The link ID
+	 * @param string $mode    add|edit
+	 *
+	 * @return null
+	 */
+	private function _populate_form($link_id, $mode)
+	{
+		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());
+
+			$this->template->assign_vars([
+				'S_CONFIRM_CODE'          => true,
+				'CAPTCHA_TEMPLATE'        => $this->captcha->get_template(),
+			]);
+		}
+
+		if (!function_exists('generate_smilies')) {
+			include $this->root_path.'includes/functions_posting.'.$this->php_ext;
+		}
+		if (!function_exists('display_custom_bbcodes')) {
+			include $this->root_path.'includes/functions_display.'.$this->php_ext;
+		}
+
+		generate_smilies('inline', 0);
+		display_custom_bbcodes();
+		add_form_key('dir_form_comment');
+
+		$this->template->assign_vars([
+			'S_AUTH_COMM'        => $this->auth->acl_get('u_comment_dir'),
+
+			'BBCODE_STATUS'        => ($this->config['dir_allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'           => ($this->config['dir_allow_bbcode']) ? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
+			'SMILIES_STATUS'       => ($this->config['dir_allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
+			'URL_STATUS'           => ($this->config['dir_allow_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
+			'FLASH_STATUS'         => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
+
+			'L_DIR_REPLY_EXP'    => $this->user->lang('DIR_REPLY_EXP', $this->config['dir_length_comments']),
+
+			'S_COMMENT'        => isset($this->s_comment) ? $this->s_comment : '',
+
+			'S_BBCODE_ALLOWED'    => (bool) $this->config['dir_allow_bbcode'],
+			'S_BBCODE_IMG'        => (bool) $this->config['dir_allow_bbcode'],
+			'S_BBCODE_FLASH'      => ($this->config['dir_allow_bbcode'] && $this->config['dir_allow_flash']) ? true : false,
+			'S_BBCODE_QUOTE'      => true,
+			'S_LINKS_ALLOWED'     => (bool) $this->config['dir_allow_links'],
+			'S_SMILIES_ALLOWED'   => (bool) $this->config['dir_allow_smilies'],
+
+			'S_HIDDEN_FIELDS'      => build_hidden_fields($this->s_hidden_fields),
+			'S_BUTTON_NAME'        => ($mode == 'edit') ? 'update_comment' : 'submit_comment',
+			'S_POST_ACTION'        => ($mode == 'edit') ? '' : $this->helper->route('ernadoo_phpbbdirectory_comment_new_controller', ['link_id' => (int) $link_id]),
+		]);
+	}
 }

Braces +57 added lines, -26 removed lines

@@ -95,7 +95,8 @@ 
         ]);
 
         // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'])
+        {
             $this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
             $this->captcha->init(CONFIRM_POST);
         }
@@ -115,7 +116,8 @@ 
     {
         $this->_check_comments_enable($link_id);
 
-        if ($this->request->is_set_post('cancel')) {
+        if ($this->request->is_set_post('cancel'))
+        {
             $redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
             redirect($redirect);
         }
@@ -126,11 +128,13 @@ 
         $result = $this->db->sql_query($sql);
         $value = $this->db->sql_fetchrow($result);
 
-        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_delete_comment_dir') && (!$this->auth->acl_get('u_delete_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
+        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_delete_comment_dir') && (!$this->auth->acl_get('u_delete_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id']))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
-        if (confirm_box(true)) {
+        if (confirm_box(true))
+        {
             $this->comment->del($link_id, $comment_id);
 
             $meta_info = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
@@ -139,7 +143,9 @@ 
             $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 
             return $this->helper->message($message);
-        } else {
+        }
+        else
+        {
             confirm_box(false, 'DIR_COMMENT_DELETE');
         }
     }
@@ -164,7 +170,8 @@ 
         $result = $this->db->sql_query($sql);
         $value = $this->db->sql_fetchrow($result);
 
-        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_edit_comment_dir') && (!$this->auth->acl_get('u_edit_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id'])) {
+        if (!$this->user->data['is_registered'] || !$this->auth->acl_get('m_edit_comment_dir') && (!$this->auth->acl_get('u_edit_comment_dir') || $this->user->data['user_id'] != $value['comment_user_id']))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -174,7 +181,8 @@ 
         $submit = $this->request->is_set_post('update_comment') ? true : false;
 
         // If form is done
-        if ($submit) {
+        if ($submit)
+        {
             return $this->_data_processing($link_id, $comment_id, 'edit');
         }
 
@@ -194,7 +202,8 @@ 
     {
         $this->_check_comments_enable($link_id);
 
-        if (!$this->auth->acl_get('u_comment_dir')) {
+        if (!$this->auth->acl_get('u_comment_dir'))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -202,9 +211,12 @@ 
         $refresh = $this->request->is_set_post('refresh_vc') ? true : false;
 
         // If form is done
-        if ($submit || $refresh) {
+        if ($submit || $refresh)
+        {
             return $this->_data_processing($link_id);
-        } else {
+        }
+        else
+        {
             $redirect = $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $link_id]);
             redirect($redirect);
         }
@@ -264,7 +276,8 @@ 
 
         $have_result = false;
 
-        while ($comments = $this->db->sql_fetchrow($result)) {
+        while ($comments = $this->db->sql_fetchrow($result))
+        {
             $have_result = true;
 
             $edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_comment_dir') || (
@@ -322,13 +335,15 @@ 
      */
     private function _data_processing($link_id, $comment_id = 0, $mode = 'new')
     {
-        if (!check_form_key('dir_form_comment')) {
+        if (!check_form_key('dir_form_comment'))
+        {
             return $this->helper->message('FORM_INVALID');
         }
 
         $this->s_comment = $this->request->variable('message', '', true);
 
-        if (!function_exists('validate_data')) {
+        if (!function_exists('validate_data'))
+        {
             include $this->root_path.'includes/functions_user.'.$this->php_ext;
         }
 
@@ -344,18 +359,22 @@ 
 
         $error = array_map([$this->user, 'lang'], $error);
 
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'])
+        {
             $vc_response = $this->captcha->validate();
-            if ($vc_response !== false) {
+            if ($vc_response !== false)
+            {
                 $error[] = $vc_response;
             }
 
-            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
+            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts'])
+            {
                 $error[] = $this->user->lang['TOO_MANY_ADDS'];
             }
         }
 
-        if (!$error) {
+        if (!$error)
+        {
             $uid = $bitfield = $flags = '';
             generate_text_for_storage($this->s_comment, $uid, $bitfield, $flags, (bool) $this->config['dir_allow_bbcode'], (bool) $this->config['dir_allow_links'], (bool) $this->config['dir_allow_smilies']);
 
@@ -366,9 +385,12 @@ 
                 'comment_bitfield'     => $bitfield,
             ];
 
-            if ($mode == 'edit') {
+            if ($mode == 'edit')
+            {
                 $this->comment->edit($data_edit, $comment_id);
-            } else {
+            }
+            else
+            {
                 $data_add = [
                     'comment_link_id'     => (int) $link_id,
                     'comment_date'        => time(),
@@ -387,7 +409,9 @@ 
             $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_COMMENT', '<a href="'.$meta_info.'">', '</a>');
 
             return $this->helper->message($message);
-        } else {
+        }
+        else
+        {
             $this->template->assign_vars([
                 'ERROR'    => (count($error)) ? implode('<br />', $error) : '',
             ]);
@@ -414,13 +438,17 @@ 
         $cat_id = (int) $this->db->sql_fetchfield('link_cat');
         $this->db->sql_freeresult($result);
 
-        if ($cat_id) {
+        if ($cat_id)
+        {
             $this->categorie->get($cat_id);
 
-            if (!$this->categorie->data['cat_allow_comments']) {
+            if (!$this->categorie->data['cat_allow_comments'])
+            {
                 throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
             }
-        } else {
+        }
+        else
+        {
             throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
         }
     }
@@ -435,7 +463,8 @@ 
      */
     private function _populate_form($link_id, $mode)
     {
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode != 'edit') {
+        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());
 
             $this->template->assign_vars([
@@ -444,10 +473,12 @@ 
             ]);
         }
 
-        if (!function_exists('generate_smilies')) {
+        if (!function_exists('generate_smilies'))
+        {
             include $this->root_path.'includes/functions_posting.'.$this->php_ext;
         }
-        if (!function_exists('display_custom_bbcodes')) {
+        if (!function_exists('display_custom_bbcodes'))
+        {
             include $this->root_path.'includes/functions_display.'.$this->php_ext;
         }
 

ext.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
      * @license GNU General Public License, version 2 (GPL-2.0)
      *
      * @param string $step               The step (enable, disable, purge)
-     * @param array  $notification_types The notification type names
+     * @param string[]  $notification_types The notification type names
      *
      * @return string Return notifications as temporary state
      */

Indentation +142 added lines, -142 removed lines

@@ -14,146 +14,146 @@
 
 class ext extends \phpbb\extension\base
 {
-    /**
-     * Enable extension if requirements are met.
-     *
-     * @return bool
-     * @aceess public
-     */
-    public function is_enableable()
-    {
-        $config = $this->container->get('config');
-
-        // Check phpbb version
-        if (!version_compare($config['version'], '3.1.3', '>=')) {
-            return false;
-        }
-
-        // Check for getimagesize
-        if (!@function_exists('getimagesize')) {
-            return false;
-        }
-
-        // Check for url_fopen
-        return (bool) @ini_get('allow_url_fopen');
-    }
-
-    /**
-     * Single enable step that installs any included migrations.
-     *
-     * @param mixed $old_state State returned by previous call of this method
-     *
-     * @return mixed Returns false after last step, otherwise temporary state
-     */
-    public function enable_step($old_state)
-    {
-        switch ($old_state) {
-            case '': // Empty means nothing has run yet
-
-                // Enable notifications
-                return $this->notification_handler('enable', [
-                    'ernadoo.phpbbdirectory.notification.type.directory_website',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
-                ]);
-
-            break;
-
-            default:
-
-                // Run parent enable step method
-                return parent::enable_step($old_state);
-
-            break;
-        }
-    }
-
-    /**
-     * Single disable step that does nothing.
-     *
-     * @param mixed $old_state State returned by previous call of this method
-     *
-     * @return mixed Returns false after last step, otherwise temporary state
-     */
-    public function disable_step($old_state)
-    {
-        switch ($old_state) {
-            case '': // Empty means nothing has run yet
-
-                // Disable notifications
-                return $this->notification_handler('disable', [
-                    'ernadoo.phpbbdirectory.notification.type.directory_website',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
-                ]);
-
-            break;
-
-            default:
-
-                // Run parent disable step method
-                return parent::disable_step($old_state);
-
-            break;
-        }
-    }
-
-    /**
-     * Single purge step that reverts any included and installed migrations.
-     *
-     * @param mixed $old_state State returned by previous call of this method
-     *
-     * @return mixed Returns false after last step, otherwise temporary state
-     */
-    public function purge_step($old_state)
-    {
-        switch ($old_state) {
-            case '': // Empty means nothing has run yet
-
-                // Purge notifications
-                return $this->notification_handler('purge', [
-                    'ernadoo.phpbbdirectory.notification.type.directory_website',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
-                    'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
-                ]);
-
-            break;
-
-            default:
-
-                // Run parent purge step method
-                return parent::purge_step($old_state);
-
-            break;
-        }
-    }
-
-    /**
-     * Notification handler to call notification enable/disable/purge steps.
-     *
-     * @author VSEphpbb (Matt Friedman)
-     * @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
-     * @license GNU General Public License, version 2 (GPL-2.0)
-     *
-     * @param string $step               The step (enable, disable, purge)
-     * @param array  $notification_types The notification type names
-     *
-     * @return string Return notifications as temporary state
-     */
-    protected function notification_handler($step, $notification_types)
-    {
-        $phpbb_notifications = $this->container->get('notification_manager');
-
-        foreach ($notification_types as $notification_type) {
-            call_user_func([$phpbb_notifications, $step.'_notifications'], $notification_type);
-        }
-
-        return 'notifications';
-    }
+	/**
+	 * Enable extension if requirements are met.
+	 *
+	 * @return bool
+	 * @aceess public
+	 */
+	public function is_enableable()
+	{
+		$config = $this->container->get('config');
+
+		// Check phpbb version
+		if (!version_compare($config['version'], '3.1.3', '>=')) {
+			return false;
+		}
+
+		// Check for getimagesize
+		if (!@function_exists('getimagesize')) {
+			return false;
+		}
+
+		// Check for url_fopen
+		return (bool) @ini_get('allow_url_fopen');
+	}
+
+	/**
+	 * Single enable step that installs any included migrations.
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 *
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
+	public function enable_step($old_state)
+	{
+		switch ($old_state) {
+			case '': // Empty means nothing has run yet
+
+				// Enable notifications
+				return $this->notification_handler('enable', [
+					'ernadoo.phpbbdirectory.notification.type.directory_website',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
+				]);
+
+			break;
+
+			default:
+
+				// Run parent enable step method
+				return parent::enable_step($old_state);
+
+			break;
+		}
+	}
+
+	/**
+	 * Single disable step that does nothing.
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 *
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
+	public function disable_step($old_state)
+	{
+		switch ($old_state) {
+			case '': // Empty means nothing has run yet
+
+				// Disable notifications
+				return $this->notification_handler('disable', [
+					'ernadoo.phpbbdirectory.notification.type.directory_website',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
+				]);
+
+			break;
+
+			default:
+
+				// Run parent disable step method
+				return parent::disable_step($old_state);
+
+			break;
+		}
+	}
+
+	/**
+	 * Single purge step that reverts any included and installed migrations.
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 *
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
+	public function purge_step($old_state)
+	{
+		switch ($old_state) {
+			case '': // Empty means nothing has run yet
+
+				// Purge notifications
+				return $this->notification_handler('purge', [
+					'ernadoo.phpbbdirectory.notification.type.directory_website',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_approved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron',
+					'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
+				]);
+
+			break;
+
+			default:
+
+				// Run parent purge step method
+				return parent::purge_step($old_state);
+
+			break;
+		}
+	}
+
+	/**
+	 * Notification handler to call notification enable/disable/purge steps.
+	 *
+	 * @author VSEphpbb (Matt Friedman)
+	 * @copyright (c) 2014 phpBB Limited <https://www.phpbb.com>
+	 * @license GNU General Public License, version 2 (GPL-2.0)
+	 *
+	 * @param string $step               The step (enable, disable, purge)
+	 * @param array  $notification_types The notification type names
+	 *
+	 * @return string Return notifications as temporary state
+	 */
+	protected function notification_handler($step, $notification_types)
+	{
+		$phpbb_notifications = $this->container->get('notification_manager');
+
+		foreach ($notification_types as $notification_type) {
+			call_user_func([$phpbb_notifications, $step.'_notifications'], $notification_type);
+		}
+
+		return 'notifications';
+	}
 }

Braces +12 added lines, -6 removed lines

@@ -25,12 +25,14 @@ 
         $config = $this->container->get('config');
 
         // Check phpbb version
-        if (!version_compare($config['version'], '3.1.3', '>=')) {
+        if (!version_compare($config['version'], '3.1.3', '>='))
+        {
             return false;
         }
 
         // Check for getimagesize
-        if (!@function_exists('getimagesize')) {
+        if (!@function_exists('getimagesize'))
+        {
             return false;
         }
 
@@ -47,7 +49,8 @@ 
      */
     public function enable_step($old_state)
     {
-        switch ($old_state) {
+        switch ($old_state)
+        {
             case '': // Empty means nothing has run yet
 
                 // Enable notifications
@@ -79,7 +82,8 @@ 
      */
     public function disable_step($old_state)
     {
-        switch ($old_state) {
+        switch ($old_state)
+        {
             case '': // Empty means nothing has run yet
 
                 // Disable notifications
@@ -111,7 +115,8 @@ 
      */
     public function purge_step($old_state)
     {
-        switch ($old_state) {
+        switch ($old_state)
+        {
             case '': // Empty means nothing has run yet
 
                 // Purge notifications
@@ -150,7 +155,8 @@ 
     {
         $phpbb_notifications = $this->container->get('notification_manager');
 
-        foreach ($notification_types as $notification_type) {
+        foreach ($notification_types as $notification_type)
+        {
             call_user_func([$phpbb_notifications, $step.'_notifications'], $notification_type);
         }
 

controller/categories.php

Indentation +345 added lines, -345 removed lines

@@ -9,354 +9,354 @@
 
 class categories
 {
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \phpbb\controller\helper */
-    protected $helper;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\auth\auth */
-    protected $auth;
-
-    /** @var \phpbb\pagination */
-    protected $pagination;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\link */
-    protected $link;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface      $db         Database object
-     * @param \phpbb\config\config                   $config     Config object
-     * @param \phpbb\template\template               $template   Template object
-     * @param \phpbb\user                            $user       User object
-     * @param \phpbb\controller\helper               $helper     Controller helper object
-     * @param \phpbb\request\request                 $request    Request object
-     * @param \phpbb\auth\auth                       $auth       Auth object
-     * @param \phpbb\pagination                      $pagination Pagination object
-     * @param \ernadoo\phpbbdirectory\core\categorie $categorie  PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\link      $link       PhpBB Directory extension link object
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
-    {
-        $this->db = $db;
-        $this->config = $config;
-        $this->template = $template;
-        $this->user = $user;
-        $this->helper = $helper;
-        $this->request = $request;
-        $this->auth = $auth;
-        $this->pagination = $pagination;
-        $this->categorie = $categorie;
-        $this->link = $link;
-
-        $this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
-
-        $this->template->assign_vars([
-            'S_PHPBB_DIRECTORY'                => true,
-            'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
-        ]);
-    }
-
-    /**
-     * Base controller to be accessed with the URL /directory.
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function base()
-    {
-        $this->categorie->display();
-        $this->link->recents();
-
-        return $this->helper->render('body.html', $this->user->lang['DIRECTORY']);
-    }
-
-    /**
-     * View controller for display a category.
-     *
-     * @param int    $cat_id    The category ID
-     * @param int    $page      Page number taken from the URL
-     * @param int    $sort_days Specifies the maximum amount of days a link may be old
-     * @param string $sort_key  is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
-     * @param string $sort_dir  is either a or d representing ASC and DESC (ascending|descending)
-     * @param string $mode      watch|unwatch
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
-    {
-        if (false === $this->categorie->get($cat_id)) {
-            throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_CATS');
-        }
-
-        $start = ($page - 1) * $this->config['dir_show'];
-
-        $default_sort_days = 0;
-        $default_sort_key = (string) substr($this->config['dir_default_order'], 0, 1);
-        $default_sort_dir = (string) substr($this->config['dir_default_order'], 2);
-
-        $sort_days = (!$sort_days) ? $this->request->variable('st', $default_sort_days) : $sort_days;
-        $sort_key = (!$sort_key) ? $this->request->variable('sk', $default_sort_key) : $sort_key;
-        $sort_dir = (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
-        $link_list = $rowset = [];
-
-        // Categorie ordering options
-        $limit_days = [0 => $this->user->lang['SEE_ALL'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
-        $sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
-        $sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
-
-        if ($this->config['dir_activ_pagerank']) {
-            $sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
-            $sort_by_sql['p'] = 'l.link_pagerank';
-        }
-
-        $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-        gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir);
-
-        $u_sort_param = ($sort_days === $default_sort_days && $sort_key == $default_sort_key && $sort_dir == $default_sort_dir) ? [] : ['sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir];
-
-        // Are we watching this categorie?
-        $s_watching_categorie = [
-            'link'             => '',
-            'link_toggle'      => '',
-            'title'            => '',
-            'title_toggle'     => '',
-            'is_watching'      => false,
-        ];
-
-        if ($this->config['email_enable'] && $this->user->data['is_registered']) {
-            $notify_status = (isset($this->categorie->data['notify_status'])) ? $this->categorie->data['notify_status'] : null;
-
-            if (($message = $this->categorie->watch_categorie($mode, $s_watching_categorie, $this->user->data['user_id'], $cat_id, $notify_status))) {
-                return $this->helper->message($message);
-            }
-        }
-
-        // A deadline has been selected
-        if ($sort_days) {
-            $min_post_time = time() - ($sort_days * 86400);
-
-            $sql = 'SELECT COUNT(link_id) AS nb_links
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\pagination */
+	protected $pagination;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\link */
+	protected $link;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface      $db         Database object
+	 * @param \phpbb\config\config                   $config     Config object
+	 * @param \phpbb\template\template               $template   Template object
+	 * @param \phpbb\user                            $user       User object
+	 * @param \phpbb\controller\helper               $helper     Controller helper object
+	 * @param \phpbb\request\request                 $request    Request object
+	 * @param \phpbb\auth\auth                       $auth       Auth object
+	 * @param \phpbb\pagination                      $pagination Pagination object
+	 * @param \ernadoo\phpbbdirectory\core\categorie $categorie  PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link      $link       PhpBB Directory extension link object
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\pagination $pagination, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->helper = $helper;
+		$this->request = $request;
+		$this->auth = $auth;
+		$this->pagination = $pagination;
+		$this->categorie = $categorie;
+		$this->link = $link;
+
+		$this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
+
+		$this->template->assign_vars([
+			'S_PHPBB_DIRECTORY'                => true,
+			'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
+		]);
+	}
+
+	/**
+	 * Base controller to be accessed with the URL /directory.
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function base()
+	{
+		$this->categorie->display();
+		$this->link->recents();
+
+		return $this->helper->render('body.html', $this->user->lang['DIRECTORY']);
+	}
+
+	/**
+	 * View controller for display a category.
+	 *
+	 * @param int    $cat_id    The category ID
+	 * @param int    $page      Page number taken from the URL
+	 * @param int    $sort_days Specifies the maximum amount of days a link may be old
+	 * @param string $sort_key  is the key of $sort_by_sql for the selected sorting: a|t|r|s|v|p
+	 * @param string $sort_dir  is either a or d representing ASC and DESC (ascending|descending)
+	 * @param string $mode      watch|unwatch
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
+	{
+		if (false === $this->categorie->get($cat_id)) {
+			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_CATS');
+		}
+
+		$start = ($page - 1) * $this->config['dir_show'];
+
+		$default_sort_days = 0;
+		$default_sort_key = (string) substr($this->config['dir_default_order'], 0, 1);
+		$default_sort_dir = (string) substr($this->config['dir_default_order'], 2);
+
+		$sort_days = (!$sort_days) ? $this->request->variable('st', $default_sort_days) : $sort_days;
+		$sort_key = (!$sort_key) ? $this->request->variable('sk', $default_sort_key) : $sort_key;
+		$sort_dir = (!$sort_dir) ? $this->request->variable('sd', $default_sort_dir) : $sort_dir;
+		$link_list = $rowset = [];
+
+		// Categorie ordering options
+		$limit_days = [0 => $this->user->lang['SEE_ALL'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
+		$sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
+		$sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
+
+		if ($this->config['dir_activ_pagerank']) {
+			$sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
+			$sort_by_sql['p'] = 'l.link_pagerank';
+		}
+
+		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param, $default_sort_days, $default_sort_key, $default_sort_dir);
+
+		$u_sort_param = ($sort_days === $default_sort_days && $sort_key == $default_sort_key && $sort_dir == $default_sort_dir) ? [] : ['sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir];
+
+		// Are we watching this categorie?
+		$s_watching_categorie = [
+			'link'             => '',
+			'link_toggle'      => '',
+			'title'            => '',
+			'title_toggle'     => '',
+			'is_watching'      => false,
+		];
+
+		if ($this->config['email_enable'] && $this->user->data['is_registered']) {
+			$notify_status = (isset($this->categorie->data['notify_status'])) ? $this->categorie->data['notify_status'] : null;
+
+			if (($message = $this->categorie->watch_categorie($mode, $s_watching_categorie, $this->user->data['user_id'], $cat_id, $notify_status))) {
+				return $this->helper->message($message);
+			}
+		}
+
+		// A deadline has been selected
+		if ($sort_days) {
+			$min_post_time = time() - ($sort_days * 86400);
+
+			$sql = 'SELECT COUNT(link_id) AS nb_links
 				FROM '.DIR_LINK_TABLE.'
 				WHERE link_cat = '.(int) $cat_id.'
 					AND link_time >= '.$min_post_time;
-            $result = $this->db->sql_query($sql);
-            $nb_links = (int) $this->db->sql_fetchfield('nb_links');
-            $this->db->sql_freeresult($result);
-
-            if ($this->request->is_set_post('sort')) {
-                $start = 0;
-            }
-            $sql_limit_time = " AND l.link_time >= $min_post_time";
-        } else {
-            $sql_limit_time = '';
-            $nb_links = (int) $this->categorie->data['cat_links'];
-        }
-
-        // Make sure $start is set to the last page if it exceeds the amount
-        $start = $this->pagination->validate_start($start, $this->config['dir_show'], $nb_links);
-
-        // Build navigation links
-        $this->categorie->generate_dir_nav($this->categorie->data);
-
-        // Jumpbox
-        $this->categorie->make_cat_jumpbox();
-
-        $base_url = [
-            'routes'    => 'ernadoo_phpbbdirectory_page_controller',
-            'params'    => array_merge(['cat_id' => $cat_id], $u_sort_param),
-        ];
-
-        $this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $nb_links, $this->config['dir_show'], $start);
-
-        $this->template->assign_vars([
-            'S_SELECT_SORT_DIR'        => $s_sort_dir,
-            'S_SELECT_SORT_KEY'        => $s_sort_key,
-            'S_SELECT_SORT_DAYS'       => $s_limit_days,
-            'S_CATLIST'                => $this->categorie->make_cat_select($cat_id),
-            'S_PAGE_ACTION'            => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => $cat_id, 'page' => $page]),
-            'S_CAT_ID'                 => $cat_id,
-
-            'TOTAL_LINKS'            => $this->user->lang('DIR_NB_LINKS', (int) $nb_links),
-
-            'U_NEW_SITE'            => $this->helper->route('ernadoo_phpbbdirectory_new_controller', ['cat_id' => $cat_id]),
-
-            'U_WATCH_CAT'              => $s_watching_categorie['link'],
-            'U_WATCH_CAT_TOGGLE'       => $s_watching_categorie['link_toggle'],
-            'S_WATCH_CAT_TITLE'        => $s_watching_categorie['title'],
-            'S_WATCH_CAT_TOGGLE'       => $s_watching_categorie['title_toggle'],
-            'S_WATCHING_CAT'           => $s_watching_categorie['is_watching'],
-        ]);
-
-        // If the user is trying to reach late pages, start searching from the end
-        $store_reverse = false;
-        $sql_limit = $this->config['dir_show'];
-        if ($start > $nb_links / 2) {
-            $store_reverse = true;
-
-            // Select the sort order
-            $direction = (($sort_dir == 'd') ? 'ASC' : 'DESC');
-
-            $sql_limit = $this->pagination->reverse_limit($start, $sql_limit, $nb_links);
-            $sql_start = $this->pagination->reverse_start($start, $sql_limit, $nb_links);
-        } else {
-            // Select the sort order
-            $direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
-            $sql_start = $start;
-        }
-
-        if (is_array($sort_by_sql[$sort_key])) {
-            $sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
-        } else {
-            $sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
-        }
-
-        // Grab just the sorted link ids
-        $sql_array = [
-            'SELECT'      => 'l.link_id',
-            'FROM'        => [
-                    DIR_LINK_TABLE    => 'l', ],
-            'LEFT_JOIN'    => [
-                    [
-                        'FROM'    => [USERS_TABLE    => 'u'],
-                        'ON'      => 'l.link_user_id = u.user_id',
-                    ],
-            ],
-            'WHERE'        => "l.link_cat = $cat_id
+			$result = $this->db->sql_query($sql);
+			$nb_links = (int) $this->db->sql_fetchfield('nb_links');
+			$this->db->sql_freeresult($result);
+
+			if ($this->request->is_set_post('sort')) {
+				$start = 0;
+			}
+			$sql_limit_time = " AND l.link_time >= $min_post_time";
+		} else {
+			$sql_limit_time = '';
+			$nb_links = (int) $this->categorie->data['cat_links'];
+		}
+
+		// Make sure $start is set to the last page if it exceeds the amount
+		$start = $this->pagination->validate_start($start, $this->config['dir_show'], $nb_links);
+
+		// Build navigation links
+		$this->categorie->generate_dir_nav($this->categorie->data);
+
+		// Jumpbox
+		$this->categorie->make_cat_jumpbox();
+
+		$base_url = [
+			'routes'    => 'ernadoo_phpbbdirectory_page_controller',
+			'params'    => array_merge(['cat_id' => $cat_id], $u_sort_param),
+		];
+
+		$this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $nb_links, $this->config['dir_show'], $start);
+
+		$this->template->assign_vars([
+			'S_SELECT_SORT_DIR'        => $s_sort_dir,
+			'S_SELECT_SORT_KEY'        => $s_sort_key,
+			'S_SELECT_SORT_DAYS'       => $s_limit_days,
+			'S_CATLIST'                => $this->categorie->make_cat_select($cat_id),
+			'S_PAGE_ACTION'            => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => $cat_id, 'page' => $page]),
+			'S_CAT_ID'                 => $cat_id,
+
+			'TOTAL_LINKS'            => $this->user->lang('DIR_NB_LINKS', (int) $nb_links),
+
+			'U_NEW_SITE'            => $this->helper->route('ernadoo_phpbbdirectory_new_controller', ['cat_id' => $cat_id]),
+
+			'U_WATCH_CAT'              => $s_watching_categorie['link'],
+			'U_WATCH_CAT_TOGGLE'       => $s_watching_categorie['link_toggle'],
+			'S_WATCH_CAT_TITLE'        => $s_watching_categorie['title'],
+			'S_WATCH_CAT_TOGGLE'       => $s_watching_categorie['title_toggle'],
+			'S_WATCHING_CAT'           => $s_watching_categorie['is_watching'],
+		]);
+
+		// If the user is trying to reach late pages, start searching from the end
+		$store_reverse = false;
+		$sql_limit = $this->config['dir_show'];
+		if ($start > $nb_links / 2) {
+			$store_reverse = true;
+
+			// Select the sort order
+			$direction = (($sort_dir == 'd') ? 'ASC' : 'DESC');
+
+			$sql_limit = $this->pagination->reverse_limit($start, $sql_limit, $nb_links);
+			$sql_start = $this->pagination->reverse_start($start, $sql_limit, $nb_links);
+		} else {
+			// Select the sort order
+			$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
+			$sql_start = $start;
+		}
+
+		if (is_array($sort_by_sql[$sort_key])) {
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
+		} else {
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
+		}
+
+		// Grab just the sorted link ids
+		$sql_array = [
+			'SELECT'      => 'l.link_id',
+			'FROM'        => [
+					DIR_LINK_TABLE    => 'l', ],
+			'LEFT_JOIN'    => [
+					[
+						'FROM'    => [USERS_TABLE    => 'u'],
+						'ON'      => 'l.link_user_id = u.user_id',
+					],
+			],
+			'WHERE'        => "l.link_cat = $cat_id
 				AND l.link_active = 1
 					$sql_limit_time",
-            'ORDER_BY'    => $sql_sort_order,
-        ];
-
-        $sql = $this->db->sql_build_query('SELECT', $sql_array);
-        $result = $this->db->sql_query_limit($sql, $sql_limit, $sql_start);
-
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $link_list[] = (int) $row['link_id'];
-        }
-        $this->db->sql_freeresult($result);
-
-        if (count($link_list)) {
-            // We get links, informations about poster, votes and number of comments
-            $sql_array = [
-                'SELECT'      => 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_banner, l.link_rss, l. link_uid, l.link_bitfield, l.link_flags, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_flag, l.link_pagerank, l.link_thumb, u.user_id, u.username, u.user_colour, v.vote_user_id',
-                'FROM'        => [
-                        DIR_LINK_TABLE    => 'l', ],
-                'LEFT_JOIN'    => [
-                        [
-                            'FROM'    => [USERS_TABLE    => 'u'],
-                            'ON'      => 'l.link_user_id = u.user_id',
-                        ],
-                        [
-                            'FROM'    => [DIR_VOTE_TABLE => 'v'],
-                            'ON'      => 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$this->user->data['user_id'],
-                        ],
-                ],
-                'WHERE'        => $this->db->sql_in_set('l.link_id', $link_list),
-            ];
-
-            $sql = $this->db->sql_build_query('SELECT', $sql_array);
-            $result = $this->db->sql_query($sql);
-
-            while ($site = $this->db->sql_fetchrow($result)) {
-                $rowset[$site['link_id']] = $site;
-            }
-            $this->db->sql_freeresult($result);
-
-            $link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
-
-            $votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
-            $comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
-
-            foreach ($link_list as $link_id) {
-                $site = &$rowset[$link_id];
-
-                $s_flag = $this->link->display_flag($site);
-                $s_note = $this->link->display_note($site['link_note'], $site['link_vote'], $votes_status);
-                $s_thumb = $this->link->display_thumb($site);
-                $s_vote = $this->link->display_vote($site);
-                $s_banner = $this->link->display_bann($site);
-                $s_pr = $this->link->display_pagerank($site);
-                $s_rss = $this->link->display_rss($site);
-
-                $edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
-                $delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_delete_dir'))));
-
-                $this->template->assign_block_vars('site', [
-                    'BANNER'           => $s_banner,
-                    'COUNT'            => $this->user->lang('DIR_NB_CLICKS', (int) $site['link_view']),
-                    'DESCRIPTION'      => generate_text_for_display($site['link_description'], $site['link_uid'], $site['link_bitfield'], $site['link_flags']),
-                    'LINK_ID'          => $site['link_id'],
-                    'NAME'             => $site['link_name'],
-                    'NB_COMMENT'       => ($comments_status) ? $this->user->lang('DIR_NB_COMMS', (int) $site['link_comment']) : '',
-                    'NB_VOTE'          => $this->user->lang('DIR_NB_VOTES', (int) $site['link_vote']),
-                    'NOTE'             => $s_note,
-                    'PAGERANK'         => $s_pr,
-                    'RSS'              => $s_rss,
-                    'TIME'             => ($site['link_time']) ? $this->user->format_date($site['link_time']) : '',
-                    'USER'             => get_username_string('full', $site['link_user_id'], $site['username'], $site['user_colour']),
-                    'VOTE_LIST'        => ($votes_status) ? $s_vote : '',
-
-                    'IMG_FLAG'        => $s_flag,
-                    'ON_CLICK'        => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $site['link_id']])."'); return false;\"",
-
-                    'S_NEW_LINK'    => (((time() - $site['link_time']) / 86400) <= $this->config['dir_new_time']) ? true : false,
-
-                    'U_COMMENT'        => ($comments_status) ? $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $site['link_id']]) : '',
-                    'U_DELETE'         => $delete_allowed ? $this->helper->route('ernadoo_phpbbdirectory_delete_controller', ['cat_id' => (int) $cat_id, 'link_id' => (int) $site['link_id'], '_referer' => $this->helper->get_current_url()]) : '',
-                    'U_EDIT'           => $edit_allowed ? $this->helper->route('ernadoo_phpbbdirectory_edit_controller', ['cat_id' => (int) $cat_id, 'link_id' => (int) $site['link_id']]) : '',
-                    'U_FORM_VOTE'      => ($votes_status) ? $this->helper->route('ernadoo_phpbbdirectory_vote_controller', ['cat_id' => (int) $site['link_cat'], 'link_id' => (int) $site['link_id']]) : '',
-                    'U_LINK'           => $site['link_url'],
-                    'U_THUMB'          => $s_thumb,
-                ]);
-            }
-        } else {
-            $this->template->assign_block_vars('no_draw_link', []);
-        }
-
-        $page_title = $this->user->lang['DIRECTORY'].' - '.$this->categorie->data['cat_name'];
-
-        $this->categorie->display();
-
-        return $this->helper->render('view_cat.html', $page_title);
-    }
-
-    /**
-     * date controller for return a date.
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \phpbb\json_response A Json Response
-     */
-    public function return_date()
-    {
-        if (!$this->request->is_ajax()) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $timestamp = $this->request->variable('timestamp', 0);
-        $json_response = new \phpbb\json_response();
-        $json_response->send([
-            'success'     => true,
-            'DATE'        => $this->user->format_date((int) $timestamp),
-        ]);
-    }
+			'ORDER_BY'    => $sql_sort_order,
+		];
+
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $sql_limit, $sql_start);
+
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$link_list[] = (int) $row['link_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (count($link_list)) {
+			// We get links, informations about poster, votes and number of comments
+			$sql_array = [
+				'SELECT'      => 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_banner, l.link_rss, l. link_uid, l.link_bitfield, l.link_flags, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_flag, l.link_pagerank, l.link_thumb, u.user_id, u.username, u.user_colour, v.vote_user_id',
+				'FROM'        => [
+						DIR_LINK_TABLE    => 'l', ],
+				'LEFT_JOIN'    => [
+						[
+							'FROM'    => [USERS_TABLE    => 'u'],
+							'ON'      => 'l.link_user_id = u.user_id',
+						],
+						[
+							'FROM'    => [DIR_VOTE_TABLE => 'v'],
+							'ON'      => 'l.link_id = v.vote_link_id AND v.vote_user_id = '.$this->user->data['user_id'],
+						],
+				],
+				'WHERE'        => $this->db->sql_in_set('l.link_id', $link_list),
+			];
+
+			$sql = $this->db->sql_build_query('SELECT', $sql_array);
+			$result = $this->db->sql_query($sql);
+
+			while ($site = $this->db->sql_fetchrow($result)) {
+				$rowset[$site['link_id']] = $site;
+			}
+			$this->db->sql_freeresult($result);
+
+			$link_list = ($store_reverse) ? array_reverse($link_list) : $link_list;
+
+			$votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
+			$comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
+
+			foreach ($link_list as $link_id) {
+				$site = &$rowset[$link_id];
+
+				$s_flag = $this->link->display_flag($site);
+				$s_note = $this->link->display_note($site['link_note'], $site['link_vote'], $votes_status);
+				$s_thumb = $this->link->display_thumb($site);
+				$s_vote = $this->link->display_vote($site);
+				$s_banner = $this->link->display_bann($site);
+				$s_pr = $this->link->display_pagerank($site);
+				$s_rss = $this->link->display_rss($site);
+
+				$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
+				$delete_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $site['link_user_id'] && $this->auth->acl_get('u_delete_dir'))));
+
+				$this->template->assign_block_vars('site', [
+					'BANNER'           => $s_banner,
+					'COUNT'            => $this->user->lang('DIR_NB_CLICKS', (int) $site['link_view']),
+					'DESCRIPTION'      => generate_text_for_display($site['link_description'], $site['link_uid'], $site['link_bitfield'], $site['link_flags']),
+					'LINK_ID'          => $site['link_id'],
+					'NAME'             => $site['link_name'],
+					'NB_COMMENT'       => ($comments_status) ? $this->user->lang('DIR_NB_COMMS', (int) $site['link_comment']) : '',
+					'NB_VOTE'          => $this->user->lang('DIR_NB_VOTES', (int) $site['link_vote']),
+					'NOTE'             => $s_note,
+					'PAGERANK'         => $s_pr,
+					'RSS'              => $s_rss,
+					'TIME'             => ($site['link_time']) ? $this->user->format_date($site['link_time']) : '',
+					'USER'             => get_username_string('full', $site['link_user_id'], $site['username'], $site['user_colour']),
+					'VOTE_LIST'        => ($votes_status) ? $s_vote : '',
+
+					'IMG_FLAG'        => $s_flag,
+					'ON_CLICK'        => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $site['link_id']])."'); return false;\"",
+
+					'S_NEW_LINK'    => (((time() - $site['link_time']) / 86400) <= $this->config['dir_new_time']) ? true : false,
+
+					'U_COMMENT'        => ($comments_status) ? $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $site['link_id']]) : '',
+					'U_DELETE'         => $delete_allowed ? $this->helper->route('ernadoo_phpbbdirectory_delete_controller', ['cat_id' => (int) $cat_id, 'link_id' => (int) $site['link_id'], '_referer' => $this->helper->get_current_url()]) : '',
+					'U_EDIT'           => $edit_allowed ? $this->helper->route('ernadoo_phpbbdirectory_edit_controller', ['cat_id' => (int) $cat_id, 'link_id' => (int) $site['link_id']]) : '',
+					'U_FORM_VOTE'      => ($votes_status) ? $this->helper->route('ernadoo_phpbbdirectory_vote_controller', ['cat_id' => (int) $site['link_cat'], 'link_id' => (int) $site['link_id']]) : '',
+					'U_LINK'           => $site['link_url'],
+					'U_THUMB'          => $s_thumb,
+				]);
+			}
+		} else {
+			$this->template->assign_block_vars('no_draw_link', []);
+		}
+
+		$page_title = $this->user->lang['DIRECTORY'].' - '.$this->categorie->data['cat_name'];
+
+		$this->categorie->display();
+
+		return $this->helper->render('view_cat.html', $page_title);
+	}
+
+	/**
+	 * date controller for return a date.
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \phpbb\json_response A Json Response
+	 */
+	public function return_date()
+	{
+		if (!$this->request->is_ajax()) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$timestamp = $this->request->variable('timestamp', 0);
+		$json_response = new \phpbb\json_response();
+		$json_response->send([
+			'success'     => true,
+			'DATE'        => $this->user->format_date((int) $timestamp),
+		]);
+	}
 }

Braces +38 added lines, -17 removed lines

@@ -103,7 +103,8 @@ 
      */
     public function view($cat_id, $page, $sort_days, $sort_key, $sort_dir, $mode = '')
     {
-        if (false === $this->categorie->get($cat_id)) {
+        if (false === $this->categorie->get($cat_id))
+        {
             throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_CATS');
         }
 
@@ -123,7 +124,8 @@ 
         $sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
         $sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
 
-        if ($this->config['dir_activ_pagerank']) {
+        if ($this->config['dir_activ_pagerank'])
+        {
             $sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
             $sort_by_sql['p'] = 'l.link_pagerank';
         }
@@ -142,16 +144,19 @@ 
             'is_watching'      => false,
         ];
 
-        if ($this->config['email_enable'] && $this->user->data['is_registered']) {
+        if ($this->config['email_enable'] && $this->user->data['is_registered'])
+        {
             $notify_status = (isset($this->categorie->data['notify_status'])) ? $this->categorie->data['notify_status'] : null;
 
-            if (($message = $this->categorie->watch_categorie($mode, $s_watching_categorie, $this->user->data['user_id'], $cat_id, $notify_status))) {
+            if (($message = $this->categorie->watch_categorie($mode, $s_watching_categorie, $this->user->data['user_id'], $cat_id, $notify_status)))
+            {
                 return $this->helper->message($message);
             }
         }
 
         // A deadline has been selected
-        if ($sort_days) {
+        if ($sort_days)
+        {
             $min_post_time = time() - ($sort_days * 86400);
 
             $sql = 'SELECT COUNT(link_id) AS nb_links
@@ -162,11 +167,14 @@ 
             $nb_links = (int) $this->db->sql_fetchfield('nb_links');
             $this->db->sql_freeresult($result);
 
-            if ($this->request->is_set_post('sort')) {
+            if ($this->request->is_set_post('sort'))
+            {
                 $start = 0;
             }
             $sql_limit_time = " AND l.link_time >= $min_post_time";
-        } else {
+        }
+        else
+        {
             $sql_limit_time = '';
             $nb_links = (int) $this->categorie->data['cat_links'];
         }
@@ -209,7 +217,8 @@ 
         // If the user is trying to reach late pages, start searching from the end
         $store_reverse = false;
         $sql_limit = $this->config['dir_show'];
-        if ($start > $nb_links / 2) {
+        if ($start > $nb_links / 2)
+        {
             $store_reverse = true;
 
             // Select the sort order
@@ -217,15 +226,20 @@ 
 
             $sql_limit = $this->pagination->reverse_limit($start, $sql_limit, $nb_links);
             $sql_start = $this->pagination->reverse_start($start, $sql_limit, $nb_links);
-        } else {
+        }
+        else
+        {
             // Select the sort order
             $direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
             $sql_start = $start;
         }
 
-        if (is_array($sort_by_sql[$sort_key])) {
+        if (is_array($sort_by_sql[$sort_key]))
+        {
             $sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
-        } else {
+        }
+        else
+        {
             $sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
         }
 
@@ -249,12 +263,14 @@ 
         $sql = $this->db->sql_build_query('SELECT', $sql_array);
         $result = $this->db->sql_query_limit($sql, $sql_limit, $sql_start);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $link_list[] = (int) $row['link_id'];
         }
         $this->db->sql_freeresult($result);
 
-        if (count($link_list)) {
+        if (count($link_list))
+        {
             // We get links, informations about poster, votes and number of comments
             $sql_array = [
                 'SELECT'      => 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_banner, l.link_rss, l. link_uid, l.link_bitfield, l.link_flags, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_flag, l.link_pagerank, l.link_thumb, u.user_id, u.username, u.user_colour, v.vote_user_id',
@@ -276,7 +292,8 @@ 
             $sql = $this->db->sql_build_query('SELECT', $sql_array);
             $result = $this->db->sql_query($sql);
 
-            while ($site = $this->db->sql_fetchrow($result)) {
+            while ($site = $this->db->sql_fetchrow($result))
+            {
                 $rowset[$site['link_id']] = $site;
             }
             $this->db->sql_freeresult($result);
@@ -286,7 +303,8 @@ 
             $votes_status = ($this->categorie->data['cat_allow_votes']) ? true : false;
             $comments_status = ($this->categorie->data['cat_allow_comments']) ? true : false;
 
-            foreach ($link_list as $link_id) {
+            foreach ($link_list as $link_id)
+            {
                 $site = &$rowset[$link_id];
 
                 $s_flag = $this->link->display_flag($site);
@@ -328,7 +346,9 @@ 
                     'U_THUMB'          => $s_thumb,
                 ]);
             }
-        } else {
+        }
+        else
+        {
             $this->template->assign_block_vars('no_draw_link', []);
         }
 
@@ -348,7 +368,8 @@ 
      */
     public function return_date()
     {
-        if (!$this->request->is_ajax()) {
+        if (!$this->request->is_ajax())
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 

controller/acp/cat.php

Indentation +962 added lines, -962 removed lines

@@ -9,1025 +9,1025 @@
 
 class cat
 {
-    /** @var \phpbb\cache\service */
-    protected $cache;
-
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\controller\helper */
-    protected $helper;
-
-    /** @var \phpbb\log\log */
-    protected $phpbb_log;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\helper */
-    protected $dir_helper;
-
-    /** @var \ernadoo\phpbbdirectory\core\nestedset_category */
-    protected $nestedset_category;
-
-    /** @var string Custom form action */
-    protected $u_action;
-
-    /** @var string */
-    private $action;
-
-    /** @var array */
-    private $cat_data = [];
-
-    /** @var int */
-    private $cat_id;
-
-    /** @var array */
-    private $errors;
-
-    /** @var string */
-    private $form_key;
-
-    /** @var int */
-    private $parent_id;
-
-    /** @var bool */
-    private $update;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\cache\service                            $cache              Cache object
-     * @param \phpbb\db\driver\driver_interface               $db                 Database object
-     * @param \phpbb\controller\helper                        $helper             Helper object
-     * @param \phpbb\log\log                                  $log                Log object
-     * @param \phpbb\request\request                          $request            Request object
-     * @param \phpbb\template\template                        $template           Template object
-     * @param \phpbb\user                                     $user               User object
-     * @param \ernadoo\phpbbdirectory\core\categorie          $categorie          PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\helper             $dir_helper         PhpBB Directory extension helper object
-     * @param \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category PhpBB Directory extension nestedset object
-     */
-    public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
-    {
-        $this->cache = $cache;
-        $this->db = $db;
-        $this->helper = $helper;
-        $this->phpbb_log = $log;
-        $this->request = $request;
-        $this->template = $template;
-        $this->user = $user;
-        $this->categorie = $categorie;
-        $this->dir_helper = $dir_helper;
-        $this->nestedset_category = $nestedset_category;
-
-        $this->form_key = 'acp_dir_cat';
-        add_form_key($this->form_key);
-
-        $this->action = $this->request->variable('action', '');
-        $this->cat_id = $request->variable('c', 0);
-        $this->parent_id = $request->variable('parent_id', 0);
-        $this->update = ($this->request->is_set_post('update')) ? true : false;
-    }
-
-    /**
-     * Initialize defaults data for add page.
-     *
-     * @return null
-     */
-    public function action_add()
-    {
-        $this->cat_id = $this->parent_id;
-        $parents_list = $this->categorie->make_cat_select($this->parent_id);
-
-        // Fill categorie data with default values
-        if (!$this->update) {
-            $this->cat_data = [
-                'parent_id'                => $this->parent_id,
-                'cat_name'                 => $this->request->variable('cat_name', '', true),
-                'cat_desc'                 => '',
-                'cat_icon'                 => '',
-                'cat_allow_comments'       => true,
-                'cat_allow_votes'          => true,
-                'cat_must_describe'        => true,
-                'cat_count_all'            => false,
-                'cat_validate'             => false,
-                'enable_icons'             => false,
-
-                'display_subcat_list'    => true,
-
-                'cat_link_back'            => false,
-                'cat_cron_enable'          => false,
-                'cat_cron_freq'            => 7,
-                'cat_cron_nb_check'        => 1,
-            ];
-        }
-
-        $this->_display_cat_form($parents_list);
-    }
-
-    /**
-     * Display deleting page.
-     *
-     * @return null
-     */
-    public function action_delete()
-    {
-        if (!$this->cat_id) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&parent_id='.$this->parent_id), E_USER_WARNING);
-        }
-
-        $this->cat_data = $this->_get_cat_info($this->cat_id);
-
-        $subcats_id = [];
-        $subcats = $this->nestedset_category->get_subtree_data($this->cat_id);
-
-        foreach ($subcats as $row) {
-            $subcats_id[] = $row['cat_id'];
-        }
-
-        $cat_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id);
-
-        $sql = 'SELECT cat_id
+	/** @var \phpbb\cache\service */
+	protected $cache;
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\log\log */
+	protected $phpbb_log;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\helper */
+	protected $dir_helper;
+
+	/** @var \ernadoo\phpbbdirectory\core\nestedset_category */
+	protected $nestedset_category;
+
+	/** @var string Custom form action */
+	protected $u_action;
+
+	/** @var string */
+	private $action;
+
+	/** @var array */
+	private $cat_data = [];
+
+	/** @var int */
+	private $cat_id;
+
+	/** @var array */
+	private $errors;
+
+	/** @var string */
+	private $form_key;
+
+	/** @var int */
+	private $parent_id;
+
+	/** @var bool */
+	private $update;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\cache\service                            $cache              Cache object
+	 * @param \phpbb\db\driver\driver_interface               $db                 Database object
+	 * @param \phpbb\controller\helper                        $helper             Helper object
+	 * @param \phpbb\log\log                                  $log                Log object
+	 * @param \phpbb\request\request                          $request            Request object
+	 * @param \phpbb\template\template                        $template           Template object
+	 * @param \phpbb\user                                     $user               User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie          $categorie          PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\helper             $dir_helper         PhpBB Directory extension helper object
+	 * @param \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category PhpBB Directory extension nestedset object
+	 */
+	public function __construct(\phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\nestedset_category $nestedset_category)
+	{
+		$this->cache = $cache;
+		$this->db = $db;
+		$this->helper = $helper;
+		$this->phpbb_log = $log;
+		$this->request = $request;
+		$this->template = $template;
+		$this->user = $user;
+		$this->categorie = $categorie;
+		$this->dir_helper = $dir_helper;
+		$this->nestedset_category = $nestedset_category;
+
+		$this->form_key = 'acp_dir_cat';
+		add_form_key($this->form_key);
+
+		$this->action = $this->request->variable('action', '');
+		$this->cat_id = $request->variable('c', 0);
+		$this->parent_id = $request->variable('parent_id', 0);
+		$this->update = ($this->request->is_set_post('update')) ? true : false;
+	}
+
+	/**
+	 * Initialize defaults data for add page.
+	 *
+	 * @return null
+	 */
+	public function action_add()
+	{
+		$this->cat_id = $this->parent_id;
+		$parents_list = $this->categorie->make_cat_select($this->parent_id);
+
+		// Fill categorie data with default values
+		if (!$this->update) {
+			$this->cat_data = [
+				'parent_id'                => $this->parent_id,
+				'cat_name'                 => $this->request->variable('cat_name', '', true),
+				'cat_desc'                 => '',
+				'cat_icon'                 => '',
+				'cat_allow_comments'       => true,
+				'cat_allow_votes'          => true,
+				'cat_must_describe'        => true,
+				'cat_count_all'            => false,
+				'cat_validate'             => false,
+				'enable_icons'             => false,
+
+				'display_subcat_list'    => true,
+
+				'cat_link_back'            => false,
+				'cat_cron_enable'          => false,
+				'cat_cron_freq'            => 7,
+				'cat_cron_nb_check'        => 1,
+			];
+		}
+
+		$this->_display_cat_form($parents_list);
+	}
+
+	/**
+	 * Display deleting page.
+	 *
+	 * @return null
+	 */
+	public function action_delete()
+	{
+		if (!$this->cat_id) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&parent_id='.$this->parent_id), E_USER_WARNING);
+		}
+
+		$this->cat_data = $this->_get_cat_info($this->cat_id);
+
+		$subcats_id = [];
+		$subcats = $this->nestedset_category->get_subtree_data($this->cat_id);
+
+		foreach ($subcats as $row) {
+			$subcats_id[] = $row['cat_id'];
+		}
+
+		$cat_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id);
+
+		$sql = 'SELECT cat_id
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id <> '.(int) $this->cat_id;
-        $result = $this->db->sql_query_limit($sql, 1);
-
-        if ($this->db->sql_fetchrow($result)) {
-            $this->template->assign_vars([
-                'S_MOVE_DIR_CAT_OPTIONS'    => $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id), ]
-            );
-        }
-        $this->db->sql_freeresult($result);
-
-        $parent_id = ($this->parent_id == $this->cat_id) ? 0 : $this->parent_id;
-
-        $this->template->assign_vars([
-            'S_DELETE_DIR_CAT'        => true,
-            'U_ACTION'                => $this->u_action."&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
-            'U_BACK'                  => $this->u_action.'&amp;parent_id='.$this->parent_id,
-
-            'DIR_CAT_NAME'             => $this->cat_data['cat_name'],
-            'S_HAS_SUBCATS'            => ($this->cat_data['right_id'] - $this->cat_data['left_id'] > 1) ? true : false,
-            'S_CATS_LIST'              => $cat_list,
-            'S_ERROR'                  => (count($this->errors)) ? true : false,
-            'ERROR_MSG'                => (count($this->errors)) ? implode('<br />', $this->errors) : '', ]
-        );
-    }
-
-    /**
-     * Initialize data for edit page.
-     *
-     * @return null
-     */
-    public function action_edit()
-    {
-        $row = $this->_get_cat_info($this->cat_id);
-
-        if (!$this->update) {
-            $this->cat_data = $row;
-        } else {
-            $this->cat_data['left_id'] = $row['left_id'];
-            $this->cat_data['right_id'] = $row['right_id'];
-        }
-
-        // Make sure no direct child categories are able to be selected as parents.
-        $exclude_cats = [];
-        foreach ($this->nestedset_category->get_subtree_data($this->cat_id) as $row2) {
-            $exclude_cats[] = $row2['cat_id'];
-        }
-        $parents_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $exclude_cats);
-
-        $this->_display_cat_form($parents_list);
-    }
-
-    /**
-     * Move order categories.
-     *
-     * @return null
-     */
-    public function action_move()
-    {
-        if (!$this->cat_id) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
-        }
-
-        $sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
+		$result = $this->db->sql_query_limit($sql, 1);
+
+		if ($this->db->sql_fetchrow($result)) {
+			$this->template->assign_vars([
+				'S_MOVE_DIR_CAT_OPTIONS'    => $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id), ]
+			);
+		}
+		$this->db->sql_freeresult($result);
+
+		$parent_id = ($this->parent_id == $this->cat_id) ? 0 : $this->parent_id;
+
+		$this->template->assign_vars([
+			'S_DELETE_DIR_CAT'        => true,
+			'U_ACTION'                => $this->u_action."&amp;parent_id={$parent_id}&amp;action=delete&amp;c=$this->cat_id",
+			'U_BACK'                  => $this->u_action.'&amp;parent_id='.$this->parent_id,
+
+			'DIR_CAT_NAME'             => $this->cat_data['cat_name'],
+			'S_HAS_SUBCATS'            => ($this->cat_data['right_id'] - $this->cat_data['left_id'] > 1) ? true : false,
+			'S_CATS_LIST'              => $cat_list,
+			'S_ERROR'                  => (count($this->errors)) ? true : false,
+			'ERROR_MSG'                => (count($this->errors)) ? implode('<br />', $this->errors) : '', ]
+		);
+	}
+
+	/**
+	 * Initialize data for edit page.
+	 *
+	 * @return null
+	 */
+	public function action_edit()
+	{
+		$row = $this->_get_cat_info($this->cat_id);
+
+		if (!$this->update) {
+			$this->cat_data = $row;
+		} else {
+			$this->cat_data['left_id'] = $row['left_id'];
+			$this->cat_data['right_id'] = $row['right_id'];
+		}
+
+		// Make sure no direct child categories are able to be selected as parents.
+		$exclude_cats = [];
+		foreach ($this->nestedset_category->get_subtree_data($this->cat_id) as $row2) {
+			$exclude_cats[] = $row2['cat_id'];
+		}
+		$parents_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $exclude_cats);
+
+		$this->_display_cat_form($parents_list);
+	}
+
+	/**
+	 * Move order categories.
+	 *
+	 * @return null
+	 */
+	public function action_move()
+	{
+		if (!$this->cat_id) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
+		}
+
+		$sql = 'SELECT cat_id, cat_name, parent_id, left_id, right_id
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id = '.(int) $this->cat_id;
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
-        $this->db->sql_freeresult($result);
-
-        if (!$row) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
-        }
-
-        try {
-            $move_cat_name = $this->nestedset_category->{$this->action}($this->cat_id);
-        } catch (\Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-        }
-
-        if ($move_cat_name !== false) {
-            $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_'.strtoupper($this->action), time(), [$row['cat_name'], $move_cat_name]);
-            $this->cache->destroy('sql', DIR_CAT_TABLE);
-        }
-
-        if ($this->request->is_ajax()) {
-            $json_response = new \phpbb\json_response();
-            $json_response->send(['success' => ($move_cat_name !== false)]);
-        }
-    }
-
-    /**
-     * Display progress bar for syncinc categories.
-     *
-     * @return null
-     */
-    public function action_progress_bar()
-    {
-        $start = $this->request->variable('start', 0);
-        $total = $this->request->variable('total', 0);
-
-        adm_page_header($this->user->lang['SYNC_IN_PROGRESS']);
-
-        $this->template->set_filenames([
-            'body'    => 'progress_bar.html', ]
-        );
-
-        $this->template->assign_vars([
-            'L_PROGRESS'            => $this->user->lang['SYNC_IN_PROGRESS'],
-            'L_PROGRESS_EXPLAIN'    => ($start && $total) ? $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', $start, $total) : $this->user->lang['SYNC_IN_PROGRESS'], ]
-        );
-
-        adm_page_footer();
-    }
-
-    /**
-     * Get link's ID interval for _sync_dir_links().
-     *
-     * @return null
-     */
-    public function action_sync()
-    {
-        if (!$this->cat_id) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
-        }
-
-        @set_time_limit(0);
-
-        $sql = 'SELECT cat_name, cat_links
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
+		}
+
+		try {
+			$move_cat_name = $this->nestedset_category->{$this->action}($this->cat_id);
+		} catch (\Exception $e) {
+			trigger_error($e->getMessage(), E_USER_WARNING);
+		}
+
+		if ($move_cat_name !== false) {
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_'.strtoupper($this->action), time(), [$row['cat_name'], $move_cat_name]);
+			$this->cache->destroy('sql', DIR_CAT_TABLE);
+		}
+
+		if ($this->request->is_ajax()) {
+			$json_response = new \phpbb\json_response();
+			$json_response->send(['success' => ($move_cat_name !== false)]);
+		}
+	}
+
+	/**
+	 * Display progress bar for syncinc categories.
+	 *
+	 * @return null
+	 */
+	public function action_progress_bar()
+	{
+		$start = $this->request->variable('start', 0);
+		$total = $this->request->variable('total', 0);
+
+		adm_page_header($this->user->lang['SYNC_IN_PROGRESS']);
+
+		$this->template->set_filenames([
+			'body'    => 'progress_bar.html', ]
+		);
+
+		$this->template->assign_vars([
+			'L_PROGRESS'            => $this->user->lang['SYNC_IN_PROGRESS'],
+			'L_PROGRESS_EXPLAIN'    => ($start && $total) ? $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', $start, $total) : $this->user->lang['SYNC_IN_PROGRESS'], ]
+		);
+
+		adm_page_footer();
+	}
+
+	/**
+	 * Get link's ID interval for _sync_dir_links().
+	 *
+	 * @return null
+	 */
+	public function action_sync()
+	{
+		if (!$this->cat_id) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
+		}
+
+		@set_time_limit(0);
+
+		$sql = 'SELECT cat_name, cat_links
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id = '.(int) $this->cat_id;
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
-        if (!$row) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
-        }
+		if (!$row) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
+		}
 
-        $sql = 'SELECT MIN(link_id) as min_link_id, MAX(link_id) as max_link_id
+		$sql = 'SELECT MIN(link_id) as min_link_id, MAX(link_id) as max_link_id
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_cat = '.(int) $this->cat_id.'
 				AND link_active = 1';
-        $result = $this->db->sql_query($sql);
-        $row2 = $this->db->sql_fetchrow($result);
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$row2 = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
 
-        // Typecast to int if there is no data available
-        $row2['min_link_id'] = (int) $row2['min_link_id'];
-        $row2['max_link_id'] = (int) $row2['max_link_id'];
+		// Typecast to int if there is no data available
+		$row2['min_link_id'] = (int) $row2['min_link_id'];
+		$row2['max_link_id'] = (int) $row2['max_link_id'];
 
-        $start = $this->request->variable('start', $row2['min_link_id']);
+		$start = $this->request->variable('start', $row2['min_link_id']);
 
-        $batch_size = 200;
-        $end = $start + $batch_size;
+		$batch_size = 200;
+		$end = $start + $batch_size;
 
-        // Sync all links in batch mode...
-        $this->_sync_dir_links($start, $end);
+		// Sync all links in batch mode...
+		$this->_sync_dir_links($start, $end);
 
-        if ($end < $row2['max_link_id']) {
-            // We really need to find a way of showing statistics... no progress here
-            $sql = 'SELECT COUNT(link_id) as num_links
+		if ($end < $row2['max_link_id']) {
+			// We really need to find a way of showing statistics... no progress here
+			$sql = 'SELECT COUNT(link_id) as num_links
 				FROM '.DIR_LINK_TABLE.'
 				WHERE link_cat = '.(int) $this->cat_id.'
 						AND link_active = 1
 						AND link_id BETWEEN '.$start.' AND '.$end;
-            $result = $this->db->sql_query($sql);
-            $links_done = $this->request->variable('links_done', 0) + (int) $this->db->sql_fetchfield('num_links');
-            $this->db->sql_freeresult($result);
-
-            $start += $batch_size;
-
-            $url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
-
-            meta_refresh(0, $url);
-
-            $this->template->assign_vars([
-                'U_PROGRESS_BAR'         => $this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
-                'UA_PROGRESS_BAR'        => addslashes($this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
-                'S_CONTINUE_SYNC'        => true,
-                'L_PROGRESS_EXPLAIN'     => $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', $links_done, $row['cat_links']), ]
-            );
-
-            return;
-        }
-
-        $url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
-        meta_refresh(0, $url);
-
-        $this->template->assign_vars([
-            'U_PROGRESS_BAR'         => $this->u_action.'&amp;action=progress_bar',
-            'UA_PROGRESS_BAR'        => addslashes($this->u_action.'&amp;action=progress_bar'),
-            'S_CONTINUE_SYNC'        => true,
-            'L_PROGRESS_EXPLAIN'     => $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', 0, $row['cat_links']), ]
-        );
-    }
-
-    /**
-     * Sync category data.
-     *
-     * @return null
-     */
-    public function action_sync_cat()
-    {
-        $sql = 'SELECT cat_name
+			$result = $this->db->sql_query($sql);
+			$links_done = $this->request->variable('links_done', 0) + (int) $this->db->sql_fetchfield('num_links');
+			$this->db->sql_freeresult($result);
+
+			$start += $batch_size;
+
+			$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync&amp;start=$start&amp;links_done=$links_done&amp;total={$row['cat_links']}";
+
+			meta_refresh(0, $url);
+
+			$this->template->assign_vars([
+				'U_PROGRESS_BAR'         => $this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}",
+				'UA_PROGRESS_BAR'        => addslashes($this->u_action."&amp;action=progress_bar&amp;start=$links_done&amp;total={$row['cat_links']}"),
+				'S_CONTINUE_SYNC'        => true,
+				'L_PROGRESS_EXPLAIN'     => $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', $links_done, $row['cat_links']), ]
+			);
+
+			return;
+		}
+
+		$url = $this->u_action."&amp;parent_id={$this->parent_id}&amp;c=$this->cat_id&amp;action=sync_cat";
+		meta_refresh(0, $url);
+
+		$this->template->assign_vars([
+			'U_PROGRESS_BAR'         => $this->u_action.'&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'        => addslashes($this->u_action.'&amp;action=progress_bar'),
+			'S_CONTINUE_SYNC'        => true,
+			'L_PROGRESS_EXPLAIN'     => $this->user->lang('SYNC_IN_PROGRESS_EXPLAIN', 0, $row['cat_links']), ]
+		);
+	}
+
+	/**
+	 * Sync category data.
+	 *
+	 * @return null
+	 */
+	public function action_sync_cat()
+	{
+		$sql = 'SELECT cat_name
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id = '.(int) $this->cat_id;
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
-        $this->db->sql_freeresult($result);
-
-        if (!$row) {
-            trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
-        }
-
-        $this->_sync_dir_cat($this->cat_id);
-
-        $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_SYNC', time(), [$row['cat_name']]);
-        $this->cache->destroy('sql', DIR_CAT_TABLE);
-
-        $this->template->assign_var('L_DIR_CAT_RESYNCED', $this->user->lang('DIR_CAT_RESYNCED', $row['cat_name']));
-    }
-
-    /**
-     * Display categories page.
-     *
-     * @return null
-     */
-    public function display_cats()
-    {
-        // Default management page
-        if (!$this->parent_id) {
-            $navigation = $this->user->lang['DIR_INDEX'];
-        } else {
-            $navigation = '<a href="'.$this->u_action.'">'.$this->user->lang['DIR_INDEX'].'</a>';
-
-            $cats_nav = $this->nestedset_category->get_path_data($this->parent_id);
-
-            foreach ($cats_nav as $row) {
-                if ($row['cat_id'] == $this->parent_id) {
-                    $navigation .= ' -&gt; '.$row['cat_name'];
-                } else {
-                    $navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
-                }
-            }
-        }
-
-        // Jumpbox
-        $cat_box = $this->categorie->make_cat_select($this->parent_id);
-
-        if ($this->action == 'sync' || $this->action == 'sync_cat') {
-            $this->template->assign_var('S_RESYNCED', true);
-        }
-
-        $sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_name, cat_icon, cat_desc_uid, cat_desc_bitfield, cat_desc, cat_desc_options, cat_links
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row) {
+			trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
+		}
+
+		$this->_sync_dir_cat($this->cat_id);
+
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_SYNC', time(), [$row['cat_name']]);
+		$this->cache->destroy('sql', DIR_CAT_TABLE);
+
+		$this->template->assign_var('L_DIR_CAT_RESYNCED', $this->user->lang('DIR_CAT_RESYNCED', $row['cat_name']));
+	}
+
+	/**
+	 * Display categories page.
+	 *
+	 * @return null
+	 */
+	public function display_cats()
+	{
+		// Default management page
+		if (!$this->parent_id) {
+			$navigation = $this->user->lang['DIR_INDEX'];
+		} else {
+			$navigation = '<a href="'.$this->u_action.'">'.$this->user->lang['DIR_INDEX'].'</a>';
+
+			$cats_nav = $this->nestedset_category->get_path_data($this->parent_id);
+
+			foreach ($cats_nav as $row) {
+				if ($row['cat_id'] == $this->parent_id) {
+					$navigation .= ' -&gt; '.$row['cat_name'];
+				} else {
+					$navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
+				}
+			}
+		}
+
+		// Jumpbox
+		$cat_box = $this->categorie->make_cat_select($this->parent_id);
+
+		if ($this->action == 'sync' || $this->action == 'sync_cat') {
+			$this->template->assign_var('S_RESYNCED', true);
+		}
+
+		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_name, cat_icon, cat_desc_uid, cat_desc_bitfield, cat_desc, cat_desc_options, cat_links
 			FROM '.DIR_CAT_TABLE.'
 			WHERE parent_id = '.(int) $this->parent_id.'
 			ORDER BY left_id';
-        $result = $this->db->sql_query($sql);
-
-        if ($row = $this->db->sql_fetchrow($result)) {
-            do {
-                $folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$this->user->lang['DIR_SUBCAT'].'" />' : '<img src="images/icon_folder.gif" alt="'.$this->user->lang['FOLDER'].'" />';
-
-                $url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
-
-                $this->template->assign_block_vars('cats', [
-                    'FOLDER_IMAGE'         => $folder_image,
-                    'CAT_IMAGE'            => ($row['cat_icon']) ? '<img src="'.$this->dir_helper->get_img_path('icons', $row['cat_icon']).'" alt="" />' : '',
-                    'CAT_NAME'             => $row['cat_name'],
-                    'CAT_DESCRIPTION'      => generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
-                    'CAT_LINKS'            => $row['cat_links'],
-
-                    'U_CAT'                => $this->u_action.'&amp;parent_id='.$row['cat_id'],
-                    'U_MOVE_UP'            => $url.'&amp;action=move_up',
-                    'U_MOVE_DOWN'          => $url.'&amp;action=move_down',
-                    'U_EDIT'               => $url.'&amp;action=edit',
-                    'U_DELETE'             => $url.'&amp;action=delete',
-                    'U_SYNC'               => $url.'&amp;action=sync', ]
-                );
-            } while ($row = $this->db->sql_fetchrow($result));
-        } elseif ($this->parent_id) {
-            $row = $this->_get_cat_info($this->parent_id);
-
-            $url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
-
-            $this->template->assign_vars([
-                'S_NO_CATS'            => true,
-
-                'U_EDIT'              => $url.'&amp;action=edit',
-                'U_DELETE'            => $url.'&amp;action=delete',
-                'U_SYNC'              => $url.'&amp;action=sync', ]
-            );
-        }
-        $this->db->sql_freeresult($result);
-
-        $this->template->assign_vars([
-            'ERROR_MSG'        => (count($this->errors)) ? implode('<br />', $this->errors) : '',
-            'NAVIGATION'       => $navigation,
-            'CAT_BOX'          => $cat_box,
-            'U_SEL_ACTION'     => $this->u_action,
-            'U_ACTION'         => $this->u_action.'&amp;parent_id='.$this->parent_id,
-
-            'U_PROGRESS_BAR'     => $this->u_action.'&amp;action=progress_bar',
-            'UA_PROGRESS_BAR'    => addslashes($this->u_action.'&amp;action=progress_bar'),
-        ]);
-    }
-
-    /**
-     * Set page url.
-     *
-     * @param string $u_action Custom form action
-     *
-     * @return null
-     */
-    public function set_page_url($u_action)
-    {
-        $this->u_action = $u_action;
-    }
-
-    /**
-     * Update cat table.
-     *
-     * @return null
-     */
-    public function update()
-    {
-        if (!check_form_key($this->form_key)) {
-            $this->update = false;
-            $this->errors[] = $this->user->lang['FORM_INVALID'];
-        }
-
-        switch ($this->action) {
-            case 'delete':
-                $action_subcats = $this->request->variable('action_subcats', '');
-                $subcats_to_id = $this->request->variable('subcats_to_id', 0);
-                $action_links = $this->request->variable('action_links', '');
-                $links_to_id = $this->request->variable('links_to_id', 0);
-
-                try {
-                    $this->errors = $this->_delete_cat($action_links, $action_subcats, $links_to_id, $subcats_to_id);
-                } catch (\Exception $e) {
-                    trigger_error($e->getMessage(), E_USER_WARNING);
-                }
-
-                if (count($this->errors)) {
-                    break;
-                }
-
-                $this->cache->destroy('sql', DIR_CAT_TABLE);
-
-                trigger_error($this->user->lang['DIR_CAT_DELETED'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
-
-                break;
-
-            case 'edit':
-                $this->cat_data = [
-                    'cat_id'        => $this->cat_id,
-                ];
-                // No break here
-            case 'add':
-
-                $this->cat_data += [
-                    'parent_id'                => $this->request->variable('cat_parent_id', (int) $this->parent_id),
-                    'cat_parents'              => '',
-                    'cat_name'                 => $this->request->variable('cat_name', '', true),
-                    'cat_desc'                 => $this->request->variable('cat_desc', '', true),
-                    'cat_desc_uid'             => '',
-                    'cat_desc_options'         => 7,
-                    'cat_desc_bitfield'        => '',
-                    'cat_icon'                 => $this->request->variable('cat_icon', ''),
-                    'display_subcat_list'      => $this->request->variable('display_on_index', false),
-                    'cat_allow_comments'       => $this->request->variable('allow_comments', 1),
-                    'cat_allow_votes'          => $this->request->variable('allow_votes', 1),
-                    'cat_must_describe'        => $this->request->variable('must_describe', 1),
-                    'cat_count_all'            => $this->request->variable('count_all', 0),
-                    'cat_validate'             => $this->request->variable('validate', 0),
-                    'cat_link_back'            => $this->request->variable('link_back', 0),
-                    'cat_cron_enable'          => $this->request->variable('cron_enable', 0),
-                    'cat_cron_freq'            => $this->request->variable('cron_every', 7),
-                    'cat_cron_nb_check'        => $this->request->variable('nb_check', 1),
-                ];
-
-                // Get data for cat description if specified
-                if ($this->cat_data['cat_desc']) {
-                    generate_text_for_storage($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_bitfield'], $this->cat_data['cat_desc_options'], $this->request->variable('desc_parse_bbcode', false), $this->request->variable('desc_parse_urls', false), $this->request->variable('desc_parse_smilies', false));
-                }
-
-                try {
-                    $this->errors = $this->_update_cat_data();
-                } catch (\Exception $e) {
-                    trigger_error($e->getMessage(), E_USER_WARNING);
-                }
-
-                if (!count($this->errors)) {
-                    $this->cache->destroy('sql', DIR_CAT_TABLE);
-
-                    $message = ($this->action == 'add') ? $this->user->lang['DIR_CAT_CREATED'] : $this->user->lang['DIR_CAT_UPDATED'];
-
-                    trigger_error($message.adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
-                }
-
-            break;
-        }
-    }
-
-    /**
-     * Display form.
-     *
-     * @param string $parents_list Drop-down list
-     *
-     * @return null
-     */
-    private function _display_cat_form($parents_list)
-    {
-        $dir_cat_desc_data = [
-            'text'             => $this->cat_data['cat_desc'],
-            'allow_bbcode'     => true,
-            'allow_smilies'    => true,
-            'allow_urls'       => true,
-        ];
-
-        // Parse desciption if specified
-        if ($this->cat_data['cat_desc']) {
-            if (!isset($this->cat_data['cat_desc_uid'])) {
-                // Before we are able to display the preview and plane text, we need to parse our $request->variable()'d value...
-                $this->cat_data['cat_desc_uid'] = '';
-                $this->cat_data['cat_desc_bitfield'] = '';
-                $this->cat_data['cat_desc_options'] = 0;
-
-                generate_text_for_storage($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_bitfield'], $this->cat_data['cat_desc_options'], $this->request->variable('desc_allow_bbcode', false), $this->request->variable('desc_allow_urls', false), $this->request->variable('desc_allow_smilies', false));
-            }
-
-            // decode...
-            $dir_cat_desc_data = generate_text_for_edit($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_options']);
-        }
-
-        $this->template->assign_vars([
-            'S_EDIT_CAT'          => true,
-            'S_ERROR'             => (count($this->errors)) ? true : false,
-            'S_CAT_PARENT_ID'     => $this->cat_data['parent_id'],
-            'S_ADD_ACTION'        => ($this->action == 'add') ? true : false,
-
-            'U_BACK'               => $this->u_action.'&amp;parent_id='.$this->parent_id,
-            'U_EDIT_ACTION'        => $this->u_action."&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
-
-            'L_TITLE'                      => $this->user->lang['DIR_'.strtoupper($this->action).'_CAT'],
-            'ERROR_MSG'                    => (count($this->errors)) ? implode('<br />', $this->errors) : '',
-            'ICON_IMAGE'                   => ($this->cat_data['cat_icon']) ? $this->dir_helper->get_img_path('icons', $this->cat_data['cat_icon']) : 'images/spacer.gif',
-
-            'DIR_ICON_PATH'                => $this->dir_helper->get_img_path('icons'),
-            'DIR_CAT_NAME'                 => $this->cat_data['cat_name'],
-            'DIR_CAT_DESC'                 => $dir_cat_desc_data['text'],
-
-            'S_DESC_BBCODE_CHECKED'        => ($dir_cat_desc_data['allow_bbcode']) ? true : false,
-            'S_DESC_SMILIES_CHECKED'       => ($dir_cat_desc_data['allow_smilies']) ? true : false,
-            'S_DESC_URLS_CHECKED'          => ($dir_cat_desc_data['allow_urls']) ? true : false,
-            'S_DISPLAY_SUBCAT_LIST'        => ($this->cat_data['display_subcat_list']) ? true : false,
-            'S_PARENT_OPTIONS'             => $parents_list,
-            'S_ICON_OPTIONS'               => $this->_get_dir_icon_list($this->dir_helper->get_img_path('icons'), $this->cat_data['cat_icon']),
-            'S_ALLOW_COMMENTS'             => ($this->cat_data['cat_allow_comments']) ? true : false,
-            'S_ALLOW_VOTES'                => ($this->cat_data['cat_allow_votes']) ? true : false,
-            'S_MUST_DESCRIBE'              => ($this->cat_data['cat_must_describe']) ? true : false,
-            'S_COUNT_ALL'                  => ($this->cat_data['cat_count_all']) ? true : false,
-            'S_VALIDATE'                   => ($this->cat_data['cat_validate']) ? true : false,
-
-            'DIR_CRON_EVERY'               => $this->cat_data['cat_cron_freq'],
-            'DIR_NEXT_CRON_ACTION'         => !empty($this->cat_data['cat_cron_next']) ? $this->user->format_date($this->cat_data['cat_cron_next']) : '-',
-            'DIR_CRON_NB_CHECK'            => $this->cat_data['cat_cron_nb_check'],
-
-            'S_LINK_BACK'                  => ($this->cat_data['cat_link_back']) ? true : false,
-            'S_CRON_ENABLE'                => ($this->cat_data['cat_cron_enable']) ? true : false,
-
-            'U_DATE'                    => $this->helper->route('ernadoo_phpbbdirectory_ajax_controller'),
-        ]);
-    }
-
-    /**
-     * Get category details.
-     *
-     * @param int $cat_id The category ID
-     *
-     * @return array
-     */
-    private function _get_cat_info($cat_id)
-    {
-        $sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
+		$result = $this->db->sql_query($sql);
+
+		if ($row = $this->db->sql_fetchrow($result)) {
+			do {
+				$folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$this->user->lang['DIR_SUBCAT'].'" />' : '<img src="images/icon_folder.gif" alt="'.$this->user->lang['FOLDER'].'" />';
+
+				$url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
+
+				$this->template->assign_block_vars('cats', [
+					'FOLDER_IMAGE'         => $folder_image,
+					'CAT_IMAGE'            => ($row['cat_icon']) ? '<img src="'.$this->dir_helper->get_img_path('icons', $row['cat_icon']).'" alt="" />' : '',
+					'CAT_NAME'             => $row['cat_name'],
+					'CAT_DESCRIPTION'      => generate_text_for_display($row['cat_desc'], $row['cat_desc_uid'], $row['cat_desc_bitfield'], $row['cat_desc_options']),
+					'CAT_LINKS'            => $row['cat_links'],
+
+					'U_CAT'                => $this->u_action.'&amp;parent_id='.$row['cat_id'],
+					'U_MOVE_UP'            => $url.'&amp;action=move_up',
+					'U_MOVE_DOWN'          => $url.'&amp;action=move_down',
+					'U_EDIT'               => $url.'&amp;action=edit',
+					'U_DELETE'             => $url.'&amp;action=delete',
+					'U_SYNC'               => $url.'&amp;action=sync', ]
+				);
+			} while ($row = $this->db->sql_fetchrow($result));
+		} elseif ($this->parent_id) {
+			$row = $this->_get_cat_info($this->parent_id);
+
+			$url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
+
+			$this->template->assign_vars([
+				'S_NO_CATS'            => true,
+
+				'U_EDIT'              => $url.'&amp;action=edit',
+				'U_DELETE'            => $url.'&amp;action=delete',
+				'U_SYNC'              => $url.'&amp;action=sync', ]
+			);
+		}
+		$this->db->sql_freeresult($result);
+
+		$this->template->assign_vars([
+			'ERROR_MSG'        => (count($this->errors)) ? implode('<br />', $this->errors) : '',
+			'NAVIGATION'       => $navigation,
+			'CAT_BOX'          => $cat_box,
+			'U_SEL_ACTION'     => $this->u_action,
+			'U_ACTION'         => $this->u_action.'&amp;parent_id='.$this->parent_id,
+
+			'U_PROGRESS_BAR'     => $this->u_action.'&amp;action=progress_bar',
+			'UA_PROGRESS_BAR'    => addslashes($this->u_action.'&amp;action=progress_bar'),
+		]);
+	}
+
+	/**
+	 * Set page url.
+	 *
+	 * @param string $u_action Custom form action
+	 *
+	 * @return null
+	 */
+	public function set_page_url($u_action)
+	{
+		$this->u_action = $u_action;
+	}
+
+	/**
+	 * Update cat table.
+	 *
+	 * @return null
+	 */
+	public function update()
+	{
+		if (!check_form_key($this->form_key)) {
+			$this->update = false;
+			$this->errors[] = $this->user->lang['FORM_INVALID'];
+		}
+
+		switch ($this->action) {
+			case 'delete':
+				$action_subcats = $this->request->variable('action_subcats', '');
+				$subcats_to_id = $this->request->variable('subcats_to_id', 0);
+				$action_links = $this->request->variable('action_links', '');
+				$links_to_id = $this->request->variable('links_to_id', 0);
+
+				try {
+					$this->errors = $this->_delete_cat($action_links, $action_subcats, $links_to_id, $subcats_to_id);
+				} catch (\Exception $e) {
+					trigger_error($e->getMessage(), E_USER_WARNING);
+				}
+
+				if (count($this->errors)) {
+					break;
+				}
+
+				$this->cache->destroy('sql', DIR_CAT_TABLE);
+
+				trigger_error($this->user->lang['DIR_CAT_DELETED'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
+
+				break;
+
+			case 'edit':
+				$this->cat_data = [
+					'cat_id'        => $this->cat_id,
+				];
+				// No break here
+			case 'add':
+
+				$this->cat_data += [
+					'parent_id'                => $this->request->variable('cat_parent_id', (int) $this->parent_id),
+					'cat_parents'              => '',
+					'cat_name'                 => $this->request->variable('cat_name', '', true),
+					'cat_desc'                 => $this->request->variable('cat_desc', '', true),
+					'cat_desc_uid'             => '',
+					'cat_desc_options'         => 7,
+					'cat_desc_bitfield'        => '',
+					'cat_icon'                 => $this->request->variable('cat_icon', ''),
+					'display_subcat_list'      => $this->request->variable('display_on_index', false),
+					'cat_allow_comments'       => $this->request->variable('allow_comments', 1),
+					'cat_allow_votes'          => $this->request->variable('allow_votes', 1),
+					'cat_must_describe'        => $this->request->variable('must_describe', 1),
+					'cat_count_all'            => $this->request->variable('count_all', 0),
+					'cat_validate'             => $this->request->variable('validate', 0),
+					'cat_link_back'            => $this->request->variable('link_back', 0),
+					'cat_cron_enable'          => $this->request->variable('cron_enable', 0),
+					'cat_cron_freq'            => $this->request->variable('cron_every', 7),
+					'cat_cron_nb_check'        => $this->request->variable('nb_check', 1),
+				];
+
+				// Get data for cat description if specified
+				if ($this->cat_data['cat_desc']) {
+					generate_text_for_storage($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_bitfield'], $this->cat_data['cat_desc_options'], $this->request->variable('desc_parse_bbcode', false), $this->request->variable('desc_parse_urls', false), $this->request->variable('desc_parse_smilies', false));
+				}
+
+				try {
+					$this->errors = $this->_update_cat_data();
+				} catch (\Exception $e) {
+					trigger_error($e->getMessage(), E_USER_WARNING);
+				}
+
+				if (!count($this->errors)) {
+					$this->cache->destroy('sql', DIR_CAT_TABLE);
+
+					$message = ($this->action == 'add') ? $this->user->lang['DIR_CAT_CREATED'] : $this->user->lang['DIR_CAT_UPDATED'];
+
+					trigger_error($message.adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id));
+				}
+
+			break;
+		}
+	}
+
+	/**
+	 * Display form.
+	 *
+	 * @param string $parents_list Drop-down list
+	 *
+	 * @return null
+	 */
+	private function _display_cat_form($parents_list)
+	{
+		$dir_cat_desc_data = [
+			'text'             => $this->cat_data['cat_desc'],
+			'allow_bbcode'     => true,
+			'allow_smilies'    => true,
+			'allow_urls'       => true,
+		];
+
+		// Parse desciption if specified
+		if ($this->cat_data['cat_desc']) {
+			if (!isset($this->cat_data['cat_desc_uid'])) {
+				// Before we are able to display the preview and plane text, we need to parse our $request->variable()'d value...
+				$this->cat_data['cat_desc_uid'] = '';
+				$this->cat_data['cat_desc_bitfield'] = '';
+				$this->cat_data['cat_desc_options'] = 0;
+
+				generate_text_for_storage($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_bitfield'], $this->cat_data['cat_desc_options'], $this->request->variable('desc_allow_bbcode', false), $this->request->variable('desc_allow_urls', false), $this->request->variable('desc_allow_smilies', false));
+			}
+
+			// decode...
+			$dir_cat_desc_data = generate_text_for_edit($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_options']);
+		}
+
+		$this->template->assign_vars([
+			'S_EDIT_CAT'          => true,
+			'S_ERROR'             => (count($this->errors)) ? true : false,
+			'S_CAT_PARENT_ID'     => $this->cat_data['parent_id'],
+			'S_ADD_ACTION'        => ($this->action == 'add') ? true : false,
+
+			'U_BACK'               => $this->u_action.'&amp;parent_id='.$this->parent_id,
+			'U_EDIT_ACTION'        => $this->u_action."&amp;parent_id={$this->parent_id}&amp;action=$this->action&amp;c=$this->cat_id",
+
+			'L_TITLE'                      => $this->user->lang['DIR_'.strtoupper($this->action).'_CAT'],
+			'ERROR_MSG'                    => (count($this->errors)) ? implode('<br />', $this->errors) : '',
+			'ICON_IMAGE'                   => ($this->cat_data['cat_icon']) ? $this->dir_helper->get_img_path('icons', $this->cat_data['cat_icon']) : 'images/spacer.gif',
+
+			'DIR_ICON_PATH'                => $this->dir_helper->get_img_path('icons'),
+			'DIR_CAT_NAME'                 => $this->cat_data['cat_name'],
+			'DIR_CAT_DESC'                 => $dir_cat_desc_data['text'],
+
+			'S_DESC_BBCODE_CHECKED'        => ($dir_cat_desc_data['allow_bbcode']) ? true : false,
+			'S_DESC_SMILIES_CHECKED'       => ($dir_cat_desc_data['allow_smilies']) ? true : false,
+			'S_DESC_URLS_CHECKED'          => ($dir_cat_desc_data['allow_urls']) ? true : false,
+			'S_DISPLAY_SUBCAT_LIST'        => ($this->cat_data['display_subcat_list']) ? true : false,
+			'S_PARENT_OPTIONS'             => $parents_list,
+			'S_ICON_OPTIONS'               => $this->_get_dir_icon_list($this->dir_helper->get_img_path('icons'), $this->cat_data['cat_icon']),
+			'S_ALLOW_COMMENTS'             => ($this->cat_data['cat_allow_comments']) ? true : false,
+			'S_ALLOW_VOTES'                => ($this->cat_data['cat_allow_votes']) ? true : false,
+			'S_MUST_DESCRIBE'              => ($this->cat_data['cat_must_describe']) ? true : false,
+			'S_COUNT_ALL'                  => ($this->cat_data['cat_count_all']) ? true : false,
+			'S_VALIDATE'                   => ($this->cat_data['cat_validate']) ? true : false,
+
+			'DIR_CRON_EVERY'               => $this->cat_data['cat_cron_freq'],
+			'DIR_NEXT_CRON_ACTION'         => !empty($this->cat_data['cat_cron_next']) ? $this->user->format_date($this->cat_data['cat_cron_next']) : '-',
+			'DIR_CRON_NB_CHECK'            => $this->cat_data['cat_cron_nb_check'],
+
+			'S_LINK_BACK'                  => ($this->cat_data['cat_link_back']) ? true : false,
+			'S_CRON_ENABLE'                => ($this->cat_data['cat_cron_enable']) ? true : false,
+
+			'U_DATE'                    => $this->helper->route('ernadoo_phpbbdirectory_ajax_controller'),
+		]);
+	}
+
+	/**
+	 * Get category details.
+	 *
+	 * @param int $cat_id The category ID
+	 *
+	 * @return array
+	 */
+	private function _get_cat_info($cat_id)
+	{
+		$sql = 'SELECT cat_id, parent_id, right_id, left_id, cat_desc, cat_desc_uid, cat_desc_options, cat_icon, cat_name, display_subcat_list, cat_allow_comments, cat_allow_votes, cat_must_describe, cat_count_all, cat_validate, cat_cron_freq, cat_cron_nb_check, cat_link_back, cat_cron_enable, cat_cron_next
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id = '.(int) $cat_id;
-        $result = $this->db->sql_query($sql);
-        $row = $this->db->sql_fetchrow($result);
-        $this->db->sql_freeresult($result);
-
-        if (!$row) {
-            trigger_error('DIR_ERROR_NO_CATS', E_USER_ERROR);
-        }
-
-        return $row;
-    }
-
-    /**
-     * Update category data.
-     *
-     * @return array
-     */
-    private function _update_cat_data()
-    {
-        if (!$this->cat_data['cat_name']) {
-            $this->errors[] = $this->user->lang['DIR_CAT_NAME_EMPTY'];
-        }
-
-        if (utf8_strlen($this->cat_data['cat_desc']) > 4000) {
-            $this->errors[] = $this->user->lang['DIR_CAT_DESC_TOO_LONG'];
-        }
-
-        if (($this->cat_data['cat_cron_enable'] && $this->cat_data['cat_cron_freq'] <= 0) || $this->cat_data['cat_cron_nb_check'] < 0) {
-            $this->errors[] = $this->user->lang['DIR_CAT_DATA_NEGATIVE'];
-        }
-
-        // Unset data that are not database fields
-        $cat_data_sql = $this->cat_data;
-
-        // What are we going to do tonight Brain? The same thing we do everynight,
-        // try to take over the world ... or decide whether to continue update
-        // and if so, whether it's a new cat/link or an existing one
-        if (count($this->errors)) {
-            return $this->errors;
-        }
-
-        if (!$cat_data_sql['cat_link_back']) {
-            $cat_data_sql['cat_cron_enable'] = 0;
-            $cat_data_sql['cat_cron_next'] = 0;
-        }
-
-        if (!$cat_data_sql['parent_id']) {
-            $cat_data_sql['display_subcat_list'] = 0;
-        }
-
-        // no cat_id means we're creating a new categorie
-        if (!isset($cat_data_sql['cat_id'])) {
-            if ($cat_data_sql['cat_cron_enable']) {
-                $cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
-            }
-
-            $this->cat_data = $this->nestedset_category->insert($cat_data_sql);
-
-            if ($cat_data_sql['parent_id']) {
-                $this->nestedset_category->change_parent($this->cat_data['cat_id'], $cat_data_sql['parent_id']);
-            }
-
-            $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_ADD', time(), [$this->cat_data['cat_name']]);
-        } else {
-            $row = $this->_get_cat_info($cat_data_sql['cat_id']);
-
-            if ($row['parent_id'] != $cat_data_sql['parent_id']) {
-                $this->nestedset_category->change_parent($cat_data_sql['cat_id'], $cat_data_sql['parent_id']);
-            }
-
-            if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable'])) {
-                $cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
-            }
-
-            if ($row['cat_name'] != $cat_data_sql['cat_name']) {
-                // the cat name has changed, clear the parents list of all categories (for safety)
-                $sql = 'UPDATE '.DIR_CAT_TABLE."
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		if (!$row) {
+			trigger_error('DIR_ERROR_NO_CATS', E_USER_ERROR);
+		}
+
+		return $row;
+	}
+
+	/**
+	 * Update category data.
+	 *
+	 * @return array
+	 */
+	private function _update_cat_data()
+	{
+		if (!$this->cat_data['cat_name']) {
+			$this->errors[] = $this->user->lang['DIR_CAT_NAME_EMPTY'];
+		}
+
+		if (utf8_strlen($this->cat_data['cat_desc']) > 4000) {
+			$this->errors[] = $this->user->lang['DIR_CAT_DESC_TOO_LONG'];
+		}
+
+		if (($this->cat_data['cat_cron_enable'] && $this->cat_data['cat_cron_freq'] <= 0) || $this->cat_data['cat_cron_nb_check'] < 0) {
+			$this->errors[] = $this->user->lang['DIR_CAT_DATA_NEGATIVE'];
+		}
+
+		// Unset data that are not database fields
+		$cat_data_sql = $this->cat_data;
+
+		// What are we going to do tonight Brain? The same thing we do everynight,
+		// try to take over the world ... or decide whether to continue update
+		// and if so, whether it's a new cat/link or an existing one
+		if (count($this->errors)) {
+			return $this->errors;
+		}
+
+		if (!$cat_data_sql['cat_link_back']) {
+			$cat_data_sql['cat_cron_enable'] = 0;
+			$cat_data_sql['cat_cron_next'] = 0;
+		}
+
+		if (!$cat_data_sql['parent_id']) {
+			$cat_data_sql['display_subcat_list'] = 0;
+		}
+
+		// no cat_id means we're creating a new categorie
+		if (!isset($cat_data_sql['cat_id'])) {
+			if ($cat_data_sql['cat_cron_enable']) {
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
+			}
+
+			$this->cat_data = $this->nestedset_category->insert($cat_data_sql);
+
+			if ($cat_data_sql['parent_id']) {
+				$this->nestedset_category->change_parent($this->cat_data['cat_id'], $cat_data_sql['parent_id']);
+			}
+
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_ADD', time(), [$this->cat_data['cat_name']]);
+		} else {
+			$row = $this->_get_cat_info($cat_data_sql['cat_id']);
+
+			if ($row['parent_id'] != $cat_data_sql['parent_id']) {
+				$this->nestedset_category->change_parent($cat_data_sql['cat_id'], $cat_data_sql['parent_id']);
+			}
+
+			if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable'])) {
+				$cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
+			}
+
+			if ($row['cat_name'] != $cat_data_sql['cat_name']) {
+				// the cat name has changed, clear the parents list of all categories (for safety)
+				$sql = 'UPDATE '.DIR_CAT_TABLE."
 					SET cat_parents = ''";
-                $this->db->sql_query($sql);
-            }
+				$this->db->sql_query($sql);
+			}
 
-            // Setting the cat id to the categorie id is not really received well by some dbs. ;)
-            unset($cat_data_sql['cat_id']);
+			// Setting the cat id to the categorie id is not really received well by some dbs. ;)
+			unset($cat_data_sql['cat_id']);
 
-            $sql = 'UPDATE '.DIR_CAT_TABLE.'
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET '.$this->db->sql_build_array('UPDATE', $cat_data_sql).'
 				WHERE cat_id = '.(int) $this->cat_id;
-            $this->db->sql_query($sql);
-
-            $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_EDIT', time(), [$this->cat_data['cat_name']]);
-        }
-
-        return $this->errors;
-    }
-
-    /**
-     * Remove complete category.
-     *
-     * @param string $action_links   Action for categories links
-     * @param string $action_subcats Action for sub-categories
-     * @param int    $links_to_id    New category ID for links
-     * @param int    $subcats_to_id  New category ID for sub-categories
-     *
-     * @return array
-     */
-    private function _delete_cat($action_links = 'delete', $action_subcats = 'delete', $links_to_id = 0, $subcats_to_id = 0)
-    {
-        $this->cat_data = $this->_get_cat_info($this->cat_id);
-
-        $log_action_links = $log_action_cats = $links_to_name = $subcats_to_name = '';
-
-        if ($action_links == 'delete') {
-            $log_action_links = 'LINKS';
-            $this->errors = array_merge($this->errors, $this->_delete_cat_content());
-        } elseif ($action_links == 'move') {
-            if (!$links_to_id) {
-                $this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
-            } else {
-                $log_action_links = 'MOVE_LINKS';
-
-                $sql = 'SELECT cat_name
+			$this->db->sql_query($sql);
+
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_EDIT', time(), [$this->cat_data['cat_name']]);
+		}
+
+		return $this->errors;
+	}
+
+	/**
+	 * Remove complete category.
+	 *
+	 * @param string $action_links   Action for categories links
+	 * @param string $action_subcats Action for sub-categories
+	 * @param int    $links_to_id    New category ID for links
+	 * @param int    $subcats_to_id  New category ID for sub-categories
+	 *
+	 * @return array
+	 */
+	private function _delete_cat($action_links = 'delete', $action_subcats = 'delete', $links_to_id = 0, $subcats_to_id = 0)
+	{
+		$this->cat_data = $this->_get_cat_info($this->cat_id);
+
+		$log_action_links = $log_action_cats = $links_to_name = $subcats_to_name = '';
+
+		if ($action_links == 'delete') {
+			$log_action_links = 'LINKS';
+			$this->errors = array_merge($this->errors, $this->_delete_cat_content());
+		} elseif ($action_links == 'move') {
+			if (!$links_to_id) {
+				$this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
+			} else {
+				$log_action_links = 'MOVE_LINKS';
+
+				$sql = 'SELECT cat_name
 					FROM '.DIR_CAT_TABLE.'
 					WHERE cat_id = '.(int) $links_to_id;
-                $result = $this->db->sql_query($sql);
-                $row = $this->db->sql_fetchrow($result);
-                $this->db->sql_freeresult($result);
-
-                if (!$row) {
-                    throw new \OutOfBoundsException('DIR_NO_CAT');
-                } else {
-                    $links_to_name = $row['cat_name'];
-                    $this->_move_cat_content($this->cat_id, $links_to_id);
-                }
-            }
-        }
-
-        if (count($this->errors)) {
-            return $this->errors;
-        }
-
-        if ($action_subcats == 'delete') {
-            $log_action_cats = 'CATS';
-        } elseif ($action_subcats == 'move') {
-            if (!$subcats_to_id) {
-                $this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
-            } else {
-                $log_action_cats = 'MOVE_CATS';
-
-                $subcats_to_name = $row['cat_name'];
-                $this->nestedset_category->move_children($this->cat_id, $subcats_to_id);
-            }
-        }
-
-        if (count($this->errors)) {
-            return $this->errors;
-        }
-
-        $this->nestedset_category->delete($this->cat_id);
-
-        $log_action = implode('_', [$log_action_links, $log_action_cats]);
-
-        switch ($log_action) {
-            case 'MOVE_LINKS_MOVE_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS_MOVE_CATS', time(), [$links_to_name, $subcats_to_name, $this->cat_data['cat_name']]);
-            break;
-
-            case 'MOVE_LINKS_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS_CATS', time(), [$links_to_name, $this->cat_data['cat_name']]);
-            break;
-
-            case 'LINKS_MOVE_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS_MOVE_CATS', time(), [$subcats_to_name, $this->cat_data['cat_name']]);
-            break;
-
-            case '_MOVE_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_CATS', time(), [$subcats_to_name, $this->cat_data['cat_name']]);
-            break;
-
-            case 'MOVE_LINKS_':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS', time(), [$links_to_name, $this->cat_data['cat_name']]);
-            break;
-
-            case 'LINKS_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS_CATS', time(), [$this->cat_data['cat_name']]);
-            break;
-
-            case '_CATS':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_CATS', time(), [$this->cat_data['cat_name']]);
-            break;
-
-            case 'LINKS_':
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS', time(), [$this->cat_data['cat_name']]);
-            break;
-
-            default:
-                $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_CAT', time(), [$this->cat_data['cat_name']]);
-            break;
-        }
-
-        return $this->errors;
-    }
-
-    /**
-     * Move category content from one to another forum.
-     *
-     * @param int $from_id
-     * @param int $to_id
-     *
-     * @return null
-     */
-    private function _move_cat_content($from_id, $to_id)
-    {
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+				$result = $this->db->sql_query($sql);
+				$row = $this->db->sql_fetchrow($result);
+				$this->db->sql_freeresult($result);
+
+				if (!$row) {
+					throw new \OutOfBoundsException('DIR_NO_CAT');
+				} else {
+					$links_to_name = $row['cat_name'];
+					$this->_move_cat_content($this->cat_id, $links_to_id);
+				}
+			}
+		}
+
+		if (count($this->errors)) {
+			return $this->errors;
+		}
+
+		if ($action_subcats == 'delete') {
+			$log_action_cats = 'CATS';
+		} elseif ($action_subcats == 'move') {
+			if (!$subcats_to_id) {
+				$this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
+			} else {
+				$log_action_cats = 'MOVE_CATS';
+
+				$subcats_to_name = $row['cat_name'];
+				$this->nestedset_category->move_children($this->cat_id, $subcats_to_id);
+			}
+		}
+
+		if (count($this->errors)) {
+			return $this->errors;
+		}
+
+		$this->nestedset_category->delete($this->cat_id);
+
+		$log_action = implode('_', [$log_action_links, $log_action_cats]);
+
+		switch ($log_action) {
+			case 'MOVE_LINKS_MOVE_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS_MOVE_CATS', time(), [$links_to_name, $subcats_to_name, $this->cat_data['cat_name']]);
+			break;
+
+			case 'MOVE_LINKS_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS_CATS', time(), [$links_to_name, $this->cat_data['cat_name']]);
+			break;
+
+			case 'LINKS_MOVE_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS_MOVE_CATS', time(), [$subcats_to_name, $this->cat_data['cat_name']]);
+			break;
+
+			case '_MOVE_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_CATS', time(), [$subcats_to_name, $this->cat_data['cat_name']]);
+			break;
+
+			case 'MOVE_LINKS_':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS', time(), [$links_to_name, $this->cat_data['cat_name']]);
+			break;
+
+			case 'LINKS_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS_CATS', time(), [$this->cat_data['cat_name']]);
+			break;
+
+			case '_CATS':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_CATS', time(), [$this->cat_data['cat_name']]);
+			break;
+
+			case 'LINKS_':
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_LINKS', time(), [$this->cat_data['cat_name']]);
+			break;
+
+			default:
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_CAT', time(), [$this->cat_data['cat_name']]);
+			break;
+		}
+
+		return $this->errors;
+	}
+
+	/**
+	 * Move category content from one to another forum.
+	 *
+	 * @param int $from_id
+	 * @param int $to_id
+	 *
+	 * @return null
+	 */
+	private function _move_cat_content($from_id, $to_id)
+	{
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_cat = '.(int) $to_id.'
 			WHERE link_cat = '.(int) $from_id;
-        $this->db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-        $sql = 'DELETE FROM '.DIR_WATCH_TABLE.'
+		$sql = 'DELETE FROM '.DIR_WATCH_TABLE.'
 			WHERE cat_id = '.(int) $from_id;
-        $this->db->sql_query($sql);
-
-        $this->_sync_dir_cat($to_id);
-    }
-
-    /**
-     * Delete category content.
-     *
-     * @return array
-     */
-    private function _delete_cat_content()
-    {
-        $this->db->sql_transaction('begin');
-
-        // Before we remove anything we make sure we are able to adjust the post counts later. ;)
-        $sql = 'SELECT link_id, link_banner
+		$this->db->sql_query($sql);
+
+		$this->_sync_dir_cat($to_id);
+	}
+
+	/**
+	 * Delete category content.
+	 *
+	 * @return array
+	 */
+	private function _delete_cat_content()
+	{
+		$this->db->sql_transaction('begin');
+
+		// Before we remove anything we make sure we are able to adjust the post counts later. ;)
+		$sql = 'SELECT link_id, link_banner
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_cat = '.(int) $this->cat_id;
-        $result = $this->db->sql_query($sql);
-
-        $link_ids = [];
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $link_ids[] = $row['link_id'];
-
-            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
-                $banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
-
-                if (file_exists($banner_img)) {
-                    @unlink($banner_img);
-                }
-            }
-        }
-        $this->db->sql_freeresult($result);
-
-        if (count($link_ids)) {
-            // Delete links datas
-            $link_datas_ary = [
-                DIR_COMMENT_TABLE     => 'comment_link_id',
-                DIR_VOTE_TABLE        => 'vote_link_id',
-            ];
-
-            foreach ($link_datas_ary as $table => $field) {
-                $this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $link_ids));
-            }
-        }
-
-        // Delete cats datas
-        $cat_datas_ary = [
-            DIR_LINK_TABLE     => 'link_cat',
-            DIR_WATCH_TABLE    => 'cat_id',
-        ];
-
-        foreach ($cat_datas_ary as $table => $field) {
-            $this->db->sql_query("DELETE FROM $table WHERE $field = ".(int) $this->cat_id);
-        }
-
-        $this->db->sql_transaction('commit');
-
-        return [];
-    }
-
-    /**
-     * Update links counter.
-     *
-     * @param int $cat_id The category ID
-     *
-     * @return null
-     */
-    private function _sync_dir_cat($cat_id)
-    {
-        $sql = 'SELECT COUNT(link_id) AS num_links
+		$result = $this->db->sql_query($sql);
+
+		$link_ids = [];
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$link_ids[] = $row['link_id'];
+
+			if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+				$banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
+
+				if (file_exists($banner_img)) {
+					@unlink($banner_img);
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (count($link_ids)) {
+			// Delete links datas
+			$link_datas_ary = [
+				DIR_COMMENT_TABLE     => 'comment_link_id',
+				DIR_VOTE_TABLE        => 'vote_link_id',
+			];
+
+			foreach ($link_datas_ary as $table => $field) {
+				$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $link_ids));
+			}
+		}
+
+		// Delete cats datas
+		$cat_datas_ary = [
+			DIR_LINK_TABLE     => 'link_cat',
+			DIR_WATCH_TABLE    => 'cat_id',
+		];
+
+		foreach ($cat_datas_ary as $table => $field) {
+			$this->db->sql_query("DELETE FROM $table WHERE $field = ".(int) $this->cat_id);
+		}
+
+		$this->db->sql_transaction('commit');
+
+		return [];
+	}
+
+	/**
+	 * Update links counter.
+	 *
+	 * @param int $cat_id The category ID
+	 *
+	 * @return null
+	 */
+	private function _sync_dir_cat($cat_id)
+	{
+		$sql = 'SELECT COUNT(link_id) AS num_links
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_cat = '.(int) $cat_id.'
 				AND link_active = 1';
-        $result = $this->db->sql_query($sql);
-        $total_links = (int) $this->db->sql_fetchfield('num_links');
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$total_links = (int) $this->db->sql_fetchfield('num_links');
+		$this->db->sql_freeresult($result);
 
-        $sql = 'UPDATE '.DIR_CAT_TABLE.'
+		$sql = 'UPDATE '.DIR_CAT_TABLE.'
 			SET cat_links = '.$total_links.'
 			WHERE cat_id = '.(int) $cat_id;
-        $this->db->sql_query($sql);
-    }
-
-    /**
-     * Update link data (note, vote, comment).
-     *
-     * @param int $start
-     * @param int $stop
-     *
-     * @return null
-     */
-    private function _sync_dir_links($start, $stop)
-    {
-        $sql_ary = [
-            'link_comment'     => 0,
-            'link_note'        => 0,
-            'link_vote'        => 0,
-        ];
-
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	 * Update link data (note, vote, comment).
+	 *
+	 * @param int $start
+	 * @param int $stop
+	 *
+	 * @return null
+	 */
+	private function _sync_dir_links($start, $stop)
+	{
+		$sql_ary = [
+			'link_comment'     => 0,
+			'link_note'        => 0,
+			'link_vote'        => 0,
+		];
+
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET '.$this->db->sql_build_array('UPDATE', $sql_ary).'
 			WHERE link_id BETWEEN '.(int) $start.' AND '.(int) $stop;
-        $this->db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-        $sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM '.DIR_VOTE_TABLE.'
+		$sql = 'SELECT vote_link_id, COUNT(vote_note) AS nb_vote, SUM(vote_note) AS total FROM '.DIR_VOTE_TABLE.'
 			WHERE vote_link_id BETWEEN '.(int) $start.' AND '.(int) $stop.'
 			GROUP BY vote_link_id';
-        $result = $this->db->sql_query($sql);
-        while ($tmp = $this->db->sql_fetchrow($result)) {
-            $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$result = $this->db->sql_query($sql);
+		while ($tmp = $this->db->sql_fetchrow($result)) {
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
 				SET link_note = '.(int) $tmp['total'].', link_vote = '.(int) $tmp['nb_vote'].'
 				WHERE link_id = '.(int) $tmp['vote_link_id'];
-            $this->db->sql_query($sql);
-        }
-        $this->db->sql_freeresult($result);
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
 
-        $sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment
+		$sql = 'SELECT 	comment_link_id, COUNT(comment_id) AS nb_comment
 			FROM '.DIR_COMMENT_TABLE.'
 			WHERE comment_link_id BETWEEN '.(int) $start.' AND '.(int) $stop.'
 			GROUP BY comment_link_id';
-        $result = $this->db->sql_query($sql);
-        while ($tmp = $this->db->sql_fetchrow($result)) {
-            $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$result = $this->db->sql_query($sql);
+		while ($tmp = $this->db->sql_fetchrow($result)) {
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
 				SET link_comment = '.(int) $tmp['nb_comment'].'
 				WHERE link_id = '.(int) $tmp['comment_link_id'];
-            $this->db->sql_query($sql);
-        }
-        $this->db->sql_freeresult($result);
-    }
-
-    /**
-     * Display icons drop-down list.
-     *
-     * @param string $icons_path
-     * @param string $img_selected
-     *
-     * @return string
-     */
-    private function _get_dir_icon_list($icons_path, $img_selected)
-    {
-        $imglist = filelist($icons_path, '');
-        $filename_list = '<option value="">----------</option>';
-
-        foreach ($imglist as $path => $img_ary) {
-            sort($img_ary);
-
-            foreach ($img_ary as $img) {
-                $img = $path.$img;
-                $selected = '';
-
-                if (strlen($img) > 255) {
-                    continue;
-                }
-
-                if ($img == $img_selected) {
-                    $selected = ' selected="selected"';
-                }
-
-                $filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
-            }
-        }
-
-        return $filename_list;
-    }
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
+
+	/**
+	 * Display icons drop-down list.
+	 *
+	 * @param string $icons_path
+	 * @param string $img_selected
+	 *
+	 * @return string
+	 */
+	private function _get_dir_icon_list($icons_path, $img_selected)
+	{
+		$imglist = filelist($icons_path, '');
+		$filename_list = '<option value="">----------</option>';
+
+		foreach ($imglist as $path => $img_ary) {
+			sort($img_ary);
+
+			foreach ($img_ary as $img) {
+				$img = $path.$img;
+				$selected = '';
+
+				if (strlen($img) > 255) {
+					continue;
+				}
+
+				if ($img == $img_selected) {
+					$selected = ' selected="selected"';
+				}
+
+				$filename_list .= '<option value="'.htmlspecialchars($img).'"'.$selected.'>'.$img.'</option>';
+			}
+		}
+
+		return $filename_list;
+	}
 }

Braces +165 added lines, -76 removed lines

@@ -110,7 +110,8 @@ 
         $parents_list = $this->categorie->make_cat_select($this->parent_id);
 
         // Fill categorie data with default values
-        if (!$this->update) {
+        if (!$this->update)
+        {
             $this->cat_data = [
                 'parent_id'                => $this->parent_id,
                 'cat_name'                 => $this->request->variable('cat_name', '', true),
@@ -142,7 +143,8 @@ 
      */
     public function action_delete()
     {
-        if (!$this->cat_id) {
+        if (!$this->cat_id)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
@@ -151,7 +153,8 @@ 
         $subcats_id = [];
         $subcats = $this->nestedset_category->get_subtree_data($this->cat_id);
 
-        foreach ($subcats as $row) {
+        foreach ($subcats as $row)
+        {
             $subcats_id[] = $row['cat_id'];
         }
 
@@ -162,7 +165,8 @@ 
 			WHERE cat_id <> '.(int) $this->cat_id;
         $result = $this->db->sql_query_limit($sql, 1);
 
-        if ($this->db->sql_fetchrow($result)) {
+        if ($this->db->sql_fetchrow($result))
+        {
             $this->template->assign_vars([
                 'S_MOVE_DIR_CAT_OPTIONS'    => $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $subcats_id), ]
             );
@@ -193,16 +197,20 @@ 
     {
         $row = $this->_get_cat_info($this->cat_id);
 
-        if (!$this->update) {
+        if (!$this->update)
+        {
             $this->cat_data = $row;
-        } else {
+        }
+        else
+        {
             $this->cat_data['left_id'] = $row['left_id'];
             $this->cat_data['right_id'] = $row['right_id'];
         }
 
         // Make sure no direct child categories are able to be selected as parents.
         $exclude_cats = [];
-        foreach ($this->nestedset_category->get_subtree_data($this->cat_id) as $row2) {
+        foreach ($this->nestedset_category->get_subtree_data($this->cat_id) as $row2)
+        {
             $exclude_cats[] = $row2['cat_id'];
         }
         $parents_list = $this->categorie->make_cat_select((int) $this->cat_data['parent_id'], $exclude_cats);
@@ -217,7 +225,8 @@ 
      */
     public function action_move()
     {
-        if (!$this->cat_id) {
+        if (!$this->cat_id)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
@@ -228,22 +237,28 @@ 
         $row = $this->db->sql_fetchrow($result);
         $this->db->sql_freeresult($result);
 
-        if (!$row) {
+        if (!$row)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
-        try {
+        try
+        {
             $move_cat_name = $this->nestedset_category->{$this->action}($this->cat_id);
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e)
+        {
             trigger_error($e->getMessage(), E_USER_WARNING);
         }
 
-        if ($move_cat_name !== false) {
+        if ($move_cat_name !== false)
+        {
             $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_'.strtoupper($this->action), time(), [$row['cat_name'], $move_cat_name]);
             $this->cache->destroy('sql', DIR_CAT_TABLE);
         }
 
-        if ($this->request->is_ajax()) {
+        if ($this->request->is_ajax())
+        {
             $json_response = new \phpbb\json_response();
             $json_response->send(['success' => ($move_cat_name !== false)]);
         }
@@ -280,7 +295,8 @@ 
      */
     public function action_sync()
     {
-        if (!$this->cat_id) {
+        if (!$this->cat_id)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
@@ -293,7 +309,8 @@ 
         $row = $this->db->sql_fetchrow($result);
         $this->db->sql_freeresult($result);
 
-        if (!$row) {
+        if (!$row)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
@@ -317,7 +334,8 @@ 
         // Sync all links in batch mode...
         $this->_sync_dir_links($start, $end);
 
-        if ($end < $row2['max_link_id']) {
+        if ($end < $row2['max_link_id'])
+        {
             // We really need to find a way of showing statistics... no progress here
             $sql = 'SELECT COUNT(link_id) as num_links
 				FROM '.DIR_LINK_TABLE.'
@@ -369,7 +387,8 @@ 
         $row = $this->db->sql_fetchrow($result);
         $this->db->sql_freeresult($result);
 
-        if (!$row) {
+        if (!$row)
+        {
             trigger_error($this->user->lang['DIR_NO_CAT'].adm_back_link($this->u_action.'&amp;parent_id='.$this->parent_id), E_USER_WARNING);
         }
 
@@ -389,17 +408,24 @@ 
     public function display_cats()
     {
         // Default management page
-        if (!$this->parent_id) {
+        if (!$this->parent_id)
+        {
             $navigation = $this->user->lang['DIR_INDEX'];
-        } else {
+        }
+        else
+        {
             $navigation = '<a href="'.$this->u_action.'">'.$this->user->lang['DIR_INDEX'].'</a>';
 
             $cats_nav = $this->nestedset_category->get_path_data($this->parent_id);
 
-            foreach ($cats_nav as $row) {
-                if ($row['cat_id'] == $this->parent_id) {
+            foreach ($cats_nav as $row)
+            {
+                if ($row['cat_id'] == $this->parent_id)
+                {
                     $navigation .= ' -&gt; '.$row['cat_name'];
-                } else {
+                }
+                else
+                {
                     $navigation .= ' -&gt; <a href="'.$this->u_action.'&amp;parent_id='.$row['cat_id'].'">'.$row['cat_name'].'</a>';
                 }
             }
@@ -408,7 +434,8 @@ 
         // Jumpbox
         $cat_box = $this->categorie->make_cat_select($this->parent_id);
 
-        if ($this->action == 'sync' || $this->action == 'sync_cat') {
+        if ($this->action == 'sync' || $this->action == 'sync_cat')
+        {
             $this->template->assign_var('S_RESYNCED', true);
         }
 
@@ -418,8 +445,10 @@ 
 			ORDER BY left_id';
         $result = $this->db->sql_query($sql);
 
-        if ($row = $this->db->sql_fetchrow($result)) {
-            do {
+        if ($row = $this->db->sql_fetchrow($result))
+        {
+            do
+            {
                 $folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '<img src="images/icon_subfolder.gif" alt="'.$this->user->lang['DIR_SUBCAT'].'" />' : '<img src="images/icon_folder.gif" alt="'.$this->user->lang['FOLDER'].'" />';
 
                 $url = $this->u_action."&amp;parent_id=$this->parent_id&amp;c={$row['cat_id']}";
@@ -439,7 +468,9 @@ 
                     'U_SYNC'               => $url.'&amp;action=sync', ]
                 );
             } while ($row = $this->db->sql_fetchrow($result));
-        } elseif ($this->parent_id) {
+        }
+        elseif ($this->parent_id)
+        {
             $row = $this->_get_cat_info($this->parent_id);
 
             $url = $this->u_action.'&amp;parent_id='.$this->parent_id.'&amp;c='.$row['cat_id'];
@@ -485,25 +516,31 @@ 
      */
     public function update()
     {
-        if (!check_form_key($this->form_key)) {
+        if (!check_form_key($this->form_key))
+        {
             $this->update = false;
             $this->errors[] = $this->user->lang['FORM_INVALID'];
         }
 
-        switch ($this->action) {
+        switch ($this->action)
+        {
             case 'delete':
                 $action_subcats = $this->request->variable('action_subcats', '');
                 $subcats_to_id = $this->request->variable('subcats_to_id', 0);
                 $action_links = $this->request->variable('action_links', '');
                 $links_to_id = $this->request->variable('links_to_id', 0);
 
-                try {
+                try
+                {
                     $this->errors = $this->_delete_cat($action_links, $action_subcats, $links_to_id, $subcats_to_id);
-                } catch (\Exception $e) {
+                }
+                catch (\Exception $e)
+                {
                     trigger_error($e->getMessage(), E_USER_WARNING);
                 }
 
-                if (count($this->errors)) {
+                if (count($this->errors))
+                {
                     break;
                 }
 
@@ -542,17 +579,22 @@ 
                 ];
 
                 // Get data for cat description if specified
-                if ($this->cat_data['cat_desc']) {
+                if ($this->cat_data['cat_desc'])
+                {
                     generate_text_for_storage($this->cat_data['cat_desc'], $this->cat_data['cat_desc_uid'], $this->cat_data['cat_desc_bitfield'], $this->cat_data['cat_desc_options'], $this->request->variable('desc_parse_bbcode', false), $this->request->variable('desc_parse_urls', false), $this->request->variable('desc_parse_smilies', false));
                 }
 
-                try {
+                try
+                {
                     $this->errors = $this->_update_cat_data();
-                } catch (\Exception $e) {
+                }
+                catch (\Exception $e)
+                {
                     trigger_error($e->getMessage(), E_USER_WARNING);
                 }
 
-                if (!count($this->errors)) {
+                if (!count($this->errors))
+                {
                     $this->cache->destroy('sql', DIR_CAT_TABLE);
 
                     $message = ($this->action == 'add') ? $this->user->lang['DIR_CAT_CREATED'] : $this->user->lang['DIR_CAT_UPDATED'];
@@ -581,8 +623,10 @@ 
         ];
 
         // Parse desciption if specified
-        if ($this->cat_data['cat_desc']) {
-            if (!isset($this->cat_data['cat_desc_uid'])) {
+        if ($this->cat_data['cat_desc'])
+        {
+            if (!isset($this->cat_data['cat_desc_uid']))
+            {
                 // Before we are able to display the preview and plane text, we need to parse our $request->variable()'d value...
                 $this->cat_data['cat_desc_uid'] = '';
                 $this->cat_data['cat_desc_bitfield'] = '';
@@ -651,7 +695,8 @@ 
         $row = $this->db->sql_fetchrow($result);
         $this->db->sql_freeresult($result);
 
-        if (!$row) {
+        if (!$row)
+        {
             trigger_error('DIR_ERROR_NO_CATS', E_USER_ERROR);
         }
 
@@ -665,15 +710,18 @@ 
      */
     private function _update_cat_data()
     {
-        if (!$this->cat_data['cat_name']) {
+        if (!$this->cat_data['cat_name'])
+        {
             $this->errors[] = $this->user->lang['DIR_CAT_NAME_EMPTY'];
         }
 
-        if (utf8_strlen($this->cat_data['cat_desc']) > 4000) {
+        if (utf8_strlen($this->cat_data['cat_desc']) > 4000)
+        {
             $this->errors[] = $this->user->lang['DIR_CAT_DESC_TOO_LONG'];
         }
 
-        if (($this->cat_data['cat_cron_enable'] && $this->cat_data['cat_cron_freq'] <= 0) || $this->cat_data['cat_cron_nb_check'] < 0) {
+        if (($this->cat_data['cat_cron_enable'] && $this->cat_data['cat_cron_freq'] <= 0) || $this->cat_data['cat_cron_nb_check'] < 0)
+        {
             $this->errors[] = $this->user->lang['DIR_CAT_DATA_NEGATIVE'];
         }
 
@@ -683,44 +731,55 @@ 
         // What are we going to do tonight Brain? The same thing we do everynight,
         // try to take over the world ... or decide whether to continue update
         // and if so, whether it's a new cat/link or an existing one
-        if (count($this->errors)) {
+        if (count($this->errors))
+        {
             return $this->errors;
         }
 
-        if (!$cat_data_sql['cat_link_back']) {
+        if (!$cat_data_sql['cat_link_back'])
+        {
             $cat_data_sql['cat_cron_enable'] = 0;
             $cat_data_sql['cat_cron_next'] = 0;
         }
 
-        if (!$cat_data_sql['parent_id']) {
+        if (!$cat_data_sql['parent_id'])
+        {
             $cat_data_sql['display_subcat_list'] = 0;
         }
 
         // no cat_id means we're creating a new categorie
-        if (!isset($cat_data_sql['cat_id'])) {
-            if ($cat_data_sql['cat_cron_enable']) {
+        if (!isset($cat_data_sql['cat_id']))
+        {
+            if ($cat_data_sql['cat_cron_enable'])
+            {
                 $cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
             }
 
             $this->cat_data = $this->nestedset_category->insert($cat_data_sql);
 
-            if ($cat_data_sql['parent_id']) {
+            if ($cat_data_sql['parent_id'])
+            {
                 $this->nestedset_category->change_parent($this->cat_data['cat_id'], $cat_data_sql['parent_id']);
             }
 
             $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_ADD', time(), [$this->cat_data['cat_name']]);
-        } else {
+        }
+        else
+        {
             $row = $this->_get_cat_info($cat_data_sql['cat_id']);
 
-            if ($row['parent_id'] != $cat_data_sql['parent_id']) {
+            if ($row['parent_id'] != $cat_data_sql['parent_id'])
+            {
                 $this->nestedset_category->change_parent($cat_data_sql['cat_id'], $cat_data_sql['parent_id']);
             }
 
-            if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable'])) {
+            if ($cat_data_sql['cat_cron_enable'] && ($row['cat_cron_freq'] != $cat_data_sql['cat_cron_freq'] || !$row['cat_cron_enable']))
+            {
                 $cat_data_sql['cat_cron_next'] = time() + $cat_data_sql['cat_cron_freq'] * 86400;
             }
 
-            if ($row['cat_name'] != $cat_data_sql['cat_name']) {
+            if ($row['cat_name'] != $cat_data_sql['cat_name'])
+            {
                 // the cat name has changed, clear the parents list of all categories (for safety)
                 $sql = 'UPDATE '.DIR_CAT_TABLE."
 					SET cat_parents = ''";
@@ -757,13 +816,19 @@ 
 
         $log_action_links = $log_action_cats = $links_to_name = $subcats_to_name = '';
 
-        if ($action_links == 'delete') {
+        if ($action_links == 'delete')
+        {
             $log_action_links = 'LINKS';
             $this->errors = array_merge($this->errors, $this->_delete_cat_content());
-        } elseif ($action_links == 'move') {
-            if (!$links_to_id) {
+        }
+        elseif ($action_links == 'move')
+        {
+            if (!$links_to_id)
+            {
                 $this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
-            } else {
+            }
+            else
+            {
                 $log_action_links = 'MOVE_LINKS';
 
                 $sql = 'SELECT cat_name
@@ -773,25 +838,35 @@ 
                 $row = $this->db->sql_fetchrow($result);
                 $this->db->sql_freeresult($result);
 
-                if (!$row) {
+                if (!$row)
+                {
                     throw new \OutOfBoundsException('DIR_NO_CAT');
-                } else {
+                }
+                else
+                {
                     $links_to_name = $row['cat_name'];
                     $this->_move_cat_content($this->cat_id, $links_to_id);
                 }
             }
         }
 
-        if (count($this->errors)) {
+        if (count($this->errors))
+        {
             return $this->errors;
         }
 
-        if ($action_subcats == 'delete') {
+        if ($action_subcats == 'delete')
+        {
             $log_action_cats = 'CATS';
-        } elseif ($action_subcats == 'move') {
-            if (!$subcats_to_id) {
+        }
+        elseif ($action_subcats == 'move')
+        {
+            if (!$subcats_to_id)
+            {
                 $this->errors[] = $this->user->lang['DIR_NO_DESTINATION_CAT'];
-            } else {
+            }
+            else
+            {
                 $log_action_cats = 'MOVE_CATS';
 
                 $subcats_to_name = $row['cat_name'];
@@ -799,7 +874,8 @@ 
             }
         }
 
-        if (count($this->errors)) {
+        if (count($this->errors))
+        {
             return $this->errors;
         }
 
@@ -807,7 +883,8 @@ 
 
         $log_action = implode('_', [$log_action_links, $log_action_cats]);
 
-        switch ($log_action) {
+        switch ($log_action)
+        {
             case 'MOVE_LINKS_MOVE_CATS':
                 $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_CAT_DEL_MOVE_LINKS_MOVE_CATS', time(), [$links_to_name, $subcats_to_name, $this->cat_data['cat_name']]);
             break;
@@ -886,27 +963,32 @@ 
         $result = $this->db->sql_query($sql);
 
         $link_ids = [];
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $link_ids[] = $row['link_id'];
 
-            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+            {
                 $banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
 
-                if (file_exists($banner_img)) {
+                if (file_exists($banner_img))
+                {
                     @unlink($banner_img);
                 }
             }
         }
         $this->db->sql_freeresult($result);
 
-        if (count($link_ids)) {
+        if (count($link_ids))
+        {
             // Delete links datas
             $link_datas_ary = [
                 DIR_COMMENT_TABLE     => 'comment_link_id',
                 DIR_VOTE_TABLE        => 'vote_link_id',
             ];
 
-            foreach ($link_datas_ary as $table => $field) {
+            foreach ($link_datas_ary as $table => $field)
+            {
                 $this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $link_ids));
             }
         }
@@ -917,7 +999,8 @@ 
             DIR_WATCH_TABLE    => 'cat_id',
         ];
 
-        foreach ($cat_datas_ary as $table => $field) {
+        foreach ($cat_datas_ary as $table => $field)
+        {
             $this->db->sql_query("DELETE FROM $table WHERE $field = ".(int) $this->cat_id);
         }
 
@@ -974,7 +1057,8 @@ 
 			WHERE vote_link_id BETWEEN '.(int) $start.' AND '.(int) $stop.'
 			GROUP BY vote_link_id';
         $result = $this->db->sql_query($sql);
-        while ($tmp = $this->db->sql_fetchrow($result)) {
+        while ($tmp = $this->db->sql_fetchrow($result))
+        {
             $sql = 'UPDATE '.DIR_LINK_TABLE.'
 				SET link_note = '.(int) $tmp['total'].', link_vote = '.(int) $tmp['nb_vote'].'
 				WHERE link_id = '.(int) $tmp['vote_link_id'];
@@ -987,7 +1071,8 @@ 
 			WHERE comment_link_id BETWEEN '.(int) $start.' AND '.(int) $stop.'
 			GROUP BY comment_link_id';
         $result = $this->db->sql_query($sql);
-        while ($tmp = $this->db->sql_fetchrow($result)) {
+        while ($tmp = $this->db->sql_fetchrow($result))
+        {
             $sql = 'UPDATE '.DIR_LINK_TABLE.'
 				SET link_comment = '.(int) $tmp['nb_comment'].'
 				WHERE link_id = '.(int) $tmp['comment_link_id'];
@@ -1009,18 +1094,22 @@ 
         $imglist = filelist($icons_path, '');
         $filename_list = '<option value="">----------</option>';
 
-        foreach ($imglist as $path => $img_ary) {
+        foreach ($imglist as $path => $img_ary)
+        {
             sort($img_ary);
 
-            foreach ($img_ary as $img) {
+            foreach ($img_ary as $img)
+            {
                 $img = $path.$img;
                 $selected = '';
 
-                if (strlen($img) > 255) {
+                if (strlen($img) > 255)
+                {
                     continue;
                 }
 
-                if ($img == $img_selected) {
+                if ($img == $img_selected)
+                {
                     $selected = ' selected="selected"';
                 }
 

controller/acp/main.php

Indentation +275 added lines, -275 removed lines

@@ -9,294 +9,294 @@
 
 class main
 {
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \ernadoo\phpbbdirectory\core\helper */
-    protected $dir_helper;
-
-    /** @var string Custom form action */
-    protected $u_action;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface   $db         Database object
-     * @param \phpbb\request\request              $request    Request object
-     * @param \phpbb\template\template            $template   Template object
-     * @param \phpbb\user                         $user       User object
-     * @param \ernadoo\phpbbdirectory\core\helper $dir_helper PhpBB Directory extension helper object
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\helper $dir_helper)
-    {
-        $this->db = $db;
-        $this->template = $template;
-        $this->user = $user;
-        $this->request = $request;
-        $this->dir_helper = $dir_helper;
-    }
-
-    /**
-     * Display confirm box.
-     *
-     * @param string $action Requested action
-     *
-     * @return null
-     */
-    public function display_confirm($action)
-    {
-        switch ($action) {
-            case 'votes':
-                $confirm = true;
-                $confirm_lang = 'DIR_RESET_VOTES_CONFIRM';
-                break;
-
-            case 'comments':
-                $confirm = true;
-                $confirm_lang = 'DIR_RESET_COMMENTS_CONFIRM';
-                break;
-
-            case 'clicks':
-                $confirm = true;
-                $confirm_lang = 'DIR_RESET_CLICKS_CONFIRM';
-                break;
-
-            case 'orphans':
-                $confirm = true;
-                $confirm_lang = 'DIR_DELETE_ORPHANS';
-                break;
-
-            default:
-                $confirm = false;
-        }
-
-        if ($confirm) {
-            confirm_box(false, $this->user->lang[$confirm_lang], build_hidden_fields([
-                'action'    => $action,
-            ]));
-        }
-    }
-
-    /**
-     * Display phpBB Directory statistics.
-     *
-     * @return null
-     */
-    public function display_stats()
-    {
-        // Count number of categories
-        $sql = 'SELECT COUNT(cat_id) AS nb_cats
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \ernadoo\phpbbdirectory\core\helper */
+	protected $dir_helper;
+
+	/** @var string Custom form action */
+	protected $u_action;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface   $db         Database object
+	 * @param \phpbb\request\request              $request    Request object
+	 * @param \phpbb\template\template            $template   Template object
+	 * @param \phpbb\user                         $user       User object
+	 * @param \ernadoo\phpbbdirectory\core\helper $dir_helper PhpBB Directory extension helper object
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\helper $dir_helper)
+	{
+		$this->db = $db;
+		$this->template = $template;
+		$this->user = $user;
+		$this->request = $request;
+		$this->dir_helper = $dir_helper;
+	}
+
+	/**
+	 * Display confirm box.
+	 *
+	 * @param string $action Requested action
+	 *
+	 * @return null
+	 */
+	public function display_confirm($action)
+	{
+		switch ($action) {
+			case 'votes':
+				$confirm = true;
+				$confirm_lang = 'DIR_RESET_VOTES_CONFIRM';
+				break;
+
+			case 'comments':
+				$confirm = true;
+				$confirm_lang = 'DIR_RESET_COMMENTS_CONFIRM';
+				break;
+
+			case 'clicks':
+				$confirm = true;
+				$confirm_lang = 'DIR_RESET_CLICKS_CONFIRM';
+				break;
+
+			case 'orphans':
+				$confirm = true;
+				$confirm_lang = 'DIR_DELETE_ORPHANS';
+				break;
+
+			default:
+				$confirm = false;
+		}
+
+		if ($confirm) {
+			confirm_box(false, $this->user->lang[$confirm_lang], build_hidden_fields([
+				'action'    => $action,
+			]));
+		}
+	}
+
+	/**
+	 * Display phpBB Directory statistics.
+	 *
+	 * @return null
+	 */
+	public function display_stats()
+	{
+		// Count number of categories
+		$sql = 'SELECT COUNT(cat_id) AS nb_cats
 			FROM '.DIR_CAT_TABLE;
-        $result = $this->db->sql_query($sql);
-        $total_cats = (int) $this->db->sql_fetchfield('nb_cats');
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$total_cats = (int) $this->db->sql_fetchfield('nb_cats');
+		$this->db->sql_freeresult($result);
 
-        // Cont number of links
-        $sql = 'SELECT link_id, link_active
+		// Cont number of links
+		$sql = 'SELECT link_id, link_active
 			FROM '.DIR_LINK_TABLE;
-        $result = $this->db->sql_query($sql);
-        $total_links = $waiting_links = 0;
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $total_links++;
-
-            if (!$row['link_active']) {
-                $waiting_links++;
-            }
-        }
-        $this->db->sql_freeresult($result);
-
-        // Comments number calculating
-        $sql = 'SELECT COUNT(comment_id) AS nb_comments
+		$result = $this->db->sql_query($sql);
+		$total_links = $waiting_links = 0;
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$total_links++;
+
+			if (!$row['link_active']) {
+				$waiting_links++;
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		// Comments number calculating
+		$sql = 'SELECT COUNT(comment_id) AS nb_comments
 			FROM '.DIR_COMMENT_TABLE;
-        $result = $this->db->sql_query($sql);
-        $total_comments = (int) $this->db->sql_fetchfield('nb_comments');
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$total_comments = (int) $this->db->sql_fetchfield('nb_comments');
+		$this->db->sql_freeresult($result);
 
-        // Votes number calculating
-        $sql = 'SELECT COUNT(vote_id) AS nb_votes
+		// Votes number calculating
+		$sql = 'SELECT COUNT(vote_id) AS nb_votes
 			FROM '.DIR_VOTE_TABLE;
-        $result = $this->db->sql_query($sql);
-        $total_votes = (int) $this->db->sql_fetchfield('nb_votes');
-        $this->db->sql_freeresult($result);
+		$result = $this->db->sql_query($sql);
+		$total_votes = (int) $this->db->sql_fetchfield('nb_votes');
+		$this->db->sql_freeresult($result);
 
-        // Click number calculating
-        $sql = 'SELECT SUM(link_view) AS nb_clicks
+		// Click number calculating
+		$sql = 'SELECT SUM(link_view) AS nb_clicks
 			FROM '.DIR_LINK_TABLE;
-        $result = $this->db->sql_query($sql);
-        $total_clicks = (int) $this->db->sql_fetchfield('nb_clicks');
-        $this->db->sql_freeresult($result);
-
-        $banners_dir_size = 0;
-
-        $banners_path = $this->dir_helper->get_banner_path();
-
-        if ($banners_dir = @opendir($banners_path)) {
-            while (($file = readdir($banners_dir)) !== false) {
-                if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false) {
-                    $banners_dir_size += filesize($banners_path.$file);
-                }
-            }
-            closedir($banners_dir);
-
-            $banners_dir_size = get_formatted_filesize($banners_dir_size);
-        } else {
-            // Couldn't open banners dir.
-            $banners_dir_size = $this->user->lang['NOT_AVAILABLE'];
-        }
-
-        $total_orphan = $this->_orphan_files();
-
-        $this->template->assign_vars([
-            'U_ACTION'            => $this->u_action,
-
-            'TOTAL_CATS'           => $total_cats,
-            'TOTAL_LINKS'          => $total_links - $waiting_links,
-            'WAITING_LINKS'        => $waiting_links,
-            'TOTAL_COMMENTS'       => $total_comments,
-            'TOTAL_VOTES'          => $total_votes,
-            'TOTAL_CLICKS'         => $total_clicks,
-            'TOTAL_ORPHANS'        => $total_orphan,
-            'BANNERS_DIR_SIZE'     => $banners_dir_size,
-        ]);
-    }
-
-    /**
-     * Execute action requested.
-     *
-     * @param string $action Requested action
-     *
-     * @return null
-     */
-    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 '.DIR_VOTE_TABLE);
-                    break;
-
-                    default:
-                        $this->db->sql_query('TRUNCATE TABLE '.DIR_VOTE_TABLE);
-                    break;
-                }
-
-                $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$result = $this->db->sql_query($sql);
+		$total_clicks = (int) $this->db->sql_fetchfield('nb_clicks');
+		$this->db->sql_freeresult($result);
+
+		$banners_dir_size = 0;
+
+		$banners_path = $this->dir_helper->get_banner_path();
+
+		if ($banners_dir = @opendir($banners_path)) {
+			while (($file = readdir($banners_dir)) !== false) {
+				if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false) {
+					$banners_dir_size += filesize($banners_path.$file);
+				}
+			}
+			closedir($banners_dir);
+
+			$banners_dir_size = get_formatted_filesize($banners_dir_size);
+		} else {
+			// Couldn't open banners dir.
+			$banners_dir_size = $this->user->lang['NOT_AVAILABLE'];
+		}
+
+		$total_orphan = $this->_orphan_files();
+
+		$this->template->assign_vars([
+			'U_ACTION'            => $this->u_action,
+
+			'TOTAL_CATS'           => $total_cats,
+			'TOTAL_LINKS'          => $total_links - $waiting_links,
+			'WAITING_LINKS'        => $waiting_links,
+			'TOTAL_COMMENTS'       => $total_comments,
+			'TOTAL_VOTES'          => $total_votes,
+			'TOTAL_CLICKS'         => $total_clicks,
+			'TOTAL_ORPHANS'        => $total_orphan,
+			'BANNERS_DIR_SIZE'     => $banners_dir_size,
+		]);
+	}
+
+	/**
+	 * Execute action requested.
+	 *
+	 * @param string $action Requested action
+	 *
+	 * @return null
+	 */
+	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 '.DIR_VOTE_TABLE);
+					break;
+
+					default:
+						$this->db->sql_query('TRUNCATE TABLE '.DIR_VOTE_TABLE);
+					break;
+				}
+
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_vote = 0, link_note = 0';
-                $this->db->sql_query($sql);
-
-                if ($this->request->is_ajax()) {
-                    trigger_error('DIR_RESET_VOTES_SUCCESS');
-                }
-            break;
-
-            case 'comments':
-                switch ($this->db->get_sql_layer()) {
-                    case 'sqlite':
-                    case 'firebird':
-                        $this->db->sql_query('DELETE FROM '.DIR_COMMENT_TABLE);
-                    break;
-
-                    default:
-                        $this->db->sql_query('TRUNCATE TABLE '.DIR_COMMENT_TABLE);
-                    break;
-                }
-
-                $sql = 'UPDATE '.DIR_LINK_TABLE.'
+				$this->db->sql_query($sql);
+
+				if ($this->request->is_ajax()) {
+					trigger_error('DIR_RESET_VOTES_SUCCESS');
+				}
+			break;
+
+			case 'comments':
+				switch ($this->db->get_sql_layer()) {
+					case 'sqlite':
+					case 'firebird':
+						$this->db->sql_query('DELETE FROM '.DIR_COMMENT_TABLE);
+					break;
+
+					default:
+						$this->db->sql_query('TRUNCATE TABLE '.DIR_COMMENT_TABLE);
+					break;
+				}
+
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_comment = 0';
-                $this->db->sql_query($sql);
+				$this->db->sql_query($sql);
 
-                if ($this->request->is_ajax()) {
-                    trigger_error('DIR_RESET_COMMENTS_SUCCESS');
-                }
+				if ($this->request->is_ajax()) {
+					trigger_error('DIR_RESET_COMMENTS_SUCCESS');
+				}
 
-                break;
+				break;
 
-            case 'clicks':
-                $sql = 'UPDATE '.DIR_LINK_TABLE.'
+			case 'clicks':
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_view = 0';
-                $this->db->sql_query($sql);
-
-                if ($this->request->is_ajax()) {
-                    trigger_error('DIR_RESET_CLICKS_SUCCESS');
-                }
-            break;
-
-            case 'orphans':
-                $this->_orphan_files(true);
-
-                if ($this->request->is_ajax()) {
-                    trigger_error('DIR_DELETE_ORPHANS_SUCCESS');
-                }
-            break;
-        }
-    }
-
-    /**
-     * Set page url.
-     *
-     * @param string $u_action Custom form action
-     *
-     * @return null
-     */
-    public function set_page_url($u_action)
-    {
-        $this->u_action = $u_action;
-    }
-
-    /**
-     * Get orphan banners.
-     *
-     * @param bool $delete True if we want to delete banners, else false
-     *
-     * @return null|int Number of orphan files, else null
-     */
-    private function _orphan_files($delete = false)
-    {
-        $banner_path = $this->dir_helper->get_banner_path();
-        $imglist = filelist($banner_path);
-        $physical_files = $logical_files = $orphan_files = [];
-
-        if (!empty($imglist[''])) {
-            $imglist = array_values($imglist);
-            $imglist = $imglist[0];
-
-            foreach ($imglist as $img) {
-                $physical_files[] = $img;
-            }
-            $sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.'
+				$this->db->sql_query($sql);
+
+				if ($this->request->is_ajax()) {
+					trigger_error('DIR_RESET_CLICKS_SUCCESS');
+				}
+			break;
+
+			case 'orphans':
+				$this->_orphan_files(true);
+
+				if ($this->request->is_ajax()) {
+					trigger_error('DIR_DELETE_ORPHANS_SUCCESS');
+				}
+			break;
+		}
+	}
+
+	/**
+	 * Set page url.
+	 *
+	 * @param string $u_action Custom form action
+	 *
+	 * @return null
+	 */
+	public function set_page_url($u_action)
+	{
+		$this->u_action = $u_action;
+	}
+
+	/**
+	 * Get orphan banners.
+	 *
+	 * @param bool $delete True if we want to delete banners, else false
+	 *
+	 * @return null|int Number of orphan files, else null
+	 */
+	private function _orphan_files($delete = false)
+	{
+		$banner_path = $this->dir_helper->get_banner_path();
+		$imglist = filelist($banner_path);
+		$physical_files = $logical_files = $orphan_files = [];
+
+		if (!empty($imglist[''])) {
+			$imglist = array_values($imglist);
+			$imglist = $imglist[0];
+
+			foreach ($imglist as $img) {
+				$physical_files[] = $img;
+			}
+			$sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.'
 				WHERE link_banner <> \'\'';
-            $result = $this->db->sql_query($sql);
-
-            while ($row = $this->db->sql_fetchrow($result)) {
-                if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
-                    $logical_files[] = basename($row['link_banner']);
-                }
-            }
-            $this->db->sql_freeresult($result);
-
-            $orphan_files = array_diff($physical_files, $logical_files);
-        }
-
-        if (!$delete) {
-            return count($orphan_files);
-        }
-
-        $dh = @opendir($banner_path);
-        while (($file = readdir($dh)) !== false) {
-            if (in_array($file, $orphan_files)) {
-                @unlink($this->dir_helper->get_banner_path($file));
-            }
-        }
-    }
+			$result = $this->db->sql_query($sql);
+
+			while ($row = $this->db->sql_fetchrow($result)) {
+				if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+					$logical_files[] = basename($row['link_banner']);
+				}
+			}
+			$this->db->sql_freeresult($result);
+
+			$orphan_files = array_diff($physical_files, $logical_files);
+		}
+
+		if (!$delete) {
+			return count($orphan_files);
+		}
+
+		$dh = @opendir($banner_path);
+		while (($file = readdir($dh)) !== false) {
+			if (in_array($file, $orphan_files)) {
+				@unlink($this->dir_helper->get_banner_path($file));
+			}
+		}
+	}
 }

Braces +45 added lines, -22 removed lines

@@ -54,7 +54,8 @@ 
      */
     public function display_confirm($action)
     {
-        switch ($action) {
+        switch ($action)
+        {
             case 'votes':
                 $confirm = true;
                 $confirm_lang = 'DIR_RESET_VOTES_CONFIRM';
@@ -79,7 +80,8 @@ 
                 $confirm = false;
         }
 
-        if ($confirm) {
+        if ($confirm)
+        {
             confirm_box(false, $this->user->lang[$confirm_lang], build_hidden_fields([
                 'action'    => $action,
             ]));
@@ -105,10 +107,12 @@ 
 			FROM '.DIR_LINK_TABLE;
         $result = $this->db->sql_query($sql);
         $total_links = $waiting_links = 0;
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $total_links++;
 
-            if (!$row['link_active']) {
+            if (!$row['link_active'])
+            {
                 $waiting_links++;
             }
         }
@@ -139,16 +143,21 @@ 
 
         $banners_path = $this->dir_helper->get_banner_path();
 
-        if ($banners_dir = @opendir($banners_path)) {
-            while (($file = readdir($banners_dir)) !== false) {
-                if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false) {
+        if ($banners_dir = @opendir($banners_path))
+        {
+            while (($file = readdir($banners_dir)) !== false)
+            {
+                if ($file[0] != '.' && $file[0] != '..' && strpos($file, 'index.') === false && strpos($file, '.db') === false)
+                {
                     $banners_dir_size += filesize($banners_path.$file);
                 }
             }
             closedir($banners_dir);
 
             $banners_dir_size = get_formatted_filesize($banners_dir_size);
-        } else {
+        }
+        else
+        {
             // Couldn't open banners dir.
             $banners_dir_size = $this->user->lang['NOT_AVAILABLE'];
         }
@@ -178,9 +187,11 @@ 
      */
     public function exec_action($action)
     {
-        switch ($action) {
+        switch ($action)
+        {
             case 'votes':
-                switch ($this->db->get_sql_layer()) {
+                switch ($this->db->get_sql_layer())
+                {
                     case 'sqlite':
                     case 'firebird':
                         $this->db->sql_query('DELETE FROM '.DIR_VOTE_TABLE);
@@ -195,13 +206,15 @@ 
 					SET link_vote = 0, link_note = 0';
                 $this->db->sql_query($sql);
 
-                if ($this->request->is_ajax()) {
+                if ($this->request->is_ajax())
+                {
                     trigger_error('DIR_RESET_VOTES_SUCCESS');
                 }
             break;
 
             case 'comments':
-                switch ($this->db->get_sql_layer()) {
+                switch ($this->db->get_sql_layer())
+                {
                     case 'sqlite':
                     case 'firebird':
                         $this->db->sql_query('DELETE FROM '.DIR_COMMENT_TABLE);
@@ -216,7 +229,8 @@ 
 					SET link_comment = 0';
                 $this->db->sql_query($sql);
 
-                if ($this->request->is_ajax()) {
+                if ($this->request->is_ajax())
+                {
                     trigger_error('DIR_RESET_COMMENTS_SUCCESS');
                 }
 
@@ -227,7 +241,8 @@ 
 					SET link_view = 0';
                 $this->db->sql_query($sql);
 
-                if ($this->request->is_ajax()) {
+                if ($this->request->is_ajax())
+                {
                     trigger_error('DIR_RESET_CLICKS_SUCCESS');
                 }
             break;
@@ -235,7 +250,8 @@ 
             case 'orphans':
                 $this->_orphan_files(true);
 
-                if ($this->request->is_ajax()) {
+                if ($this->request->is_ajax())
+                {
                     trigger_error('DIR_DELETE_ORPHANS_SUCCESS');
                 }
             break;
@@ -267,19 +283,23 @@ 
         $imglist = filelist($banner_path);
         $physical_files = $logical_files = $orphan_files = [];
 
-        if (!empty($imglist[''])) {
+        if (!empty($imglist['']))
+        {
             $imglist = array_values($imglist);
             $imglist = $imglist[0];
 
-            foreach ($imglist as $img) {
+            foreach ($imglist as $img)
+            {
                 $physical_files[] = $img;
             }
             $sql = 'SELECT link_banner FROM '.DIR_LINK_TABLE.'
 				WHERE link_banner <> \'\'';
             $result = $this->db->sql_query($sql);
 
-            while ($row = $this->db->sql_fetchrow($result)) {
-                if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+            while ($row = $this->db->sql_fetchrow($result))
+            {
+                if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+                {
                     $logical_files[] = basename($row['link_banner']);
                 }
             }
@@ -288,13 +308,16 @@ 
             $orphan_files = array_diff($physical_files, $logical_files);
         }
 
-        if (!$delete) {
+        if (!$delete)
+        {
             return count($orphan_files);
         }
 
         $dh = @opendir($banner_path);
-        while (($file = readdir($dh)) !== false) {
-            if (in_array($file, $orphan_files)) {
+        while (($file = readdir($dh)) !== false)
+        {
+            if (in_array($file, $orphan_files))
+            {
                 @unlink($this->dir_helper->get_banner_path($file));
             }
         }

controller/acp/settings.php

Indentation +212 added lines, -212 removed lines

@@ -9,216 +9,216 @@
 
 class settings
 {
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\log\log */
-    protected $log;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var string Custom form action */
-    protected $u_action;
-
-    /** @var array */
-    private $new_config;
-
-    /** @var array */
-    private $display_vars;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\config\config     $config   Config object
-     * @param \phpbb\log\log           $log      Log object
-     * @param \phpbb\request\request   $request  Request object
-     * @param \phpbb\template\template $template Template object
-     * @param \phpbb\user              $user     User object
-     */
-    public function __construct(\phpbb\config\config $config, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
-    {
-        $this->config = $config;
-        $this->log = $log;
-        $this->template = $template;
-        $this->user = $user;
-        $this->request = $request;
-
-        $this->_generate_config();
-    }
-
-    /**
-     * Display config page.
-     *
-     * @return null
-     */
-    public function display_config()
-    {
-        // Output relevant page
-        foreach ($this->display_vars['vars'] as $config_key => $vars) {
-            if (!is_array($vars) && strpos($config_key, 'legend') === false) {
-                continue;
-            }
-
-            if (strpos($config_key, 'legend') !== false) {
-                $this->template->assign_block_vars('options', [
-                    'S_LEGEND'    => true,
-                    'LEGEND'      => (isset($this->user->lang[$vars])) ? $this->user->lang[$vars] : $vars, ]
-                );
-
-                continue;
-            }
-
-            $type = explode(':', $vars['type']);
-
-            $l_explain = '';
-            if ($vars['explain'] && isset($vars['lang_explain'])) {
-                $l_explain = (isset($this->user->lang[$vars['lang_explain']])) ? $this->user->lang[$vars['lang_explain']] : $vars['lang_explain'];
-            } elseif ($vars['explain']) {
-                $l_explain = (isset($this->user->lang[$vars['lang'].'_EXPLAIN'])) ? $this->user->lang[$vars['lang'].'_EXPLAIN'] : '';
-            }
-
-            $this->template->assign_block_vars('options', [
-                'KEY'              => $config_key,
-                'TITLE'            => (isset($this->user->lang[$vars['lang']])) ? $this->user->lang[$vars['lang']] : $vars['lang'],
-                'S_EXPLAIN'        => $vars['explain'],
-                'TITLE_EXPLAIN'    => $l_explain,
-                'CONTENT'          => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
-            ]);
-
-            unset($this->display_vars['vars'][$config_key]);
-        }
-    }
-
-    /**
-     * Validate config vars and update config table if needed.
-     *
-     * @return null
-     */
-    public function process()
-    {
-        $submit = ($this->request->is_set_post('submit')) ? true : false;
-
-        $this->new_config = $this->config;
-        $cfg_array = ($this->request->is_set('config')) ? $this->request->variable('config', ['' => ''], true) : $this->new_config;
-        $error = [];
-
-        // We validate the complete config if whished
-        validate_config_vars($this->display_vars['vars'], $cfg_array, $error);
-
-        // Do not write values if there is an error
-        if (count($error)) {
-            $submit = false;
-        }
-
-        // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-        foreach ($this->display_vars['vars'] as $config_name => $null) {
-            if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) {
-                continue;
-            }
-
-            $this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
-
-            if ($config_name == 'dir_banner_filesize') {
-                $size_var = $this->request->variable($config_name, '');
-                $this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value);
-            }
-
-            if ($submit) {
-                $this->config->set($config_name, $config_value);
-            }
-        }
-
-        if ($submit) {
-            $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS');
-
-            trigger_error($this->user->lang['CONFIG_UPDATED'].adm_back_link($this->u_action));
-        }
-
-        $this->template->assign_vars([
-            'L_TITLE'            => $this->user->lang[$this->display_vars['title']],
-            'L_TITLE_EXPLAIN'    => $this->user->lang[$this->display_vars['title'].'_EXPLAIN'],
-
-            'S_ERROR'              => (count($error)) ? true : false,
-            'ERROR_MSG'            => implode('<br />', $error),
-
-            'U_ACTION'            => $this->u_action, ]
-        );
-    }
-
-    /**
-     * Set page url.
-     *
-     * @param string $u_action Custom form action
-     *
-     * @return null
-     */
-    public function set_page_url($u_action)
-    {
-        $this->u_action = $u_action;
-    }
-
-    /**
-     * Build config matrice.
-     *
-     * @return null
-     */
-    private function _generate_config()
-    {
-        $this->display_vars = [
-            'title'    => 'ACP_DIRECTORY_SETTINGS',
-            'vars'     => [
-                'legend1' => 'DIR_PARAM',
-
-                'dir_banner_width'                     => '',
-                'dir_banner_height'                    => '',
-
-                'dir_mail'                             => ['lang' => 'DIR_MAIL_VALIDATION',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_checkurl'                   => ['lang' => 'DIR_ACTIVE_CHECK',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_activ_flag'                       => ['lang' => 'DIR_ACTIV_FLAG',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_rss'                        => ['lang' => 'DIR_ACTIV_RSS',            'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_activ_pagerank'                   => ['lang' => 'DIR_ACTIV_PAGERANK',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_show'                             => ['lang' => 'DIR_SHOW',                'validate' => 'int:1:9999', 'type' => 'number:1:9999',    'explain' => false],
-                'dir_length_describe'                  => ['lang' => 'DIR_MAX_DESC',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_new_time'                         => ['lang' => 'DIR_NEW_TIME',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
-                'dir_default_order'                    => ['lang' => 'DIR_DEFAULT_ORDER',        'validate' => 'string',    'type' => 'select',            'explain' => true, 'method' => 'get_order_list', 'params' => ['{CONFIG_VALUE}']],
-
-                'legend2'                             => 'DIR_RECENT_GUEST',
-                'dir_recent_block'                    => ['lang' => 'DIR_RECENT_ENABLE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_recent_rows'                     => ['lang' => 'DIR_RECENT_ROWS',        'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_recent_columns'                  => ['lang' => 'DIR_RECENT_COLUMNS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_recent_exclude'                  => ['lang' => 'DIR_RECENT_EXCLUDE',    'validate' => 'string',        'type' => 'text:6:99',        'explain' => true],
-
-                'legend3'                            => 'DIR_ADD_GUEST',
-                'dir_visual_confirm'                 => ['lang' => 'DIR_VISUAL_CONFIRM',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_visual_confirm_max_attempts'    => ['lang' => 'DIR_MAX_ADD_ATTEMPTS',    'validate' => 'int:0:9999',    'type' => 'number:0:9999',    'explain' => true],
-
-                'legend4'                              => 'DIR_THUMB_PARAM',
-                'dir_activ_thumb'                      => ['lang' => 'DIR_ACTIVE_THUMB',            'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_thumb_remote'               => ['lang' => 'DIR_ACTIVE_THUMB_REMOTE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
-                'dir_thumb_service'                    => ['lang' => 'DIR_THUMB_SERVICE',            'validate' => 'string', 'type' => 'select',            'explain' => true, 'method' => 'get_thumb_service_list', 'params' => ['{CONFIG_VALUE}']],
-                'dir_thumb_service_reverse'            => ['lang' => 'DIR_THUMB_SERVICE_REVERSE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
-
-                'legend5'                              => 'DIR_COMM_PARAM',
-                'dir_allow_bbcode'                     => ['lang' => 'DIR_ALLOW_BBCODE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_flash'                      => ['lang' => 'DIR_ALLOW_FLASH',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_links'                      => ['lang' => 'DIR_ALLOW_LINKS',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_smilies'                    => ['lang' => 'DIR_ALLOW_SMILIES',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_length_comments'                  => ['lang' => 'DIR_LENGTH_COMMENTS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
-                'dir_comments_per_page'                => ['lang' => 'DIR_COMM_PER_PAGE',        'validate' => 'int:1:9999',    'type' => 'number:1:9999',    'explain' => false],
-
-                'legend6'                             => 'DIR_BANN_PARAM',
-                'dir_activ_banner'                    => ['lang' => 'DIR_ACTIV_BANNER',        'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
-                'dir_banner'                          => ['lang' => 'DIR_MAX_BANN',            'validate' => 'int:0',    'type' => 'dimension:0',    'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']],
-                'dir_banner_filesize'                 => ['lang' => 'DIR_MAX_SIZE',            'validate' => 'string',    'type' => 'custom', 'method' => 'max_filesize', 'explain' => true],
-                'dir_storage_banner'                  => ['lang' => 'DIR_STORAGE_BANNER',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
-            ],
-        ];
-    }
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\log\log */
+	protected $log;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var string Custom form action */
+	protected $u_action;
+
+	/** @var array */
+	private $new_config;
+
+	/** @var array */
+	private $display_vars;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\config\config     $config   Config object
+	 * @param \phpbb\log\log           $log      Log object
+	 * @param \phpbb\request\request   $request  Request object
+	 * @param \phpbb\template\template $template Template object
+	 * @param \phpbb\user              $user     User object
+	 */
+	public function __construct(\phpbb\config\config $config, \phpbb\log\log $log, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user)
+	{
+		$this->config = $config;
+		$this->log = $log;
+		$this->template = $template;
+		$this->user = $user;
+		$this->request = $request;
+
+		$this->_generate_config();
+	}
+
+	/**
+	 * Display config page.
+	 *
+	 * @return null
+	 */
+	public function display_config()
+	{
+		// Output relevant page
+		foreach ($this->display_vars['vars'] as $config_key => $vars) {
+			if (!is_array($vars) && strpos($config_key, 'legend') === false) {
+				continue;
+			}
+
+			if (strpos($config_key, 'legend') !== false) {
+				$this->template->assign_block_vars('options', [
+					'S_LEGEND'    => true,
+					'LEGEND'      => (isset($this->user->lang[$vars])) ? $this->user->lang[$vars] : $vars, ]
+				);
+
+				continue;
+			}
+
+			$type = explode(':', $vars['type']);
+
+			$l_explain = '';
+			if ($vars['explain'] && isset($vars['lang_explain'])) {
+				$l_explain = (isset($this->user->lang[$vars['lang_explain']])) ? $this->user->lang[$vars['lang_explain']] : $vars['lang_explain'];
+			} elseif ($vars['explain']) {
+				$l_explain = (isset($this->user->lang[$vars['lang'].'_EXPLAIN'])) ? $this->user->lang[$vars['lang'].'_EXPLAIN'] : '';
+			}
+
+			$this->template->assign_block_vars('options', [
+				'KEY'              => $config_key,
+				'TITLE'            => (isset($this->user->lang[$vars['lang']])) ? $this->user->lang[$vars['lang']] : $vars['lang'],
+				'S_EXPLAIN'        => $vars['explain'],
+				'TITLE_EXPLAIN'    => $l_explain,
+				'CONTENT'          => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
+			]);
+
+			unset($this->display_vars['vars'][$config_key]);
+		}
+	}
+
+	/**
+	 * Validate config vars and update config table if needed.
+	 *
+	 * @return null
+	 */
+	public function process()
+	{
+		$submit = ($this->request->is_set_post('submit')) ? true : false;
+
+		$this->new_config = $this->config;
+		$cfg_array = ($this->request->is_set('config')) ? $this->request->variable('config', ['' => ''], true) : $this->new_config;
+		$error = [];
+
+		// We validate the complete config if whished
+		validate_config_vars($this->display_vars['vars'], $cfg_array, $error);
+
+		// Do not write values if there is an error
+		if (count($error)) {
+			$submit = false;
+		}
+
+		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
+		foreach ($this->display_vars['vars'] as $config_name => $null) {
+			if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) {
+				continue;
+			}
+
+			$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
+
+			if ($config_name == 'dir_banner_filesize') {
+				$size_var = $this->request->variable($config_name, '');
+				$this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value);
+			}
+
+			if ($submit) {
+				$this->config->set($config_name, $config_value);
+			}
+		}
+
+		if ($submit) {
+			$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS');
+
+			trigger_error($this->user->lang['CONFIG_UPDATED'].adm_back_link($this->u_action));
+		}
+
+		$this->template->assign_vars([
+			'L_TITLE'            => $this->user->lang[$this->display_vars['title']],
+			'L_TITLE_EXPLAIN'    => $this->user->lang[$this->display_vars['title'].'_EXPLAIN'],
+
+			'S_ERROR'              => (count($error)) ? true : false,
+			'ERROR_MSG'            => implode('<br />', $error),
+
+			'U_ACTION'            => $this->u_action, ]
+		);
+	}
+
+	/**
+	 * Set page url.
+	 *
+	 * @param string $u_action Custom form action
+	 *
+	 * @return null
+	 */
+	public function set_page_url($u_action)
+	{
+		$this->u_action = $u_action;
+	}
+
+	/**
+	 * Build config matrice.
+	 *
+	 * @return null
+	 */
+	private function _generate_config()
+	{
+		$this->display_vars = [
+			'title'    => 'ACP_DIRECTORY_SETTINGS',
+			'vars'     => [
+				'legend1' => 'DIR_PARAM',
+
+				'dir_banner_width'                     => '',
+				'dir_banner_height'                    => '',
+
+				'dir_mail'                             => ['lang' => 'DIR_MAIL_VALIDATION',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_activ_checkurl'                   => ['lang' => 'DIR_ACTIVE_CHECK',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
+				'dir_activ_flag'                       => ['lang' => 'DIR_ACTIV_FLAG',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_activ_rss'                        => ['lang' => 'DIR_ACTIV_RSS',            'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
+				'dir_activ_pagerank'                   => ['lang' => 'DIR_ACTIV_PAGERANK',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
+				'dir_show'                             => ['lang' => 'DIR_SHOW',                'validate' => 'int:1:9999', 'type' => 'number:1:9999',    'explain' => false],
+				'dir_length_describe'                  => ['lang' => 'DIR_MAX_DESC',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
+				'dir_new_time'                         => ['lang' => 'DIR_NEW_TIME',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
+				'dir_default_order'                    => ['lang' => 'DIR_DEFAULT_ORDER',        'validate' => 'string',    'type' => 'select',            'explain' => true, 'method' => 'get_order_list', 'params' => ['{CONFIG_VALUE}']],
+
+				'legend2'                             => 'DIR_RECENT_GUEST',
+				'dir_recent_block'                    => ['lang' => 'DIR_RECENT_ENABLE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
+				'dir_recent_rows'                     => ['lang' => 'DIR_RECENT_ROWS',        'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
+				'dir_recent_columns'                  => ['lang' => 'DIR_RECENT_COLUMNS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
+				'dir_recent_exclude'                  => ['lang' => 'DIR_RECENT_EXCLUDE',    'validate' => 'string',        'type' => 'text:6:99',        'explain' => true],
+
+				'legend3'                            => 'DIR_ADD_GUEST',
+				'dir_visual_confirm'                 => ['lang' => 'DIR_VISUAL_CONFIRM',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
+				'dir_visual_confirm_max_attempts'    => ['lang' => 'DIR_MAX_ADD_ATTEMPTS',    'validate' => 'int:0:9999',    'type' => 'number:0:9999',    'explain' => true],
+
+				'legend4'                              => 'DIR_THUMB_PARAM',
+				'dir_activ_thumb'                      => ['lang' => 'DIR_ACTIVE_THUMB',            'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
+				'dir_activ_thumb_remote'               => ['lang' => 'DIR_ACTIVE_THUMB_REMOTE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
+				'dir_thumb_service'                    => ['lang' => 'DIR_THUMB_SERVICE',            'validate' => 'string', 'type' => 'select',            'explain' => true, 'method' => 'get_thumb_service_list', 'params' => ['{CONFIG_VALUE}']],
+				'dir_thumb_service_reverse'            => ['lang' => 'DIR_THUMB_SERVICE_REVERSE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
+
+				'legend5'                              => 'DIR_COMM_PARAM',
+				'dir_allow_bbcode'                     => ['lang' => 'DIR_ALLOW_BBCODE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_allow_flash'                      => ['lang' => 'DIR_ALLOW_FLASH',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_allow_links'                      => ['lang' => 'DIR_ALLOW_LINKS',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_allow_smilies'                    => ['lang' => 'DIR_ALLOW_SMILIES',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
+				'dir_length_comments'                  => ['lang' => 'DIR_LENGTH_COMMENTS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
+				'dir_comments_per_page'                => ['lang' => 'DIR_COMM_PER_PAGE',        'validate' => 'int:1:9999',    'type' => 'number:1:9999',    'explain' => false],
+
+				'legend6'                             => 'DIR_BANN_PARAM',
+				'dir_activ_banner'                    => ['lang' => 'DIR_ACTIV_BANNER',        'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
+				'dir_banner'                          => ['lang' => 'DIR_MAX_BANN',            'validate' => 'int:0',    'type' => 'dimension:0',    'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']],
+				'dir_banner_filesize'                 => ['lang' => 'DIR_MAX_SIZE',            'validate' => 'string',    'type' => 'custom', 'method' => 'max_filesize', 'explain' => true],
+				'dir_storage_banner'                  => ['lang' => 'DIR_STORAGE_BANNER',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
+			],
+		];
+	}
 }

Spacing +29 added lines, -29 removed lines

@@ -179,45 +179,45 @@
                 'dir_banner_width'                     => '',
                 'dir_banner_height'                    => '',
 
-                'dir_mail'                             => ['lang' => 'DIR_MAIL_VALIDATION',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_checkurl'                   => ['lang' => 'DIR_ACTIVE_CHECK',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_activ_flag'                       => ['lang' => 'DIR_ACTIV_FLAG',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_rss'                        => ['lang' => 'DIR_ACTIV_RSS',            'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_activ_pagerank'                   => ['lang' => 'DIR_ACTIV_PAGERANK',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_show'                             => ['lang' => 'DIR_SHOW',                'validate' => 'int:1:9999', 'type' => 'number:1:9999',    'explain' => false],
-                'dir_length_describe'                  => ['lang' => 'DIR_MAX_DESC',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_new_time'                         => ['lang' => 'DIR_NEW_TIME',            'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
-                'dir_default_order'                    => ['lang' => 'DIR_DEFAULT_ORDER',        'validate' => 'string',    'type' => 'select',            'explain' => true, 'method' => 'get_order_list', 'params' => ['{CONFIG_VALUE}']],
+                'dir_mail'                             => ['lang' => 'DIR_MAIL_VALIDATION', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_activ_checkurl'                   => ['lang' => 'DIR_ACTIVE_CHECK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_activ_flag'                       => ['lang' => 'DIR_ACTIV_FLAG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_activ_rss'                        => ['lang' => 'DIR_ACTIV_RSS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_activ_pagerank'                   => ['lang' => 'DIR_ACTIV_PAGERANK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_show'                             => ['lang' => 'DIR_SHOW', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false],
+                'dir_length_describe'                  => ['lang' => 'DIR_MAX_DESC', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false],
+                'dir_new_time'                         => ['lang' => 'DIR_NEW_TIME', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true],
+                'dir_default_order'                    => ['lang' => 'DIR_DEFAULT_ORDER', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_order_list', 'params' => ['{CONFIG_VALUE}']],
 
                 'legend2'                             => 'DIR_RECENT_GUEST',
-                'dir_recent_block'                    => ['lang' => 'DIR_RECENT_ENABLE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_recent_rows'                     => ['lang' => 'DIR_RECENT_ROWS',        'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_recent_columns'                  => ['lang' => 'DIR_RECENT_COLUMNS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => false],
-                'dir_recent_exclude'                  => ['lang' => 'DIR_RECENT_EXCLUDE',    'validate' => 'string',        'type' => 'text:6:99',        'explain' => true],
+                'dir_recent_block'                    => ['lang' => 'DIR_RECENT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_recent_rows'                     => ['lang' => 'DIR_RECENT_ROWS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false],
+                'dir_recent_columns'                  => ['lang' => 'DIR_RECENT_COLUMNS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => false],
+                'dir_recent_exclude'                  => ['lang' => 'DIR_RECENT_EXCLUDE', 'validate' => 'string', 'type' => 'text:6:99', 'explain' => true],
 
                 'legend3'                            => 'DIR_ADD_GUEST',
-                'dir_visual_confirm'                 => ['lang' => 'DIR_VISUAL_CONFIRM',    'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => true],
-                'dir_visual_confirm_max_attempts'    => ['lang' => 'DIR_MAX_ADD_ATTEMPTS',    'validate' => 'int:0:9999',    'type' => 'number:0:9999',    'explain' => true],
+                'dir_visual_confirm'                 => ['lang' => 'DIR_VISUAL_CONFIRM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_visual_confirm_max_attempts'    => ['lang' => 'DIR_MAX_ADD_ATTEMPTS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true],
 
                 'legend4'                              => 'DIR_THUMB_PARAM',
-                'dir_activ_thumb'                      => ['lang' => 'DIR_ACTIVE_THUMB',            'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
-                'dir_activ_thumb_remote'               => ['lang' => 'DIR_ACTIVE_THUMB_REMOTE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
-                'dir_thumb_service'                    => ['lang' => 'DIR_THUMB_SERVICE',            'validate' => 'string', 'type' => 'select',            'explain' => true, 'method' => 'get_thumb_service_list', 'params' => ['{CONFIG_VALUE}']],
-                'dir_thumb_service_reverse'            => ['lang' => 'DIR_THUMB_SERVICE_REVERSE',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
+                'dir_activ_thumb'                      => ['lang' => 'DIR_ACTIVE_THUMB', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_activ_thumb_remote'               => ['lang' => 'DIR_ACTIVE_THUMB_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
+                'dir_thumb_service'                    => ['lang' => 'DIR_THUMB_SERVICE', 'validate' => 'string', 'type' => 'select', 'explain' => true, 'method' => 'get_thumb_service_list', 'params' => ['{CONFIG_VALUE}']],
+                'dir_thumb_service_reverse'            => ['lang' => 'DIR_THUMB_SERVICE_REVERSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
 
                 'legend5'                              => 'DIR_COMM_PARAM',
-                'dir_allow_bbcode'                     => ['lang' => 'DIR_ALLOW_BBCODE',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_flash'                      => ['lang' => 'DIR_ALLOW_FLASH',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_links'                      => ['lang' => 'DIR_ALLOW_LINKS',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_allow_smilies'                    => ['lang' => 'DIR_ALLOW_SMILIES',        'validate' => 'bool',        'type' => 'radio:yes_no',    'explain' => false],
-                'dir_length_comments'                  => ['lang' => 'DIR_LENGTH_COMMENTS',    'validate' => 'int:1:999',    'type' => 'number:1:999',    'explain' => true],
-                'dir_comments_per_page'                => ['lang' => 'DIR_COMM_PER_PAGE',        'validate' => 'int:1:9999',    'type' => 'number:1:9999',    'explain' => false],
+                'dir_allow_bbcode'                     => ['lang' => 'DIR_ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_allow_flash'                      => ['lang' => 'DIR_ALLOW_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_allow_links'                      => ['lang' => 'DIR_ALLOW_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_allow_smilies'                    => ['lang' => 'DIR_ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_length_comments'                  => ['lang' => 'DIR_LENGTH_COMMENTS', 'validate' => 'int:1:999', 'type' => 'number:1:999', 'explain' => true],
+                'dir_comments_per_page'                => ['lang' => 'DIR_COMM_PER_PAGE', 'validate' => 'int:1:9999', 'type' => 'number:1:9999', 'explain' => false],
 
                 'legend6'                             => 'DIR_BANN_PARAM',
-                'dir_activ_banner'                    => ['lang' => 'DIR_ACTIV_BANNER',        'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => false],
-                'dir_banner'                          => ['lang' => 'DIR_MAX_BANN',            'validate' => 'int:0',    'type' => 'dimension:0',    'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']],
-                'dir_banner_filesize'                 => ['lang' => 'DIR_MAX_SIZE',            'validate' => 'string',    'type' => 'custom', 'method' => 'max_filesize', 'explain' => true],
-                'dir_storage_banner'                  => ['lang' => 'DIR_STORAGE_BANNER',    'validate' => 'bool',    'type' => 'radio:yes_no',    'explain' => true],
+                'dir_activ_banner'                    => ['lang' => 'DIR_ACTIV_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false],
+                'dir_banner'                          => ['lang' => 'DIR_MAX_BANN', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' '.$this->user->lang['PIXEL']],
+                'dir_banner_filesize'                 => ['lang' => 'DIR_MAX_SIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true],
+                'dir_storage_banner'                  => ['lang' => 'DIR_STORAGE_BANNER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true],
             ],
         ];
     }

Braces +23 added lines, -11 removed lines

@@ -61,12 +61,15 @@ 
     public function display_config()
     {
         // Output relevant page
-        foreach ($this->display_vars['vars'] as $config_key => $vars) {
-            if (!is_array($vars) && strpos($config_key, 'legend') === false) {
+        foreach ($this->display_vars['vars'] as $config_key => $vars)
+        {
+            if (!is_array($vars) && strpos($config_key, 'legend') === false)
+            {
                 continue;
             }
 
-            if (strpos($config_key, 'legend') !== false) {
+            if (strpos($config_key, 'legend') !== false)
+            {
                 $this->template->assign_block_vars('options', [
                     'S_LEGEND'    => true,
                     'LEGEND'      => (isset($this->user->lang[$vars])) ? $this->user->lang[$vars] : $vars, ]
@@ -78,9 +81,12 @@ 
             $type = explode(':', $vars['type']);
 
             $l_explain = '';
-            if ($vars['explain'] && isset($vars['lang_explain'])) {
+            if ($vars['explain'] && isset($vars['lang_explain']))
+            {
                 $l_explain = (isset($this->user->lang[$vars['lang_explain']])) ? $this->user->lang[$vars['lang_explain']] : $vars['lang_explain'];
-            } elseif ($vars['explain']) {
+            }
+            elseif ($vars['explain'])
+            {
                 $l_explain = (isset($this->user->lang[$vars['lang'].'_EXPLAIN'])) ? $this->user->lang[$vars['lang'].'_EXPLAIN'] : '';
             }
 
@@ -113,29 +119,35 @@ 
         validate_config_vars($this->display_vars['vars'], $cfg_array, $error);
 
         // Do not write values if there is an error
-        if (count($error)) {
+        if (count($error))
+        {
             $submit = false;
         }
 
         // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-        foreach ($this->display_vars['vars'] as $config_name => $null) {
-            if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) {
+        foreach ($this->display_vars['vars'] as $config_name => $null)
+        {
+            if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
+            {
                 continue;
             }
 
             $this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
 
-            if ($config_name == 'dir_banner_filesize') {
+            if ($config_name == 'dir_banner_filesize')
+            {
                 $size_var = $this->request->variable($config_name, '');
                 $this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value);
             }
 
-            if ($submit) {
+            if ($submit)
+            {
                 $this->config->set($config_name, $config_value);
             }
         }
 
-        if ($submit) {
+        if ($submit)
+        {
             $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'DIR_CONFIG_SETTINGS');
 
             trigger_error($this->user->lang['CONFIG_UPDATED'].adm_back_link($this->u_action));

controller/acp/validation.php

Indentation +395 added lines, -395 removed lines

@@ -9,406 +9,406 @@
 
 class validation
 {
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\pagination */
-    protected $pagination;
-
-    /** @var \phpbb\log\log */
-    protected $phpbb_log;
-
-    /** @var \phpbb\notification\manager */
-    protected $notification;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\helper */
-    protected $dir_helper;
-
-    /** @var \ernadoo\phpbbdirectory\core\link */
-    protected $link;
-
-    /** @var string phpBB root path */
-    protected $root_path;
-
-    /** @var string phpEx */
-    protected $php_ext;
-
-    /** @var string Custom form action */
-    protected $u_action;
-
-    /** @var string */
-    private $action;
-
-    /** @var array */
-    private $affected_link_name = [];
-
-    /** @var array */
-    private $cat_data = [];
-
-    /** @var array */
-    private $links_data;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\config\config                   $config       Config object
-     * @param \phpbb\db\driver\driver_interface      $db           Database object
-     * @param \phpbb\pagination                      $pagination   Pagination object
-     * @param \phpbb\log\log                         $log          Log object
-     * @param \phpbb\notification\manager            $notification Notification object
-     * @param \phpbb\request\request                 $request      Request object
-     * @param \phpbb\template\template               $template     Template object
-     * @param \phpbb\user                            $user         User object
-     * @param \ernadoo\phpbbdirectory\core\categorie $categorie    PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\helper    $dir_helper   PhpBB Directory extension helper object
-     * @param \ernadoo\phpbbdirectory\core\link      $link         PhpBB Directory extension link object
-     * @param string                                 $root_path    phpBB root path
-     * @param string                                 $php_ext      phpEx
-     */
-    public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
-    {
-        $this->config = $config;
-        $this->db = $db;
-        $this->pagination = $pagination;
-        $this->phpbb_log = $log;
-        $this->notification = $notification;
-        $this->request = $request;
-        $this->template = $template;
-        $this->user = $user;
-        $this->categorie = $categorie;
-        $this->dir_helper = $dir_helper;
-        $this->link = $link;
-        $this->root_path = $root_path;
-        $this->php_ext = $php_ext;
-
-        $this->action = $this->request->variable('action', '');
-    }
-
-    /**
-     * Display confirm box.
-     *
-     * @param array $mark Website selected for (dis)approval
-     *
-     * @return null
-     */
-    public function display_confirm($mark)
-    {
-        $s_hidden_fields = [
-            'action'           => $this->action,
-            'link_id'          => $mark,
-            'start'            => $this->request->variable('start', 0),
-        ];
-        confirm_box(false, $this->user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
-    }
-
-    /**
-     * Display website list for (dis)approval.
-     *
-     * @return null
-     */
-    public function display_websites()
-    {
-        global $phpbb_admin_path;
-
-        // Sort keys
-        $sort_days = $this->request->variable('st', 0);
-        $sort_key = $this->request->variable('sk', 't');
-        $sort_dir = $this->request->variable('sd', 'd');
-
-        // Number of entries to display
-        $per_page = $this->request->variable('links_per_page', (int) $this->config['dir_show']);
-
-        $start = $this->request->variable('start', 0);
-
-        // Categorie ordering options
-        $limit_days = [0 => $this->user->lang['SEE_ALL'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
-        $sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME']];
-        $sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id']];
-
-        $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-        gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-        // Define where and sort sql for use in displaying logs
-        $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
-        $direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
-
-        if (is_array($sort_by_sql[$sort_key])) {
-            $sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
-        } else {
-            $sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
-        }
-
-        $sql = 'SELECT COUNT(1) AS total_links
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\pagination */
+	protected $pagination;
+
+	/** @var \phpbb\log\log */
+	protected $phpbb_log;
+
+	/** @var \phpbb\notification\manager */
+	protected $notification;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\helper */
+	protected $dir_helper;
+
+	/** @var \ernadoo\phpbbdirectory\core\link */
+	protected $link;
+
+	/** @var string phpBB root path */
+	protected $root_path;
+
+	/** @var string phpEx */
+	protected $php_ext;
+
+	/** @var string Custom form action */
+	protected $u_action;
+
+	/** @var string */
+	private $action;
+
+	/** @var array */
+	private $affected_link_name = [];
+
+	/** @var array */
+	private $cat_data = [];
+
+	/** @var array */
+	private $links_data;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\config\config                   $config       Config object
+	 * @param \phpbb\db\driver\driver_interface      $db           Database object
+	 * @param \phpbb\pagination                      $pagination   Pagination object
+	 * @param \phpbb\log\log                         $log          Log object
+	 * @param \phpbb\notification\manager            $notification Notification object
+	 * @param \phpbb\request\request                 $request      Request object
+	 * @param \phpbb\template\template               $template     Template object
+	 * @param \phpbb\user                            $user         User object
+	 * @param \ernadoo\phpbbdirectory\core\categorie $categorie    PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\helper    $dir_helper   PhpBB Directory extension helper object
+	 * @param \ernadoo\phpbbdirectory\core\link      $link         PhpBB Directory extension link object
+	 * @param string                                 $root_path    phpBB root path
+	 * @param string                                 $php_ext      phpEx
+	 */
+	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\helper $dir_helper, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
+	{
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
+		$this->phpbb_log = $log;
+		$this->notification = $notification;
+		$this->request = $request;
+		$this->template = $template;
+		$this->user = $user;
+		$this->categorie = $categorie;
+		$this->dir_helper = $dir_helper;
+		$this->link = $link;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+
+		$this->action = $this->request->variable('action', '');
+	}
+
+	/**
+	 * Display confirm box.
+	 *
+	 * @param array $mark Website selected for (dis)approval
+	 *
+	 * @return null
+	 */
+	public function display_confirm($mark)
+	{
+		$s_hidden_fields = [
+			'action'           => $this->action,
+			'link_id'          => $mark,
+			'start'            => $this->request->variable('start', 0),
+		];
+		confirm_box(false, $this->user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
+	}
+
+	/**
+	 * Display website list for (dis)approval.
+	 *
+	 * @return null
+	 */
+	public function display_websites()
+	{
+		global $phpbb_admin_path;
+
+		// Sort keys
+		$sort_days = $this->request->variable('st', 0);
+		$sort_key = $this->request->variable('sk', 't');
+		$sort_dir = $this->request->variable('sd', 'd');
+
+		// Number of entries to display
+		$per_page = $this->request->variable('links_per_page', (int) $this->config['dir_show']);
+
+		$start = $this->request->variable('start', 0);
+
+		// Categorie ordering options
+		$limit_days = [0 => $this->user->lang['SEE_ALL'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
+		$sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME']];
+		$sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id']];
+
+		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
+
+		// Define where and sort sql for use in displaying logs
+		$sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
+		$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
+
+		if (is_array($sort_by_sql[$sort_key])) {
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
+		} else {
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
+		}
+
+		$sql = 'SELECT COUNT(1) AS total_links
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_active = 0'.
-                (($sql_where) ? " AND link_time >= $sql_where" : '');
-        $result = $this->db->sql_query($sql);
-        $total_links = (int) $this->db->sql_fetchfield('total_links');
-        $this->db->sql_freeresult($result);
-
-        // Make sure $start is set to the last page if it exceeds the amount
-        $start = $this->pagination->validate_start($start, $per_page, $total_links);
-
-        $sql_array = [
-            'SELECT'      => 'l.link_id, l.link_name, l.link_url, l.link_description, l.link_cat, l.link_user_id, l.link_guest_email, l.link_uid, l.link_bitfield, l.link_flags, l.link_banner, l.link_time, c.cat_name, u.user_id, u.username, u.user_colour',
-            'FROM'        => [
-                DIR_LINK_TABLE    => 'l', ],
-            'LEFT_JOIN'    => [
-                [
-                    'FROM'    => [DIR_CAT_TABLE => 'c'],
-                    'ON'      => 'c.cat_id = l.link_cat',
-                ],
-                [
-                    'FROM'    => [USERS_TABLE => 'u'],
-                    'ON'      => 'u.user_id = l.link_user_id',
-                ],
-            ],
-            'WHERE'        => 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
-            'ORDER_BY'     => $sql_sort_order, ];
-
-        $sql = $this->db->sql_build_query('SELECT', $sql_array);
-        $result = $this->db->sql_query_limit($sql, $per_page, $start);
-
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $s_banner = $this->link->display_bann($row);
-
-            $username = ($row['link_user_id'] == ANONYMOUS) ? $row['link_guest_email'] : $row['username'];
-
-            $link_row = [
-                'LINK_URL'             => $row['link_url'],
-                'LINK_NAME'            => $row['link_name'],
-                'LINK_DESC'            => generate_text_for_display($row['link_description'], $row['link_uid'], $row['link_bitfield'], $row['link_flags']),
-                'L_DIR_USER_PROP'      => $this->user->lang('DIR_USER_PROP', get_username_string('full', $row['link_user_id'], $username, $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$this->php_ext", 'i=users&amp;mode=overview')), '<select name=c'.$row['link_id'].'>'.$this->categorie->make_cat_select((int) $row['link_cat']).'</select>', $this->user->format_date($row['link_time'])),
-                'BANNER'               => $s_banner,
-                'LINK_ID'              => $row['link_id'],
-
-            ];
-            $this->template->assign_block_vars('linkrow', $link_row);
-        }
-        $this->db->sql_freeresult($result);
-
-        $option_ary = ['approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE'];
-
-        $base_url = $this->u_action."&amp;$u_sort_param&amp;links_per_page=$per_page";
-        $this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
-
-        $this->template->assign_vars([
-            'S_LINKS_OPTIONS'    => build_select($option_ary),
-
-            'S_LIMIT_DAYS'        => $s_limit_days,
-            'S_SORT_KEY'          => $s_sort_key,
-            'S_SORT_DIR'          => $s_sort_dir,
-            'LINKS_PER_PAGE'      => $per_page,
-
-            'U_ACTION'            => $this->u_action."&amp;$u_sort_param&amp;links_per_page=$per_page&amp;start=$start",
-        ]);
-    }
-
-    /**
-     * Get link's information and call appropriate action.
-     *
-     * @param array $mark Website selected for (dis)approval
-     *
-     * @return null
-     */
-    public function exec_action($mark)
-    {
-        $this->_get_infos_links($mark);
-
-        switch ($this->action) {
-            case 'approved':
-                $this->_action_approved();
-                break;
-
-            case 'disapproved':
-                $this->_action_disapproved();
-                break;
-
-            default:
-                return;
-        }
-
-        $this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), [implode(', ', $this->affected_link_name)]);
-    }
-
-    /**
-     * Notify users which had submitted their websites.
-     *
-     * @return null
-     */
-    public function notifiy_submiters()
-    {
-        if (!class_exists('messenger')) {
-            include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
-        }
-        $messenger = new \messenger(false);
-
-        foreach ($this->links_data as $row) {
-            $this->notification->mark_notifications_read('ernadoo.phpbbdirectory.notification.type.directory_website_in_queue', (int) $row['link_id'], false);
-
-            // New notification system can't send mail to an anonymous user with an email adress storage in another table than phpbb_users
-            if ($row['link_user_id'] == ANONYMOUS) {
-                $username = $email = $row['link_guest_email'];
-
-                $messenger->template('@ernadoo_phpbbdirectory/directory_website_'.$this->action, $row['user_lang']);
-                $messenger->to($email, $username);
-
-                $messenger->assign_vars([
-                    'USERNAME'     => htmlspecialchars_decode($username),
-                    'LINK_NAME'    => $row['link_name'],
-                ]);
-
-                $messenger->send(NOTIFY_EMAIL);
-            } else {
-                $notification_data = [
-                    'user_from'            => (int) $row['link_user_id'],
-                    'link_id'              => (int) $row['link_id'],
-                    'link_name'            => $row['link_name'],
-                    'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $row['link_cat']),
-                    'cat_id'               => (int) $row['link_cat'],
-                ];
-
-                $this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_'.$this->action, $notification_data);
-            }
-        }
-    }
-
-    /**
-     * Set page url.
-     *
-     * @param string $u_action Custom form action
-     *
-     * @return null
-     */
-    public function set_page_url($u_action)
-    {
-        $this->u_action = $u_action;
-    }
-
-    /**
-     * Approve action.
-     *
-     * @return null
-     */
-    private function _action_approved()
-    {
-        foreach ($this->links_data as $row) {
-            $this->_notify_suscribers($row);
-
-            $sql_ary = [
-                'link_active'      => 1,
-                'link_time'        => time(),
-                'link_cat'         => (int) $row['link_cat'],
-            ];
-
-            $sql = 'UPDATE '.DIR_LINK_TABLE.'
+				(($sql_where) ? " AND link_time >= $sql_where" : '');
+		$result = $this->db->sql_query($sql);
+		$total_links = (int) $this->db->sql_fetchfield('total_links');
+		$this->db->sql_freeresult($result);
+
+		// Make sure $start is set to the last page if it exceeds the amount
+		$start = $this->pagination->validate_start($start, $per_page, $total_links);
+
+		$sql_array = [
+			'SELECT'      => 'l.link_id, l.link_name, l.link_url, l.link_description, l.link_cat, l.link_user_id, l.link_guest_email, l.link_uid, l.link_bitfield, l.link_flags, l.link_banner, l.link_time, c.cat_name, u.user_id, u.username, u.user_colour',
+			'FROM'        => [
+				DIR_LINK_TABLE    => 'l', ],
+			'LEFT_JOIN'    => [
+				[
+					'FROM'    => [DIR_CAT_TABLE => 'c'],
+					'ON'      => 'c.cat_id = l.link_cat',
+				],
+				[
+					'FROM'    => [USERS_TABLE => 'u'],
+					'ON'      => 'u.user_id = l.link_user_id',
+				],
+			],
+			'WHERE'        => 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
+			'ORDER_BY'     => $sql_sort_order, ];
+
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query_limit($sql, $per_page, $start);
+
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$s_banner = $this->link->display_bann($row);
+
+			$username = ($row['link_user_id'] == ANONYMOUS) ? $row['link_guest_email'] : $row['username'];
+
+			$link_row = [
+				'LINK_URL'             => $row['link_url'],
+				'LINK_NAME'            => $row['link_name'],
+				'LINK_DESC'            => generate_text_for_display($row['link_description'], $row['link_uid'], $row['link_bitfield'], $row['link_flags']),
+				'L_DIR_USER_PROP'      => $this->user->lang('DIR_USER_PROP', get_username_string('full', $row['link_user_id'], $username, $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$this->php_ext", 'i=users&amp;mode=overview')), '<select name=c'.$row['link_id'].'>'.$this->categorie->make_cat_select((int) $row['link_cat']).'</select>', $this->user->format_date($row['link_time'])),
+				'BANNER'               => $s_banner,
+				'LINK_ID'              => $row['link_id'],
+
+			];
+			$this->template->assign_block_vars('linkrow', $link_row);
+		}
+		$this->db->sql_freeresult($result);
+
+		$option_ary = ['approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE'];
+
+		$base_url = $this->u_action."&amp;$u_sort_param&amp;links_per_page=$per_page";
+		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
+
+		$this->template->assign_vars([
+			'S_LINKS_OPTIONS'    => build_select($option_ary),
+
+			'S_LIMIT_DAYS'        => $s_limit_days,
+			'S_SORT_KEY'          => $s_sort_key,
+			'S_SORT_DIR'          => $s_sort_dir,
+			'LINKS_PER_PAGE'      => $per_page,
+
+			'U_ACTION'            => $this->u_action."&amp;$u_sort_param&amp;links_per_page=$per_page&amp;start=$start",
+		]);
+	}
+
+	/**
+	 * Get link's information and call appropriate action.
+	 *
+	 * @param array $mark Website selected for (dis)approval
+	 *
+	 * @return null
+	 */
+	public function exec_action($mark)
+	{
+		$this->_get_infos_links($mark);
+
+		switch ($this->action) {
+			case 'approved':
+				$this->_action_approved();
+				break;
+
+			case 'disapproved':
+				$this->_action_disapproved();
+				break;
+
+			default:
+				return;
+		}
+
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), [implode(', ', $this->affected_link_name)]);
+	}
+
+	/**
+	 * Notify users which had submitted their websites.
+	 *
+	 * @return null
+	 */
+	public function notifiy_submiters()
+	{
+		if (!class_exists('messenger')) {
+			include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
+		}
+		$messenger = new \messenger(false);
+
+		foreach ($this->links_data as $row) {
+			$this->notification->mark_notifications_read('ernadoo.phpbbdirectory.notification.type.directory_website_in_queue', (int) $row['link_id'], false);
+
+			// New notification system can't send mail to an anonymous user with an email adress storage in another table than phpbb_users
+			if ($row['link_user_id'] == ANONYMOUS) {
+				$username = $email = $row['link_guest_email'];
+
+				$messenger->template('@ernadoo_phpbbdirectory/directory_website_'.$this->action, $row['user_lang']);
+				$messenger->to($email, $username);
+
+				$messenger->assign_vars([
+					'USERNAME'     => htmlspecialchars_decode($username),
+					'LINK_NAME'    => $row['link_name'],
+				]);
+
+				$messenger->send(NOTIFY_EMAIL);
+			} else {
+				$notification_data = [
+					'user_from'            => (int) $row['link_user_id'],
+					'link_id'              => (int) $row['link_id'],
+					'link_name'            => $row['link_name'],
+					'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $row['link_cat']),
+					'cat_id'               => (int) $row['link_cat'],
+				];
+
+				$this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_'.$this->action, $notification_data);
+			}
+		}
+	}
+
+	/**
+	 * Set page url.
+	 *
+	 * @param string $u_action Custom form action
+	 *
+	 * @return null
+	 */
+	public function set_page_url($u_action)
+	{
+		$this->u_action = $u_action;
+	}
+
+	/**
+	 * Approve action.
+	 *
+	 * @return null
+	 */
+	private function _action_approved()
+	{
+		foreach ($this->links_data as $row) {
+			$this->_notify_suscribers($row);
+
+			$sql_ary = [
+				'link_active'      => 1,
+				'link_time'        => time(),
+				'link_cat'         => (int) $row['link_cat'],
+			];
+
+			$sql = 'UPDATE '.DIR_LINK_TABLE.'
 							SET '.$this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE link_id = '.(int) $row['link_id'];
-            $this->db->sql_query($sql);
-        }
+			$this->db->sql_query($sql);
+		}
 
-        foreach ($this->cat_data as $cat_id => $count) {
-            $sql = 'UPDATE '.DIR_CAT_TABLE.'
+		foreach ($this->cat_data as $cat_id => $count) {
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = '.(int) $cat_id;
-            $this->db->sql_query($sql);
-        }
-    }
-
-    /**
-     * Disapprove action.
-     *
-     * @return null
-     */
-    private function _action_disapproved()
-    {
-        foreach ($this->links_data as $row) {
-            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
-                $banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
-
-                if (file_exists($banner_img)) {
-                    @unlink($banner_img);
-                }
-            }
-
-            $sql = 'DELETE FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $row['link_id'];
-            $this->db->sql_query($sql);
-        }
-    }
-
-    /**
-     * Get informations about links selected.
-     *
-     * @param	$mark Website selected for (dis)approval
-     *
-     * @return null
-     */
-    private function _get_infos_links($mark)
-    {
-        $sql_array = [
-            'SELECT'      => 'a.link_id, a.link_name, a.link_url, a.link_description, a.link_banner, a.link_user_id, a.link_guest_email, u.username, u.user_email, u.user_lang, u.user_notify_type, c.cat_id, c.cat_name',
-            'FROM'        => [
-                DIR_LINK_TABLE    => 'a', ],
-            'LEFT_JOIN'    => [
-                [
-                    'FROM'    => [USERS_TABLE => 'u'],
-                    'ON'      => 'u.user_id = a.link_user_id',
-                ],
-                [
-                    'FROM'    => [DIR_CAT_TABLE => 'c'],
-                    'ON'      => 'a.link_cat = c.cat_id',
-                ],
-            ],
-            'WHERE'        => $this->db->sql_in_set('a.link_id', $mark), ];
-
-        $sql = $this->db->sql_build_query('SELECT', $sql_array);
-        $result = $this->db->sql_query($sql);
-
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $row['link_cat'] = $this->request->variable('c'.$row['link_id'], (int) $row['cat_id']);
-
-            $this->links_data[] = $row;
-
-            $this->affected_link_name[] = $row['link_name'];
-
-            $this->cat_data[$row['link_cat']] = isset($this->cat_data[$row['link_cat']]) ? $this->cat_data[$row['link_cat']] + 1 : 1;
-        }
-    }
-
-    /**
-     * Notify users which watch categories.
-     *
-     * @param	$row Informations about website
-     *
-     * @return null
-     */
-    private function _notify_suscribers($row)
-    {
-        $notification_data = [
-            'user_from'            => (int) $row['link_user_id'],
-            'link_id'              => (int) $row['link_id'],
-            'link_name'            => $row['link_name'],
-            'link_url'             => $row['link_url'],
-            'link_description'     => preg_replace('/(\[.*?\])(.*?)(\[\/.*?\])/si', '\\1', $row['link_description']),
-            'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $row['link_cat']),
-            'cat_id'               => (int) $row['link_cat'],
-        ];
-
-        $this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website', $notification_data);
-    }
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	 * Disapprove action.
+	 *
+	 * @return null
+	 */
+	private function _action_disapproved()
+	{
+		foreach ($this->links_data as $row) {
+			if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+				$banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
+
+				if (file_exists($banner_img)) {
+					@unlink($banner_img);
+				}
+			}
+
+			$sql = 'DELETE FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $row['link_id'];
+			$this->db->sql_query($sql);
+		}
+	}
+
+	/**
+	 * Get informations about links selected.
+	 *
+	 * @param	$mark Website selected for (dis)approval
+	 *
+	 * @return null
+	 */
+	private function _get_infos_links($mark)
+	{
+		$sql_array = [
+			'SELECT'      => 'a.link_id, a.link_name, a.link_url, a.link_description, a.link_banner, a.link_user_id, a.link_guest_email, u.username, u.user_email, u.user_lang, u.user_notify_type, c.cat_id, c.cat_name',
+			'FROM'        => [
+				DIR_LINK_TABLE    => 'a', ],
+			'LEFT_JOIN'    => [
+				[
+					'FROM'    => [USERS_TABLE => 'u'],
+					'ON'      => 'u.user_id = a.link_user_id',
+				],
+				[
+					'FROM'    => [DIR_CAT_TABLE => 'c'],
+					'ON'      => 'a.link_cat = c.cat_id',
+				],
+			],
+			'WHERE'        => $this->db->sql_in_set('a.link_id', $mark), ];
+
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$row['link_cat'] = $this->request->variable('c'.$row['link_id'], (int) $row['cat_id']);
+
+			$this->links_data[] = $row;
+
+			$this->affected_link_name[] = $row['link_name'];
+
+			$this->cat_data[$row['link_cat']] = isset($this->cat_data[$row['link_cat']]) ? $this->cat_data[$row['link_cat']] + 1 : 1;
+		}
+	}
+
+	/**
+	 * Notify users which watch categories.
+	 *
+	 * @param	$row Informations about website
+	 *
+	 * @return null
+	 */
+	private function _notify_suscribers($row)
+	{
+		$notification_data = [
+			'user_from'            => (int) $row['link_user_id'],
+			'link_id'              => (int) $row['link_id'],
+			'link_name'            => $row['link_name'],
+			'link_url'             => $row['link_url'],
+			'link_description'     => preg_replace('/(\[.*?\])(.*?)(\[\/.*?\])/si', '\\1', $row['link_description']),
+			'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $row['link_cat']),
+			'cat_id'               => (int) $row['link_cat'],
+		];
+
+		$this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website', $notification_data);
+	}
 }

Braces +30 added lines, -14 removed lines

@@ -147,9 +147,12 @@ 
         $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0;
         $direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
 
-        if (is_array($sort_by_sql[$sort_key])) {
+        if (is_array($sort_by_sql[$sort_key]))
+        {
             $sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
-        } else {
+        }
+        else
+        {
             $sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
         }
 
@@ -184,7 +187,8 @@ 
         $sql = $this->db->sql_build_query('SELECT', $sql_array);
         $result = $this->db->sql_query_limit($sql, $per_page, $start);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $s_banner = $this->link->display_bann($row);
 
             $username = ($row['link_user_id'] == ANONYMOUS) ? $row['link_guest_email'] : $row['username'];
@@ -230,7 +234,8 @@ 
     {
         $this->_get_infos_links($mark);
 
-        switch ($this->action) {
+        switch ($this->action)
+        {
             case 'approved':
                 $this->_action_approved();
                 break;
@@ -253,16 +258,19 @@ 
      */
     public function notifiy_submiters()
     {
-        if (!class_exists('messenger')) {
+        if (!class_exists('messenger'))
+        {
             include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
         }
         $messenger = new \messenger(false);
 
-        foreach ($this->links_data as $row) {
+        foreach ($this->links_data as $row)
+        {
             $this->notification->mark_notifications_read('ernadoo.phpbbdirectory.notification.type.directory_website_in_queue', (int) $row['link_id'], false);
 
             // New notification system can't send mail to an anonymous user with an email adress storage in another table than phpbb_users
-            if ($row['link_user_id'] == ANONYMOUS) {
+            if ($row['link_user_id'] == ANONYMOUS)
+            {
                 $username = $email = $row['link_guest_email'];
 
                 $messenger->template('@ernadoo_phpbbdirectory/directory_website_'.$this->action, $row['user_lang']);
@@ -274,7 +282,9 @@ 
                 ]);
 
                 $messenger->send(NOTIFY_EMAIL);
-            } else {
+            }
+            else
+            {
                 $notification_data = [
                     'user_from'            => (int) $row['link_user_id'],
                     'link_id'              => (int) $row['link_id'],
@@ -307,7 +317,8 @@ 
      */
     private function _action_approved()
     {
-        foreach ($this->links_data as $row) {
+        foreach ($this->links_data as $row)
+        {
             $this->_notify_suscribers($row);
 
             $sql_ary = [
@@ -322,7 +333,8 @@ 
             $this->db->sql_query($sql);
         }
 
-        foreach ($this->cat_data as $cat_id => $count) {
+        foreach ($this->cat_data as $cat_id => $count)
+        {
             $sql = 'UPDATE '.DIR_CAT_TABLE.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = '.(int) $cat_id;
@@ -337,11 +349,14 @@ 
      */
     private function _action_disapproved()
     {
-        foreach ($this->links_data as $row) {
-            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+        foreach ($this->links_data as $row)
+        {
+            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
+            {
                 $banner_img = $this->dir_helper->get_banner_path(basename($row['link_banner']));
 
-                if (file_exists($banner_img)) {
+                if (file_exists($banner_img))
+                {
                     @unlink($banner_img);
                 }
             }
@@ -379,7 +394,8 @@ 
         $sql = $this->db->sql_build_query('SELECT', $sql_array);
         $result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $row['link_cat'] = $this->request->variable('c'.$row['link_id'], (int) $row['cat_id']);
 
             $this->links_data[] = $row;

controller/search.php

Indentation +322 added lines, -322 removed lines

@@ -9,330 +9,330 @@
 
 class search
 {
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \phpbb\controller\helper */
-    protected $helper;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\auth\auth */
-    protected $auth;
-
-    /** @var \phpbb\pagination */
-    protected $pagination;
-
-    /** @var \ernadoo\phpbbdirectory\search\fulltext_directory */
-    protected $search;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\link */
-    protected $link;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface                 $db         Database object
-     * @param \phpbb\config\config                              $config     Config object
-     * @param \phpbb\template\template                          $template   Template object
-     * @param \phpbb\user                                       $user       User object
-     * @param \phpbb\controller\helper                          $helper     Controller helper object
-     * @param \phpbb\request\request                            $request    Request object
-     * @param \phpbb\auth\auth                                  $auth       Auth object
-     * @param \phpbb\pagination                                 $pagination Pagination object
-     * @param \ernadoo\phpbbdirectory\search\fulltext_directory $search     PhpBB Directory extension search object
-     * @param \ernadoo\phpbbdirectory\core\categorie            $categorie  PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\link                 $link       PhpBB Directory extension link object
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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)
-    {
-        $this->db = $db;
-        $this->config = $config;
-        $this->template = $template;
-        $this->user = $user;
-        $this->helper = $helper;
-        $this->request = $request;
-        $this->auth = $auth;
-        $this->pagination = $pagination;
-        $this->search = $search;
-        $this->categorie = $categorie;
-        $this->link = $link;
-
-        $this->user->add_lang_ext('ernadoo/phpbbdirectory', ['directory']);
-        $this->user->add_lang('search');
-
-        $this->template->assign_vars([
-            'S_PHPBB_DIRECTORY'                => true,
-            'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
-        ]);
-    }
-
-    /**
-     * Search controller.
-     *
-     * @param int $page Page number taken from the URL
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function main($page)
-    {
-        if (!$this->auth->acl_get('u_search_dir')) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $cat_id = $this->request->variable('cat_id', 0);
-        $keywords = $this->request->variable('keywords', '', true);
-        $search_terms = $this->request->variable('terms', 'all');
-        $search_category = $this->request->variable('cid', [0]);
-        $search_fields = $this->request->variable('sf', 'all');
-        $search_child = $this->request->variable('sc', true);
-        $sort_days = $this->request->variable('st', 0);
-        $sort_key = $this->request->variable('sk', 't');
-        $sort_dir = $this->request->variable('sd', 'd');
-        $start = ($page - 1) * (int) $this->config['dir_show'];
-
-        $default_sort_days = 0;
-        $default_sort_key = (string) substr($this->config['dir_default_order'], 0, 1);
-        $default_sort_dir = (string) substr($this->config['dir_default_order'], 2);
-
-        // Categorie ordering options
-        $limit_days = [0 => $this->user->lang['ALL_RESULTS'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
-        $sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
-        $sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
-
-        if ($this->config['dir_activ_pagerank']) {
-            $sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
-            $sort_by_sql['p'] = 'l.link_pagerank';
-        }
-
-        $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
-        gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
-
-        $u_sort_param = ($sort_days === $default_sort_days && $sort_key == $default_sort_key && $sort_dir == $default_sort_dir) ? [] : ['sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir];
-
-        /*
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\pagination */
+	protected $pagination;
+
+	/** @var \ernadoo\phpbbdirectory\search\fulltext_directory */
+	protected $search;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\link */
+	protected $link;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface                 $db         Database object
+	 * @param \phpbb\config\config                              $config     Config object
+	 * @param \phpbb\template\template                          $template   Template object
+	 * @param \phpbb\user                                       $user       User object
+	 * @param \phpbb\controller\helper                          $helper     Controller helper object
+	 * @param \phpbb\request\request                            $request    Request object
+	 * @param \phpbb\auth\auth                                  $auth       Auth object
+	 * @param \phpbb\pagination                                 $pagination Pagination object
+	 * @param \ernadoo\phpbbdirectory\search\fulltext_directory $search     PhpBB Directory extension search object
+	 * @param \ernadoo\phpbbdirectory\core\categorie            $categorie  PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link                 $link       PhpBB Directory extension link object
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \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)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->helper = $helper;
+		$this->request = $request;
+		$this->auth = $auth;
+		$this->pagination = $pagination;
+		$this->search = $search;
+		$this->categorie = $categorie;
+		$this->link = $link;
+
+		$this->user->add_lang_ext('ernadoo/phpbbdirectory', ['directory']);
+		$this->user->add_lang('search');
+
+		$this->template->assign_vars([
+			'S_PHPBB_DIRECTORY'                => true,
+			'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
+		]);
+	}
+
+	/**
+	 * Search controller.
+	 *
+	 * @param int $page Page number taken from the URL
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function main($page)
+	{
+		if (!$this->auth->acl_get('u_search_dir')) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$cat_id = $this->request->variable('cat_id', 0);
+		$keywords = $this->request->variable('keywords', '', true);
+		$search_terms = $this->request->variable('terms', 'all');
+		$search_category = $this->request->variable('cid', [0]);
+		$search_fields = $this->request->variable('sf', 'all');
+		$search_child = $this->request->variable('sc', true);
+		$sort_days = $this->request->variable('st', 0);
+		$sort_key = $this->request->variable('sk', 't');
+		$sort_dir = $this->request->variable('sd', 'd');
+		$start = ($page - 1) * (int) $this->config['dir_show'];
+
+		$default_sort_days = 0;
+		$default_sort_key = (string) substr($this->config['dir_default_order'], 0, 1);
+		$default_sort_dir = (string) substr($this->config['dir_default_order'], 2);
+
+		// Categorie ordering options
+		$limit_days = [0 => $this->user->lang['ALL_RESULTS'], 1 => $this->user->lang['1_DAY'], 7 => $this->user->lang['7_DAYS'], 14 => $this->user->lang['2_WEEKS'], 30 => $this->user->lang['1_MONTH'], 90 => $this->user->lang['3_MONTHS'], 180 => $this->user->lang['6_MONTHS'], 365 => $this->user->lang['1_YEAR']];
+		$sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
+		$sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
+
+		if ($this->config['dir_activ_pagerank']) {
+			$sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
+			$sort_by_sql['p'] = 'l.link_pagerank';
+		}
+
+		$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = '';
+		gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
+
+		$u_sort_param = ($sort_days === $default_sort_days && $sort_key == $default_sort_key && $sort_dir == $default_sort_dir) ? [] : ['sort_days' => $sort_days, 'sort_key' => $sort_key, 'sort_dir' => $sort_dir];
+
+		/*
         ** search form submited
         */
-        if ($this->request->is_set_post('submit') || $keywords) {
-            // clear arrays
-            $id_ary = $u_search = [];
-            $keywords_ary = ($keywords) ? explode(' ', $keywords) : [];
-
-            if (!count($keywords_ary)) {
-                return $this->helper->message('DIR_ERROR_KEYWORD');
-            }
-
-            $ex_cid_ary = $this->_get_exclude_categories($search_category, $search_child);
-
-            $total_match_count = $this->search->keyword_search($keywords_ary, $search_fields, $search_terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_cid_ary, $cat_id, $id_ary, $start, $this->config['dir_show']);
-
-            $l_search_matches = $this->user->lang('FOUND_SEARCH_MATCHES', (int) $total_match_count);
-
-            if (count($id_ary)) {
-                $sql_where = $this->db->sql_in_set('l.link_id', $id_ary);
-            } else {
-                return $this->helper->message('DIR_SEARCH_NO_RESULT');
-            }
-
-            // A single wildcard will make the search results look ugly
-            $hilit = phpbb_clean_search_string(str_replace(['+', '-', '|', '(', ')', '"'], ' ', $keywords));
-            $hilit = str_replace(' ', '|', $hilit);
-
-            $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 : '';
-
-            $base_url = [
-                'routes'    => 'ernadoo_phpbbdirectory_search_controller',
-                'params'    => array_merge($u_search, $u_sort_param),
-            ];
-
-            $u_search = $this->helper->route('ernadoo_phpbbdirectory_search_controller', array_merge($u_search, $u_sort_param));
-
-            $this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $total_match_count, $this->config['dir_show'], $start);
-
-            $this->template->assign_vars([
-                'SEARCH_MATCHES'      => $l_search_matches,
-                'SEARCH_WORDS'        => $keywords,
-
-                'TOTAL_MATCHES'        => $total_match_count,
-
-                'S_SELECT_SORT_DIR'        => $s_sort_dir,
-                'S_SELECT_SORT_KEY'        => $s_sort_key,
-                'S_SELECT_SORT_DAYS'       => $s_limit_days,
-                'S_SEARCH_ACTION'          => $u_search,
-
-                'U_DIR_SEARCH'            => $this->helper->route('ernadoo_phpbbdirectory_search_controller'),
-                'U_SEARCH_WORDS'          => $u_search,
-            ]);
-
-            if ($cat_id) {
-                $this->template->assign_vars([
-                    'SEARCH_CATEGORY'      => $this->user->lang('RETURN_TO', \ernadoo\phpbbdirectory\core\categorie::getname((int) $cat_id)),
-                    'U_SEARCH_CATEGORY'    => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]),
-                ]);
-            }
-
-            if ($sql_where) {
-                $sql_array = [
-                    'SELECT'      => 'l.link_name, l.link_description, l.link_url, l.link_uid, l.link_bitfield, l.link_flags, l.link_view, l.link_user_id, l.link_time, l.link_comment, l.link_flag, l.link_id, l.link_thumb, l.link_banner, c.cat_name, u.user_id, u.username, u.user_colour',
-                    'FROM'        => [
-                            DIR_LINK_TABLE    => 'l', ],
-                    'LEFT_JOIN'    => [
-                            [
-                                'FROM'    => [DIR_CAT_TABLE => 'c'],
-                                'ON'      => 'l.link_cat = c.cat_id',
-                            ],
-                            [
-                                'FROM'    => [USERS_TABLE => 'u'],
-                                'ON'      => 'u.user_id = l.link_user_id',
-                            ],
-                    ],
-                    'WHERE'        => $sql_where, ];
-
-                $sql = $this->db->sql_build_query('SELECT', $sql_array);
-                $result = $this->db->sql_query($sql);
-
-                $rowset = $this->db->sql_fetchrowset($result);
-
-                if (count($rowset)) {
-                    if ($hilit) {
-                        // Remove bad highlights
-                        $hilit_array = array_filter(explode('|', $hilit), 'strlen');
-                        foreach ($hilit_array as $key => $value) {
-                            $hilit_array[$key] = phpbb_clean_search_string($value);
-                            $hilit_array[$key] = str_replace('\*', '\w*?', preg_quote($hilit_array[$key], '#'));
-                            $hilit_array[$key] = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $hilit_array[$key]);
-                        }
-                        $hilit = implode('|', $hilit_array);
-                    }
-
-                    foreach ($rowset as $data) {
-                        $s_banner = $this->link->display_bann($data);
-                        $s_thumb = $this->link->display_thumb($data);
-                        $s_flag = $this->link->display_flag($data);
-
-                        $data['link_description'] = generate_text_for_display($data['link_description'], $data['link_uid'], $data['link_bitfield'], $data['link_flags']);
-
-                        if ($hilit) {
-                            $data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_name']);
-                            $data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_description']);
-                        }
-
-                        $this->template->assign_block_vars('results', [
-                            'S_SITE'           => $data['link_name'],
-                            'S_DESCRIPTION'    => $data['link_description'],
-                            'S_COUNT'          => $data['link_view'],
-                            'S_CAT'            => $data['cat_name'],
-                            'S_USER'           => get_username_string('full', $data['link_user_id'], $data['username'], $data['user_colour']),
-                            'S_TIME'           => ($data['link_time'] != 0) ? $this->user->format_date($data['link_time']) : '',
-                            'S_COMMENT'        => $data['link_comment'],
-
-                            'THUMB'            => '<img src="'.$s_thumb.'" alt="'.$this->user->lang['DIR_THUMB'].'" title="'.$data['link_name'].'"/>',
-                            'IMG_BANNER'       => $s_banner,
-                            'IMG_FLAG'         => $s_flag,
-                            'ON_CLICK'         => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $data['link_id']])."'); return false;\"",
-
-                            'L_DIR_SEARCH_NB_CLICKS'       => $this->user->lang('DIR_SEARCH_NB_CLICKS', (int) $data['link_view']),
-                            'L_DIR_SEARCH_NB_COMMS'        => $this->user->lang('DIR_SEARCH_NB_COMMS', (int) $data['link_comment']),
-
-                            'U_COMMENT'        => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $data['link_id']]),
-                            'U_SITE'           => $data['link_url'],
-                            'LINK_ID'          => $data['link_id'],
-                        ]);
-
-                        if ($s_banner) {
-                            $this->template->assign_block_vars('results.banner', []);
-                        }
-
-                        if ($this->config['dir_activ_flag']) {
-                            $this->template->assign_block_vars('results.switch_dir_flag', []);
-                        }
-                    }
-                    unset($rowset);
-
-                    return $this->helper->render('search_results.html', $this->user->lang['DIR_MAKE_SEARCH']);
-                }
-            }
-        }
-
-        $s_catlist = $this->categorie->make_cat_select();
-
-        if (!$s_catlist) {
-            return $this->helper->message('NO_SEARCH');
-        }
-
-        $this->template->assign_vars([
-            'S_POST_ACTION'            => build_url(true),
-            'S_KEYWORD'                => $keywords,
-            'S_CATLIST'                => $s_catlist,
-            'S_SELECT_SORT_DIR'        => $s_sort_dir,
-            'S_SELECT_SORT_KEY'        => $s_sort_key,
-            'S_SELECT_SORT_DAYS'       => $s_limit_days,
-        ]);
-
-        return $this->helper->render('search_body.html', $this->user->lang['DIR_MAKE_SEARCH']);
-    }
-
-    /**
-     * @param array $search_category
-     * @param bool  $search_child
-     *
-     * @return array Categories to exclude from search
-     */
-    private function _get_exclude_categories(&$search_category, $search_child)
-    {
-        $sql = 'SELECT cat_id, parent_id, right_id
+		if ($this->request->is_set_post('submit') || $keywords) {
+			// clear arrays
+			$id_ary = $u_search = [];
+			$keywords_ary = ($keywords) ? explode(' ', $keywords) : [];
+
+			if (!count($keywords_ary)) {
+				return $this->helper->message('DIR_ERROR_KEYWORD');
+			}
+
+			$ex_cid_ary = $this->_get_exclude_categories($search_category, $search_child);
+
+			$total_match_count = $this->search->keyword_search($keywords_ary, $search_fields, $search_terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_cid_ary, $cat_id, $id_ary, $start, $this->config['dir_show']);
+
+			$l_search_matches = $this->user->lang('FOUND_SEARCH_MATCHES', (int) $total_match_count);
+
+			if (count($id_ary)) {
+				$sql_where = $this->db->sql_in_set('l.link_id', $id_ary);
+			} else {
+				return $this->helper->message('DIR_SEARCH_NO_RESULT');
+			}
+
+			// A single wildcard will make the search results look ugly
+			$hilit = phpbb_clean_search_string(str_replace(['+', '-', '|', '(', ')', '&quot;'], ' ', $keywords));
+			$hilit = str_replace(' ', '|', $hilit);
+
+			$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 : '';
+
+			$base_url = [
+				'routes'    => 'ernadoo_phpbbdirectory_search_controller',
+				'params'    => array_merge($u_search, $u_sort_param),
+			];
+
+			$u_search = $this->helper->route('ernadoo_phpbbdirectory_search_controller', array_merge($u_search, $u_sort_param));
+
+			$this->pagination->generate_template_pagination($base_url, 'pagination', 'page', $total_match_count, $this->config['dir_show'], $start);
+
+			$this->template->assign_vars([
+				'SEARCH_MATCHES'      => $l_search_matches,
+				'SEARCH_WORDS'        => $keywords,
+
+				'TOTAL_MATCHES'        => $total_match_count,
+
+				'S_SELECT_SORT_DIR'        => $s_sort_dir,
+				'S_SELECT_SORT_KEY'        => $s_sort_key,
+				'S_SELECT_SORT_DAYS'       => $s_limit_days,
+				'S_SEARCH_ACTION'          => $u_search,
+
+				'U_DIR_SEARCH'            => $this->helper->route('ernadoo_phpbbdirectory_search_controller'),
+				'U_SEARCH_WORDS'          => $u_search,
+			]);
+
+			if ($cat_id) {
+				$this->template->assign_vars([
+					'SEARCH_CATEGORY'      => $this->user->lang('RETURN_TO', \ernadoo\phpbbdirectory\core\categorie::getname((int) $cat_id)),
+					'U_SEARCH_CATEGORY'    => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]),
+				]);
+			}
+
+			if ($sql_where) {
+				$sql_array = [
+					'SELECT'      => 'l.link_name, l.link_description, l.link_url, l.link_uid, l.link_bitfield, l.link_flags, l.link_view, l.link_user_id, l.link_time, l.link_comment, l.link_flag, l.link_id, l.link_thumb, l.link_banner, c.cat_name, u.user_id, u.username, u.user_colour',
+					'FROM'        => [
+							DIR_LINK_TABLE    => 'l', ],
+					'LEFT_JOIN'    => [
+							[
+								'FROM'    => [DIR_CAT_TABLE => 'c'],
+								'ON'      => 'l.link_cat = c.cat_id',
+							],
+							[
+								'FROM'    => [USERS_TABLE => 'u'],
+								'ON'      => 'u.user_id = l.link_user_id',
+							],
+					],
+					'WHERE'        => $sql_where, ];
+
+				$sql = $this->db->sql_build_query('SELECT', $sql_array);
+				$result = $this->db->sql_query($sql);
+
+				$rowset = $this->db->sql_fetchrowset($result);
+
+				if (count($rowset)) {
+					if ($hilit) {
+						// Remove bad highlights
+						$hilit_array = array_filter(explode('|', $hilit), 'strlen');
+						foreach ($hilit_array as $key => $value) {
+							$hilit_array[$key] = phpbb_clean_search_string($value);
+							$hilit_array[$key] = str_replace('\*', '\w*?', preg_quote($hilit_array[$key], '#'));
+							$hilit_array[$key] = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $hilit_array[$key]);
+						}
+						$hilit = implode('|', $hilit_array);
+					}
+
+					foreach ($rowset as $data) {
+						$s_banner = $this->link->display_bann($data);
+						$s_thumb = $this->link->display_thumb($data);
+						$s_flag = $this->link->display_flag($data);
+
+						$data['link_description'] = generate_text_for_display($data['link_description'], $data['link_uid'], $data['link_bitfield'], $data['link_flags']);
+
+						if ($hilit) {
+							$data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_name']);
+							$data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_description']);
+						}
+
+						$this->template->assign_block_vars('results', [
+							'S_SITE'           => $data['link_name'],
+							'S_DESCRIPTION'    => $data['link_description'],
+							'S_COUNT'          => $data['link_view'],
+							'S_CAT'            => $data['cat_name'],
+							'S_USER'           => get_username_string('full', $data['link_user_id'], $data['username'], $data['user_colour']),
+							'S_TIME'           => ($data['link_time'] != 0) ? $this->user->format_date($data['link_time']) : '',
+							'S_COMMENT'        => $data['link_comment'],
+
+							'THUMB'            => '<img src="'.$s_thumb.'" alt="'.$this->user->lang['DIR_THUMB'].'" title="'.$data['link_name'].'"/>',
+							'IMG_BANNER'       => $s_banner,
+							'IMG_FLAG'         => $s_flag,
+							'ON_CLICK'         => "onclick=\"window.open('".$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $data['link_id']])."'); return false;\"",
+
+							'L_DIR_SEARCH_NB_CLICKS'       => $this->user->lang('DIR_SEARCH_NB_CLICKS', (int) $data['link_view']),
+							'L_DIR_SEARCH_NB_COMMS'        => $this->user->lang('DIR_SEARCH_NB_COMMS', (int) $data['link_comment']),
+
+							'U_COMMENT'        => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $data['link_id']]),
+							'U_SITE'           => $data['link_url'],
+							'LINK_ID'          => $data['link_id'],
+						]);
+
+						if ($s_banner) {
+							$this->template->assign_block_vars('results.banner', []);
+						}
+
+						if ($this->config['dir_activ_flag']) {
+							$this->template->assign_block_vars('results.switch_dir_flag', []);
+						}
+					}
+					unset($rowset);
+
+					return $this->helper->render('search_results.html', $this->user->lang['DIR_MAKE_SEARCH']);
+				}
+			}
+		}
+
+		$s_catlist = $this->categorie->make_cat_select();
+
+		if (!$s_catlist) {
+			return $this->helper->message('NO_SEARCH');
+		}
+
+		$this->template->assign_vars([
+			'S_POST_ACTION'            => build_url(true),
+			'S_KEYWORD'                => $keywords,
+			'S_CATLIST'                => $s_catlist,
+			'S_SELECT_SORT_DIR'        => $s_sort_dir,
+			'S_SELECT_SORT_KEY'        => $s_sort_key,
+			'S_SELECT_SORT_DAYS'       => $s_limit_days,
+		]);
+
+		return $this->helper->render('search_body.html', $this->user->lang['DIR_MAKE_SEARCH']);
+	}
+
+	/**
+	 * @param array $search_category
+	 * @param bool  $search_child
+	 *
+	 * @return array Categories to exclude from search
+	 */
+	private function _get_exclude_categories(&$search_category, $search_child)
+	{
+		$sql = 'SELECT cat_id, parent_id, right_id
 				FROM '.DIR_CAT_TABLE.'
 				ORDER BY left_id';
-        $result = $this->db->sql_query($sql);
-
-        $right_id = 0;
-        $reset_search_category = true;
-        $ex_cid_ary = [];
-
-        while ($row = $this->db->sql_fetchrow($result)) {
-            if (count($search_category)) {
-                if ($search_child) {
-                    if (in_array($row['cat_id'], $search_category) && $row['right_id'] > $right_id) {
-                        $right_id = (int) $row['right_id'];
-                    } elseif ($row['right_id'] < $right_id) {
-                        continue;
-                    }
-                }
-
-                if (!in_array($row['cat_id'], $search_category)) {
-                    $ex_cid_ary[] = (int) $row['cat_id'];
-                    $reset_search_category = false;
-                }
-            }
-        }
-        $this->db->sql_freeresult($result);
-
-        if ($reset_search_category) {
-            $search_category = [];
-        }
-
-        return $ex_cid_ary;
-    }
+		$result = $this->db->sql_query($sql);
+
+		$right_id = 0;
+		$reset_search_category = true;
+		$ex_cid_ary = [];
+
+		while ($row = $this->db->sql_fetchrow($result)) {
+			if (count($search_category)) {
+				if ($search_child) {
+					if (in_array($row['cat_id'], $search_category) && $row['right_id'] > $right_id) {
+						$right_id = (int) $row['right_id'];
+					} elseif ($row['right_id'] < $right_id) {
+						continue;
+					}
+				}
+
+				if (!in_array($row['cat_id'], $search_category)) {
+					$ex_cid_ary[] = (int) $row['cat_id'];
+					$reset_search_category = false;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if ($reset_search_category) {
+			$search_category = [];
+		}
+
+		return $ex_cid_ary;
+	}
 }

Braces +48 added lines, -23 removed lines

@@ -91,7 +91,8 @@ 
      */
     public function main($page)
     {
-        if (!$this->auth->acl_get('u_search_dir')) {
+        if (!$this->auth->acl_get('u_search_dir'))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -115,7 +116,8 @@ 
         $sort_by_text = ['a' => $this->user->lang['AUTHOR'], 't' => $this->user->lang['POST_TIME'], 'r' => $this->user->lang['DIR_COMMENTS_ORDER'], 's' =>  $this->user->lang['DIR_NAME_ORDER'], 'v' => $this->user->lang['DIR_NB_CLICKS_ORDER']];
         $sort_by_sql = ['a' => 'u.username_clean', 't' => ['l.link_time', 'l.link_id'], 'r' => 'l.link_comment', 's' => 'LOWER(l.link_name)', 'v' => 'l.link_view'];
 
-        if ($this->config['dir_activ_pagerank']) {
+        if ($this->config['dir_activ_pagerank'])
+        {
             $sort_by_text['p'] = $this->user->lang['DIR_PR_ORDER'];
             $sort_by_sql['p'] = 'l.link_pagerank';
         }
@@ -128,12 +130,14 @@ 
         /*
         ** search form submited
         */
-        if ($this->request->is_set_post('submit') || $keywords) {
+        if ($this->request->is_set_post('submit') || $keywords)
+        {
             // clear arrays
             $id_ary = $u_search = [];
             $keywords_ary = ($keywords) ? explode(' ', $keywords) : [];
 
-            if (!count($keywords_ary)) {
+            if (!count($keywords_ary))
+            {
                 return $this->helper->message('DIR_ERROR_KEYWORD');
             }
 
@@ -143,9 +147,12 @@ 
 
             $l_search_matches = $this->user->lang('FOUND_SEARCH_MATCHES', (int) $total_match_count);
 
-            if (count($id_ary)) {
+            if (count($id_ary))
+            {
                 $sql_where = $this->db->sql_in_set('l.link_id', $id_ary);
-            } else {
+            }
+            else
+            {
                 return $this->helper->message('DIR_SEARCH_NO_RESULT');
             }
 
@@ -186,14 +193,16 @@ 
                 'U_SEARCH_WORDS'          => $u_search,
             ]);
 
-            if ($cat_id) {
+            if ($cat_id)
+            {
                 $this->template->assign_vars([
                     'SEARCH_CATEGORY'      => $this->user->lang('RETURN_TO', \ernadoo\phpbbdirectory\core\categorie::getname((int) $cat_id)),
                     'U_SEARCH_CATEGORY'    => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]),
                 ]);
             }
 
-            if ($sql_where) {
+            if ($sql_where)
+            {
                 $sql_array = [
                     'SELECT'      => 'l.link_name, l.link_description, l.link_url, l.link_uid, l.link_bitfield, l.link_flags, l.link_view, l.link_user_id, l.link_time, l.link_comment, l.link_flag, l.link_id, l.link_thumb, l.link_banner, c.cat_name, u.user_id, u.username, u.user_colour',
                     'FROM'        => [
@@ -215,11 +224,14 @@ 
 
                 $rowset = $this->db->sql_fetchrowset($result);
 
-                if (count($rowset)) {
-                    if ($hilit) {
+                if (count($rowset))
+                {
+                    if ($hilit)
+                    {
                         // Remove bad highlights
                         $hilit_array = array_filter(explode('|', $hilit), 'strlen');
-                        foreach ($hilit_array as $key => $value) {
+                        foreach ($hilit_array as $key => $value)
+                        {
                             $hilit_array[$key] = phpbb_clean_search_string($value);
                             $hilit_array[$key] = str_replace('\*', '\w*?', preg_quote($hilit_array[$key], '#'));
                             $hilit_array[$key] = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $hilit_array[$key]);
@@ -227,14 +239,16 @@ 
                         $hilit = implode('|', $hilit_array);
                     }
 
-                    foreach ($rowset as $data) {
+                    foreach ($rowset as $data)
+                    {
                         $s_banner = $this->link->display_bann($data);
                         $s_thumb = $this->link->display_thumb($data);
                         $s_flag = $this->link->display_flag($data);
 
                         $data['link_description'] = generate_text_for_display($data['link_description'], $data['link_uid'], $data['link_bitfield'], $data['link_flags']);
 
-                        if ($hilit) {
+                        if ($hilit)
+                        {
                             $data['link_name'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_name']);
                             $data['link_description'] = preg_replace('#(?!<.*)(?<!\w)('.$hilit.')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $data['link_description']);
                         }
@@ -261,11 +275,13 @@ 
                             'LINK_ID'          => $data['link_id'],
                         ]);
 
-                        if ($s_banner) {
+                        if ($s_banner)
+                        {
                             $this->template->assign_block_vars('results.banner', []);
                         }
 
-                        if ($this->config['dir_activ_flag']) {
+                        if ($this->config['dir_activ_flag'])
+                        {
                             $this->template->assign_block_vars('results.switch_dir_flag', []);
                         }
                     }
@@ -278,7 +294,8 @@ 
 
         $s_catlist = $this->categorie->make_cat_select();
 
-        if (!$s_catlist) {
+        if (!$s_catlist)
+        {
             return $this->helper->message('NO_SEARCH');
         }
 
@@ -311,17 +328,24 @@ 
         $reset_search_category = true;
         $ex_cid_ary = [];
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            if (count($search_category)) {
-                if ($search_child) {
-                    if (in_array($row['cat_id'], $search_category) && $row['right_id'] > $right_id) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
+            if (count($search_category))
+            {
+                if ($search_child)
+                {
+                    if (in_array($row['cat_id'], $search_category) && $row['right_id'] > $right_id)
+                    {
                         $right_id = (int) $row['right_id'];
-                    } elseif ($row['right_id'] < $right_id) {
+                    }
+                    elseif ($row['right_id'] < $right_id)
+                    {
                         continue;
                     }
                 }
 
-                if (!in_array($row['cat_id'], $search_category)) {
+                if (!in_array($row['cat_id'], $search_category))
+                {
                     $ex_cid_ary[] = (int) $row['cat_id'];
                     $reset_search_category = false;
                 }
@@ -329,7 +353,8 @@ 
         }
         $this->db->sql_freeresult($result);
 
-        if ($reset_search_category) {
+        if ($reset_search_category)
+        {
             $search_category = [];
         }
 

controller/links.php

Indentation +587 added lines, -587 removed lines

@@ -12,602 +12,602 @@
 
 class links
 {
-    private $link_user_id;
-    private $site_name;
-    private $url;
-    private $description;
-    private $guest_email;
-    private $rss;
-    private $banner;
-    private $back;
-    private $flag;
-
-    private $captcha;
-    private $s_hidden_fields = [];
-
-    /** @var \phpbb\db\driver\driver_interface */
-    protected $db;
-
-    /** @var \phpbb\config\config */
-    protected $config;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /** @var \phpbb\controller\helper */
-    protected $helper;
-
-    /** @var \phpbb\request\request */
-    protected $request;
-
-    /** @var \phpbb\auth\auth */
-    protected $auth;
-
-    /** @var \phpbb\captcha\factory */
-    protected $captcha_factory;
-
-    /** @var \ernadoo\phpbbdirectory\core\categorie */
-    protected $categorie;
-
-    /** @var \ernadoo\phpbbdirectory\core\link */
-    protected $link;
-
-    /** @var \ernadoo\phpbbdirectory\core\helper */
-    protected $dir_helper;
-
-    /** @var string phpBB root path */
-    protected $root_path;
-
-    /** @var string phpEx */
-    protected $php_ext;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface      $db              Database object
-     * @param \phpbb\config\config                   $config          Config object
-     * @param \phpbb\template\template               $template        Template object
-     * @param \phpbb\user                            $user            User object
-     * @param \phpbb\controller\helper               $helper          Controller helper object
-     * @param \phpbb\request\request                 $request         Request object
-     * @param \phpbb\auth\auth                       $auth            Auth object
-     * @param \phpbb\captcha\factory                 $captcha_factory Captcha object
-     * @param \ernadoo\phpbbdirectory\core\categorie $categorie       PhpBB Directory extension categorie object
-     * @param \ernadoo\phpbbdirectory\core\link      $link            PhpBB Directory extension link object
-     * @param \ernadoo\phpbbdirectory\core\helper    $dir_helper      PhpBB Directory extension helper object
-     * @param string                                 $root_path       phpBB root path
-     * @param string                                 $php_ext         phpEx
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
-    {
-        $this->db = $db;
-        $this->config = $config;
-        $this->template = $template;
-        $this->user = $user;
-        $this->helper = $helper;
-        $this->request = $request;
-        $this->auth = $auth;
-        $this->captcha_factory = $captcha_factory;
-        $this->categorie = $categorie;
-        $this->link = $link;
-        $this->dir_helper = $dir_helper;
-        $this->root_path = $root_path;
-        $this->php_ext = $php_ext;
-
-        $this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
-
-        $this->template->assign_vars([
-            'S_PHPBB_DIRECTORY'                => true,
-            'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
-        ]);
-    }
-
-    /**
-     * Delete a link.
-     *
-     * @param int $cat_id  The category ID
-     * @param int $link_id The link ID
-     *
-     * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function delete_link($cat_id, $link_id)
-    {
-        if ($this->request->is_set_post('cancel')) {
-            $redirect = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
-            redirect($redirect);
-        }
-
-        $sql = 'SELECT link_user_id
+	private $link_user_id;
+	private $site_name;
+	private $url;
+	private $description;
+	private $guest_email;
+	private $rss;
+	private $banner;
+	private $back;
+	private $flag;
+
+	private $captcha;
+	private $s_hidden_fields = [];
+
+	/** @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/** @var \phpbb\config\config */
+	protected $config;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/** @var \phpbb\controller\helper */
+	protected $helper;
+
+	/** @var \phpbb\request\request */
+	protected $request;
+
+	/** @var \phpbb\auth\auth */
+	protected $auth;
+
+	/** @var \phpbb\captcha\factory */
+	protected $captcha_factory;
+
+	/** @var \ernadoo\phpbbdirectory\core\categorie */
+	protected $categorie;
+
+	/** @var \ernadoo\phpbbdirectory\core\link */
+	protected $link;
+
+	/** @var \ernadoo\phpbbdirectory\core\helper */
+	protected $dir_helper;
+
+	/** @var string phpBB root path */
+	protected $root_path;
+
+	/** @var string phpEx */
+	protected $php_ext;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface      $db              Database object
+	 * @param \phpbb\config\config                   $config          Config object
+	 * @param \phpbb\template\template               $template        Template object
+	 * @param \phpbb\user                            $user            User object
+	 * @param \phpbb\controller\helper               $helper          Controller helper object
+	 * @param \phpbb\request\request                 $request         Request object
+	 * @param \phpbb\auth\auth                       $auth            Auth object
+	 * @param \phpbb\captcha\factory                 $captcha_factory Captcha object
+	 * @param \ernadoo\phpbbdirectory\core\categorie $categorie       PhpBB Directory extension categorie object
+	 * @param \ernadoo\phpbbdirectory\core\link      $link            PhpBB Directory extension link object
+	 * @param \ernadoo\phpbbdirectory\core\helper    $dir_helper      PhpBB Directory extension helper object
+	 * @param string                                 $root_path       phpBB root path
+	 * @param string                                 $php_ext         phpEx
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, \ernadoo\phpbbdirectory\core\helper $dir_helper, $root_path, $php_ext)
+	{
+		$this->db = $db;
+		$this->config = $config;
+		$this->template = $template;
+		$this->user = $user;
+		$this->helper = $helper;
+		$this->request = $request;
+		$this->auth = $auth;
+		$this->captcha_factory = $captcha_factory;
+		$this->categorie = $categorie;
+		$this->link = $link;
+		$this->dir_helper = $dir_helper;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+
+		$this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory');
+
+		$this->template->assign_vars([
+			'S_PHPBB_DIRECTORY'                => true,
+			'DIRECTORY_TRANSLATION_INFO'       => (!empty($user->lang['DIRECTORY_TRANSLATION_INFO'])) ? $user->lang['DIRECTORY_TRANSLATION_INFO'] : '',
+		]);
+	}
+
+	/**
+	 * Delete a link.
+	 *
+	 * @param int $cat_id  The category ID
+	 * @param int $link_id The link ID
+	 *
+	 * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function delete_link($cat_id, $link_id)
+	{
+		if ($this->request->is_set_post('cancel')) {
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
+			redirect($redirect);
+		}
+
+		$sql = 'SELECT link_user_id
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $link_id;
-        $result = $this->db->sql_query($sql);
-        $link_data = $this->db->sql_fetchrow($result);
-
-        if (empty($link_data)) {
-            throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
-        }
-
-        $delete_allowed = $this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $link_data['link_user_id'] && $this->auth->acl_get('u_delete_dir')));
-
-        if (!$delete_allowed) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        if (confirm_box(true)) {
-            $this->link->del($cat_id, $link_id);
-
-            $meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
-            meta_refresh(3, $meta_info);
-            $message = $this->user->lang['DIR_DELETE_OK'].'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
-
-            return $this->helper->message($message);
-        } else {
-            confirm_box(false, 'DIR_DELETE_SITE');
-        }
-    }
-
-    /**
-     * Edit a link.
-     *
-     * @param int $cat_id  The category ID
-     * @param int $link_id The link ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function edit_link($cat_id, $link_id)
-    {
-        $sql = 'SELECT link_user_id
+		$result = $this->db->sql_query($sql);
+		$link_data = $this->db->sql_fetchrow($result);
+
+		if (empty($link_data)) {
+			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
+		}
+
+		$delete_allowed = $this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $link_data['link_user_id'] && $this->auth->acl_get('u_delete_dir')));
+
+		if (!$delete_allowed) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		if (confirm_box(true)) {
+			$this->link->del($cat_id, $link_id);
+
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
+			meta_refresh(3, $meta_info);
+			$message = $this->user->lang['DIR_DELETE_OK'].'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
+
+			return $this->helper->message($message);
+		} else {
+			confirm_box(false, 'DIR_DELETE_SITE');
+		}
+	}
+
+	/**
+	 * Edit a link.
+	 *
+	 * @param int $cat_id  The category ID
+	 * @param int $link_id The link ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function edit_link($cat_id, $link_id)
+	{
+		$sql = 'SELECT link_user_id
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $link_id;
-        $result = $this->db->sql_query($sql);
-        $link_data = $this->db->sql_fetchrow($result);
-        $this->link_user_id = (int) $link_data['link_user_id'];
-
-        $edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == (int) $link_data['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
-
-        if (!$edit_allowed) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $cat_id = $this->request->variable('id', $cat_id);
-        $submit = $this->request->is_set_post('submit') ? true : false;
-        $refresh = $this->request->is_set_post('refresh_vc') ? true : false;
-        $title = $this->user->lang['DIR_EDIT_SITE'];
-
-        $this->template->assign_block_vars('dir_navlinks', [
-            'FORUM_NAME'      => $title,
-            'U_VIEW_FORUM'    => $this->helper->route('ernadoo_phpbbdirectory_edit_controller', ['cat_id' => (int) $cat_id, 'link_id' => $link_id]),
-        ]);
-
-        $this->categorie->get($cat_id);
-
-        // If form is done
-        if ($submit || $refresh) {
-            if (false != ($result = $this->_data_processing($cat_id, $link_id, 'edit'))) {
-                return $result;
-            }
-        } else {
-            $sql = 'SELECT link_id, link_uid, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
+		$result = $this->db->sql_query($sql);
+		$link_data = $this->db->sql_fetchrow($result);
+		$this->link_user_id = (int) $link_data['link_user_id'];
+
+		$edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == (int) $link_data['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
+
+		if (!$edit_allowed) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$cat_id = $this->request->variable('id', $cat_id);
+		$submit = $this->request->is_set_post('submit') ? true : false;
+		$refresh = $this->request->is_set_post('refresh_vc') ? true : false;
+		$title = $this->user->lang['DIR_EDIT_SITE'];
+
+		$this->template->assign_block_vars('dir_navlinks', [
+			'FORUM_NAME'      => $title,
+			'U_VIEW_FORUM'    => $this->helper->route('ernadoo_phpbbdirectory_edit_controller', ['cat_id' => (int) $cat_id, 'link_id' => $link_id]),
+		]);
+
+		$this->categorie->get($cat_id);
+
+		// If form is done
+		if ($submit || $refresh) {
+			if (false != ($result = $this->_data_processing($cat_id, $link_id, 'edit'))) {
+				return $result;
+			}
+		} else {
+			$sql = 'SELECT link_id, link_uid, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
 				FROM '.DIR_LINK_TABLE.'
 				WHERE link_id = '.(int) $link_id;
-            $result = $this->db->sql_query($sql);
-
-            $site = $this->db->sql_fetchrow($result);
-
-            if (empty($site['link_id'])) {
-                throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
-            }
-
-            $this->s_hidden_fields = [
-                'old_cat_id'    => $site['link_cat'],
-                'old_banner'    => $site['link_banner'],
-            ];
-
-            $site_description = generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
-            $site['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
-
-            $this->url = $site['link_url'];
-            $this->site_name = $site['link_name'];
-            $this->description = $site_description['text'];
-            $this->guest_email = $site['link_guest_email'];
-            $this->rss = $site['link_rss'];
-            $this->banner = $site['link_banner'];
-            $this->back = $site['link_back'];
-            $this->flag = $site['link_flag'];
-        }
-
-        $this->_populate_form($cat_id, 'edit', $title);
-
-        return $this->helper->render('add_site.html', $title);
-    }
-
-    /**
-     * Display add form.
-     *
-     * @param int $cat_id The category ID
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function new_link($cat_id)
-    {
-        if (!$this->auth->acl_get('u_submit_dir')) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $cat_id = $this->request->variable('id', $cat_id);
-        $submit = $this->request->is_set_post('submit') ? true : false;
-        $refresh = $this->request->is_set_post('refresh_vc') ? true : false;
-        $title = $this->user->lang['DIR_NEW_SITE'];
-
-        $this->template->assign_block_vars('dir_navlinks', [
-            'FORUM_NAME'      => $title,
-            'U_VIEW_FORUM'    => $this->helper->route('ernadoo_phpbbdirectory_new_controller', ['cat_id' => (int) $cat_id]),
-        ]);
-
-        $this->categorie->get($cat_id);
-
-        // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
-            $this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
-            $this->captcha->init(CONFIRM_POST);
-        }
-
-        // If form is done
-        if ($submit || $refresh) {
-            if (false != ($result = $this->_data_processing($cat_id))) {
-                return $result;
-            }
-        }
-
-        $this->_populate_form($cat_id, 'new', $title);
-
-        return $this->helper->render('add_site.html', $title);
-    }
-
-    /**
-     * View link controller.
-     *
-     * @param int $link_id The link ID
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function view_link($link_id)
-    {
-        return $this->link->view($link_id);
-    }
-
-    /**
-     * Vote for a link.
-     *
-     * @param int $cat_id  The category ID
-     * @param int $link_id The link ID
-     *
-     * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    public function vote_link($cat_id, $link_id)
-    {
-        $this->categorie->get($cat_id);
-
-        if (!$this->auth->acl_get('u_vote_dir') || !$this->categorie->data['cat_allow_votes']) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        $data = [
-            'vote_link_id'        => (int) $link_id,
-            'vote_user_id'        => (int) $this->user->data['user_id'],
-        ];
-
-        // We check if user had already vot for this website.
-        $sql = 'SELECT vote_link_id
+			$result = $this->db->sql_query($sql);
+
+			$site = $this->db->sql_fetchrow($result);
+
+			if (empty($site['link_id'])) {
+				throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
+			}
+
+			$this->s_hidden_fields = [
+				'old_cat_id'    => $site['link_cat'],
+				'old_banner'    => $site['link_banner'],
+			];
+
+			$site_description = generate_text_for_edit($site['link_description'], $site['link_uid'], $site['link_flags']);
+			$site['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $site['link_banner'])) ? $site['link_banner'] : '';
+
+			$this->url = $site['link_url'];
+			$this->site_name = $site['link_name'];
+			$this->description = $site_description['text'];
+			$this->guest_email = $site['link_guest_email'];
+			$this->rss = $site['link_rss'];
+			$this->banner = $site['link_banner'];
+			$this->back = $site['link_back'];
+			$this->flag = $site['link_flag'];
+		}
+
+		$this->_populate_form($cat_id, 'edit', $title);
+
+		return $this->helper->render('add_site.html', $title);
+	}
+
+	/**
+	 * Display add form.
+	 *
+	 * @param int $cat_id The category ID
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function new_link($cat_id)
+	{
+		if (!$this->auth->acl_get('u_submit_dir')) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$cat_id = $this->request->variable('id', $cat_id);
+		$submit = $this->request->is_set_post('submit') ? true : false;
+		$refresh = $this->request->is_set_post('refresh_vc') ? true : false;
+		$title = $this->user->lang['DIR_NEW_SITE'];
+
+		$this->template->assign_block_vars('dir_navlinks', [
+			'FORUM_NAME'      => $title,
+			'U_VIEW_FORUM'    => $this->helper->route('ernadoo_phpbbdirectory_new_controller', ['cat_id' => (int) $cat_id]),
+		]);
+
+		$this->categorie->get($cat_id);
+
+		// The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
+		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+			$this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
+			$this->captcha->init(CONFIRM_POST);
+		}
+
+		// If form is done
+		if ($submit || $refresh) {
+			if (false != ($result = $this->_data_processing($cat_id))) {
+				return $result;
+			}
+		}
+
+		$this->_populate_form($cat_id, 'new', $title);
+
+		return $this->helper->render('add_site.html', $title);
+	}
+
+	/**
+	 * View link controller.
+	 *
+	 * @param int $link_id The link ID
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function view_link($link_id)
+	{
+		return $this->link->view($link_id);
+	}
+
+	/**
+	 * Vote for a link.
+	 *
+	 * @param int $cat_id  The category ID
+	 * @param int $link_id The link ID
+	 *
+	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	public function vote_link($cat_id, $link_id)
+	{
+		$this->categorie->get($cat_id);
+
+		if (!$this->auth->acl_get('u_vote_dir') || !$this->categorie->data['cat_allow_votes']) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		$data = [
+			'vote_link_id'        => (int) $link_id,
+			'vote_user_id'        => (int) $this->user->data['user_id'],
+		];
+
+		// We check if user had already vot for this website.
+		$sql = 'SELECT vote_link_id
 			FROM '.DIR_VOTE_TABLE.'
 			WHERE '.$this->db->sql_build_array('SELECT', $data);
-        $result = $this->db->sql_query($sql);
-        $data = $this->db->sql_fetchrow($result);
-
-        if (!empty($data['vote_link_id'])) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_VOTE');
-        }
-
-        $this->link->add_vote($link_id);
-
-        $meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
-        meta_refresh(3, $meta_info);
-        $message = $this->user->lang['DIR_VOTE_OK'].'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
-
-        return $this->helper->message($message);
-    }
-
-    /**
-     * Routine.
-     *
-     * @param int    $cat_id  The category ID
-     * @param int    $link_id The link ID
-     * @param string $mode    add|edit
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
-     */
-    private function _data_processing($cat_id, $link_id = 0, $mode = 'new')
-    {
-        if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir'))) {
-            throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
-        }
-
-        if (!check_form_key('dir_form')) {
-            return $this->helper->message('FORM_INVALID');
-        }
-
-        $this->url = $this->request->variable('url', '');
-        $this->site_name = $this->request->variable('site_name', '', true);
-        $this->description = $this->request->variable('description', '', true);
-        $this->guest_email = $this->request->variable('guest_email', '');
-        $this->rss = $this->request->variable('rss', '');
-        $this->banner = $this->request->variable('banner', '');
-        $this->back = $this->request->variable('back', '');
-        $this->flag = $this->request->variable('flag', '');
-
-        if (!function_exists('validate_data')) {
-            include $this->root_path.'includes/functions_user.'.$this->php_ext;
-        }
-
-        // We define variables to check
-        $data = [
-            'email'            => $this->guest_email,
-            'site_name'        => $this->site_name,
-            'website'          => $this->url,
-            'description'      => $this->description,
-            'rss'              => $this->rss,
-            'banner'           => $this->banner,
-            'back'             => $this->back,
-            'cat'              => (int) $cat_id,
-        ];
-
-        // We define verification type for each variable
-        $data2 = [
-            'email'            => [
-                ['string', $this->user->data['is_registered'], 6, 60],
-                ['user_email', ''], ],
-            'site_name' => [
-                ['string', false, 1, 100], ],
-            'website'        => [
-                ['string',    false, 12, 255],
-                ['match',    true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
-            'description'    => [
-                ['string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe']], ],
-            'rss'            => [
-                ['string', true, 12, 255],
-                ['match',    empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
-            'banner'        => [
-                ['string', true, 5, 255], ],
-            'back'            => [
-                ['string',    !$this->categorie->data['cat_link_back'], 12, 255],
-                [[$this->link, 'link_back'], true], ],
-            'cat'            => [
-                ['num', '', 1], ],
-        ];
-
-        $this->user->add_lang('ucp');
-        $error = validate_data($data, $data2);
-        $error = array_map([$this->user, 'lang'], $error);
-
-        // We check that url have good format
-        if (preg_match('/^(http|https):\/\//si', $this->url) && $this->config['dir_activ_checkurl'] && !$this->link->checkurl($this->url)) {
-            $error[] = $this->user->lang['DIR_ERROR_CHECK_URL'];
-        }
-
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
-            $vc_response = $this->captcha->validate($data);
-            if ($vc_response !== false) {
-                $error[] = $vc_response;
-            }
-
-            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
-                $error[] = $this->user->lang['TOO_MANY_ADDS'];
-            }
-        }
-
-        if (!$error) {
-            /*
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
+
+		if (!empty($data['vote_link_id'])) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_VOTE');
+		}
+
+		$this->link->add_vote($link_id);
+
+		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
+		meta_refresh(3, $meta_info);
+		$message = $this->user->lang['DIR_VOTE_OK'].'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
+
+		return $this->helper->message($message);
+	}
+
+	/**
+	 * Routine.
+	 *
+	 * @param int    $cat_id  The category ID
+	 * @param int    $link_id The link ID
+	 * @param string $mode    add|edit
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null|\Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 */
+	private function _data_processing($cat_id, $link_id = 0, $mode = 'new')
+	{
+		if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir'))) {
+			throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
+		}
+
+		if (!check_form_key('dir_form')) {
+			return $this->helper->message('FORM_INVALID');
+		}
+
+		$this->url = $this->request->variable('url', '');
+		$this->site_name = $this->request->variable('site_name', '', true);
+		$this->description = $this->request->variable('description', '', true);
+		$this->guest_email = $this->request->variable('guest_email', '');
+		$this->rss = $this->request->variable('rss', '');
+		$this->banner = $this->request->variable('banner', '');
+		$this->back = $this->request->variable('back', '');
+		$this->flag = $this->request->variable('flag', '');
+
+		if (!function_exists('validate_data')) {
+			include $this->root_path.'includes/functions_user.'.$this->php_ext;
+		}
+
+		// We define variables to check
+		$data = [
+			'email'            => $this->guest_email,
+			'site_name'        => $this->site_name,
+			'website'          => $this->url,
+			'description'      => $this->description,
+			'rss'              => $this->rss,
+			'banner'           => $this->banner,
+			'back'             => $this->back,
+			'cat'              => (int) $cat_id,
+		];
+
+		// We define verification type for each variable
+		$data2 = [
+			'email'            => [
+				['string', $this->user->data['is_registered'], 6, 60],
+				['user_email', ''], ],
+			'site_name' => [
+				['string', false, 1, 100], ],
+			'website'        => [
+				['string',    false, 12, 255],
+				['match',    true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
+			'description'    => [
+				['string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe']], ],
+			'rss'            => [
+				['string', true, 12, 255],
+				['match',    empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
+			'banner'        => [
+				['string', true, 5, 255], ],
+			'back'            => [
+				['string',    !$this->categorie->data['cat_link_back'], 12, 255],
+				[[$this->link, 'link_back'], true], ],
+			'cat'            => [
+				['num', '', 1], ],
+		];
+
+		$this->user->add_lang('ucp');
+		$error = validate_data($data, $data2);
+		$error = array_map([$this->user, 'lang'], $error);
+
+		// We check that url have good format
+		if (preg_match('/^(http|https):\/\//si', $this->url) && $this->config['dir_activ_checkurl'] && !$this->link->checkurl($this->url)) {
+			$error[] = $this->user->lang['DIR_ERROR_CHECK_URL'];
+		}
+
+		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+			$vc_response = $this->captcha->validate($data);
+			if ($vc_response !== false) {
+				$error[] = $vc_response;
+			}
+
+			if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
+				$error[] = $this->user->lang['TOO_MANY_ADDS'];
+			}
+		}
+
+		if (!$error) {
+			/*
             * No errrors, we execute heavy tasks wich need a valid url
             */
 
-            // Banner
-            $this->link->banner_process($this->banner, $error);
-
-            // PageRank
-            $pagerank = $this->link->pagerank_process($this->url);
-
-            // Thumb ;)
-            $thumb = $this->link->thumb_process($this->url);
-        }
-
-        // Still no errors?? So let's go!
-        if (!$error) {
-            $this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
-            $this->url = $this->link->clean_url($this->url);
-
-            $data_edit = [
-                'link_user_id'         => $this->link_user_id,
-                'link_guest_email'     => $this->guest_email,
-                'link_name'            => $this->site_name,
-                'link_url'             => $this->url,
-                'link_description'     => $this->description,
-                'link_cat'             => (int) $cat_id,
-                'link_rss'             => $this->rss,
-                'link_banner'          => $this->banner,
-                'link_back'            => $this->back,
-                'link_uid'             => '',
-                'link_flags'           => 7,
-                'link_flag'            => $this->flag,
-                'link_bitfield'        => '',
-                'link_pagerank'        => (int) $pagerank,
-                'link_thumb'           => $thumb,
-            ];
-
-            if ($this->description) {
-                generate_text_for_storage($this->description, $data_edit['link_uid'], $data_edit['link_bitfield'], $data_edit['link_flags'], (bool) $this->config['allow_bbcode'], (bool) $this->config['allow_post_links'], (bool) $this->config['allow_smilies']);
-            }
-
-            $need_approval = ($this->categorie->need_approval() && !$this->auth->acl_get('a_') && !$this->auth->acl_get('m_')) ? true : false;
-
-            if ($mode == 'edit') {
-                $data_edit['link_cat_old'] = $this->request->variable('old_cat_id', 0);
-                $this->link->edit($data_edit, $link_id, $need_approval);
-            } else {
-                $data_add = [
-                    'link_time'            => time(),
-                    'link_view'            => 0,
-                    'link_active'          => $need_approval ? false : true,
-                    'link_user_id'         => $this->user->data['user_id'],
-                ];
-
-                $data_add = array_merge($data_edit, $data_add);
-
-                $this->link->add($data_add, $need_approval);
-            }
-
-            $meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
-            meta_refresh(3, $meta_info);
-            $message = ($need_approval) ? $this->user->lang['DIR_'.strtoupper($mode).'_SITE_ACTIVE'] : $this->user->lang['DIR_'.strtoupper($mode).'_SITE_OK'];
-            $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
-
-            return $this->helper->message($message);
-        } else {
-            if ($mode == 'edit') {
-                $this->s_hidden_fields = [
-                    'old_cat_id'    => $this->request->variable('old_cat_id', 0),
-                    'old_banner'    => $this->request->variable('old_banner', ''),
-                ];
-            }
-
-            $this->template->assign_vars([
-                'ERROR'    => (isset($error)) ? implode('<br />', $error) : '',
-            ]);
-        }
-    }
-
-    /**
-     * Display a banner.
-     *
-     * @param string $banner_img Path to banner file
-     *
-     * @return Response object
-     */
-    public function return_banner($banner_img)
-    {
-        if (!function_exists('file_gc')) {
-            include $this->root_path.'includes/functions_download.'.$this->php_ext;
-        }
-
-        $file_path = $this->dir_helper->get_banner_path($banner_img);
-
-        if ((@file_exists($file_path) && @is_readable($file_path))) {
-            $response = new BinaryFileResponse($file_path);
-            $response->setContentDisposition('inline', $banner_img);
-
-            // Without fileinfo extension, Symfony is unable to guess the mime type
-            if (!extension_loaded('fileinfo')) {
-                $image_data = @getimagesize($file_path);
-                $response->headers->set('Content-Type', image_type_to_mime_type($image_data[2]));
-            }
-        } else {
-            $response = new Response();
-            $response->setStatusCode(404);
-        }
-        file_gc(false);
-
-        return $response;
-    }
-
-    /**
-     * Populate form when an error occurred.
-     *
-     * @param int    $cat_id The category ID
-     * @param string $mode   add|edit
-     * @param string $title  Page title (depends of $mode)
-     *
-     * @return null
-     */
-    private function _populate_form($cat_id, $mode, $title)
-    {
-        global $phpbb_extension_manager;
-
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode == 'new') {
-            $this->s_hidden_fields = array_merge($this->s_hidden_fields, $this->captcha->get_hidden_fields());
-
-            $this->user->add_lang('ucp');
-
-            $this->template->assign_vars([
-                'CAPTCHA_TEMPLATE'        => $this->captcha->get_template(),
-            ]);
-        }
-
-        $this->user->add_lang('posting');
-
-        if (!function_exists('display_custom_bbcodes')) {
-            include $this->root_path.'includes/functions_display.'.$this->php_ext;
-        }
-        display_custom_bbcodes();
-        add_form_key('dir_form');
-
-        $ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
-        $flag_path = $ext_path.'images/flags/';
-
-        $s_guest = (!$this->user->data['is_registered'] || !empty($this->guest_email));
-        $s_rss = $this->config['dir_activ_rss'];
-        $s_banner = $this->config['dir_activ_banner'];
-        $s_back = $this->categorie->data['cat_link_back'];
-        $s_flag = $this->config['dir_activ_flag'];
-
-        $this->template->assign_vars([
-            'BBCODE_STATUS'            => ($this->config['allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
-            'IMG_STATUS'               => ($this->config['allow_bbcode']) ? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
-            'SMILIES_STATUS'           => ($this->config['allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
-            'URL_STATUS'               => ($this->config['allow_post_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
-            'FLASH_STATUS'             => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
-
-            'L_TITLE'                  => $title,
-            'L_DIR_DESCRIPTION_EXP'    => $this->user->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),
-            'L_DIR_SUBMIT_TYPE'        => $this->categorie->dir_submit_type($this->categorie->need_approval()),
-            'L_DIR_SITE_BANN_EXP'      => $this->user->lang('DIR_SITE_BANN_EXP', $this->config['dir_banner_width'], $this->config['dir_banner_height']),
-
-            'S_GUEST'                  => $s_guest ? true : false,
-            'S_RSS'                    => $s_rss ? true : false,
-            'S_BANNER'                 => $s_banner ? true : false,
-            'S_BACK'                   => $s_back ? true : false,
-            'S_FLAG'                   => $s_flag ? true : false,
-            'S_BBCODE_ALLOWED'         => (bool) $this->config['allow_bbcode'],
-            'S_BBCODE_IMG'             => (bool) $this->config['allow_bbcode'],
-            'S_BBCODE_FLASH'           => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? true : false,
-            'S_BBCODE_QUOTE'           => true,
-            'S_LINKS_ALLOWED'          => (bool) $this->config['allow_post_links'],
-
-            'DIR_FLAG_PATH'            => $flag_path,
-            'DIR_FLAG_IMAGE'           => $this->flag ? $this->dir_helper->get_img_path('flags', $this->flag) : '',
-
-            'EDIT_MODE'                => ($mode == 'edit') ? true : false,
-
-            'SITE_NAME'                => isset($this->site_name) ? $this->site_name : '',
-            'SITE_URL'                 => isset($this->url) ? $this->url : '',
-            'DESCRIPTION'              => isset($this->description) ? $this->description : '',
-            'GUEST_EMAIL'              => isset($this->guest_email) ? $this->guest_email : '',
-            'RSS'                      => isset($this->rss) ? $this->rss : '',
-            'BANNER'                   => isset($this->banner) ? $this->banner : '',
-            'BACK'                     => isset($this->back) ? $this->back : '',
-            'S_POST_ACTION'            => '',
-            'S_CATLIST'                => $this->categorie->make_cat_select($cat_id),
-            'S_LIST_FLAG'              => $this->link->get_dir_flag_list($flag_path, $this->flag),
-            'S_DESC_STAR'              => (@$this->categorie->data['cat_must_describe']) ? '*' : '',
-            'S_ROOT'                   => $cat_id,
-            'S_HIDDEN_FIELDS'          => build_hidden_fields($this->s_hidden_fields),
-        ]);
-    }
+			// Banner
+			$this->link->banner_process($this->banner, $error);
+
+			// PageRank
+			$pagerank = $this->link->pagerank_process($this->url);
+
+			// Thumb ;)
+			$thumb = $this->link->thumb_process($this->url);
+		}
+
+		// Still no errors?? So let's go!
+		if (!$error) {
+			$this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
+			$this->url = $this->link->clean_url($this->url);
+
+			$data_edit = [
+				'link_user_id'         => $this->link_user_id,
+				'link_guest_email'     => $this->guest_email,
+				'link_name'            => $this->site_name,
+				'link_url'             => $this->url,
+				'link_description'     => $this->description,
+				'link_cat'             => (int) $cat_id,
+				'link_rss'             => $this->rss,
+				'link_banner'          => $this->banner,
+				'link_back'            => $this->back,
+				'link_uid'             => '',
+				'link_flags'           => 7,
+				'link_flag'            => $this->flag,
+				'link_bitfield'        => '',
+				'link_pagerank'        => (int) $pagerank,
+				'link_thumb'           => $thumb,
+			];
+
+			if ($this->description) {
+				generate_text_for_storage($this->description, $data_edit['link_uid'], $data_edit['link_bitfield'], $data_edit['link_flags'], (bool) $this->config['allow_bbcode'], (bool) $this->config['allow_post_links'], (bool) $this->config['allow_smilies']);
+			}
+
+			$need_approval = ($this->categorie->need_approval() && !$this->auth->acl_get('a_') && !$this->auth->acl_get('m_')) ? true : false;
+
+			if ($mode == 'edit') {
+				$data_edit['link_cat_old'] = $this->request->variable('old_cat_id', 0);
+				$this->link->edit($data_edit, $link_id, $need_approval);
+			} else {
+				$data_add = [
+					'link_time'            => time(),
+					'link_view'            => 0,
+					'link_active'          => $need_approval ? false : true,
+					'link_user_id'         => $this->user->data['user_id'],
+				];
+
+				$data_add = array_merge($data_edit, $data_add);
+
+				$this->link->add($data_add, $need_approval);
+			}
+
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
+			meta_refresh(3, $meta_info);
+			$message = ($need_approval) ? $this->user->lang['DIR_'.strtoupper($mode).'_SITE_ACTIVE'] : $this->user->lang['DIR_'.strtoupper($mode).'_SITE_OK'];
+			$message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
+
+			return $this->helper->message($message);
+		} else {
+			if ($mode == 'edit') {
+				$this->s_hidden_fields = [
+					'old_cat_id'    => $this->request->variable('old_cat_id', 0),
+					'old_banner'    => $this->request->variable('old_banner', ''),
+				];
+			}
+
+			$this->template->assign_vars([
+				'ERROR'    => (isset($error)) ? implode('<br />', $error) : '',
+			]);
+		}
+	}
+
+	/**
+	 * Display a banner.
+	 *
+	 * @param string $banner_img Path to banner file
+	 *
+	 * @return Response object
+	 */
+	public function return_banner($banner_img)
+	{
+		if (!function_exists('file_gc')) {
+			include $this->root_path.'includes/functions_download.'.$this->php_ext;
+		}
+
+		$file_path = $this->dir_helper->get_banner_path($banner_img);
+
+		if ((@file_exists($file_path) && @is_readable($file_path))) {
+			$response = new BinaryFileResponse($file_path);
+			$response->setContentDisposition('inline', $banner_img);
+
+			// Without fileinfo extension, Symfony is unable to guess the mime type
+			if (!extension_loaded('fileinfo')) {
+				$image_data = @getimagesize($file_path);
+				$response->headers->set('Content-Type', image_type_to_mime_type($image_data[2]));
+			}
+		} else {
+			$response = new Response();
+			$response->setStatusCode(404);
+		}
+		file_gc(false);
+
+		return $response;
+	}
+
+	/**
+	 * Populate form when an error occurred.
+	 *
+	 * @param int    $cat_id The category ID
+	 * @param string $mode   add|edit
+	 * @param string $title  Page title (depends of $mode)
+	 *
+	 * @return null
+	 */
+	private function _populate_form($cat_id, $mode, $title)
+	{
+		global $phpbb_extension_manager;
+
+		if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode == 'new') {
+			$this->s_hidden_fields = array_merge($this->s_hidden_fields, $this->captcha->get_hidden_fields());
+
+			$this->user->add_lang('ucp');
+
+			$this->template->assign_vars([
+				'CAPTCHA_TEMPLATE'        => $this->captcha->get_template(),
+			]);
+		}
+
+		$this->user->add_lang('posting');
+
+		if (!function_exists('display_custom_bbcodes')) {
+			include $this->root_path.'includes/functions_display.'.$this->php_ext;
+		}
+		display_custom_bbcodes();
+		add_form_key('dir_form');
+
+		$ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
+		$flag_path = $ext_path.'images/flags/';
+
+		$s_guest = (!$this->user->data['is_registered'] || !empty($this->guest_email));
+		$s_rss = $this->config['dir_activ_rss'];
+		$s_banner = $this->config['dir_activ_banner'];
+		$s_back = $this->categorie->data['cat_link_back'];
+		$s_flag = $this->config['dir_activ_flag'];
+
+		$this->template->assign_vars([
+			'BBCODE_STATUS'            => ($this->config['allow_bbcode']) ? $this->user->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->user->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'               => ($this->config['allow_bbcode']) ? $this->user->lang['IMAGES_ARE_ON'] : $this->user->lang['IMAGES_ARE_OFF'],
+			'SMILIES_STATUS'           => ($this->config['allow_smilies']) ? $this->user->lang['SMILIES_ARE_ON'] : $this->user->lang['SMILIES_ARE_OFF'],
+			'URL_STATUS'               => ($this->config['allow_post_links']) ? $this->user->lang['URL_IS_ON'] : $this->user->lang['URL_IS_OFF'],
+			'FLASH_STATUS'             => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->user->lang['FLASH_IS_ON'] : $this->user->lang['FLASH_IS_OFF'],
+
+			'L_TITLE'                  => $title,
+			'L_DIR_DESCRIPTION_EXP'    => $this->user->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),
+			'L_DIR_SUBMIT_TYPE'        => $this->categorie->dir_submit_type($this->categorie->need_approval()),
+			'L_DIR_SITE_BANN_EXP'      => $this->user->lang('DIR_SITE_BANN_EXP', $this->config['dir_banner_width'], $this->config['dir_banner_height']),
+
+			'S_GUEST'                  => $s_guest ? true : false,
+			'S_RSS'                    => $s_rss ? true : false,
+			'S_BANNER'                 => $s_banner ? true : false,
+			'S_BACK'                   => $s_back ? true : false,
+			'S_FLAG'                   => $s_flag ? true : false,
+			'S_BBCODE_ALLOWED'         => (bool) $this->config['allow_bbcode'],
+			'S_BBCODE_IMG'             => (bool) $this->config['allow_bbcode'],
+			'S_BBCODE_FLASH'           => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? true : false,
+			'S_BBCODE_QUOTE'           => true,
+			'S_LINKS_ALLOWED'          => (bool) $this->config['allow_post_links'],
+
+			'DIR_FLAG_PATH'            => $flag_path,
+			'DIR_FLAG_IMAGE'           => $this->flag ? $this->dir_helper->get_img_path('flags', $this->flag) : '',
+
+			'EDIT_MODE'                => ($mode == 'edit') ? true : false,
+
+			'SITE_NAME'                => isset($this->site_name) ? $this->site_name : '',
+			'SITE_URL'                 => isset($this->url) ? $this->url : '',
+			'DESCRIPTION'              => isset($this->description) ? $this->description : '',
+			'GUEST_EMAIL'              => isset($this->guest_email) ? $this->guest_email : '',
+			'RSS'                      => isset($this->rss) ? $this->rss : '',
+			'BANNER'                   => isset($this->banner) ? $this->banner : '',
+			'BACK'                     => isset($this->back) ? $this->back : '',
+			'S_POST_ACTION'            => '',
+			'S_CATLIST'                => $this->categorie->make_cat_select($cat_id),
+			'S_LIST_FLAG'              => $this->link->get_dir_flag_list($flag_path, $this->flag),
+			'S_DESC_STAR'              => (@$this->categorie->data['cat_must_describe']) ? '*' : '',
+			'S_ROOT'                   => $cat_id,
+			'S_HIDDEN_FIELDS'          => build_hidden_fields($this->s_hidden_fields),
+		]);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -378,17 +378,17 @@
             'site_name' => [
                 ['string', false, 1, 100], ],
             'website'        => [
-                ['string',    false, 12, 255],
-                ['match',    true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
+                ['string', false, 12, 255],
+                ['match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
             'description'    => [
                 ['string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe']], ],
             'rss'            => [
                 ['string', true, 12, 255],
-                ['match',    empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
+                ['match', empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i'], ],
             'banner'        => [
                 ['string', true, 5, 255], ],
             'back'            => [
-                ['string',    !$this->categorie->data['cat_link_back'], 12, 255],
+                ['string', !$this->categorie->data['cat_link_back'], 12, 255],
                 [[$this->link, 'link_back'], true], ],
             'cat'            => [
                 ['num', '', 1], ],

Braces +77 added lines, -36 removed lines

@@ -115,7 +115,8 @@ 
      */
     public function delete_link($cat_id, $link_id)
     {
-        if ($this->request->is_set_post('cancel')) {
+        if ($this->request->is_set_post('cancel'))
+        {
             $redirect = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
             redirect($redirect);
         }
@@ -126,17 +127,20 @@ 
         $result = $this->db->sql_query($sql);
         $link_data = $this->db->sql_fetchrow($result);
 
-        if (empty($link_data)) {
+        if (empty($link_data))
+        {
             throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
         }
 
         $delete_allowed = $this->user->data['is_registered'] && ($this->auth->acl_get('m_delete_dir') || ($this->user->data['user_id'] == $link_data['link_user_id'] && $this->auth->acl_get('u_delete_dir')));
 
-        if (!$delete_allowed) {
+        if (!$delete_allowed)
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
-        if (confirm_box(true)) {
+        if (confirm_box(true))
+        {
             $this->link->del($cat_id, $link_id);
 
             $meta_info = $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]);
@@ -144,7 +148,9 @@ 
             $message = $this->user->lang['DIR_DELETE_OK'].'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
 
             return $this->helper->message($message);
-        } else {
+        }
+        else
+        {
             confirm_box(false, 'DIR_DELETE_SITE');
         }
     }
@@ -170,7 +176,8 @@ 
 
         $edit_allowed = ($this->user->data['is_registered'] && ($this->auth->acl_get('m_edit_dir') || ($this->user->data['user_id'] == (int) $link_data['link_user_id'] && $this->auth->acl_get('u_edit_dir'))));
 
-        if (!$edit_allowed) {
+        if (!$edit_allowed)
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -187,11 +194,15 @@ 
         $this->categorie->get($cat_id);
 
         // If form is done
-        if ($submit || $refresh) {
-            if (false != ($result = $this->_data_processing($cat_id, $link_id, 'edit'))) {
+        if ($submit || $refresh)
+        {
+            if (false != ($result = $this->_data_processing($cat_id, $link_id, 'edit')))
+            {
                 return $result;
             }
-        } else {
+        }
+        else
+        {
             $sql = 'SELECT link_id, link_uid, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
 				FROM '.DIR_LINK_TABLE.'
 				WHERE link_id = '.(int) $link_id;
@@ -199,7 +210,8 @@ 
 
             $site = $this->db->sql_fetchrow($result);
 
-            if (empty($site['link_id'])) {
+            if (empty($site['link_id']))
+            {
                 throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
             }
 
@@ -237,7 +249,8 @@ 
      */
     public function new_link($cat_id)
     {
-        if (!$this->auth->acl_get('u_submit_dir')) {
+        if (!$this->auth->acl_get('u_submit_dir'))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -254,14 +267,17 @@ 
         $this->categorie->get($cat_id);
 
         // The CAPTCHA kicks in here. We can't help that the information gets lost on language change.
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'])
+        {
             $this->captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']);
             $this->captcha->init(CONFIRM_POST);
         }
 
         // If form is done
-        if ($submit || $refresh) {
-            if (false != ($result = $this->_data_processing($cat_id))) {
+        if ($submit || $refresh)
+        {
+            if (false != ($result = $this->_data_processing($cat_id)))
+            {
                 return $result;
             }
         }
@@ -295,7 +311,8 @@ 
     {
         $this->categorie->get($cat_id);
 
-        if (!$this->auth->acl_get('u_vote_dir') || !$this->categorie->data['cat_allow_votes']) {
+        if (!$this->auth->acl_get('u_vote_dir') || !$this->categorie->data['cat_allow_votes'])
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
@@ -311,7 +328,8 @@ 
         $result = $this->db->sql_query($sql);
         $data = $this->db->sql_fetchrow($result);
 
-        if (!empty($data['vote_link_id'])) {
+        if (!empty($data['vote_link_id']))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_VOTE');
         }
 
@@ -337,11 +355,13 @@ 
      */
     private function _data_processing($cat_id, $link_id = 0, $mode = 'new')
     {
-        if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir'))) {
+        if (($mode == 'edit' && !$this->auth->acl_get('m_edit_dir') && !$this->auth->acl_get('u_edit_dir')) || ($mode == 'new' && !$this->auth->acl_get('u_submit_dir')))
+        {
             throw new \phpbb\exception\http_exception(403, 'DIR_ERROR_NOT_AUTH');
         }
 
-        if (!check_form_key('dir_form')) {
+        if (!check_form_key('dir_form'))
+        {
             return $this->helper->message('FORM_INVALID');
         }
 
@@ -354,7 +374,8 @@ 
         $this->back = $this->request->variable('back', '');
         $this->flag = $this->request->variable('flag', '');
 
-        if (!function_exists('validate_data')) {
+        if (!function_exists('validate_data'))
+        {
             include $this->root_path.'includes/functions_user.'.$this->php_ext;
         }
 
@@ -399,22 +420,27 @@ 
         $error = array_map([$this->user, 'lang'], $error);
 
         // We check that url have good format
-        if (preg_match('/^(http|https):\/\//si', $this->url) && $this->config['dir_activ_checkurl'] && !$this->link->checkurl($this->url)) {
+        if (preg_match('/^(http|https):\/\//si', $this->url) && $this->config['dir_activ_checkurl'] && !$this->link->checkurl($this->url))
+        {
             $error[] = $this->user->lang['DIR_ERROR_CHECK_URL'];
         }
 
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm']) {
+        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'])
+        {
             $vc_response = $this->captcha->validate($data);
-            if ($vc_response !== false) {
+            if ($vc_response !== false)
+            {
                 $error[] = $vc_response;
             }
 
-            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts']) {
+            if ($this->config['dir_visual_confirm_max_attempts'] && $this->captcha->get_attempt_count() > $this->config['dir_visual_confirm_max_attempts'])
+            {
                 $error[] = $this->user->lang['TOO_MANY_ADDS'];
             }
         }
 
-        if (!$error) {
+        if (!$error)
+        {
             /*
             * No errrors, we execute heavy tasks wich need a valid url
             */
@@ -430,7 +456,8 @@ 
         }
 
         // Still no errors?? So let's go!
-        if (!$error) {
+        if (!$error)
+        {
             $this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
             $this->url = $this->link->clean_url($this->url);
 
@@ -452,16 +479,20 @@ 
                 'link_thumb'           => $thumb,
             ];
 
-            if ($this->description) {
+            if ($this->description)
+            {
                 generate_text_for_storage($this->description, $data_edit['link_uid'], $data_edit['link_bitfield'], $data_edit['link_flags'], (bool) $this->config['allow_bbcode'], (bool) $this->config['allow_post_links'], (bool) $this->config['allow_smilies']);
             }
 
             $need_approval = ($this->categorie->need_approval() && !$this->auth->acl_get('a_') && !$this->auth->acl_get('m_')) ? true : false;
 
-            if ($mode == 'edit') {
+            if ($mode == 'edit')
+            {
                 $data_edit['link_cat_old'] = $this->request->variable('old_cat_id', 0);
                 $this->link->edit($data_edit, $link_id, $need_approval);
-            } else {
+            }
+            else
+            {
                 $data_add = [
                     'link_time'            => time(),
                     'link_view'            => 0,
@@ -480,8 +511,11 @@ 
             $message = $message.'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->user->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $cat_id]).'">', '</a>');
 
             return $this->helper->message($message);
-        } else {
-            if ($mode == 'edit') {
+        }
+        else
+        {
+            if ($mode == 'edit')
+            {
                 $this->s_hidden_fields = [
                     'old_cat_id'    => $this->request->variable('old_cat_id', 0),
                     'old_banner'    => $this->request->variable('old_banner', ''),
@@ -503,22 +537,27 @@ 
      */
     public function return_banner($banner_img)
     {
-        if (!function_exists('file_gc')) {
+        if (!function_exists('file_gc'))
+        {
             include $this->root_path.'includes/functions_download.'.$this->php_ext;
         }
 
         $file_path = $this->dir_helper->get_banner_path($banner_img);
 
-        if ((@file_exists($file_path) && @is_readable($file_path))) {
+        if ((@file_exists($file_path) && @is_readable($file_path)))
+        {
             $response = new BinaryFileResponse($file_path);
             $response->setContentDisposition('inline', $banner_img);
 
             // Without fileinfo extension, Symfony is unable to guess the mime type
-            if (!extension_loaded('fileinfo')) {
+            if (!extension_loaded('fileinfo'))
+            {
                 $image_data = @getimagesize($file_path);
                 $response->headers->set('Content-Type', image_type_to_mime_type($image_data[2]));
             }
-        } else {
+        }
+        else
+        {
             $response = new Response();
             $response->setStatusCode(404);
         }
@@ -540,7 +579,8 @@ 
     {
         global $phpbb_extension_manager;
 
-        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode == 'new') {
+        if (!$this->user->data['is_registered'] && $this->config['dir_visual_confirm'] && $mode == 'new')
+        {
             $this->s_hidden_fields = array_merge($this->s_hidden_fields, $this->captcha->get_hidden_fields());
 
             $this->user->add_lang('ucp');
@@ -552,7 +592,8 @@ 
 
         $this->user->add_lang('posting');
 
-        if (!function_exists('display_custom_bbcodes')) {
+        if (!function_exists('display_custom_bbcodes'))
+        {
             include $this->root_path.'includes/functions_display.'.$this->php_ext;
         }
         display_custom_bbcodes();