ErnadoO / ext-phpbb-directory

core/link.php

Indentation +1074 added lines, -1074 removed lines

@@ -9,1126 +9,1126 @@
 
 class link
 {
-    /** @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\notification\manager */
-    protected $notification;
-
-    /** @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\notification\manager         $notification Notification 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\notification\manager $notification, \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->notification = $notification;
-        $this->dir_helper = $dir_helper;
-        $this->root_path = $root_path;
-        $this->php_ext = $php_ext;
-    }
-
-    /**
-     * Add a link into db.
-     *
-     * @param array $data          Contains all data to insert in db
-     * @param bool  $need_approval Links needs to be approved?
-     *
-     * @return null
-     */
-    public function add($data, $need_approval)
-    {
-        $notification_data = [];
-
-        $this->db->sql_transaction('begin');
-
-        $sql = 'INSERT INTO '.DIR_LINK_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
-        $this->db->sql_query($sql);
-        $notification_data['link_id'] = $this->db->sql_nextid();
-
-        if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_')) {
-            $sql = 'UPDATE '.DIR_CAT_TABLE.'
+	/** @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\notification\manager */
+	protected $notification;
+
+	/** @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\notification\manager         $notification Notification 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\notification\manager $notification, \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->notification = $notification;
+		$this->dir_helper = $dir_helper;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
+	}
+
+	/**
+	 * Add a link into db.
+	 *
+	 * @param array $data          Contains all data to insert in db
+	 * @param bool  $need_approval Links needs to be approved?
+	 *
+	 * @return null
+	 */
+	public function add($data, $need_approval)
+	{
+		$notification_data = [];
+
+		$this->db->sql_transaction('begin');
+
+		$sql = 'INSERT INTO '.DIR_LINK_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
+		$this->db->sql_query($sql);
+		$notification_data['link_id'] = $this->db->sql_nextid();
+
+		if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_')) {
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = '.(int) $data['link_cat'];
-            $this->db->sql_query($sql);
-
-            $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
-        } elseif ($this->config['dir_mail']) {
-            $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
-        }
-
-        $this->db->sql_transaction('commit');
-
-        if (isset($notification_type)) {
-            $notification_data = array_merge($notification_data,
-                [
-                    'user_from'            => (int) $data['link_user_id'],
-                    'link_name'            => $data['link_name'],
-                    'link_url'             => $data['link_url'],
-                    'link_description'     => $data['link_description'],
-                    'cat_id'               => (int) $data['link_cat'],
-                    'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
-                ]
-            );
-
-            $this->notification->add_notifications($notification_type, $notification_data);
-        }
-    }
-
-    /**
-     * Edit a link of the db.
-     *
-     * @param array $data          Contains all data to edit in db
-     * @param int   $link_id       is link's id, for WHERE clause
-     * @param bool  $need_approval Links needs to be approved?
-     *
-     * @return null
-     */
-    public function edit($data, $link_id, $need_approval)
-    {
-        $notification_data = [
-            'link_id'              => (int) $link_id,
-            'user_from'            => (int) $data['link_user_id'],
-            'link_name'            => $data['link_name'],
-            'link_description'     => $data['link_description'],
-            'cat_id'               => (int) $data['link_cat'],
-            'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
-        ];
-
-        $old_cat = array_pop($data);
-
-        if ($old_cat != $data['link_cat'] || $need_approval) {
-            $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website', (int) $link_id);
-
-            $this->db->sql_transaction('begin');
-
-            $sql = 'UPDATE '.DIR_CAT_TABLE.'
+			$this->db->sql_query($sql);
+
+			$notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
+		} elseif ($this->config['dir_mail']) {
+			$notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
+		}
+
+		$this->db->sql_transaction('commit');
+
+		if (isset($notification_type)) {
+			$notification_data = array_merge($notification_data,
+				[
+					'user_from'            => (int) $data['link_user_id'],
+					'link_name'            => $data['link_name'],
+					'link_url'             => $data['link_url'],
+					'link_description'     => $data['link_description'],
+					'cat_id'               => (int) $data['link_cat'],
+					'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
+				]
+			);
+
+			$this->notification->add_notifications($notification_type, $notification_data);
+		}
+	}
+
+	/**
+	 * Edit a link of the db.
+	 *
+	 * @param array $data          Contains all data to edit in db
+	 * @param int   $link_id       is link's id, for WHERE clause
+	 * @param bool  $need_approval Links needs to be approved?
+	 *
+	 * @return null
+	 */
+	public function edit($data, $link_id, $need_approval)
+	{
+		$notification_data = [
+			'link_id'              => (int) $link_id,
+			'user_from'            => (int) $data['link_user_id'],
+			'link_name'            => $data['link_name'],
+			'link_description'     => $data['link_description'],
+			'cat_id'               => (int) $data['link_cat'],
+			'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
+		];
+
+		$old_cat = array_pop($data);
+
+		if ($old_cat != $data['link_cat'] || $need_approval) {
+			$this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website', (int) $link_id);
+
+			$this->db->sql_transaction('begin');
+
+			$sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links - 1
 				WHERE cat_id = '.(int) $old_cat;
-            $this->db->sql_query($sql);
+			$this->db->sql_query($sql);
 
-            if (!$need_approval) {
-                $sql = 'UPDATE '.DIR_CAT_TABLE.'
+			if (!$need_approval) {
+				$sql = 'UPDATE '.DIR_CAT_TABLE.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = '.(int) $data['link_cat'];
-                $this->db->sql_query($sql);
+				$this->db->sql_query($sql);
 
-                $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
-            } else {
-                $data['link_active'] = false;
-                $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
-            }
+				$notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
+			} else {
+				$data['link_active'] = false;
+				$notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
+			}
 
-            $this->db->sql_transaction('commit');
+			$this->db->sql_transaction('commit');
 
-            $this->notification->add_notifications($notification_type, $notification_data);
-        }
+			$this->notification->add_notifications($notification_type, $notification_data);
+		}
 
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET '.$this->db->sql_build_array('UPDATE', $data).'
 			WHERE link_id = '.(int) $link_id;
-        $this->db->sql_query($sql);
-    }
-
-    /**
-     * Delete a link of the db.
-     *
-     * @param int   $cat_id  The category ID
-     * @param mixed $link_id Link's id, for WHERE clause
-     *
-     * @return null
-     */
-    public function del($cat_id, $link_id)
-    {
-        $this->db->sql_transaction('begin');
-
-        $url_array = is_array($link_id) ? $link_id : [$link_id];
-
-        // Delete links datas
-        $link_datas_ary = [
-            DIR_LINK_TABLE        => 'link_id',
-            DIR_COMMENT_TABLE     => 'comment_link_id',
-            DIR_VOTE_TABLE        => 'vote_link_id',
-        ];
-
-        $sql = 'SELECT link_banner
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	 * Delete a link of the db.
+	 *
+	 * @param int   $cat_id  The category ID
+	 * @param mixed $link_id Link's id, for WHERE clause
+	 *
+	 * @return null
+	 */
+	public function del($cat_id, $link_id)
+	{
+		$this->db->sql_transaction('begin');
+
+		$url_array = is_array($link_id) ? $link_id : [$link_id];
+
+		// Delete links datas
+		$link_datas_ary = [
+			DIR_LINK_TABLE        => 'link_id',
+			DIR_COMMENT_TABLE     => 'comment_link_id',
+			DIR_VOTE_TABLE        => 'vote_link_id',
+		];
+
+		$sql = 'SELECT link_banner
 			FROM '.DIR_LINK_TABLE.'
 			WHERE '.$this->db->sql_in_set('link_id', $url_array);
-        $result = $this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            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']));
+		while ($row = $this->db->sql_fetchrow($result)) {
+			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);
-                }
-            }
-        }
+				if (file_exists($banner_img)) {
+					@unlink($banner_img);
+				}
+			}
+		}
 
-        foreach ($link_datas_ary as $table => $field) {
-            $this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
-        }
+		foreach ($link_datas_ary as $table => $field) {
+			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
+		}
 
-        $sql = 'UPDATE '.DIR_CAT_TABLE.'
+		$sql = 'UPDATE '.DIR_CAT_TABLE.'
 			SET cat_links = cat_links - '.count($url_array).'
 			WHERE cat_id = '.(int) $cat_id;
-        $this->db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-        $this->db->sql_transaction('commit');
+		$this->db->sql_transaction('commit');
 
-        foreach ($url_array as $link_id) {
-            $this->notification->delete_notifications([
-                'ernadoo.phpbbdirectory.notification.type.directory_website',
-                'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
-            ], $link_id);
-        }
+		foreach ($url_array as $link_id) {
+			$this->notification->delete_notifications([
+				'ernadoo.phpbbdirectory.notification.type.directory_website',
+				'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
+			], $link_id);
+		}
 
-        if ($this->request->is_ajax()) {
-            $sql = 'SELECT cat_links
+		if ($this->request->is_ajax()) {
+			$sql = 'SELECT cat_links
 				FROM '.DIR_CAT_TABLE.'
 				WHERE cat_id = '.(int) $cat_id;
-            $result = $this->db->sql_query($sql);
-            $data = $this->db->sql_fetchrow($result);
-
-            $json_response = new \phpbb\json_response();
-            $json_response->send([
-                'success' => true,
-
-                'MESSAGE_TITLE'    => $this->user->lang['INFORMATION'],
-                'MESSAGE_TEXT'     => $this->user->lang['DIR_DELETE_OK'],
-                'LINK_ID'          => $link_id,
-                'TOTAL_LINKS'      => $this->user->lang('DIR_NB_LINKS', (int) $data['cat_links']),
-            ]);
-        }
-    }
-
-    /**
-     * Increments link view counter.
-     *
-     * @param int $link_id Link's id, for WHERE clause
-     *
-     * @throws \phpbb\exception\http_exception
-     *
-     * @return null
-     */
-    public function view($link_id)
-    {
-        $sql = 'SELECT link_id, link_url
+			$result = $this->db->sql_query($sql);
+			$data = $this->db->sql_fetchrow($result);
+
+			$json_response = new \phpbb\json_response();
+			$json_response->send([
+				'success' => true,
+
+				'MESSAGE_TITLE'    => $this->user->lang['INFORMATION'],
+				'MESSAGE_TEXT'     => $this->user->lang['DIR_DELETE_OK'],
+				'LINK_ID'          => $link_id,
+				'TOTAL_LINKS'      => $this->user->lang('DIR_NB_LINKS', (int) $data['cat_links']),
+			]);
+		}
+	}
+
+	/**
+	 * Increments link view counter.
+	 *
+	 * @param int $link_id Link's id, for WHERE clause
+	 *
+	 * @throws \phpbb\exception\http_exception
+	 *
+	 * @return null
+	 */
+	public function view($link_id)
+	{
+		$sql = 'SELECT link_id, link_url
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $link_id;
-        $result = $this->db->sql_query($sql);
-        $data = $this->db->sql_fetchrow($result);
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
 
-        if (empty($data['link_id'])) {
-            throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
-        }
+		if (empty($data['link_id'])) {
+			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
+		}
 
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_view = link_view + 1
 			WHERE link_id = '.(int) $link_id;
-        $this->db->sql_query($sql);
-
-        redirect($data['link_url'], false, true);
-    }
-
-    /**
-     * Verify that an URL exist before add into db.
-     *
-     * @param string $url The URL to check
-     *
-     * @return bool True if url is reachable, else false.
-     */
-    public function checkurl($url)
-    {
-        $details = parse_url($url);
-
-        $default_port = 80;
-        $hostname = $details['host'];
-
-        if ($details['scheme'] == 'https') {
-            $default_port = 443;
-            $hostname = 'tls://'.$details['host'];
-        }
-
-        if (!isset($details['path'])) {
-            $details['path'] = '/';
-        }
-
-        $port = (isset($details['port']) && !empty($details['port'])) ? (int) $details['port'] : $default_port;
-
-        if ($sock = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
-            $requete = 'GET '.$details['path']." HTTP/1.1\r\n";
-            $requete .= 'Host: '.$details['host']."\r\n\r\n";
-
-            // Send a HTTP GET header
-            fwrite($sock, $requete);
-            // answer from server
-            $str = fgets($sock, 1024);
-            preg_match("'HTTP/1\.. (.*) (.*)'U", $str, $parts);
-            fclose($sock);
-
-            return !($parts[1] == '404');
-        }
-
-        return false;
-    }
-
-    /**
-     * Delete the final '/', if no path.
-     *
-     * @param string $url URL to clean
-     *
-     * @return string $url	The correct string.
-     */
-    public function clean_url($url)
-    {
-        $details = parse_url($url);
-
-        if (isset($details['path']) && $details['path'] == '/' && !isset($details['query'])) {
-            return substr($url, 0, -1);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Display a flag.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return string Flag path.
-     */
-    public function display_flag($data)
-    {
-        global $phpbb_extension_manager;
-
-        $ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
-        $flag_path = $ext_path.'images/flags/';
-        $img_flag = 'no_flag.png';
-
-        if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag'])) {
-            $img_flag = $data['link_flag'];
-        }
-
-        return $this->dir_helper->get_img_path('flags', $img_flag);
-    }
-
-    /**
-     * Calculate the link's note.
-     *
-     * @param int  $total_note   Sum of all link's notes
-     * @param int  $nb_vote      Number of votes
-     * @param bool $votes_status Votes are enable in this category?
-     *
-     * @return string $note			The calculated note.
-     */
-    public function display_note($total_note, $nb_vote, $votes_status)
-    {
-        if (!$votes_status) {
-            return;
-        }
-
-        $note = ($nb_vote < 1) ? '' : $total_note / $nb_vote;
-        $note = (strlen($note) > 2) ? number_format($note, 1) : $note;
-
-        return ($nb_vote) ? $this->user->lang('DIR_FROM_TEN', $note) : $this->user->lang['DIR_NO_NOTE'];
-    }
-
-    /**
-     * Display the vote form for auth users.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return null|string Html combo list or nothing if votes are not available.
-     */
-    public function display_vote($data)
-    {
-        if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id'])) {
-            $list = '<select name="vote">';
-            for ($i = 0; $i <= 10; $i++) {
-                $list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
-            }
-            $list .= '</select>';
-
-            return $list;
-        }
-    }
-
-    /**
-     * Display the RSS icon.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return null|string RSS feed URL or nothing.
-     */
-    public function display_rss($data)
-    {
-        if ($this->config['dir_activ_rss'] && !empty($data['link_rss'])) {
-            return $data['link_rss'];
-        }
-    }
-
-    /**
-     * Display link's thumb if thumb service enabled.
-     * if thumb don't exists in db or if a new service was choosen in acp
-     * thumb is research.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return string|null Thumb or null.
-     */
-    public function display_thumb($data)
-    {
-        if ($this->config['dir_activ_thumb']) {
-            if (!$data['link_thumb'] || ($this->config['dir_thumb_service_reverse'] && (!strstr($data['link_thumb'], 'ascreen.jpg') && (!strstr($data['link_thumb'], $this->config['dir_thumb_service']))))) {
-                $thumb = $this->thumb_process($data['link_url']);
-
-                $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$this->db->sql_query($sql);
+
+		redirect($data['link_url'], false, true);
+	}
+
+	/**
+	 * Verify that an URL exist before add into db.
+	 *
+	 * @param string $url The URL to check
+	 *
+	 * @return bool True if url is reachable, else false.
+	 */
+	public function checkurl($url)
+	{
+		$details = parse_url($url);
+
+		$default_port = 80;
+		$hostname = $details['host'];
+
+		if ($details['scheme'] == 'https') {
+			$default_port = 443;
+			$hostname = 'tls://'.$details['host'];
+		}
+
+		if (!isset($details['path'])) {
+			$details['path'] = '/';
+		}
+
+		$port = (isset($details['port']) && !empty($details['port'])) ? (int) $details['port'] : $default_port;
+
+		if ($sock = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
+			$requete = 'GET '.$details['path']." HTTP/1.1\r\n";
+			$requete .= 'Host: '.$details['host']."\r\n\r\n";
+
+			// Send a HTTP GET header
+			fwrite($sock, $requete);
+			// answer from server
+			$str = fgets($sock, 1024);
+			preg_match("'HTTP/1\.. (.*) (.*)'U", $str, $parts);
+			fclose($sock);
+
+			return !($parts[1] == '404');
+		}
+
+		return false;
+	}
+
+	/**
+	 * Delete the final '/', if no path.
+	 *
+	 * @param string $url URL to clean
+	 *
+	 * @return string $url	The correct string.
+	 */
+	public function clean_url($url)
+	{
+		$details = parse_url($url);
+
+		if (isset($details['path']) && $details['path'] == '/' && !isset($details['query'])) {
+			return substr($url, 0, -1);
+		}
+
+		return $url;
+	}
+
+	/**
+	 * Display a flag.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return string Flag path.
+	 */
+	public function display_flag($data)
+	{
+		global $phpbb_extension_manager;
+
+		$ext_path = $phpbb_extension_manager->get_extension_path('ernadoo/phpbbdirectory', false);
+		$flag_path = $ext_path.'images/flags/';
+		$img_flag = 'no_flag.png';
+
+		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag'])) {
+			$img_flag = $data['link_flag'];
+		}
+
+		return $this->dir_helper->get_img_path('flags', $img_flag);
+	}
+
+	/**
+	 * Calculate the link's note.
+	 *
+	 * @param int  $total_note   Sum of all link's notes
+	 * @param int  $nb_vote      Number of votes
+	 * @param bool $votes_status Votes are enable in this category?
+	 *
+	 * @return string $note			The calculated note.
+	 */
+	public function display_note($total_note, $nb_vote, $votes_status)
+	{
+		if (!$votes_status) {
+			return;
+		}
+
+		$note = ($nb_vote < 1) ? '' : $total_note / $nb_vote;
+		$note = (strlen($note) > 2) ? number_format($note, 1) : $note;
+
+		return ($nb_vote) ? $this->user->lang('DIR_FROM_TEN', $note) : $this->user->lang['DIR_NO_NOTE'];
+	}
+
+	/**
+	 * Display the vote form for auth users.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return null|string Html combo list or nothing if votes are not available.
+	 */
+	public function display_vote($data)
+	{
+		if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id'])) {
+			$list = '<select name="vote">';
+			for ($i = 0; $i <= 10; $i++) {
+				$list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
+			}
+			$list .= '</select>';
+
+			return $list;
+		}
+	}
+
+	/**
+	 * Display the RSS icon.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return null|string RSS feed URL or nothing.
+	 */
+	public function display_rss($data)
+	{
+		if ($this->config['dir_activ_rss'] && !empty($data['link_rss'])) {
+			return $data['link_rss'];
+		}
+	}
+
+	/**
+	 * Display link's thumb if thumb service enabled.
+	 * if thumb don't exists in db or if a new service was choosen in acp
+	 * thumb is research.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return string|null Thumb or null.
+	 */
+	public function display_thumb($data)
+	{
+		if ($this->config['dir_activ_thumb']) {
+			if (!$data['link_thumb'] || ($this->config['dir_thumb_service_reverse'] && (!strstr($data['link_thumb'], 'ascreen.jpg') && (!strstr($data['link_thumb'], $this->config['dir_thumb_service']))))) {
+				$thumb = $this->thumb_process($data['link_url']);
+
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_thumb = "'.$this->db->sql_escape($thumb).'"
 					WHERE link_id = '.(int) $data['link_id'];
-                $this->db->sql_query($sql);
-
-                return $thumb;
-            }
-
-            return $data['link_thumb'];
-        }
-    }
-
-    /**
-     * Display and calculate PageRank if needed.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return string Pagerank, 'n/a' or false
-     */
-    public function display_pagerank($data)
-    {
-        if ($this->config['dir_activ_pagerank']) {
-            if ($data['link_pagerank'] == '') {
-                $pagerank = $this->pagerank_process($data['link_url']);
-
-                $sql = 'UPDATE '.DIR_LINK_TABLE.'
+				$this->db->sql_query($sql);
+
+				return $thumb;
+			}
+
+			return $data['link_thumb'];
+		}
+	}
+
+	/**
+	 * Display and calculate PageRank if needed.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return string Pagerank, 'n/a' or false
+	 */
+	public function display_pagerank($data)
+	{
+		if ($this->config['dir_activ_pagerank']) {
+			if ($data['link_pagerank'] == '') {
+				$pagerank = $this->pagerank_process($data['link_url']);
+
+				$sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_pagerank = '.(int) $pagerank.'
 					WHERE link_id = '.(int) $data['link_id'];
-                $this->db->sql_query($sql);
-            } else {
-                $pagerank = (int) $data['link_pagerank'];
-            }
-
-            $prpos = 40 * $pagerank / 10;
-            $prneg = 40 - $prpos;
-            $html = '<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
-
-            $pagerank = $pagerank == '-1' ? $this->user->lang['DIR_PAGERANK_NOT_AVAILABLE'] : $this->user->lang('DIR_FROM_TEN', $pagerank);
-
-            return $html.$pagerank;
-        }
-
-        return false;
-    }
-
-    /**
-     * Display and resize a banner.
-     *
-     * @param array $data link's data from db
-     *
-     * @return string $s_banner	html code.
-     */
-    public function display_bann($data)
-    {
-        $s_banner = '';
-
-        if (!empty($data['link_banner'])) {
-            if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $data['link_banner'])) {
-                $img_src = $this->helper->route('ernadoo_phpbbdirectory_banner_controller', ['banner_img' => $data['link_banner']]);
-                $physical_path = $this->dir_helper->get_banner_path($data['link_banner']);
-            } else {
-                $img_src = $physical_path = $data['link_banner'];
-            }
-
-            list($width, $height) = @getimagesize($physical_path);
-            if (($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height']) && $this->config['dir_banner_width'] > 0 && $this->config['dir_banner_height'] > 0) {
-                $coef_w = $width / $this->config['dir_banner_width'];
-                $coef_h = $height / $this->config['dir_banner_height'];
-                $coef_max = max($coef_w, $coef_h);
-                $width /= $coef_max;
-                $height /= $coef_max;
-            }
-
-            $s_banner = '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
-        }
-
-        return $s_banner;
-    }
-
-    /**
-     * Add a vote in db, for a specifi link.
-     *
-     * @param int $link_id Link_id from db
-     *
-     * @return null
-     */
-    public function add_vote($link_id)
-    {
-        $data = [
-            'vote_link_id'         => (int) $link_id,
-            'vote_user_id'         => $this->user->data['user_id'],
-            'vote_note'            => $this->request->variable('vote', 0),
-        ];
-
-        $this->db->sql_transaction('begin');
-
-        $sql = 'INSERT INTO '.DIR_VOTE_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
-        $this->db->sql_query($sql);
-
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+				$this->db->sql_query($sql);
+			} else {
+				$pagerank = (int) $data['link_pagerank'];
+			}
+
+			$prpos = 40 * $pagerank / 10;
+			$prneg = 40 - $prpos;
+			$html = '<img src="http://www.google.com/images/pos.gif" width="'.$prpos.'" height="4" alt="'.$pagerank.'" /><img src="http://www.google.com/images/neg.gif" width="'.$prneg.'" height="4" alt="'.$pagerank.'" /> ';
+
+			$pagerank = $pagerank == '-1' ? $this->user->lang['DIR_PAGERANK_NOT_AVAILABLE'] : $this->user->lang('DIR_FROM_TEN', $pagerank);
+
+			return $html.$pagerank;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Display and resize a banner.
+	 *
+	 * @param array $data link's data from db
+	 *
+	 * @return string $s_banner	html code.
+	 */
+	public function display_bann($data)
+	{
+		$s_banner = '';
+
+		if (!empty($data['link_banner'])) {
+			if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $data['link_banner'])) {
+				$img_src = $this->helper->route('ernadoo_phpbbdirectory_banner_controller', ['banner_img' => $data['link_banner']]);
+				$physical_path = $this->dir_helper->get_banner_path($data['link_banner']);
+			} else {
+				$img_src = $physical_path = $data['link_banner'];
+			}
+
+			list($width, $height) = @getimagesize($physical_path);
+			if (($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height']) && $this->config['dir_banner_width'] > 0 && $this->config['dir_banner_height'] > 0) {
+				$coef_w = $width / $this->config['dir_banner_width'];
+				$coef_h = $height / $this->config['dir_banner_height'];
+				$coef_max = max($coef_w, $coef_h);
+				$width /= $coef_max;
+				$height /= $coef_max;
+			}
+
+			$s_banner = '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+		}
+
+		return $s_banner;
+	}
+
+	/**
+	 * Add a vote in db, for a specifi link.
+	 *
+	 * @param int $link_id Link_id from db
+	 *
+	 * @return null
+	 */
+	public function add_vote($link_id)
+	{
+		$data = [
+			'vote_link_id'         => (int) $link_id,
+			'vote_user_id'         => $this->user->data['user_id'],
+			'vote_note'            => $this->request->variable('vote', 0),
+		];
+
+		$this->db->sql_transaction('begin');
+
+		$sql = 'INSERT INTO '.DIR_VOTE_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_vote = link_vote + 1,
 			link_note = link_note + '.(int) $data['vote_note'].'
 		WHERE link_id = '.(int) $link_id;
-        $this->db->sql_query($sql);
-
-        $this->db->sql_transaction('commit');
-
-        if ($this->request->is_ajax()) {
-            $sql = 'SELECT link_vote, link_note FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $link_id;
-            $result = $this->db->sql_query($sql);
-            $data = $this->db->sql_fetchrow($result);
-
-            $note = $this->display_note($data['link_note'], $data['link_vote'], true);
-
-            $json_response = new \phpbb\json_response();
-            $json_response->send([
-                'success' => true,
-
-                'MESSAGE_TITLE'    => $this->user->lang['INFORMATION'],
-                'MESSAGE_TEXT'     => $this->user->lang['DIR_VOTE_OK'],
-                'NOTE'             => $note,
-                'NB_VOTE'          => $this->user->lang('DIR_NB_VOTES', (int) $data['link_vote']),
-                'LINK_ID'          => $link_id,
-            ]);
-        }
-    }
-
-    /**
-     * Search an appropriate thumb for url.
-     *
-     * @param string $url Link's url
-     *
-     * @return string The thumb url
-     */
-    public function thumb_process($url)
-    {
-        if (!$this->config['dir_activ_thumb']) {
-            return $this->root_path.'images/directory/nothumb.gif';
-        }
-
-        $details = parse_url($url);
-
-        $root_url = $details['scheme'].'://'.$details['host'];
-        $absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
-
-        if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host'])) {
-            return $root_url.'/ascreen.jpg';
-        }
-
-        return $this->config['dir_thumb_service'].$absolute_url;
-    }
-
-    /**
-     * Check if ascreen thumb exists.
-     *
-     * @param string $protocol The protocol
-     * @param string $host     The hostname
-     *
-     * @return bool True if ascreen file exixts, else false
-     */
-    private function _ascreen_exist($protocol, $host)
-    {
-        if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg')) {
-            // Obviously this is an image, we did some additional tests
-            if ($thumb_info[0] == '120' && $thumb_info[1] == '90' && $thumb_info['mime'] == 'image/jpeg') {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Primary work on banner, can edit, copy or check a banner.
-     *
-     * @param string $banner The banner's remote url
-     * @param array  $error  The array error, passed by reference
-     *
-     * @return null
-     */
-    public function banner_process(&$banner, &$error)
-    {
-        $old_banner = $this->request->variable('old_banner', '');
-
-        $destination = $this->dir_helper->get_banner_path();
-
-        // Can we upload?
-        $can_upload = ($this->config['dir_storage_banner'] && file_exists($this->root_path.$destination) && phpbb_is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
-
-        if ($banner && $can_upload) {
-            $file = $this->_banner_upload($banner, $error);
-        } elseif ($banner) {
-            $file = $this->_banner_remote($banner, $error);
-        } elseif ($this->request->is_set_post('delete_banner') && $old_banner) {
-            $this->_banner_delete($old_banner);
-
-            return;
-        }
-
-        if (!count($error)) {
-            if ($banner && $old_banner && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $old_banner)) {
-                $this->_banner_delete($old_banner);
-            }
-
-            $banner = !empty($file) ? $file : '';
-        }
-    }
-
-    /**
-     * Copy a remonte banner to server.
-     * called by banner_process().
-     *
-     * @param string $banner The anner's remote url
-     * @param array  $error  The array error, passed by reference
-     *
-     * @return false|string String if no errors, else false
-     */
-    private function _banner_upload($banner, &$error)
-    {
-        // Init upload class
-        if (!class_exists('fileupload')) {
-            include $this->root_path.'includes/functions_upload.'.$this->php_ext;
-        }
-        $upload = new \fileupload('DIR_BANNER_', ['jpg', 'jpeg', 'gif', 'png'], $this->config['dir_banner_filesize']);
-
-        $file = $upload->remote_upload($banner);
-
-        $prefix = unique_id().'_';
-        $file->clean_filename('real', $prefix);
-
-        $destination = $this->dir_helper->get_banner_path();
-
-        // Move file and overwrite any existing image
-        $file->move_file($destination, true);
-
-        if (count($file->error)) {
-            $file->remove();
-            $error = array_merge($error, $file->error);
-
-            return false;
-        }
-
-        return $prefix.strtolower($file->uploadname);
-    }
-
-    /**
-     * Check than remote banner exists
-     * called by banner_process().
-     *
-     * @param string $banner The banner's remote url
-     * @param array  $error  The array error, passed by reference
-     *
-     * @return false|string String if no errors, else false
-     */
-    private function _banner_remote($banner, &$error)
-    {
-        if (!preg_match('#^(http|https|ftp)://#i', $banner)) {
-            $banner = 'http://'.$banner;
-        }
-        if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner)) {
-            $error[] = $this->user->lang['DIR_BANNER_URL_INVALID'];
-
-            return false;
-        }
-
-        // Make sure getimagesize works...
-        if (($image_data = @getimagesize($banner)) === false) {
-            $error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
-
-            return false;
-        }
-
-        if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2)) {
-            $error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
-
-            return false;
-        }
-
-        $width = $image_data[0];
-        $height = $image_data[1];
-
-        // Check image type
-        if (!class_exists('fileupload')) {
-            include $this->root_path.'includes/functions_upload.'.$this->php_ext;
-        }
-
-        $types = \fileupload::image_types();
-        $extension = strtolower(\filespec::get_extension($banner));
-
-        // Check if this is actually an image
-        if ($file_stream = @fopen($banner, 'r')) {
-            // Timeout after 1 second
-            stream_set_timeout($file_stream, 1);
-            // read some data to ensure headers are present
-            fread($file_stream, 1024);
-            $meta = stream_get_meta_data($file_stream);
-            if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers'])) {
-                $headers = $meta['wrapper_data']['headers'];
-            } elseif (isset($meta['wrapper_data']) && is_array($meta['wrapper_data'])) {
-                $headers = $meta['wrapper_data'];
-            } else {
-                $headers = [];
-            }
-
-            foreach ($headers as $header) {
-                $header = preg_split('/ /', $header, 2);
-                if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type') {
-                    if (strpos($header[1], 'image/') !== 0) {
-                        $error[] = 'DIR_BANNER_URL_INVALID';
-                        fclose($file_stream);
-
-                        return false;
-                    } else {
-                        fclose($file_stream);
-                        break;
-                    }
-                }
-            }
-        } else {
-            $error[] = 'DIR_BANNER_URL_INVALID';
-
-            return false;
-        }
-
-        if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) {
-            if (!isset($types[$image_data[2]])) {
-                $error[] = $this->user->lang['UNABLE_GET_IMAGE_SIZE'];
-            } else {
-                $error[] = $this->user->lang('DIR_BANNER_IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
-            }
-
-            return false;
-        }
-
-        if (($this->config['dir_banner_width'] || $this->config['dir_banner_height']) && ($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height'])) {
-            $error[] = $this->user->lang('DIR_BANNER_WRONG_SIZE', $this->config['dir_banner_width'], $this->config['dir_banner_height'], $width, $height);
-
-            return false;
-        }
-
-        return $banner;
-    }
-
-    /**
-     * Delete a banner from server.
-     *
-     * @param string $file The file's name
-     *
-     * @return bool True if delete success, else false
-     */
-    private function _banner_delete($file)
-    {
-        if (file_exists($this->dir_helper->get_banner_path($file))) {
-            @unlink($this->dir_helper->get_banner_path($file));
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * PageRank Lookup (Based on Google Toolbar for Mozilla Firefox).
-     *
-     * @copyright 2012 HM2K <hm2k@php.net>
-     *
-     * @link http://pagerank.phurix.net/
-     *
-     * @author James Wade <hm2k@php.net>
-     *
-     * @version $Revision: 2.1 $
-     * @require PHP 4.3.0 (file_get_contents)
-     * @updated 06/10/11
-     *
-     * @param string $q The website URL
-     *
-     * @return string The calculated pagerank, or -1
-     */
-    public function pagerank_process($q)
-    {
-        $googleDomains = ['.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch'];
-        $seed = $this->user->lang['SEED'];
-        $result = 0x01020345;
-        $len = strlen($q);
-
-        for ($i = 0; $i < $len; $i++) {
-            $result ^= ord($seed[$i % strlen($seed)]) ^ ord($q[$i]);
-            $result = (($result >> 23) & 0x1ff) | $result << 9;
-        }
-
-        if (PHP_INT_MAX != 2147483647) {
-            $result = -(~($result & 0xFFFFFFFF) + 1);
-        }
-
-        $ch = sprintf('8%x', $result);
-        $url = 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
-        $host = 'toolbarqueries.google'.$googleDomains[mt_rand(0, count($googleDomains) - 1)];
-
-        $url = sprintf($url, $host, $ch, $q);
-        @$pr = trim(file_get_contents($url, false));
-
-        if (is_numeric(substr(strrchr($pr, ':'), 1))) {
-            return substr(strrchr($pr, ':'), 1);
-        }
-
-        return '-1';
-    }
-
-    /**
-     * List flags.
-     *
-     * @param string $flag_path The flag directory path
-     * @param string $value     Selected flag
-     *
-     * @return string $list		Html code
-     */
-    public function get_dir_flag_list($flag_path, $value)
-    {
-        $list = '';
-
-        $this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory_flags');
-
-        $flags = $this->dir_helper->preg_grep_keys('/^DIR_FLAG_CODE_/i', $this->user->lang);
-
-        if (extension_loaded('intl')) {
-            $locale = $this->user->lang['USER_LANG'];
-
-            $col = new \Collator($locale);
-            $col->asort($flags);
-        } else {
-            asort($flags);
-        }
-
-        foreach ($flags as $file => $name) {
-            $img_file = strtolower(substr(strrchr($file, '_'), 1)).'.png';
-
-            if (file_exists($flag_path.$img_file)) {
-                $list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Display recents links added.
-     *
-     * @return null
-     */
-    public function recents()
-    {
-        if ($this->config['dir_recent_block']) {
-            $limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-            $exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
-
-            $sql_array = [
-                'SELECT'      => 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
-                'FROM'        => [
-                        DIR_LINK_TABLE    => 'l', ],
-                'LEFT_JOIN'    => [
-                        [
-                            'FROM'    => [USERS_TABLE    => 'u'],
-                            'ON'      => 'l.link_user_id = u.user_id',
-                        ],
-                        [
-                            'FROM'    => [DIR_CAT_TABLE => 'c'],
-                            'ON'      => 'l.link_cat = c.cat_id',
-                        ],
-                ],
-                'WHERE'        => $this->db->sql_in_set('l.link_cat', $exclude_array, true).' AND l.link_active = 1',
-                'ORDER_BY'     => 'l.link_time DESC, l.link_id DESC', ];
-
-            $sql = $this->db->sql_build_query('SELECT', $sql_array);
-            $result = $this->db->sql_query_limit($sql, $limit_sql, 0);
-            $num = 0;
-            $rowset = [];
-
-            while ($site = $this->db->sql_fetchrow($result)) {
-                $rowset[$site['link_id']] = $site;
-            }
-            $this->db->sql_freeresult($result);
-
-            if (count($rowset)) {
-                $this->template->assign_block_vars('block', [
-                    'S_COL_WIDTH'            => (100 / $this->config['dir_recent_columns']).'%',
-                ]);
-
-                foreach ($rowset as $row) {
-                    if (($num % $this->config['dir_recent_columns']) == 0) {
-                        $this->template->assign_block_vars('block.row', []);
-                    }
-
-                    $this->template->assign_block_vars('block.row.col', [
-                        'UC_THUMBNAIL'               => '<a href="'.$row['link_url'].'" onclick="window.open(\''.$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $row['link_id']]).'\'); return false;"><img src="'.$row['link_thumb'].'" title="'.$row['link_name'].'" alt="'.$row['link_name'].'" /></a>',
-                        'NAME'                       => $row['link_name'],
-                        'USER'                       => get_username_string('full', $row['link_user_id'], $row['username'], $row['user_colour']),
-                        'TIME'                       => ($row['link_time']) ? $this->user->format_date($row['link_time']) : '',
-                        'CAT'                        => $row['cat_name'],
-                        'COUNT'                      => $row['link_view'],
-                        'COMMENT'                    => $row['link_comment'],
-
-                        'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $row['link_cat']]),
-                        'U_COMMENT'               => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $row['link_id']]),
-
-                        'L_DIR_SEARCH_NB_CLICKS'       => $this->user->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),
-                        'L_DIR_SEARCH_NB_COMMS'        => $this->user->lang('DIR_SEARCH_NB_COMMS', (int) $row['link_comment']),
-                    ]);
-                    $num++;
-                }
-
-                while (($num % $this->config['dir_recent_columns']) != 0) {
-                    $this->template->assign_block_vars('block.row.col2', []);
-                    $num++;
-                }
-            }
-        }
-    }
-
-    /**
-     * Validate back link.
-     *
-     * @param string $remote_url Page URL contains the backlink
-     * @param bool   $optional   Link back is optional in this category?
-     * @param bool   $cron       This methos is called by con process?
-     *
-     * @return false|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
-     */
-    public function validate_link_back($remote_url, $optional, $cron = false)
-    {
-        if (!$cron) {
-            if (empty($remote_url) && $optional) {
-                return false;
-            }
-
-            if (!preg_match('#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i', $remote_url)) {
-                return 'DIR_ERROR_WRONG_DATA_BACK';
-            }
-        }
-
-        if (false === ($handle = @fopen($remote_url, 'r'))) {
-            return 'DIR_ERROR_NOT_FOUND_BACK';
-        }
-
-        $buff = '';
-
-        // Read by packet, faster than file_get_contents()
-        while (!feof($handle)) {
-            $buff .= fgets($handle, 256);
-
-            if (stristr($buff, $this->config['server_name'])) {
-                @fclose($handle);
-
-                return false;
-            }
-        }
-        @fclose($handle);
-
-        return 'DIR_ERROR_NO_LINK_BACK';
-    }
-
-    /**
-     * Check, for website with backlink specified, if backlink is always here.
-     * After $nb_check verification, website is deleted, otherwise, a notification is send to poster.
-     *
-     * @param int $cat_id     The categoryID
-     * @param int $nb_check   Number of check before demete a website
-     * @param int $next_prune Date of next auto check
-     *
-     * @return null
-     */
-    private function _check($cat_id, $nb_check, $next_prune)
-    {
-        $del_array = $update_array = [];
-
-        $sql_array = [
-            'SELECT'      => 'link_id, link_cat, link_back, link_guest_email, link_nb_check, link_user_id, link_name, link_url, link_description, u.user_lang, u.user_dateformat',
-            'FROM'        => [
-                    DIR_LINK_TABLE    => 'l', ],
-            'LEFT_JOIN'    => [
-                    [
-                        'FROM'    => [USERS_TABLE    => 'u'],
-                        'ON'      => 'l.link_user_id = u.user_id',
-                    ],
-            ],
-            'WHERE'        => 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '.(int) $cat_id, ];
-
-        $sql = $this->db->sql_build_query('SELECT', $sql_array);
-        $result = $this->db->sql_query($sql);
-
-        while ($row = $this->db->sql_fetchrow($result)) {
-            if ($this->validate_link_back($row['link_back'], false, true) !== false) {
-                if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check) {
-                    $del_array[] = $row['link_id'];
-                } else {
-                    // A first table containing links ID to update
-                    $update_array[$row['link_id']] = $row;
-                }
-            }
-        }
-        $this->db->sql_freeresult($result);
-
-        if (count($del_array)) {
-            $this->del($cat_id, $del_array);
-        }
-        if (count($update_array)) {
-            $this->_update_check($update_array, $next_prune);
-        }
-    }
-
-    /**
-     * Method called by cron task.
-     *
-     * @param array $cat_data Information about category, from db
-     *
-     * @return null
-     */
-    public function auto_check($cat_data)
-    {
-        global $phpbb_log;
-
-        $sql = 'SELECT cat_name
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+
+		if ($this->request->is_ajax()) {
+			$sql = 'SELECT link_vote, link_note FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $link_id;
+			$result = $this->db->sql_query($sql);
+			$data = $this->db->sql_fetchrow($result);
+
+			$note = $this->display_note($data['link_note'], $data['link_vote'], true);
+
+			$json_response = new \phpbb\json_response();
+			$json_response->send([
+				'success' => true,
+
+				'MESSAGE_TITLE'    => $this->user->lang['INFORMATION'],
+				'MESSAGE_TEXT'     => $this->user->lang['DIR_VOTE_OK'],
+				'NOTE'             => $note,
+				'NB_VOTE'          => $this->user->lang('DIR_NB_VOTES', (int) $data['link_vote']),
+				'LINK_ID'          => $link_id,
+			]);
+		}
+	}
+
+	/**
+	 * Search an appropriate thumb for url.
+	 *
+	 * @param string $url Link's url
+	 *
+	 * @return string The thumb url
+	 */
+	public function thumb_process($url)
+	{
+		if (!$this->config['dir_activ_thumb']) {
+			return $this->root_path.'images/directory/nothumb.gif';
+		}
+
+		$details = parse_url($url);
+
+		$root_url = $details['scheme'].'://'.$details['host'];
+		$absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
+
+		if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host'])) {
+			return $root_url.'/ascreen.jpg';
+		}
+
+		return $this->config['dir_thumb_service'].$absolute_url;
+	}
+
+	/**
+	 * Check if ascreen thumb exists.
+	 *
+	 * @param string $protocol The protocol
+	 * @param string $host     The hostname
+	 *
+	 * @return bool True if ascreen file exixts, else false
+	 */
+	private function _ascreen_exist($protocol, $host)
+	{
+		if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg')) {
+			// Obviously this is an image, we did some additional tests
+			if ($thumb_info[0] == '120' && $thumb_info[1] == '90' && $thumb_info['mime'] == 'image/jpeg') {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Primary work on banner, can edit, copy or check a banner.
+	 *
+	 * @param string $banner The banner's remote url
+	 * @param array  $error  The array error, passed by reference
+	 *
+	 * @return null
+	 */
+	public function banner_process(&$banner, &$error)
+	{
+		$old_banner = $this->request->variable('old_banner', '');
+
+		$destination = $this->dir_helper->get_banner_path();
+
+		// Can we upload?
+		$can_upload = ($this->config['dir_storage_banner'] && file_exists($this->root_path.$destination) && phpbb_is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+
+		if ($banner && $can_upload) {
+			$file = $this->_banner_upload($banner, $error);
+		} elseif ($banner) {
+			$file = $this->_banner_remote($banner, $error);
+		} elseif ($this->request->is_set_post('delete_banner') && $old_banner) {
+			$this->_banner_delete($old_banner);
+
+			return;
+		}
+
+		if (!count($error)) {
+			if ($banner && $old_banner && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $old_banner)) {
+				$this->_banner_delete($old_banner);
+			}
+
+			$banner = !empty($file) ? $file : '';
+		}
+	}
+
+	/**
+	 * Copy a remonte banner to server.
+	 * called by banner_process().
+	 *
+	 * @param string $banner The anner's remote url
+	 * @param array  $error  The array error, passed by reference
+	 *
+	 * @return false|string String if no errors, else false
+	 */
+	private function _banner_upload($banner, &$error)
+	{
+		// Init upload class
+		if (!class_exists('fileupload')) {
+			include $this->root_path.'includes/functions_upload.'.$this->php_ext;
+		}
+		$upload = new \fileupload('DIR_BANNER_', ['jpg', 'jpeg', 'gif', 'png'], $this->config['dir_banner_filesize']);
+
+		$file = $upload->remote_upload($banner);
+
+		$prefix = unique_id().'_';
+		$file->clean_filename('real', $prefix);
+
+		$destination = $this->dir_helper->get_banner_path();
+
+		// Move file and overwrite any existing image
+		$file->move_file($destination, true);
+
+		if (count($file->error)) {
+			$file->remove();
+			$error = array_merge($error, $file->error);
+
+			return false;
+		}
+
+		return $prefix.strtolower($file->uploadname);
+	}
+
+	/**
+	 * Check than remote banner exists
+	 * called by banner_process().
+	 *
+	 * @param string $banner The banner's remote url
+	 * @param array  $error  The array error, passed by reference
+	 *
+	 * @return false|string String if no errors, else false
+	 */
+	private function _banner_remote($banner, &$error)
+	{
+		if (!preg_match('#^(http|https|ftp)://#i', $banner)) {
+			$banner = 'http://'.$banner;
+		}
+		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner)) {
+			$error[] = $this->user->lang['DIR_BANNER_URL_INVALID'];
+
+			return false;
+		}
+
+		// Make sure getimagesize works...
+		if (($image_data = @getimagesize($banner)) === false) {
+			$error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
+
+			return false;
+		}
+
+		if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2)) {
+			$error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
+
+			return false;
+		}
+
+		$width = $image_data[0];
+		$height = $image_data[1];
+
+		// Check image type
+		if (!class_exists('fileupload')) {
+			include $this->root_path.'includes/functions_upload.'.$this->php_ext;
+		}
+
+		$types = \fileupload::image_types();
+		$extension = strtolower(\filespec::get_extension($banner));
+
+		// Check if this is actually an image
+		if ($file_stream = @fopen($banner, 'r')) {
+			// Timeout after 1 second
+			stream_set_timeout($file_stream, 1);
+			// read some data to ensure headers are present
+			fread($file_stream, 1024);
+			$meta = stream_get_meta_data($file_stream);
+			if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers'])) {
+				$headers = $meta['wrapper_data']['headers'];
+			} elseif (isset($meta['wrapper_data']) && is_array($meta['wrapper_data'])) {
+				$headers = $meta['wrapper_data'];
+			} else {
+				$headers = [];
+			}
+
+			foreach ($headers as $header) {
+				$header = preg_split('/ /', $header, 2);
+				if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type') {
+					if (strpos($header[1], 'image/') !== 0) {
+						$error[] = 'DIR_BANNER_URL_INVALID';
+						fclose($file_stream);
+
+						return false;
+					} else {
+						fclose($file_stream);
+						break;
+					}
+				}
+			}
+		} else {
+			$error[] = 'DIR_BANNER_URL_INVALID';
+
+			return false;
+		}
+
+		if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) {
+			if (!isset($types[$image_data[2]])) {
+				$error[] = $this->user->lang['UNABLE_GET_IMAGE_SIZE'];
+			} else {
+				$error[] = $this->user->lang('DIR_BANNER_IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
+			}
+
+			return false;
+		}
+
+		if (($this->config['dir_banner_width'] || $this->config['dir_banner_height']) && ($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height'])) {
+			$error[] = $this->user->lang('DIR_BANNER_WRONG_SIZE', $this->config['dir_banner_width'], $this->config['dir_banner_height'], $width, $height);
+
+			return false;
+		}
+
+		return $banner;
+	}
+
+	/**
+	 * Delete a banner from server.
+	 *
+	 * @param string $file The file's name
+	 *
+	 * @return bool True if delete success, else false
+	 */
+	private function _banner_delete($file)
+	{
+		if (file_exists($this->dir_helper->get_banner_path($file))) {
+			@unlink($this->dir_helper->get_banner_path($file));
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * PageRank Lookup (Based on Google Toolbar for Mozilla Firefox).
+	 *
+	 * @copyright 2012 HM2K <hm2k@php.net>
+	 *
+	 * @link http://pagerank.phurix.net/
+	 *
+	 * @author James Wade <hm2k@php.net>
+	 *
+	 * @version $Revision: 2.1 $
+	 * @require PHP 4.3.0 (file_get_contents)
+	 * @updated 06/10/11
+	 *
+	 * @param string $q The website URL
+	 *
+	 * @return string The calculated pagerank, or -1
+	 */
+	public function pagerank_process($q)
+	{
+		$googleDomains = ['.com', '.com.tr', '.de', '.fr', '.be', '.ca', '.ro', '.ch'];
+		$seed = $this->user->lang['SEED'];
+		$result = 0x01020345;
+		$len = strlen($q);
+
+		for ($i = 0; $i < $len; $i++) {
+			$result ^= ord($seed[$i % strlen($seed)]) ^ ord($q[$i]);
+			$result = (($result >> 23) & 0x1ff) | $result << 9;
+		}
+
+		if (PHP_INT_MAX != 2147483647) {
+			$result = -(~($result & 0xFFFFFFFF) + 1);
+		}
+
+		$ch = sprintf('8%x', $result);
+		$url = 'http://%s/tbr?client=navclient-auto&ch=%s&features=Rank&q=info:%s';
+		$host = 'toolbarqueries.google'.$googleDomains[mt_rand(0, count($googleDomains) - 1)];
+
+		$url = sprintf($url, $host, $ch, $q);
+		@$pr = trim(file_get_contents($url, false));
+
+		if (is_numeric(substr(strrchr($pr, ':'), 1))) {
+			return substr(strrchr($pr, ':'), 1);
+		}
+
+		return '-1';
+	}
+
+	/**
+	 * List flags.
+	 *
+	 * @param string $flag_path The flag directory path
+	 * @param string $value     Selected flag
+	 *
+	 * @return string $list		Html code
+	 */
+	public function get_dir_flag_list($flag_path, $value)
+	{
+		$list = '';
+
+		$this->user->add_lang_ext('ernadoo/phpbbdirectory', 'directory_flags');
+
+		$flags = $this->dir_helper->preg_grep_keys('/^DIR_FLAG_CODE_/i', $this->user->lang);
+
+		if (extension_loaded('intl')) {
+			$locale = $this->user->lang['USER_LANG'];
+
+			$col = new \Collator($locale);
+			$col->asort($flags);
+		} else {
+			asort($flags);
+		}
+
+		foreach ($flags as $file => $name) {
+			$img_file = strtolower(substr(strrchr($file, '_'), 1)).'.png';
+
+			if (file_exists($flag_path.$img_file)) {
+				$list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
+			}
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Display recents links added.
+	 *
+	 * @return null
+	 */
+	public function recents()
+	{
+		if ($this->config['dir_recent_block']) {
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+
+			$sql_array = [
+				'SELECT'      => 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
+				'FROM'        => [
+						DIR_LINK_TABLE    => 'l', ],
+				'LEFT_JOIN'    => [
+						[
+							'FROM'    => [USERS_TABLE    => 'u'],
+							'ON'      => 'l.link_user_id = u.user_id',
+						],
+						[
+							'FROM'    => [DIR_CAT_TABLE => 'c'],
+							'ON'      => 'l.link_cat = c.cat_id',
+						],
+				],
+				'WHERE'        => $this->db->sql_in_set('l.link_cat', $exclude_array, true).' AND l.link_active = 1',
+				'ORDER_BY'     => 'l.link_time DESC, l.link_id DESC', ];
+
+			$sql = $this->db->sql_build_query('SELECT', $sql_array);
+			$result = $this->db->sql_query_limit($sql, $limit_sql, 0);
+			$num = 0;
+			$rowset = [];
+
+			while ($site = $this->db->sql_fetchrow($result)) {
+				$rowset[$site['link_id']] = $site;
+			}
+			$this->db->sql_freeresult($result);
+
+			if (count($rowset)) {
+				$this->template->assign_block_vars('block', [
+					'S_COL_WIDTH'            => (100 / $this->config['dir_recent_columns']).'%',
+				]);
+
+				foreach ($rowset as $row) {
+					if (($num % $this->config['dir_recent_columns']) == 0) {
+						$this->template->assign_block_vars('block.row', []);
+					}
+
+					$this->template->assign_block_vars('block.row.col', [
+						'UC_THUMBNAIL'               => '<a href="'.$row['link_url'].'" onclick="window.open(\''.$this->helper->route('ernadoo_phpbbdirectory_view_controller', ['link_id' => (int) $row['link_id']]).'\'); return false;"><img src="'.$row['link_thumb'].'" title="'.$row['link_name'].'" alt="'.$row['link_name'].'" /></a>',
+						'NAME'                       => $row['link_name'],
+						'USER'                       => get_username_string('full', $row['link_user_id'], $row['username'], $row['user_colour']),
+						'TIME'                       => ($row['link_time']) ? $this->user->format_date($row['link_time']) : '',
+						'CAT'                        => $row['cat_name'],
+						'COUNT'                      => $row['link_view'],
+						'COMMENT'                    => $row['link_comment'],
+
+						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_page_controller', ['cat_id' => (int) $row['link_cat']]),
+						'U_COMMENT'               => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', ['link_id' => (int) $row['link_id']]),
+
+						'L_DIR_SEARCH_NB_CLICKS'       => $this->user->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),
+						'L_DIR_SEARCH_NB_COMMS'        => $this->user->lang('DIR_SEARCH_NB_COMMS', (int) $row['link_comment']),
+					]);
+					$num++;
+				}
+
+				while (($num % $this->config['dir_recent_columns']) != 0) {
+					$this->template->assign_block_vars('block.row.col2', []);
+					$num++;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Validate back link.
+	 *
+	 * @param string $remote_url Page URL contains the backlink
+	 * @param bool   $optional   Link back is optional in this category?
+	 * @param bool   $cron       This methos is called by con process?
+	 *
+	 * @return false|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
+	 */
+	public function validate_link_back($remote_url, $optional, $cron = false)
+	{
+		if (!$cron) {
+			if (empty($remote_url) && $optional) {
+				return false;
+			}
+
+			if (!preg_match('#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i', $remote_url)) {
+				return 'DIR_ERROR_WRONG_DATA_BACK';
+			}
+		}
+
+		if (false === ($handle = @fopen($remote_url, 'r'))) {
+			return 'DIR_ERROR_NOT_FOUND_BACK';
+		}
+
+		$buff = '';
+
+		// Read by packet, faster than file_get_contents()
+		while (!feof($handle)) {
+			$buff .= fgets($handle, 256);
+
+			if (stristr($buff, $this->config['server_name'])) {
+				@fclose($handle);
+
+				return false;
+			}
+		}
+		@fclose($handle);
+
+		return 'DIR_ERROR_NO_LINK_BACK';
+	}
+
+	/**
+	 * Check, for website with backlink specified, if backlink is always here.
+	 * After $nb_check verification, website is deleted, otherwise, a notification is send to poster.
+	 *
+	 * @param int $cat_id     The categoryID
+	 * @param int $nb_check   Number of check before demete a website
+	 * @param int $next_prune Date of next auto check
+	 *
+	 * @return null
+	 */
+	private function _check($cat_id, $nb_check, $next_prune)
+	{
+		$del_array = $update_array = [];
+
+		$sql_array = [
+			'SELECT'      => 'link_id, link_cat, link_back, link_guest_email, link_nb_check, link_user_id, link_name, link_url, link_description, u.user_lang, u.user_dateformat',
+			'FROM'        => [
+					DIR_LINK_TABLE    => 'l', ],
+			'LEFT_JOIN'    => [
+					[
+						'FROM'    => [USERS_TABLE    => 'u'],
+						'ON'      => 'l.link_user_id = u.user_id',
+					],
+			],
+			'WHERE'        => 'l.link_back <> "" AND l.link_active = 1 AND l.link_cat = '.(int) $cat_id, ];
+
+		$sql = $this->db->sql_build_query('SELECT', $sql_array);
+		$result = $this->db->sql_query($sql);
+
+		while ($row = $this->db->sql_fetchrow($result)) {
+			if ($this->validate_link_back($row['link_back'], false, true) !== false) {
+				if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check) {
+					$del_array[] = $row['link_id'];
+				} else {
+					// A first table containing links ID to update
+					$update_array[$row['link_id']] = $row;
+				}
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		if (count($del_array)) {
+			$this->del($cat_id, $del_array);
+		}
+		if (count($update_array)) {
+			$this->_update_check($update_array, $next_prune);
+		}
+	}
+
+	/**
+	 * Method called by cron task.
+	 *
+	 * @param array $cat_data Information about category, from db
+	 *
+	 * @return null
+	 */
+	public function auto_check($cat_data)
+	{
+		global $phpbb_log;
+
+		$sql = 'SELECT cat_name
 			FROM '.DIR_CAT_TABLE.'
 			WHERE cat_id = '.(int) $cat_data['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) {
-            $next_prune = time() + ($cat_data['cat_cron_freq'] * 86400);
+		if ($row) {
+			$next_prune = time() + ($cat_data['cat_cron_freq'] * 86400);
 
-            $this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
+			$this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
 
-            $sql = 'UPDATE '.DIR_CAT_TABLE."
+			$sql = 'UPDATE '.DIR_CAT_TABLE."
 				SET cat_cron_next = $next_prune
 				WHERE cat_id = ".(int) $cat_data['cat_id'];
-            $this->db->sql_query($sql);
-
-            $phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), [$row['cat_name']]);
-        }
-    }
-
-    /**
-     * Update website verification number after a missing backlink, and send notificaton.
-     *
-     * @param array $u_array    Information about website
-     * @param int   $next_prune Date of next auto check
-     *
-     * @return null
-     */
-    private function _update_check($u_array, $next_prune)
-    {
-        if (!class_exists('messenger')) {
-            include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
-        }
-
-        $messenger = new \messenger(false);
-
-        // cron.php don't call $user->setup(), so $this->timezone is unset.
-        // We need to define it, because we use user->format_date below
-        $this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
-
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+			$this->db->sql_query($sql);
+
+			$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), [$row['cat_name']]);
+		}
+	}
+
+	/**
+	 * Update website verification number after a missing backlink, and send notificaton.
+	 *
+	 * @param array $u_array    Information about website
+	 * @param int   $next_prune Date of next auto check
+	 *
+	 * @return null
+	 */
+	private function _update_check($u_array, $next_prune)
+	{
+		if (!class_exists('messenger')) {
+			include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
+		}
+
+		$messenger = new \messenger(false);
+
+		// cron.php don't call $user->setup(), so $this->timezone is unset.
+		// We need to define it, because we use user->format_date below
+		$this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
+
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_nb_check = link_nb_check + 1
 			WHERE '.$this->db->sql_in_set('link_id', array_keys($u_array));
-        $this->db->sql_query($sql);
-
-        foreach ($u_array as $data) {
-            strip_bbcode($data['link_description']);
-
-            $notification_data = [
-                    'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
-                    'link_id'              => $data['link_id'],
-                    'link_name'            => $data['link_name'],
-                    'link_url'             => $data['link_url'],
-                    'link_description'     => $data['link_description'],
-                    'next_cron'            => $this->user->format_date($next_prune, $data['user_dateformat']),
-            ];
-
-            if ($data['link_nb_check']) {
-                $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
-            }
-
-            // New notification system can't send mail to an anonymous user with an email address stored in another table than phpbb_users
-            if ($data['link_user_id'] == ANONYMOUS) {
-                $username = $email = $data['link_guest_email'];
-
-                $messenger->template('@ernadoo_phpbbdirectory/directory_website_error_cron', $data['user_lang']);
-                $messenger->to($email, $username);
-
-                $messenger->assign_vars([
-                    'USERNAME'             => htmlspecialchars_decode($username),
-                    'LINK_NAME'            => $data['link_name'],
-                    'LINK_URL'             => $data['link_url'],
-                    'LINK_DESCRIPTION'     => $data['link_description'],
-                    'NEXT_CRON'            => $this->user->format_date($next_prune, $data['user_dateformat']),
-                ]);
-
-                $messenger->send(NOTIFY_EMAIL);
-            } else {
-                $this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
-            }
-        }
-    }
+		$this->db->sql_query($sql);
+
+		foreach ($u_array as $data) {
+			strip_bbcode($data['link_description']);
+
+			$notification_data = [
+					'cat_name'             => \ernadoo\phpbbdirectory\core\categorie::getname((int) $data['link_cat']),
+					'link_id'              => $data['link_id'],
+					'link_name'            => $data['link_name'],
+					'link_url'             => $data['link_url'],
+					'link_description'     => $data['link_description'],
+					'next_cron'            => $this->user->format_date($next_prune, $data['user_dateformat']),
+			];
+
+			if ($data['link_nb_check']) {
+				$this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
+			}
+
+			// New notification system can't send mail to an anonymous user with an email address stored in another table than phpbb_users
+			if ($data['link_user_id'] == ANONYMOUS) {
+				$username = $email = $data['link_guest_email'];
+
+				$messenger->template('@ernadoo_phpbbdirectory/directory_website_error_cron', $data['user_lang']);
+				$messenger->to($email, $username);
+
+				$messenger->assign_vars([
+					'USERNAME'             => htmlspecialchars_decode($username),
+					'LINK_NAME'            => $data['link_name'],
+					'LINK_URL'             => $data['link_url'],
+					'LINK_DESCRIPTION'     => $data['link_description'],
+					'NEXT_CRON'            => $this->user->format_date($next_prune, $data['user_dateformat']),
+				]);
+
+				$messenger->send(NOTIFY_EMAIL);
+			} else {
+				$this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
+			}
+		}
+	}
 }

Braces +200 added lines, -93 removed lines

@@ -90,20 +90,24 @@ 
         $this->db->sql_query($sql);
         $notification_data['link_id'] = $this->db->sql_nextid();
 
-        if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_')) {
+        if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_'))
+        {
             $sql = 'UPDATE '.DIR_CAT_TABLE.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = '.(int) $data['link_cat'];
             $this->db->sql_query($sql);
 
             $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
-        } elseif ($this->config['dir_mail']) {
+        }
+        elseif ($this->config['dir_mail'])
+        {
             $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
         }
 
         $this->db->sql_transaction('commit');
 
-        if (isset($notification_type)) {
+        if (isset($notification_type))
+        {
             $notification_data = array_merge($notification_data,
                 [
                     'user_from'            => (int) $data['link_user_id'],
@@ -141,7 +145,8 @@ 
 
         $old_cat = array_pop($data);
 
-        if ($old_cat != $data['link_cat'] || $need_approval) {
+        if ($old_cat != $data['link_cat'] || $need_approval)
+        {
             $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website', (int) $link_id);
 
             $this->db->sql_transaction('begin');
@@ -151,14 +156,17 @@ 
 				WHERE cat_id = '.(int) $old_cat;
             $this->db->sql_query($sql);
 
-            if (!$need_approval) {
+            if (!$need_approval)
+            {
                 $sql = 'UPDATE '.DIR_CAT_TABLE.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = '.(int) $data['link_cat'];
                 $this->db->sql_query($sql);
 
                 $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website';
-            } else {
+            }
+            else
+            {
                 $data['link_active'] = false;
                 $notification_type = 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
             }
@@ -200,17 +208,21 @@ 
 			WHERE '.$this->db->sql_in_set('link_id', $url_array);
         $result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner'])) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
+            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);
                 }
             }
         }
 
-        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, $url_array));
         }
 
@@ -221,14 +233,16 @@ 
 
         $this->db->sql_transaction('commit');
 
-        foreach ($url_array as $link_id) {
+        foreach ($url_array as $link_id)
+        {
             $this->notification->delete_notifications([
                 'ernadoo.phpbbdirectory.notification.type.directory_website',
                 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue',
             ], $link_id);
         }
 
-        if ($this->request->is_ajax()) {
+        if ($this->request->is_ajax())
+        {
             $sql = 'SELECT cat_links
 				FROM '.DIR_CAT_TABLE.'
 				WHERE cat_id = '.(int) $cat_id;
@@ -264,7 +278,8 @@ 
         $result = $this->db->sql_query($sql);
         $data = $this->db->sql_fetchrow($result);
 
-        if (empty($data['link_id'])) {
+        if (empty($data['link_id']))
+        {
             throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
         }
 
@@ -290,18 +305,21 @@ 
         $default_port = 80;
         $hostname = $details['host'];
 
-        if ($details['scheme'] == 'https') {
+        if ($details['scheme'] == 'https')
+        {
             $default_port = 443;
             $hostname = 'tls://'.$details['host'];
         }
 
-        if (!isset($details['path'])) {
+        if (!isset($details['path']))
+        {
             $details['path'] = '/';
         }
 
         $port = (isset($details['port']) && !empty($details['port'])) ? (int) $details['port'] : $default_port;
 
-        if ($sock = @fsockopen($hostname, $port, $errno, $errstr, 1)) {
+        if ($sock = @fsockopen($hostname, $port, $errno, $errstr, 1))
+        {
             $requete = 'GET '.$details['path']." HTTP/1.1\r\n";
             $requete .= 'Host: '.$details['host']."\r\n\r\n";
 
@@ -329,7 +347,8 @@ 
     {
         $details = parse_url($url);
 
-        if (isset($details['path']) && $details['path'] == '/' && !isset($details['query'])) {
+        if (isset($details['path']) && $details['path'] == '/' && !isset($details['query']))
+        {
             return substr($url, 0, -1);
         }
 
@@ -351,7 +370,8 @@ 
         $flag_path = $ext_path.'images/flags/';
         $img_flag = 'no_flag.png';
 
-        if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag'])) {
+        if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
+        {
             $img_flag = $data['link_flag'];
         }
 
@@ -369,7 +389,8 @@ 
      */
     public function display_note($total_note, $nb_vote, $votes_status)
     {
-        if (!$votes_status) {
+        if (!$votes_status)
+        {
             return;
         }
 
@@ -388,9 +409,11 @@ 
      */
     public function display_vote($data)
     {
-        if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id'])) {
+        if ($this->user->data['is_registered'] && $this->auth->acl_get('u_vote_dir') && empty($data['vote_user_id']))
+        {
             $list = '<select name="vote">';
-            for ($i = 0; $i <= 10; $i++) {
+            for ($i = 0; $i <= 10; $i++)
+            {
                 $list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
             }
             $list .= '</select>';
@@ -408,7 +431,8 @@ 
      */
     public function display_rss($data)
     {
-        if ($this->config['dir_activ_rss'] && !empty($data['link_rss'])) {
+        if ($this->config['dir_activ_rss'] && !empty($data['link_rss']))
+        {
             return $data['link_rss'];
         }
     }
@@ -424,8 +448,10 @@ 
      */
     public function display_thumb($data)
     {
-        if ($this->config['dir_activ_thumb']) {
-            if (!$data['link_thumb'] || ($this->config['dir_thumb_service_reverse'] && (!strstr($data['link_thumb'], 'ascreen.jpg') && (!strstr($data['link_thumb'], $this->config['dir_thumb_service']))))) {
+        if ($this->config['dir_activ_thumb'])
+        {
+            if (!$data['link_thumb'] || ($this->config['dir_thumb_service_reverse'] && (!strstr($data['link_thumb'], 'ascreen.jpg') && (!strstr($data['link_thumb'], $this->config['dir_thumb_service'])))))
+            {
                 $thumb = $this->thumb_process($data['link_url']);
 
                 $sql = 'UPDATE '.DIR_LINK_TABLE.'
@@ -449,15 +475,19 @@ 
      */
     public function display_pagerank($data)
     {
-        if ($this->config['dir_activ_pagerank']) {
-            if ($data['link_pagerank'] == '') {
+        if ($this->config['dir_activ_pagerank'])
+        {
+            if ($data['link_pagerank'] == '')
+            {
                 $pagerank = $this->pagerank_process($data['link_url']);
 
                 $sql = 'UPDATE '.DIR_LINK_TABLE.'
 					SET link_pagerank = '.(int) $pagerank.'
 					WHERE link_id = '.(int) $data['link_id'];
                 $this->db->sql_query($sql);
-            } else {
+            }
+            else
+            {
                 $pagerank = (int) $data['link_pagerank'];
             }
 
@@ -484,16 +514,21 @@ 
     {
         $s_banner = '';
 
-        if (!empty($data['link_banner'])) {
-            if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $data['link_banner'])) {
+        if (!empty($data['link_banner']))
+        {
+            if (!preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $data['link_banner']))
+            {
                 $img_src = $this->helper->route('ernadoo_phpbbdirectory_banner_controller', ['banner_img' => $data['link_banner']]);
                 $physical_path = $this->dir_helper->get_banner_path($data['link_banner']);
-            } else {
+            }
+            else
+            {
                 $img_src = $physical_path = $data['link_banner'];
             }
 
             list($width, $height) = @getimagesize($physical_path);
-            if (($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height']) && $this->config['dir_banner_width'] > 0 && $this->config['dir_banner_height'] > 0) {
+            if (($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height']) && $this->config['dir_banner_width'] > 0 && $this->config['dir_banner_height'] > 0)
+            {
                 $coef_w = $width / $this->config['dir_banner_width'];
                 $coef_h = $height / $this->config['dir_banner_height'];
                 $coef_max = max($coef_w, $coef_h);
@@ -535,7 +570,8 @@ 
 
         $this->db->sql_transaction('commit');
 
-        if ($this->request->is_ajax()) {
+        if ($this->request->is_ajax())
+        {
             $sql = 'SELECT link_vote, link_note FROM '.DIR_LINK_TABLE.' WHERE link_id = '.(int) $link_id;
             $result = $this->db->sql_query($sql);
             $data = $this->db->sql_fetchrow($result);
@@ -564,7 +600,8 @@ 
      */
     public function thumb_process($url)
     {
-        if (!$this->config['dir_activ_thumb']) {
+        if (!$this->config['dir_activ_thumb'])
+        {
             return $this->root_path.'images/directory/nothumb.gif';
         }
 
@@ -573,7 +610,8 @@ 
         $root_url = $details['scheme'].'://'.$details['host'];
         $absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
 
-        if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host'])) {
+        if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
+        {
             return $root_url.'/ascreen.jpg';
         }
 
@@ -590,9 +628,11 @@ 
      */
     private function _ascreen_exist($protocol, $host)
     {
-        if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg')) {
+        if ($thumb_info = @getimagesize($protocol.'://'.$host.'/ascreen.jpg'))
+        {
             // Obviously this is an image, we did some additional tests
-            if ($thumb_info[0] == '120' && $thumb_info[1] == '90' && $thumb_info['mime'] == 'image/jpeg') {
+            if ($thumb_info[0] == '120' && $thumb_info[1] == '90' && $thumb_info['mime'] == 'image/jpeg')
+            {
                 return true;
             }
         }
@@ -617,18 +657,25 @@ 
         // Can we upload?
         $can_upload = ($this->config['dir_storage_banner'] && file_exists($this->root_path.$destination) && phpbb_is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
-        if ($banner && $can_upload) {
+        if ($banner && $can_upload)
+        {
             $file = $this->_banner_upload($banner, $error);
-        } elseif ($banner) {
+        }
+        elseif ($banner)
+        {
             $file = $this->_banner_remote($banner, $error);
-        } elseif ($this->request->is_set_post('delete_banner') && $old_banner) {
+        }
+        elseif ($this->request->is_set_post('delete_banner') && $old_banner)
+        {
             $this->_banner_delete($old_banner);
 
             return;
         }
 
-        if (!count($error)) {
-            if ($banner && $old_banner && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $old_banner)) {
+        if (!count($error))
+        {
+            if ($banner && $old_banner && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $old_banner))
+            {
                 $this->_banner_delete($old_banner);
             }
 
@@ -648,7 +695,8 @@ 
     private function _banner_upload($banner, &$error)
     {
         // Init upload class
-        if (!class_exists('fileupload')) {
+        if (!class_exists('fileupload'))
+        {
             include $this->root_path.'includes/functions_upload.'.$this->php_ext;
         }
         $upload = new \fileupload('DIR_BANNER_', ['jpg', 'jpeg', 'gif', 'png'], $this->config['dir_banner_filesize']);
@@ -663,7 +711,8 @@ 
         // Move file and overwrite any existing image
         $file->move_file($destination, true);
 
-        if (count($file->error)) {
+        if (count($file->error))
+        {
             $file->remove();
             $error = array_merge($error, $file->error);
 
@@ -684,23 +733,27 @@ 
      */
     private function _banner_remote($banner, &$error)
     {
-        if (!preg_match('#^(http|https|ftp)://#i', $banner)) {
+        if (!preg_match('#^(http|https|ftp)://#i', $banner))
+        {
             $banner = 'http://'.$banner;
         }
-        if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner)) {
+        if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
+        {
             $error[] = $this->user->lang['DIR_BANNER_URL_INVALID'];
 
             return false;
         }
 
         // Make sure getimagesize works...
-        if (($image_data = @getimagesize($banner)) === false) {
+        if (($image_data = @getimagesize($banner)) === false)
+        {
             $error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
 
             return false;
         }
 
-        if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2)) {
+        if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2))
+        {
             $error[] = $this->user->lang['DIR_BANNER_UNABLE_GET_IMAGE_SIZE'];
 
             return false;
@@ -710,7 +763,8 @@ 
         $height = $image_data[1];
 
         // Check image type
-        if (!class_exists('fileupload')) {
+        if (!class_exists('fileupload'))
+        {
             include $this->root_path.'includes/functions_upload.'.$this->php_ext;
         }
 
@@ -718,51 +772,69 @@ 
         $extension = strtolower(\filespec::get_extension($banner));
 
         // Check if this is actually an image
-        if ($file_stream = @fopen($banner, 'r')) {
+        if ($file_stream = @fopen($banner, 'r'))
+        {
             // Timeout after 1 second
             stream_set_timeout($file_stream, 1);
             // read some data to ensure headers are present
             fread($file_stream, 1024);
             $meta = stream_get_meta_data($file_stream);
-            if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers'])) {
+            if (isset($meta['wrapper_data']['headers']) && is_array($meta['wrapper_data']['headers']))
+            {
                 $headers = $meta['wrapper_data']['headers'];
-            } elseif (isset($meta['wrapper_data']) && is_array($meta['wrapper_data'])) {
+            }
+            elseif (isset($meta['wrapper_data']) && is_array($meta['wrapper_data']))
+            {
                 $headers = $meta['wrapper_data'];
-            } else {
+            }
+            else
+            {
                 $headers = [];
             }
 
-            foreach ($headers as $header) {
+            foreach ($headers as $header)
+            {
                 $header = preg_split('/ /', $header, 2);
-                if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type') {
-                    if (strpos($header[1], 'image/') !== 0) {
+                if (strtr(strtolower(trim($header[0], ':')), '_', '-') === 'content-type')
+                {
+                    if (strpos($header[1], 'image/') !== 0)
+                    {
                         $error[] = 'DIR_BANNER_URL_INVALID';
                         fclose($file_stream);
 
                         return false;
-                    } else {
+                    }
+                    else
+                    {
                         fclose($file_stream);
                         break;
                     }
                 }
             }
-        } else {
+        }
+        else
+        {
             $error[] = 'DIR_BANNER_URL_INVALID';
 
             return false;
         }
 
-        if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) {
-            if (!isset($types[$image_data[2]])) {
+        if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]])))
+        {
+            if (!isset($types[$image_data[2]]))
+            {
                 $error[] = $this->user->lang['UNABLE_GET_IMAGE_SIZE'];
-            } else {
+            }
+            else
+            {
                 $error[] = $this->user->lang('DIR_BANNER_IMAGE_FILETYPE_MISMATCH', $types[$image_data[2]][0], $extension);
             }
 
             return false;
         }
 
-        if (($this->config['dir_banner_width'] || $this->config['dir_banner_height']) && ($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height'])) {
+        if (($this->config['dir_banner_width'] || $this->config['dir_banner_height']) && ($width > $this->config['dir_banner_width'] || $height > $this->config['dir_banner_height']))
+        {
             $error[] = $this->user->lang('DIR_BANNER_WRONG_SIZE', $this->config['dir_banner_width'], $this->config['dir_banner_height'], $width, $height);
 
             return false;
@@ -780,7 +852,8 @@ 
      */
     private function _banner_delete($file)
     {
-        if (file_exists($this->dir_helper->get_banner_path($file))) {
+        if (file_exists($this->dir_helper->get_banner_path($file)))
+        {
             @unlink($this->dir_helper->get_banner_path($file));
 
             return true;
@@ -813,12 +886,14 @@ 
         $result = 0x01020345;
         $len = strlen($q);
 
-        for ($i = 0; $i < $len; $i++) {
+        for ($i = 0; $i < $len; $i++)
+        {
             $result ^= ord($seed[$i % strlen($seed)]) ^ ord($q[$i]);
             $result = (($result >> 23) & 0x1ff) | $result << 9;
         }
 
-        if (PHP_INT_MAX != 2147483647) {
+        if (PHP_INT_MAX != 2147483647)
+        {
             $result = -(~($result & 0xFFFFFFFF) + 1);
         }
 
@@ -829,7 +904,8 @@ 
         $url = sprintf($url, $host, $ch, $q);
         @$pr = trim(file_get_contents($url, false));
 
-        if (is_numeric(substr(strrchr($pr, ':'), 1))) {
+        if (is_numeric(substr(strrchr($pr, ':'), 1)))
+        {
             return substr(strrchr($pr, ':'), 1);
         }
 
@@ -852,19 +928,24 @@ 
 
         $flags = $this->dir_helper->preg_grep_keys('/^DIR_FLAG_CODE_/i', $this->user->lang);
 
-        if (extension_loaded('intl')) {
+        if (extension_loaded('intl'))
+        {
             $locale = $this->user->lang['USER_LANG'];
 
             $col = new \Collator($locale);
             $col->asort($flags);
-        } else {
+        }
+        else
+        {
             asort($flags);
         }
 
-        foreach ($flags as $file => $name) {
+        foreach ($flags as $file => $name)
+        {
             $img_file = strtolower(substr(strrchr($file, '_'), 1)).'.png';
 
-            if (file_exists($flag_path.$img_file)) {
+            if (file_exists($flag_path.$img_file))
+            {
                 $list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
             }
         }
@@ -879,7 +960,8 @@ 
      */
     public function recents()
     {
-        if ($this->config['dir_recent_block']) {
+        if ($this->config['dir_recent_block'])
+        {
             $limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
             $exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
@@ -905,18 +987,22 @@ 
             $num = 0;
             $rowset = [];
 
-            while ($site = $this->db->sql_fetchrow($result)) {
+            while ($site = $this->db->sql_fetchrow($result))
+            {
                 $rowset[$site['link_id']] = $site;
             }
             $this->db->sql_freeresult($result);
 
-            if (count($rowset)) {
+            if (count($rowset))
+            {
                 $this->template->assign_block_vars('block', [
                     'S_COL_WIDTH'            => (100 / $this->config['dir_recent_columns']).'%',
                 ]);
 
-                foreach ($rowset as $row) {
-                    if (($num % $this->config['dir_recent_columns']) == 0) {
+                foreach ($rowset as $row)
+                {
+                    if (($num % $this->config['dir_recent_columns']) == 0)
+                    {
                         $this->template->assign_block_vars('block.row', []);
                     }
 
@@ -938,7 +1024,8 @@ 
                     $num++;
                 }
 
-                while (($num % $this->config['dir_recent_columns']) != 0) {
+                while (($num % $this->config['dir_recent_columns']) != 0)
+                {
                     $this->template->assign_block_vars('block.row.col2', []);
                     $num++;
                 }
@@ -957,27 +1044,33 @@ 
      */
     public function validate_link_back($remote_url, $optional, $cron = false)
     {
-        if (!$cron) {
-            if (empty($remote_url) && $optional) {
+        if (!$cron)
+        {
+            if (empty($remote_url) && $optional)
+            {
                 return false;
             }
 
-            if (!preg_match('#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i', $remote_url)) {
+            if (!preg_match('#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i', $remote_url))
+            {
                 return 'DIR_ERROR_WRONG_DATA_BACK';
             }
         }
 
-        if (false === ($handle = @fopen($remote_url, 'r'))) {
+        if (false === ($handle = @fopen($remote_url, 'r')))
+        {
             return 'DIR_ERROR_NOT_FOUND_BACK';
         }
 
         $buff = '';
 
         // Read by packet, faster than file_get_contents()
-        while (!feof($handle)) {
+        while (!feof($handle))
+        {
             $buff .= fgets($handle, 256);
 
-            if (stristr($buff, $this->config['server_name'])) {
+            if (stristr($buff, $this->config['server_name']))
+            {
                 @fclose($handle);
 
                 return false;
@@ -1017,11 +1110,16 @@ 
         $sql = $this->db->sql_build_query('SELECT', $sql_array);
         $result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            if ($this->validate_link_back($row['link_back'], false, true) !== false) {
-                if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
+            if ($this->validate_link_back($row['link_back'], false, true) !== false)
+            {
+                if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check)
+                {
                     $del_array[] = $row['link_id'];
-                } else {
+                }
+                else
+                {
                     // A first table containing links ID to update
                     $update_array[$row['link_id']] = $row;
                 }
@@ -1029,10 +1127,12 @@ 
         }
         $this->db->sql_freeresult($result);
 
-        if (count($del_array)) {
+        if (count($del_array))
+        {
             $this->del($cat_id, $del_array);
         }
-        if (count($update_array)) {
+        if (count($update_array))
+        {
             $this->_update_check($update_array, $next_prune);
         }
     }
@@ -1055,7 +1155,8 @@ 
         $row = $this->db->sql_fetchrow($result);
         $this->db->sql_freeresult($result);
 
-        if ($row) {
+        if ($row)
+        {
             $next_prune = time() + ($cat_data['cat_cron_freq'] * 86400);
 
             $this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
@@ -1079,7 +1180,8 @@ 
      */
     private function _update_check($u_array, $next_prune)
     {
-        if (!class_exists('messenger')) {
+        if (!class_exists('messenger'))
+        {
             include $this->root_path.'includes/functions_messenger.'.$this->php_ext;
         }
 
@@ -1094,7 +1196,8 @@ 
 			WHERE '.$this->db->sql_in_set('link_id', array_keys($u_array));
         $this->db->sql_query($sql);
 
-        foreach ($u_array as $data) {
+        foreach ($u_array as $data)
+        {
             strip_bbcode($data['link_description']);
 
             $notification_data = [
@@ -1106,12 +1209,14 @@ 
                     'next_cron'            => $this->user->format_date($next_prune, $data['user_dateformat']),
             ];
 
-            if ($data['link_nb_check']) {
+            if ($data['link_nb_check'])
+            {
                 $this->notification->delete_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
             }
 
             // New notification system can't send mail to an anonymous user with an email address stored in another table than phpbb_users
-            if ($data['link_user_id'] == ANONYMOUS) {
+            if ($data['link_user_id'] == ANONYMOUS)
+            {
                 $username = $email = $data['link_guest_email'];
 
                 $messenger->template('@ernadoo_phpbbdirectory/directory_website_error_cron', $data['user_lang']);
@@ -1126,7 +1231,9 @@ 
                 ]);
 
                 $messenger->send(NOTIFY_EMAIL);
-            } else {
+            }
+            else
+            {
                 $this->notification->add_notifications('ernadoo.phpbbdirectory.notification.type.directory_website_error_cron', $notification_data);
             }
         }

core/comment.php

Indentation +89 added lines, -89 removed lines

@@ -12,103 +12,103 @@
  */
 class comment
 {
-    /** @var \phpbb\db\driver\driver_interface $db */
-    protected $db;
-
-    /** @var \phpbb\user */
-    protected $user;
-
-    /**
-     * Constructor.
-     *
-     * @param \phpbb\db\driver\driver_interface $db   Database object
-     * @param \phpbb\user                       $user User object
-     */
-    public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
-    {
-        $this->db = $db;
-        $this->user = $user;
-    }
-
-    /**
-     * Add a comment.
-     *
-     * @param array $data Link's data from db
-     *
-     * @return null
-     */
-    public function add($data)
-    {
-        $this->db->sql_transaction('begin');
-
-        $sql = 'INSERT INTO '.DIR_COMMENT_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
-        $this->db->sql_query($sql);
-
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+	/** @var \phpbb\db\driver\driver_interface $db */
+	protected $db;
+
+	/** @var \phpbb\user */
+	protected $user;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \phpbb\db\driver\driver_interface $db   Database object
+	 * @param \phpbb\user                       $user User object
+	 */
+	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
+	{
+		$this->db = $db;
+		$this->user = $user;
+	}
+
+	/**
+	 * Add a comment.
+	 *
+	 * @param array $data Link's data from db
+	 *
+	 * @return null
+	 */
+	public function add($data)
+	{
+		$this->db->sql_transaction('begin');
+
+		$sql = 'INSERT INTO '.DIR_COMMENT_TABLE.' '.$this->db->sql_build_array('INSERT', $data);
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_comment = link_comment + 1
 			WHERE link_id = '.(int) $data['comment_link_id'];
-        $this->db->sql_query($sql);
-
-        $this->db->sql_transaction('commit');
-    }
-
-    /**
-     * Edit a comment.
-     *
-     * @param array $data       Data to edit
-     * @param int   $comment_id The comment ID
-     *
-     * @return null
-     */
-    public function edit($data, $comment_id)
-    {
-        $sql = 'UPDATE '.DIR_COMMENT_TABLE.'
+		$this->db->sql_query($sql);
+
+		$this->db->sql_transaction('commit');
+	}
+
+	/**
+	 * Edit a comment.
+	 *
+	 * @param array $data       Data to edit
+	 * @param int   $comment_id The comment ID
+	 *
+	 * @return null
+	 */
+	public function edit($data, $comment_id)
+	{
+		$sql = 'UPDATE '.DIR_COMMENT_TABLE.'
 			SET '.$this->db->sql_build_array('UPDATE', $data).'
 			WHERE comment_id = '.(int) $comment_id;
-        $this->db->sql_query($sql);
-    }
-
-    /**
-     * Delete a comment.
-     *
-     * @param string $link_id    The link ID
-     * @param string $comment_id The comment ID
-     *
-     * @return null
-     */
-    public function del($link_id, $comment_id)
-    {
-        global $request;
-
-        $this->db->sql_transaction('begin');
-
-        $sql = 'DELETE FROM '.DIR_COMMENT_TABLE.' WHERE comment_id = '.(int) $comment_id;
-        $this->db->sql_query($sql);
-
-        $sql = 'UPDATE '.DIR_LINK_TABLE.'
+		$this->db->sql_query($sql);
+	}
+
+	/**
+	 * Delete a comment.
+	 *
+	 * @param string $link_id    The link ID
+	 * @param string $comment_id The comment ID
+	 *
+	 * @return null
+	 */
+	public function del($link_id, $comment_id)
+	{
+		global $request;
+
+		$this->db->sql_transaction('begin');
+
+		$sql = 'DELETE FROM '.DIR_COMMENT_TABLE.' WHERE comment_id = '.(int) $comment_id;
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE '.DIR_LINK_TABLE.'
 			SET link_comment = link_comment - 1
 			WHERE link_id = '.(int) $link_id;
-        $this->db->sql_query($sql);
+		$this->db->sql_query($sql);
 
-        $this->db->sql_transaction('commit');
+		$this->db->sql_transaction('commit');
 
-        if ($request->is_ajax()) {
-            $sql = 'SELECT COUNT(comment_id) AS nb_comments
+		if ($request->is_ajax()) {
+			$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);
-
-            $json_response = new \phpbb\json_response();
-            $json_response->send([
-                'success' => true,
-
-                'MESSAGE_TITLE'        => $this->user->lang['INFORMATION'],
-                'MESSAGE_TEXT'         => $this->user->lang['DIR_COMMENT_DELETE_OK'],
-                'COMMENT_ID'           => $comment_id,
-                'TOTAL_COMMENTS'       => $this->user->lang('DIR_NB_COMMS', $nb_comments),
-            ]);
-        }
-    }
+			$result = $this->db->sql_query($sql);
+			$nb_comments = (int) $this->db->sql_fetchfield('nb_comments');
+			$this->db->sql_freeresult($result);
+
+			$json_response = new \phpbb\json_response();
+			$json_response->send([
+				'success' => true,
+
+				'MESSAGE_TITLE'        => $this->user->lang['INFORMATION'],
+				'MESSAGE_TEXT'         => $this->user->lang['DIR_COMMENT_DELETE_OK'],
+				'COMMENT_ID'           => $comment_id,
+				'TOTAL_COMMENTS'       => $this->user->lang('DIR_NB_COMMS', $nb_comments),
+			]);
+		}
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -92,7 +92,8 @@
 
         $this->db->sql_transaction('commit');
 
-        if ($request->is_ajax()) {
+        if ($request->is_ajax())
+        {
             $sql = 'SELECT COUNT(comment_id) AS nb_comments
 				FROM '.DIR_COMMENT_TABLE.'
 				WHERE comment_link_id = '.(int) $link_id;

notification/type/directory_website_error_cron.php

Indentation +178 added lines, -178 removed lines

@@ -13,184 +13,184 @@
  */
 class directory_website_error_cron extends \phpbb\notification\type\base
 {
-    /**
-     * Get notification type name.
-     *
-     * @return string
-     */
-    public function get_type()
-    {
-        return 'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron';
-    }
-
-    /**
-     * Notification option data (for outputting to the user).
-     *
-     * @var bool|array False if the service should use it's default data
-     *                 Array of data (including keys 'id', 'lang', and 'group')
-     */
-    public static $notification_option = [
-        'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK',
-        'group'    => 'NOTIFICATION_DIR_UCP',
-    ];
-
-    /**
-     * Is available.
-     *
-     * @return bool True/False whether or not this is available to the user
-     */
-    public function is_available()
-    {
-        return true;
-    }
-
-    /**
-     * Get link id.
-     *
-     * @param array $data The data from the link
-     *
-     * @return int
-     */
-    public static function get_item_id($data)
-    {
-        return (int) $data['link_id'];
-    }
-
-    /**
-     * Get parent id - it's not used.
-     *
-     * @param array $data The data from the link
-     */
-    public static function get_item_parent_id($data)
-    {
-        // No parent
-        return 0;
-    }
-
-    /**
-     * Find the users who want to receive notifications.
-     *
-     * @param array $data    Data from submit link
-     * @param array $options Options for finding users for notification
-     *
-     * @return array
-     */
-    public function find_users_for_notification($data, $options = [])
-    {
-        $users = [];
-
-        $sql = 'SELECT link_user_id
+	/**
+	 * Get notification type name.
+	 *
+	 * @return string
+	 */
+	public function get_type()
+	{
+		return 'ernadoo.phpbbdirectory.notification.type.directory_website_error_cron';
+	}
+
+	/**
+	 * Notification option data (for outputting to the user).
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 *                 Array of data (including keys 'id', 'lang', and 'group')
+	 */
+	public static $notification_option = [
+		'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_ERROR_CHECK',
+		'group'    => 'NOTIFICATION_DIR_UCP',
+	];
+
+	/**
+	 * Is available.
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
+	public function is_available()
+	{
+		return true;
+	}
+
+	/**
+	 * Get link id.
+	 *
+	 * @param array $data The data from the link
+	 *
+	 * @return int
+	 */
+	public static function get_item_id($data)
+	{
+		return (int) $data['link_id'];
+	}
+
+	/**
+	 * Get parent id - it's not used.
+	 *
+	 * @param array $data The data from the link
+	 */
+	public static function get_item_parent_id($data)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	 * Find the users who want to receive notifications.
+	 *
+	 * @param array $data    Data from submit link
+	 * @param array $options Options for finding users for notification
+	 *
+	 * @return array
+	 */
+	public function find_users_for_notification($data, $options = [])
+	{
+		$users = [];
+
+		$sql = 'SELECT link_user_id
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $data['link_id'];
-        $result = $this->db->sql_query($sql);
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $users[] = (int) $row['link_user_id'];
-        }
-        $this->db->sql_freeresult($result);
-
-        if (empty($users)) {
-            return [];
-        }
-
-        sort($users);
-
-        return $this->check_user_notification_options($users, $options);
-    }
-
-    /**
-     * Get the HTML formatted title of this notification.
-     *
-     * @return string
-     */
-    public function get_title()
-    {
-        $link_name = $this->get_data('link_name');
-        $cat_name = $this->get_data('cat_name');
-
-        return $this->user->lang('NOTIFICATION_DIR_WEBSITE_ERROR_CHECK', $link_name, $cat_name);
-    }
-
-    /**
-     * Get email template.
-     *
-     * @return string
-     */
-    public function get_email_template()
-    {
-        return '@ernadoo_phpbbdirectory/directory_website_error_cron';
-    }
-
-    /**
-     * Get email template variables.
-     *
-     * @return array
-     */
-    public function get_email_template_variables()
-    {
-        return [
-                'LINK_NAME'            => $this->get_data('link_name'),
-                'LINK_URL'             => $this->get_data('link_url'),
-                'LINK_DESCRIPTION'     => $this->get_data('link_description'),
-                'NEXT_CRON'            => $this->get_data('next_cron'),
-            ];
-    }
-
-    /**
-     * Get the url to this item.
-     *
-     * @return string URL
-     */
-    public function get_url()
-    {
-        return '';
-    }
-
-    /**
-     * Users needed to query before this notification can be displayed.
-     *
-     * @return array Array of user_ids
-     */
-    public function users_to_query()
-    {
-        return [];
-    }
-
-    /**
-     * Function for preparing the data for insertion in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $data            Data from submit link
-     * @param array $pre_create_data Data from pre_create_insert_array()
-     *
-     * @return array Array of data ready to be inserted into the database
-     */
-    public function create_insert_array($data, $pre_create_data = [])
-    {
-        $this->set_data('link_name', $data['link_name']);
-        $this->set_data('cat_name', $data['cat_name']);
-
-        $this->set_data('link_url', $data['link_url']);
-        $this->set_data('link_description', $data['link_description']);
-        $this->set_data('next_cron', $data['next_cron']);
-
-        return parent::create_insert_array($data, $pre_create_data);
-    }
-
-    /**
-     * Function for preparing the data for update in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $type_data Data unique to this notification type
-     *
-     * @return array Array of data ready to be updated in the database
-     */
-    public function create_update_array($type_data)
-    {
-        $data = $this->create_insert_array($type_data);
-
-        $data['notification_time'] = time();
-        $data['notification_read'] = 0;
-
-        return $data;
-    }
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$users[] = (int) $row['link_user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (empty($users)) {
+			return [];
+		}
+
+		sort($users);
+
+		return $this->check_user_notification_options($users, $options);
+	}
+
+	/**
+	 * Get the HTML formatted title of this notification.
+	 *
+	 * @return string
+	 */
+	public function get_title()
+	{
+		$link_name = $this->get_data('link_name');
+		$cat_name = $this->get_data('cat_name');
+
+		return $this->user->lang('NOTIFICATION_DIR_WEBSITE_ERROR_CHECK', $link_name, $cat_name);
+	}
+
+	/**
+	 * Get email template.
+	 *
+	 * @return string
+	 */
+	public function get_email_template()
+	{
+		return '@ernadoo_phpbbdirectory/directory_website_error_cron';
+	}
+
+	/**
+	 * Get email template variables.
+	 *
+	 * @return array
+	 */
+	public function get_email_template_variables()
+	{
+		return [
+				'LINK_NAME'            => $this->get_data('link_name'),
+				'LINK_URL'             => $this->get_data('link_url'),
+				'LINK_DESCRIPTION'     => $this->get_data('link_description'),
+				'NEXT_CRON'            => $this->get_data('next_cron'),
+			];
+	}
+
+	/**
+	 * Get the url to this item.
+	 *
+	 * @return string URL
+	 */
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	 * Users needed to query before this notification can be displayed.
+	 *
+	 * @return array Array of user_ids
+	 */
+	public function users_to_query()
+	{
+		return [];
+	}
+
+	/**
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $data            Data from submit link
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
+	public function create_insert_array($data, $pre_create_data = [])
+	{
+		$this->set_data('link_name', $data['link_name']);
+		$this->set_data('cat_name', $data['cat_name']);
+
+		$this->set_data('link_url', $data['link_url']);
+		$this->set_data('link_description', $data['link_description']);
+		$this->set_data('next_cron', $data['next_cron']);
+
+		return parent::create_insert_array($data, $pre_create_data);
+	}
+
+	/**
+	 * Function for preparing the data for update in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $type_data Data unique to this notification type
+	 *
+	 * @return array Array of data ready to be updated in the database
+	 */
+	public function create_update_array($type_data)
+	{
+		$data = $this->create_insert_array($type_data);
+
+		$data['notification_time'] = time();
+		$data['notification_read'] = 0;
+
+		return $data;
+	}
 }

Braces +4 added lines, -2 removed lines

@@ -83,12 +83,14 @@
 			FROM '.DIR_LINK_TABLE.'
 			WHERE link_id = '.(int) $data['link_id'];
         $result = $this->db->sql_query($sql);
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $users[] = (int) $row['link_user_id'];
         }
         $this->db->sql_freeresult($result);
 
-        if (empty($users)) {
+        if (empty($users))
+        {
             return [];
         }
 

notification/type/directory_website_approved.php

Indentation +157 added lines, -157 removed lines

@@ -13,161 +13,161 @@
  */
 class directory_website_approved extends \phpbb\notification\type\base
 {
-    /**
-     * Get notification type name.
-     *
-     * @return string
-     */
-    public function get_type()
-    {
-        return 'ernadoo.phpbbdirectory.notification.type.directory_website_approved';
-    }
-
-    /**
-     * Notification option data (for outputting to the user).
-     *
-     * @var bool|array False if the service should use it's default data
-     *                 Array of data (including keys 'id', 'lang', and 'group')
-     */
-    public static $notification_option = [
-        'id'       => 'dir_moderation_queue',
-        'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
-        'group'    => 'NOTIFICATION_DIR_UCP',
-    ];
-
-    /**
-     * Permission to check for (in find_users_for_notification).
-     *
-     * @var string Permission name
-     */
-    protected $permission = ['a_', 'm_'];
-
-    /**
-     * Is available.
-     *
-     * @return bool True/False whether or not this is available to the user
-     */
-    public function is_available()
-    {
-        $has_permission = $this->auth->acl_gets($this->permission, true);
-
-        return empty($has_permission);
-    }
-
-    /**
-     * Get link id.
-     *
-     * @param array $data The data from the link
-     *
-     * @return int
-     */
-    public static function get_item_id($data)
-    {
-        return (int) $data['link_id'];
-    }
-
-    /**
-     * Get parent id - it's not used.
-     *
-     * @param array $data The data from the link
-     */
-    public static function get_item_parent_id($data)
-    {
-        // No parent
-        return 0;
-    }
-
-    /**
-     * Find the users who want to receive notifications.
-     *
-     * @param array $data    Data from submit link
-     * @param array $options Options for finding users for notification
-     *
-     * @return array
-     */
-    public function find_users_for_notification($data, $options = [])
-    {
-        $options = array_merge([
-            'ignore_users'        => [],
-        ], $options);
-
-        $users = [$data['user_from']];
-
-        return $this->check_user_notification_options($users, array_merge($options, [
-            'item_type'        => self::$notification_option['id'],
-        ]));
-    }
-
-    /**
-     * Get the HTML formatted title of this notification.
-     *
-     * @return string
-     */
-    public function get_title()
-    {
-        $link_name = $this->get_data('link_name');
-        $cat_name = $this->get_data('cat_name');
-
-        return $this->user->lang('NOTIFICATION_DIR_WEBSITE_APPROVED', $link_name, $cat_name);
-    }
-
-    /**
-     * Get email template.
-     *
-     * @return string
-     */
-    public function get_email_template()
-    {
-        return '@ernadoo_phpbbdirectory/directory_website_approved';
-    }
-
-    /**
-     * Get email template variables.
-     *
-     * @return array
-     */
-    public function get_email_template_variables()
-    {
-        return [
-            'LINK_NAME'    => htmlspecialchars_decode($this->get_data('link_name')),
-        ];
-    }
-
-    /**
-     * Get the url to this item.
-     *
-     * @return string URL
-     */
-    public function get_url()
-    {
-        return append_sid($this->phpbb_root_path.'directory/categorie/'.(int) $this->get_data('cat_id'));
-    }
-
-    /**
-     * Users needed to query before this notification can be displayed.
-     *
-     * @return array Array of user_ids
-     */
-    public function users_to_query()
-    {
-        return [];
-    }
-
-    /**
-     * Function for preparing the data for insertion in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $data            Data from submit link
-     * @param array $pre_create_data Data from pre_create_insert_array()
-     *
-     * @return array Array of data ready to be inserted into the database
-     */
-    public function create_insert_array($data, $pre_create_data = [])
-    {
-        $this->set_data('link_name', $data['link_name']);
-        $this->set_data('cat_id', $data['cat_id']);
-        $this->set_data('cat_name', $data['cat_name']);
-
-        return parent::create_insert_array($data, $pre_create_data);
-    }
+	/**
+	 * Get notification type name.
+	 *
+	 * @return string
+	 */
+	public function get_type()
+	{
+		return 'ernadoo.phpbbdirectory.notification.type.directory_website_approved';
+	}
+
+	/**
+	 * Notification option data (for outputting to the user).
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 *                 Array of data (including keys 'id', 'lang', and 'group')
+	 */
+	public static $notification_option = [
+		'id'       => 'dir_moderation_queue',
+		'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
+		'group'    => 'NOTIFICATION_DIR_UCP',
+	];
+
+	/**
+	 * Permission to check for (in find_users_for_notification).
+	 *
+	 * @var string Permission name
+	 */
+	protected $permission = ['a_', 'm_'];
+
+	/**
+	 * Is available.
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
+	public function is_available()
+	{
+		$has_permission = $this->auth->acl_gets($this->permission, true);
+
+		return empty($has_permission);
+	}
+
+	/**
+	 * Get link id.
+	 *
+	 * @param array $data The data from the link
+	 *
+	 * @return int
+	 */
+	public static function get_item_id($data)
+	{
+		return (int) $data['link_id'];
+	}
+
+	/**
+	 * Get parent id - it's not used.
+	 *
+	 * @param array $data The data from the link
+	 */
+	public static function get_item_parent_id($data)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	 * Find the users who want to receive notifications.
+	 *
+	 * @param array $data    Data from submit link
+	 * @param array $options Options for finding users for notification
+	 *
+	 * @return array
+	 */
+	public function find_users_for_notification($data, $options = [])
+	{
+		$options = array_merge([
+			'ignore_users'        => [],
+		], $options);
+
+		$users = [$data['user_from']];
+
+		return $this->check_user_notification_options($users, array_merge($options, [
+			'item_type'        => self::$notification_option['id'],
+		]));
+	}
+
+	/**
+	 * Get the HTML formatted title of this notification.
+	 *
+	 * @return string
+	 */
+	public function get_title()
+	{
+		$link_name = $this->get_data('link_name');
+		$cat_name = $this->get_data('cat_name');
+
+		return $this->user->lang('NOTIFICATION_DIR_WEBSITE_APPROVED', $link_name, $cat_name);
+	}
+
+	/**
+	 * Get email template.
+	 *
+	 * @return string
+	 */
+	public function get_email_template()
+	{
+		return '@ernadoo_phpbbdirectory/directory_website_approved';
+	}
+
+	/**
+	 * Get email template variables.
+	 *
+	 * @return array
+	 */
+	public function get_email_template_variables()
+	{
+		return [
+			'LINK_NAME'    => htmlspecialchars_decode($this->get_data('link_name')),
+		];
+	}
+
+	/**
+	 * Get the url to this item.
+	 *
+	 * @return string URL
+	 */
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path.'directory/categorie/'.(int) $this->get_data('cat_id'));
+	}
+
+	/**
+	 * Users needed to query before this notification can be displayed.
+	 *
+	 * @return array Array of user_ids
+	 */
+	public function users_to_query()
+	{
+		return [];
+	}
+
+	/**
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $data            Data from submit link
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
+	public function create_insert_array($data, $pre_create_data = [])
+	{
+		$this->set_data('link_name', $data['link_name']);
+		$this->set_data('cat_id', $data['cat_id']);
+		$this->set_data('cat_name', $data['cat_name']);
+
+		return parent::create_insert_array($data, $pre_create_data);
+	}
 }

notification/type/directory_website.php

Indentation +173 added lines, -173 removed lines

@@ -13,181 +13,181 @@
  */
 class directory_website extends \phpbb\notification\type\base
 {
-    /**
-     * Get notification type name.
-     *
-     * @return string
-     */
-    public function get_type()
-    {
-        return 'ernadoo.phpbbdirectory.notification.type.directory_website';
-    }
-
-    /**
-     * Notification option data (for outputting to the user).
-     *
-     * @var bool|array False if the service should use it's default data
-     *                 Array of data (including keys 'id', 'lang', and 'group')
-     */
-    public static $notification_option = [
-        'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE',
-        'group'    => 'NOTIFICATION_DIR_UCP',
-    ];
-
-    /**
-     * Is available.
-     *
-     * @return bool True/False whether or not this is available to the user
-     */
-    public function is_available()
-    {
-        return true;
-    }
-
-    /**
-     * Get link id.
-     *
-     * @param array $data The data from the link
-     *
-     * @return int
-     */
-    public static function get_item_id($data)
-    {
-        return (int) $data['link_id'];
-    }
-
-    /**
-     * Get parent id - it's not used.
-     *
-     * @param array $data The data from the link
-     */
-    public static function get_item_parent_id($data)
-    {
-        // No parent
-        return 0;
-    }
-
-    /**
-     * Find the users who want to receive notifications.
-     *
-     * @param array $data    Data from submit link
-     * @param array $options Options for finding users for notification
-     *
-     * @return array
-     */
-    public function find_users_for_notification($data, $options = [])
-    {
-        $options = array_merge([
-            'ignore_users'        => [],
-        ], $options);
-
-        $users = [];
-
-        $sql = 'SELECT user_id
+	/**
+	 * Get notification type name.
+	 *
+	 * @return string
+	 */
+	public function get_type()
+	{
+		return 'ernadoo.phpbbdirectory.notification.type.directory_website';
+	}
+
+	/**
+	 * Notification option data (for outputting to the user).
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 *                 Array of data (including keys 'id', 'lang', and 'group')
+	 */
+	public static $notification_option = [
+		'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_WEBSITE',
+		'group'    => 'NOTIFICATION_DIR_UCP',
+	];
+
+	/**
+	 * Is available.
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
+	public function is_available()
+	{
+		return true;
+	}
+
+	/**
+	 * Get link id.
+	 *
+	 * @param array $data The data from the link
+	 *
+	 * @return int
+	 */
+	public static function get_item_id($data)
+	{
+		return (int) $data['link_id'];
+	}
+
+	/**
+	 * Get parent id - it's not used.
+	 *
+	 * @param array $data The data from the link
+	 */
+	public static function get_item_parent_id($data)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	 * Find the users who want to receive notifications.
+	 *
+	 * @param array $data    Data from submit link
+	 * @param array $options Options for finding users for notification
+	 *
+	 * @return array
+	 */
+	public function find_users_for_notification($data, $options = [])
+	{
+		$options = array_merge([
+			'ignore_users'        => [],
+		], $options);
+
+		$users = [];
+
+		$sql = 'SELECT user_id
 			FROM '.DIR_WATCH_TABLE.'
 			WHERE cat_id = '.(int) $data['cat_id'].'
 				AND notify_status = '.NOTIFY_YES.'
 				AND user_id <> '.(int) $data['user_from'];
-        $result = $this->db->sql_query($sql);
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $users[] = (int) $row['user_id'];
-        }
-        $this->db->sql_freeresult($result);
-
-        if (empty($users)) {
-            return [];
-        }
-
-        sort($users);
-
-        return $this->check_user_notification_options($users, $options);
-    }
-
-    /**
-     * Get the user's avatar.
-     */
-    public function get_avatar()
-    {
-        return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
-    }
-
-    /**
-     * Get the HTML formatted title of this notification.
-     *
-     * @return string
-     */
-    public function get_title()
-    {
-        $link_name = $this->get_data('link_name');
-        $username = $this->user_loader->get_username($this->get_data('user_from'), 'no_profile');
-        $cat_name = $this->get_data('cat_name');
-
-        return $this->user->lang('NOTIFICATION_DIR_NEW', $username, $link_name, $cat_name);
-    }
-
-    /**
-     * Get email template.
-     *
-     * @return string
-     */
-    public function get_email_template()
-    {
-        return '@ernadoo_phpbbdirectory/directory_website';
-    }
-
-    /**
-     * Get email template variables.
-     *
-     * @return array
-     */
-    public function get_email_template_variables()
-    {
-        return [
-            'CAT_NAME'             => $this->get_data('cat_name'),
-            'LINK_NAME'            => htmlspecialchars_decode($this->get_data('link_name')),
-            'LINK_URL'             => $this->get_data('link_url'),
-            'LINK_DESCRIPTION'     => $this->get_data('link_description'),
-        ];
-    }
-
-    /**
-     * Get the url to this item.
-     *
-     * @return string URL
-     */
-    public function get_url()
-    {
-        return append_sid($this->phpbb_root_path.'directory/categorie/'.(int) $this->get_data('cat_id'));
-    }
-
-    /**
-     * Users needed to query before this notification can be displayed.
-     *
-     * @return array Array of user_ids
-     */
-    public function users_to_query()
-    {
-        return [$this->get_data('user_from')];
-    }
-
-    /**
-     * Function for preparing the data for insertion in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $data            Data from submit link
-     * @param array $pre_create_data Data from pre_create_insert_array()
-     *
-     * @return array Array of data ready to be inserted into the database
-     */
-    public function create_insert_array($data, $pre_create_data = [])
-    {
-        $this->set_data('link_name', $data['link_name']);
-        $this->set_data('link_url', $data['link_url']);
-        $this->set_data('link_description', $data['link_description']);
-        $this->set_data('user_from', $data['user_from']);
-        $this->set_data('cat_id', $data['cat_id']);
-        $this->set_data('cat_name', $data['cat_name']);
-
-        return parent::create_insert_array($data, $pre_create_data);
-    }
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$users[] = (int) $row['user_id'];
+		}
+		$this->db->sql_freeresult($result);
+
+		if (empty($users)) {
+			return [];
+		}
+
+		sort($users);
+
+		return $this->check_user_notification_options($users, $options);
+	}
+
+	/**
+	 * Get the user's avatar.
+	 */
+	public function get_avatar()
+	{
+		return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
+	}
+
+	/**
+	 * Get the HTML formatted title of this notification.
+	 *
+	 * @return string
+	 */
+	public function get_title()
+	{
+		$link_name = $this->get_data('link_name');
+		$username = $this->user_loader->get_username($this->get_data('user_from'), 'no_profile');
+		$cat_name = $this->get_data('cat_name');
+
+		return $this->user->lang('NOTIFICATION_DIR_NEW', $username, $link_name, $cat_name);
+	}
+
+	/**
+	 * Get email template.
+	 *
+	 * @return string
+	 */
+	public function get_email_template()
+	{
+		return '@ernadoo_phpbbdirectory/directory_website';
+	}
+
+	/**
+	 * Get email template variables.
+	 *
+	 * @return array
+	 */
+	public function get_email_template_variables()
+	{
+		return [
+			'CAT_NAME'             => $this->get_data('cat_name'),
+			'LINK_NAME'            => htmlspecialchars_decode($this->get_data('link_name')),
+			'LINK_URL'             => $this->get_data('link_url'),
+			'LINK_DESCRIPTION'     => $this->get_data('link_description'),
+		];
+	}
+
+	/**
+	 * Get the url to this item.
+	 *
+	 * @return string URL
+	 */
+	public function get_url()
+	{
+		return append_sid($this->phpbb_root_path.'directory/categorie/'.(int) $this->get_data('cat_id'));
+	}
+
+	/**
+	 * Users needed to query before this notification can be displayed.
+	 *
+	 * @return array Array of user_ids
+	 */
+	public function users_to_query()
+	{
+		return [$this->get_data('user_from')];
+	}
+
+	/**
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $data            Data from submit link
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
+	public function create_insert_array($data, $pre_create_data = [])
+	{
+		$this->set_data('link_name', $data['link_name']);
+		$this->set_data('link_url', $data['link_url']);
+		$this->set_data('link_description', $data['link_description']);
+		$this->set_data('user_from', $data['user_from']);
+		$this->set_data('cat_id', $data['cat_id']);
+		$this->set_data('cat_name', $data['cat_name']);
+
+		return parent::create_insert_array($data, $pre_create_data);
+	}
 }

Braces +4 added lines, -2 removed lines

@@ -89,12 +89,14 @@
 				AND notify_status = '.NOTIFY_YES.'
 				AND user_id <> '.(int) $data['user_from'];
         $result = $this->db->sql_query($sql);
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $users[] = (int) $row['user_id'];
         }
         $this->db->sql_freeresult($result);
 
-        if (empty($users)) {
+        if (empty($users))
+        {
             return [];
         }
 

notification/type/directory_website_in_queue.php

Indentation +169 added lines, -169 removed lines

@@ -13,173 +13,173 @@
  */
 class directory_website_in_queue extends \phpbb\notification\type\base
 {
-    /**
-     * Get notification type name.
-     *
-     * @return string
-     */
-    public function get_type()
-    {
-        return 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
-    }
-
-    /**
-     * Notification option data (for outputting to the user).
-     *
-     * @var bool|array False if the service should use it's default data
-     *                 Array of data (including keys 'id', 'lang', and 'group')
-     */
-    public static $notification_option = [
-        'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE',
-        'group'    => 'NOTIFICATION_DIR_UCP',
-    ];
-
-    /**
-     * Permission to check for (in find_users_for_notification).
-     *
-     * @var string Permission name
-     */
-    protected $permission = 'a_';
-
-    /**
-     * Is available.
-     *
-     * @return bool True/False whether or not this is available to the user
-     */
-    public function is_available()
-    {
-        $has_permission = $this->auth->acl_get($this->permission, true);
-
-        return !empty($has_permission);
-    }
-
-    /**
-     * Get link id.
-     *
-     * @param array $data The data from the link
-     *
-     * @return int
-     */
-    public static function get_item_id($data)
-    {
-        return (int) $data['link_id'];
-    }
-
-    /**
-     * Get parent id - it's not used.
-     *
-     * @param array $data The data from the link
-     */
-    public static function get_item_parent_id($data)
-    {
-        // No parent
-        return 0;
-    }
-
-    /**
-     * Find the users who want to receive notifications.
-     *
-     * @param array $data    Data from submit link
-     * @param array $options Options for finding users for notification
-     *
-     * @return array
-     */
-    public function find_users_for_notification($data, $options = [])
-    {
-        $options = array_merge([
-            'ignore_users'        => [],
-        ], $options);
-
-        // 0 is for global moderator permissions
-        $admin_ary = $this->auth->acl_get_list(false, $this->permission);
-        $users = (!empty($admin_ary[0][$this->permission])) ? $admin_ary[0][$this->permission] : [];
-
-        if (empty($users)) {
-            return [];
-        }
-
-        return $this->check_user_notification_options($users, $options);
-    }
-
-    /**
-     * Get the user's avatar.
-     */
-    public function get_avatar()
-    {
-        return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
-    }
-
-    /**
-     * Get the HTML formatted title of this notification.
-     *
-     * @return string
-     */
-    public function get_title()
-    {
-        $link_name = $this->get_data('link_name');
-        $username = $this->user_loader->get_username($this->get_data('user_from'), 'no_profile');
-
-        return $this->user->lang('NOTIFICATION_DIR_WEBSITE_IN_QUEUE', $link_name, $username);
-    }
-
-    /**
-     * Get email template.
-     *
-     * @return string
-     */
-    public function get_email_template()
-    {
-        return '@ernadoo_phpbbdirectory/directory_website_in_queue';
-    }
-
-    /**
-     * Get email template variables.
-     *
-     * @return array
-     */
-    public function get_email_template_variables()
-    {
-        return [];
-    }
-
-    /**
-     * Get the url to this item.
-     *
-     * @return string URL
-     */
-    public function get_url()
-    {
-        global $phpbb_admin_path;
-
-        return append_sid("{$phpbb_admin_path}index.{$this->php_ext}", ['i' => '-ernadoo-phpbbdirectory-acp-phpbbdirectory_module', 'mode' => 'val'], true, $this->user->session_id);
-    }
-
-    /**
-     * Users needed to query before this notification can be displayed.
-     *
-     * @return array Array of user_ids
-     */
-    public function users_to_query()
-    {
-        return [$this->get_data('user_from')];
-    }
-
-    /**
-     * Function for preparing the data for insertion in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $data            Data from submit link
-     * @param array $pre_create_data Data from pre_create_insert_array()
-     *
-     * @return array Array of data ready to be inserted into the database
-     */
-    public function create_insert_array($data, $pre_create_data = [])
-    {
-        $this->set_data('user_from', $data['user_from']);
-        $this->set_data('link_name', $data['link_name']);
-        $this->set_data('cat_id', $data['cat_id']);
-        $this->set_data('cat_name', $data['cat_name']);
-
-        return parent::create_insert_array($data, $pre_create_data);
-    }
+	/**
+	 * Get notification type name.
+	 *
+	 * @return string
+	 */
+	public function get_type()
+	{
+		return 'ernadoo.phpbbdirectory.notification.type.directory_website_in_queue';
+	}
+
+	/**
+	 * Notification option data (for outputting to the user).
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 *                 Array of data (including keys 'id', 'lang', and 'group')
+	 */
+	public static $notification_option = [
+		'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_IN_MODERATION_QUEUE',
+		'group'    => 'NOTIFICATION_DIR_UCP',
+	];
+
+	/**
+	 * Permission to check for (in find_users_for_notification).
+	 *
+	 * @var string Permission name
+	 */
+	protected $permission = 'a_';
+
+	/**
+	 * Is available.
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
+	public function is_available()
+	{
+		$has_permission = $this->auth->acl_get($this->permission, true);
+
+		return !empty($has_permission);
+	}
+
+	/**
+	 * Get link id.
+	 *
+	 * @param array $data The data from the link
+	 *
+	 * @return int
+	 */
+	public static function get_item_id($data)
+	{
+		return (int) $data['link_id'];
+	}
+
+	/**
+	 * Get parent id - it's not used.
+	 *
+	 * @param array $data The data from the link
+	 */
+	public static function get_item_parent_id($data)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	 * Find the users who want to receive notifications.
+	 *
+	 * @param array $data    Data from submit link
+	 * @param array $options Options for finding users for notification
+	 *
+	 * @return array
+	 */
+	public function find_users_for_notification($data, $options = [])
+	{
+		$options = array_merge([
+			'ignore_users'        => [],
+		], $options);
+
+		// 0 is for global moderator permissions
+		$admin_ary = $this->auth->acl_get_list(false, $this->permission);
+		$users = (!empty($admin_ary[0][$this->permission])) ? $admin_ary[0][$this->permission] : [];
+
+		if (empty($users)) {
+			return [];
+		}
+
+		return $this->check_user_notification_options($users, $options);
+	}
+
+	/**
+	 * Get the user's avatar.
+	 */
+	public function get_avatar()
+	{
+		return $this->user_loader->get_avatar($this->get_data('user_from'), false, true);
+	}
+
+	/**
+	 * Get the HTML formatted title of this notification.
+	 *
+	 * @return string
+	 */
+	public function get_title()
+	{
+		$link_name = $this->get_data('link_name');
+		$username = $this->user_loader->get_username($this->get_data('user_from'), 'no_profile');
+
+		return $this->user->lang('NOTIFICATION_DIR_WEBSITE_IN_QUEUE', $link_name, $username);
+	}
+
+	/**
+	 * Get email template.
+	 *
+	 * @return string
+	 */
+	public function get_email_template()
+	{
+		return '@ernadoo_phpbbdirectory/directory_website_in_queue';
+	}
+
+	/**
+	 * Get email template variables.
+	 *
+	 * @return array
+	 */
+	public function get_email_template_variables()
+	{
+		return [];
+	}
+
+	/**
+	 * Get the url to this item.
+	 *
+	 * @return string URL
+	 */
+	public function get_url()
+	{
+		global $phpbb_admin_path;
+
+		return append_sid("{$phpbb_admin_path}index.{$this->php_ext}", ['i' => '-ernadoo-phpbbdirectory-acp-phpbbdirectory_module', 'mode' => 'val'], true, $this->user->session_id);
+	}
+
+	/**
+	 * Users needed to query before this notification can be displayed.
+	 *
+	 * @return array Array of user_ids
+	 */
+	public function users_to_query()
+	{
+		return [$this->get_data('user_from')];
+	}
+
+	/**
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $data            Data from submit link
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
+	public function create_insert_array($data, $pre_create_data = [])
+	{
+		$this->set_data('user_from', $data['user_from']);
+		$this->set_data('link_name', $data['link_name']);
+		$this->set_data('cat_id', $data['cat_id']);
+		$this->set_data('cat_name', $data['cat_name']);
+
+		return parent::create_insert_array($data, $pre_create_data);
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -94,7 +94,8 @@
         $admin_ary = $this->auth->acl_get_list(false, $this->permission);
         $users = (!empty($admin_ary[0][$this->permission])) ? $admin_ary[0][$this->permission] : [];
 
-        if (empty($users)) {
+        if (empty($users))
+        {
             return [];
         }
 

notification/type/directory_website_disapproved.php

Indentation +157 added lines, -157 removed lines

@@ -13,161 +13,161 @@
  */
 class directory_website_disapproved extends \phpbb\notification\type\base
 {
-    /**
-     * Get notification type name.
-     *
-     * @return string
-     */
-    public function get_type()
-    {
-        return 'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved';
-    }
-
-    /**
-     * Notification option data (for outputting to the user).
-     *
-     * @var bool|array False if the service should use it's default data
-     *                 Array of data (including keys 'id', 'lang', and 'group')
-     */
-    public static $notification_option = [
-        'id'       => 'dir_moderation_queue',
-        'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
-        'group'    => 'NOTIFICATION_DIR_UCP',
-    ];
-
-    /**
-     * Permission to check for (in find_users_for_notification).
-     *
-     * @var string Permission name
-     */
-    protected $permission = ['a_', 'm_'];
-
-    /**
-     * Is available.
-     *
-     * @return bool True/False whether or not this is available to the user
-     */
-    public function is_available()
-    {
-        $has_permission = $this->auth->acl_gets($this->permission, true);
-
-        return empty($has_permission);
-    }
-
-    /**
-     * Get link id.
-     *
-     * @param array $data The data from the link
-     *
-     * @return int
-     */
-    public static function get_item_id($data)
-    {
-        return (int) $data['link_id'];
-    }
-
-    /**
-     * Get parent id - it's not used.
-     *
-     * @param array $data The data from the link
-     */
-    public static function get_item_parent_id($data)
-    {
-        // No parent
-        return 0;
-    }
-
-    /**
-     * Find the users who want to receive notifications.
-     *
-     * @param array $data    Data from submit link
-     * @param array $options Options for finding users for notification
-     *
-     * @return array
-     */
-    public function find_users_for_notification($data, $options = [])
-    {
-        $options = array_merge([
-            'ignore_users'        => [],
-        ], $options);
-
-        $users = [$data['user_from']];
-
-        return $this->check_user_notification_options($users, array_merge($options, [
-            'item_type'        => self::$notification_option['id'],
-        ]));
-    }
-
-    /**
-     * Get the HTML formatted title of this notification.
-     *
-     * @return string
-     */
-    public function get_title()
-    {
-        $link_name = $this->get_data('link_name');
-        $cat_name = $this->get_data('cat_name');
-
-        return $this->user->lang('NOTIFICATION_DIR_WEBSITE_DISAPPROVED', $link_name, $cat_name);
-    }
-
-    /**
-     * Get email template.
-     *
-     * @return string
-     */
-    public function get_email_template()
-    {
-        return '@ernadoo_phpbbdirectory/directory_website_disapproved';
-    }
-
-    /**
-     * Get email template variables.
-     *
-     * @return array
-     */
-    public function get_email_template_variables()
-    {
-        return [
-            'LINK_NAME'    => htmlspecialchars_decode($this->get_data('link_name')),
-        ];
-    }
-
-    /**
-     * Get the url to this item.
-     *
-     * @return string URL
-     */
-    public function get_url()
-    {
-        return '';
-    }
-
-    /**
-     * Users needed to query before this notification can be displayed.
-     *
-     * @return array Array of user_ids
-     */
-    public function users_to_query()
-    {
-        return [];
-    }
-
-    /**
-     * Function for preparing the data for insertion in an SQL query
-     * (The service handles insertion).
-     *
-     * @param array $data            Data from submit link
-     * @param array $pre_create_data Data from pre_create_insert_array()
-     *
-     * @return array Array of data ready to be inserted into the database
-     */
-    public function create_insert_array($data, $pre_create_data = [])
-    {
-        $this->set_data('link_name', $data['link_name']);
-        $this->set_data('cat_id', $data['cat_id']);
-        $this->set_data('cat_name', $data['cat_name']);
-
-        return parent::create_insert_array($data, $pre_create_data);
-    }
+	/**
+	 * Get notification type name.
+	 *
+	 * @return string
+	 */
+	public function get_type()
+	{
+		return 'ernadoo.phpbbdirectory.notification.type.directory_website_disapproved';
+	}
+
+	/**
+	 * Notification option data (for outputting to the user).
+	 *
+	 * @var bool|array False if the service should use it's default data
+	 *                 Array of data (including keys 'id', 'lang', and 'group')
+	 */
+	public static $notification_option = [
+		'id'       => 'dir_moderation_queue',
+		'lang'     => 'NOTIFICATION_TYPE_DIR_UCP_MODERATION_QUEUE',
+		'group'    => 'NOTIFICATION_DIR_UCP',
+	];
+
+	/**
+	 * Permission to check for (in find_users_for_notification).
+	 *
+	 * @var string Permission name
+	 */
+	protected $permission = ['a_', 'm_'];
+
+	/**
+	 * Is available.
+	 *
+	 * @return bool True/False whether or not this is available to the user
+	 */
+	public function is_available()
+	{
+		$has_permission = $this->auth->acl_gets($this->permission, true);
+
+		return empty($has_permission);
+	}
+
+	/**
+	 * Get link id.
+	 *
+	 * @param array $data The data from the link
+	 *
+	 * @return int
+	 */
+	public static function get_item_id($data)
+	{
+		return (int) $data['link_id'];
+	}
+
+	/**
+	 * Get parent id - it's not used.
+	 *
+	 * @param array $data The data from the link
+	 */
+	public static function get_item_parent_id($data)
+	{
+		// No parent
+		return 0;
+	}
+
+	/**
+	 * Find the users who want to receive notifications.
+	 *
+	 * @param array $data    Data from submit link
+	 * @param array $options Options for finding users for notification
+	 *
+	 * @return array
+	 */
+	public function find_users_for_notification($data, $options = [])
+	{
+		$options = array_merge([
+			'ignore_users'        => [],
+		], $options);
+
+		$users = [$data['user_from']];
+
+		return $this->check_user_notification_options($users, array_merge($options, [
+			'item_type'        => self::$notification_option['id'],
+		]));
+	}
+
+	/**
+	 * Get the HTML formatted title of this notification.
+	 *
+	 * @return string
+	 */
+	public function get_title()
+	{
+		$link_name = $this->get_data('link_name');
+		$cat_name = $this->get_data('cat_name');
+
+		return $this->user->lang('NOTIFICATION_DIR_WEBSITE_DISAPPROVED', $link_name, $cat_name);
+	}
+
+	/**
+	 * Get email template.
+	 *
+	 * @return string
+	 */
+	public function get_email_template()
+	{
+		return '@ernadoo_phpbbdirectory/directory_website_disapproved';
+	}
+
+	/**
+	 * Get email template variables.
+	 *
+	 * @return array
+	 */
+	public function get_email_template_variables()
+	{
+		return [
+			'LINK_NAME'    => htmlspecialchars_decode($this->get_data('link_name')),
+		];
+	}
+
+	/**
+	 * Get the url to this item.
+	 *
+	 * @return string URL
+	 */
+	public function get_url()
+	{
+		return '';
+	}
+
+	/**
+	 * Users needed to query before this notification can be displayed.
+	 *
+	 * @return array Array of user_ids
+	 */
+	public function users_to_query()
+	{
+		return [];
+	}
+
+	/**
+	 * Function for preparing the data for insertion in an SQL query
+	 * (The service handles insertion).
+	 *
+	 * @param array $data            Data from submit link
+	 * @param array $pre_create_data Data from pre_create_insert_array()
+	 *
+	 * @return array Array of data ready to be inserted into the database
+	 */
+	public function create_insert_array($data, $pre_create_data = [])
+	{
+		$this->set_data('link_name', $data['link_name']);
+		$this->set_data('cat_id', $data['cat_id']);
+		$this->set_data('cat_name', $data['cat_name']);
+
+		return parent::create_insert_array($data, $pre_create_data);
+	}
 }

migrations/v10x/v1_0_0.php

Indentation +313 added lines, -313 removed lines

@@ -9,317 +9,317 @@
 
 class v1_0_0 extends \phpbb\db\migration\migration
 {
-    public static function depends_on()
-    {
-        return [
-                '\ernadoo\phpbbdirectory\migrations\converter\convert_module',
-        ];
-    }
-
-    public function update_schema()
-    {
-        return [
-            'add_tables' => [
-                $this->table_prefix.'directory_cats' => [
-                    'COLUMNS' => [
-                        'cat_id'                   => ['UINT', null, 'auto_increment'],
-                        'parent_id'                => ['UINT', 0],
-                        'left_id'                  => ['UINT', 0],
-                        'right_id'                 => ['UINT', 0],
-                        'cat_parents'              => ['MTEXT_UNI', ''],
-                        'cat_name'                 => ['VCHAR', ''],
-                        'cat_desc'                 => ['TEXT_UNI', ''],
-                        'cat_desc_bitfield'        => ['VCHAR', ''],
-                        'cat_desc_options'         => ['TIMESTAMP', 7],
-                        'cat_desc_uid'             => ['VCHAR:8', ''],
-                        'cat_links'                => ['UINT', 0],
-                        'cat_icon'                 => ['VCHAR', ''],
-                        'display_subcat_list'      => ['BOOL', 1],
-                        'cat_allow_comments'       => ['BOOL', 1],
-                        'cat_allow_votes'          => ['BOOL', 1],
-                        'cat_must_describe'        => ['BOOL', 1],
-                        'cat_count_all'            => ['BOOL', 0],
-                        'cat_validate'             => ['BOOL', 1],
-                        'cat_link_back'            => ['BOOL', 0],
-                        'cat_cron_enable'          => ['BOOL', 0],
-                        'cat_cron_next'            => ['TIMESTAMP', 0],
-                        'cat_cron_freq'            => ['UINT', 7],
-                        'cat_cron_nb_check'        => ['UINT', 1],
-                    ],
-
-                    'PRIMARY_KEY'    => ['cat_id'],
-
-                    'KEYS'        => [
-                        'l_r_id' => ['INDEX', ['left_id', 'right_id']],
-                    ],
-                ],
-
-                $this->table_prefix.'directory_comments' => [
-                    'COLUMNS' => [
-                        'comment_id'          => ['UINT', null, 'auto_increment'],
-                        'comment_date'        => ['TIMESTAMP', 0],
-                        'comment_link_id'     => ['UINT', 0],
-                        'comment_user_id'     => ['UINT', 0],
-                        'comment_user_ip'     => ['VCHAR:40', ''],
-                        'comment_text'        => ['MTEXT_UNI', ''],
-                        'comment_uid'         => ['VCHAR:8', 0],
-                        'comment_flags'       => ['TIMESTAMP', 0],
-                        'comment_bitfield'    => ['VCHAR', ''],
-                    ],
-
-                    'PRIMARY_KEY'    => ['comment_id'],
-                ],
-
-                $this->table_prefix.'directory_links' => [
-                    'COLUMNS' => [
-                        'link_id'             => ['UINT', null, 'auto_increment'],
-                        'link_time'           => ['TIMESTAMP', 0],
-                        'link_uid'            => ['VCHAR:8', ''],
-                        'link_flags'          => ['TIMESTAMP', 0],
-                        'link_bitfield'       => ['VCHAR', ''],
-                        'link_url'            => ['VCHAR', ''],
-                        'link_description'    => ['MTEXT_UNI', ''],
-                        'link_view'           => ['UINT', 0],
-                        'link_active'         => ['BOOL', 0],
-                        'link_cat'            => ['UINT', 0],
-                        'link_user_id'        => ['UINT', 0],
-                        'link_name'           => ['XSTEXT_UNI', ''],
-                        'link_rss'            => ['VCHAR', ''],
-                        'link_banner'         => ['VCHAR', ''],
-                        'link_back'           => ['VCHAR', ''],
-                        'link_nb_check'       => ['TINT:3', 0],
-                        'link_flag'           => ['VCHAR', ''],
-                        'link_guest_email'    => ['XSTEXT_UNI', ''],
-                        'link_vote'           => ['UINT', 0],
-                        'link_comment'        => ['TIMESTAMP', 0],
-                        'link_note'           => ['UINT', 0],
-                        'link_pagerank'       => ['CHAR:2', ''],
-                        'link_thumb'          => ['VCHAR', ''],
-                    ],
-
-                    'PRIMARY_KEY'    => ['link_id'],
-
-                    'KEYS'        => [
-                        'link_id'             => ['UNIQUE', ['link_id']],
-                        'link_c_a'            => ['INDEX', ['link_cat', 'link_active']],
-                        'link_time'           => ['INDEX', ['link_time']],
-                        'link_u_id'           => ['INDEX', ['link_user_id']],
-                    ],
-                ],
-
-                $this->table_prefix.'directory_watch' => [
-                    'COLUMNS' => [
-                        'cat_id'           => ['UINT', 0],
-                        'user_id'          => ['UINT', 0],
-                        'notify_status'    => ['UINT', 0],
-                    ],
-
-                    'KEYS'        => [
-                        'c_id'        => ['INDEX', ['cat_id']],
-                        'u_id'        => ['INDEX', ['user_id']],
-                        'n_stat'      => ['INDEX', ['notify_status']],
-                    ],
-
-                ],
-
-                $this->table_prefix.'directory_votes' => [
-                    'COLUMNS' => [
-                        'vote_id'              => ['UINT', null, 'auto_increment'],
-                        'vote_link_id'         => ['UINT', 0],
-                        'vote_user_id'         => ['UINT', 0],
-                        'vote_note'            => ['TINT:2', 0],
-                    ],
-
-                    'PRIMARY_KEY'    => ['vote_id'],
-
-                    'KEYS'        => [
-                        'v_l_id'    => ['INDEX', ['vote_link_id']],
-                        'v_u_id'    => ['INDEX', ['vote_user_id']],
-                    ],
-                ],
-            ],
-        ];
-    }
-
-    public function revert_schema()
-    {
-        return [
-            'drop_tables'    => [
-                $this->table_prefix.'directory_cats',
-                $this->table_prefix.'directory_comments',
-                $this->table_prefix.'directory_links',
-                $this->table_prefix.'directory_votes',
-                $this->table_prefix.'directory_watch',
-            ],
-        ];
-    }
-
-    public function update_data()
-    {
-        return [
-            ['config.add', ['dir_mail', '1']],
-            ['config.add', ['dir_activ_flag', '1']],
-            ['config.add', ['dir_show', '10']],
-            ['config.add', ['dir_default_order', 't d']],
-            ['config.add', ['dir_allow_bbcode', '1']],
-            ['config.add', ['dir_allow_flash', '1']],
-            ['config.add', ['dir_allow_links', '1']],
-            ['config.add', ['dir_allow_smilies', '1']],
-            ['config.add', ['dir_length_describe', '255']],
-            ['config.add', ['dir_activ_banner', '1']],
-            ['config.add', ['dir_banner_height', '60']],
-            ['config.add', ['dir_banner_width', '480']],
-            ['config.add', ['dir_activ_checkurl', '1']],
-            ['config.add', ['dir_activ_pagerank', '1']],
-            ['config.add', ['dir_activ_thumb', '1']],
-            ['config.add', ['dir_activ_thumb_remote', '1']],
-            ['config.add', ['dir_visual_confirm', '1']],
-            ['config.add', ['dir_visual_confirm_max_attempts', '3']],
-            ['config.add', ['dir_length_comments', '256']],
-            ['config.add', ['dir_new_time', '7']],
-            ['config.add', ['dir_comments_per_page', '10']],
-            ['config.add', ['dir_storage_banner', '1']],
-            ['config.add', ['dir_banner_filesize', '30000']],
-            ['config.add', ['dir_thumb_service', 'http://www.apercite.fr/apercite/120x90/oui/oui/']],
-            ['config.add', ['dir_thumb_service_reverse', '0']],
-            ['config.add', ['dir_activ_rss', '1']],
-            ['config.add', ['dir_recent_block', '1']],
-            ['config.add', ['dir_recent_exclude', '1']],
-            ['config.add', ['dir_recent_rows', '1']],
-            ['config.add', ['dir_recent_columns', '5']],
-            ['config.add', ['dir_root_path', './']],
-            ['config.add', ['dir_activ_rewrite', '0']],
-
-            ['module.add', [
-                'acp',
-                'ACP_CAT_DOT_MODS',
-                'ACP_DIRECTORY',
-            ]],
-
-            ['module.add', [
-                'acp',
-                'ACP_DIRECTORY',
-                [
-                    'module_basename'      => '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module',
-                    'modes'                => ['main', 'settings', 'cat', 'val'],
-                ],
-            ]],
-
-            ['permission.add', ['u_comment_dir']],
-            ['permission.add', ['u_search_dir']],
-            ['permission.add', ['u_submit_dir']],
-            ['permission.add', ['u_vote_dir']],
-            ['permission.add', ['u_edit_comment_dir']],
-            ['permission.add', ['u_delete_comment_dir']],
-            ['permission.add', ['u_edit_dir']],
-            ['permission.add', ['u_delete_dir']],
-            ['permission.add', ['m_edit_dir']],
-            ['permission.add', ['m_delete_dir']],
-            ['permission.add', ['m_edit_comment_dir']],
-            ['permission.add', ['m_delete_comment_dir']],
-
-            ['permission.permission_set',
-                ['ROLE_USER_FULL',
-                    [
-                        'u_comment_dir',
-                        'u_search_dir',
-                        'u_submit_dir',
-                        'u_vote_dir',
-                        'u_edit_comment_dir',
-                        'u_delete_comment_dir',
-                        'u_edit_dir',
-                        'u_delete_dir',
-                    ],
-                ],
-            ],
-
-            ['permission.permission_set',
-                ['ROLE_MOD_FULL',
-                    [
-                        'm_edit_dir',
-                        'm_delete_dir',
-                        'm_edit_comment_dir',
-                        'm_delete_comment_dir',
-                    ],
-                ],
-            ],
-
-            ['custom', [[&$this, 'create_directories']]],
-        ];
-    }
-
-    public function revert_data()
-    {
-        return [
-            ['custom', [[&$this, 'remove_directories']]],
-        ];
-    }
-
-    /**
-     * Create directories for banners/icons uploaded.
-     *
-     * @return null
-     */
-    public function create_directories()
-    {
-        $directories = [
-            'files/ext/ernadoo/phpbbdirectory/banners/',
-            'files/ext/ernadoo/phpbbdirectory/icons/',
-        ];
-
-        foreach ($directories as $dir) {
-            if (!file_exists($this->phpbb_root_path.$dir)) {
-                @mkdir($this->phpbb_root_path.$dir, 0777, true);
-                phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
-            }
-        }
-    }
-
-    /**
-     * Remove directories for banners/icons uploaded.
-     *
-     * @return null
-     */
-    public function remove_directories()
-    {
-        $dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
-
-        $this->_recursive_rmdir($dir);
-    }
-
-    /**
-     * Attempts to remove recursively the directory named by dirname.
-     *
-     * @author Mehdi Kabab <http://pioupioum.fr>
-     * @copyright Copyright (C) 2009 Mehdi Kabab
-     * @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
-     *
-     * @param string $dirname Path to the directory.
-     *
-     * @return null
-     */
-    private function _recursive_rmdir($dirname)
-    {
-        if (is_dir($dirname) && !is_link($dirname)) {
-            $iterator = new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator($dirname),
-                \RecursiveIteratorIterator::CHILD_FIRST
-            );
-
-            while ($iterator->valid()) {
-                if (!$iterator->isDot()) {
-                    if ($iterator->isFile()) {
-                        unlink($iterator->getPathName());
-                    } elseif ($iterator->isDir()) {
-                        rmdir($iterator->getPathName());
-                    }
-                }
-
-                $iterator->next();
-            }
-            unset($iterator); // Fix for Windows.
-
-            rmdir($dirname);
-        }
-    }
+	public static function depends_on()
+	{
+		return [
+				'\ernadoo\phpbbdirectory\migrations\converter\convert_module',
+		];
+	}
+
+	public function update_schema()
+	{
+		return [
+			'add_tables' => [
+				$this->table_prefix.'directory_cats' => [
+					'COLUMNS' => [
+						'cat_id'                   => ['UINT', null, 'auto_increment'],
+						'parent_id'                => ['UINT', 0],
+						'left_id'                  => ['UINT', 0],
+						'right_id'                 => ['UINT', 0],
+						'cat_parents'              => ['MTEXT_UNI', ''],
+						'cat_name'                 => ['VCHAR', ''],
+						'cat_desc'                 => ['TEXT_UNI', ''],
+						'cat_desc_bitfield'        => ['VCHAR', ''],
+						'cat_desc_options'         => ['TIMESTAMP', 7],
+						'cat_desc_uid'             => ['VCHAR:8', ''],
+						'cat_links'                => ['UINT', 0],
+						'cat_icon'                 => ['VCHAR', ''],
+						'display_subcat_list'      => ['BOOL', 1],
+						'cat_allow_comments'       => ['BOOL', 1],
+						'cat_allow_votes'          => ['BOOL', 1],
+						'cat_must_describe'        => ['BOOL', 1],
+						'cat_count_all'            => ['BOOL', 0],
+						'cat_validate'             => ['BOOL', 1],
+						'cat_link_back'            => ['BOOL', 0],
+						'cat_cron_enable'          => ['BOOL', 0],
+						'cat_cron_next'            => ['TIMESTAMP', 0],
+						'cat_cron_freq'            => ['UINT', 7],
+						'cat_cron_nb_check'        => ['UINT', 1],
+					],
+
+					'PRIMARY_KEY'    => ['cat_id'],
+
+					'KEYS'        => [
+						'l_r_id' => ['INDEX', ['left_id', 'right_id']],
+					],
+				],
+
+				$this->table_prefix.'directory_comments' => [
+					'COLUMNS' => [
+						'comment_id'          => ['UINT', null, 'auto_increment'],
+						'comment_date'        => ['TIMESTAMP', 0],
+						'comment_link_id'     => ['UINT', 0],
+						'comment_user_id'     => ['UINT', 0],
+						'comment_user_ip'     => ['VCHAR:40', ''],
+						'comment_text'        => ['MTEXT_UNI', ''],
+						'comment_uid'         => ['VCHAR:8', 0],
+						'comment_flags'       => ['TIMESTAMP', 0],
+						'comment_bitfield'    => ['VCHAR', ''],
+					],
+
+					'PRIMARY_KEY'    => ['comment_id'],
+				],
+
+				$this->table_prefix.'directory_links' => [
+					'COLUMNS' => [
+						'link_id'             => ['UINT', null, 'auto_increment'],
+						'link_time'           => ['TIMESTAMP', 0],
+						'link_uid'            => ['VCHAR:8', ''],
+						'link_flags'          => ['TIMESTAMP', 0],
+						'link_bitfield'       => ['VCHAR', ''],
+						'link_url'            => ['VCHAR', ''],
+						'link_description'    => ['MTEXT_UNI', ''],
+						'link_view'           => ['UINT', 0],
+						'link_active'         => ['BOOL', 0],
+						'link_cat'            => ['UINT', 0],
+						'link_user_id'        => ['UINT', 0],
+						'link_name'           => ['XSTEXT_UNI', ''],
+						'link_rss'            => ['VCHAR', ''],
+						'link_banner'         => ['VCHAR', ''],
+						'link_back'           => ['VCHAR', ''],
+						'link_nb_check'       => ['TINT:3', 0],
+						'link_flag'           => ['VCHAR', ''],
+						'link_guest_email'    => ['XSTEXT_UNI', ''],
+						'link_vote'           => ['UINT', 0],
+						'link_comment'        => ['TIMESTAMP', 0],
+						'link_note'           => ['UINT', 0],
+						'link_pagerank'       => ['CHAR:2', ''],
+						'link_thumb'          => ['VCHAR', ''],
+					],
+
+					'PRIMARY_KEY'    => ['link_id'],
+
+					'KEYS'        => [
+						'link_id'             => ['UNIQUE', ['link_id']],
+						'link_c_a'            => ['INDEX', ['link_cat', 'link_active']],
+						'link_time'           => ['INDEX', ['link_time']],
+						'link_u_id'           => ['INDEX', ['link_user_id']],
+					],
+				],
+
+				$this->table_prefix.'directory_watch' => [
+					'COLUMNS' => [
+						'cat_id'           => ['UINT', 0],
+						'user_id'          => ['UINT', 0],
+						'notify_status'    => ['UINT', 0],
+					],
+
+					'KEYS'        => [
+						'c_id'        => ['INDEX', ['cat_id']],
+						'u_id'        => ['INDEX', ['user_id']],
+						'n_stat'      => ['INDEX', ['notify_status']],
+					],
+
+				],
+
+				$this->table_prefix.'directory_votes' => [
+					'COLUMNS' => [
+						'vote_id'              => ['UINT', null, 'auto_increment'],
+						'vote_link_id'         => ['UINT', 0],
+						'vote_user_id'         => ['UINT', 0],
+						'vote_note'            => ['TINT:2', 0],
+					],
+
+					'PRIMARY_KEY'    => ['vote_id'],
+
+					'KEYS'        => [
+						'v_l_id'    => ['INDEX', ['vote_link_id']],
+						'v_u_id'    => ['INDEX', ['vote_user_id']],
+					],
+				],
+			],
+		];
+	}
+
+	public function revert_schema()
+	{
+		return [
+			'drop_tables'    => [
+				$this->table_prefix.'directory_cats',
+				$this->table_prefix.'directory_comments',
+				$this->table_prefix.'directory_links',
+				$this->table_prefix.'directory_votes',
+				$this->table_prefix.'directory_watch',
+			],
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.add', ['dir_mail', '1']],
+			['config.add', ['dir_activ_flag', '1']],
+			['config.add', ['dir_show', '10']],
+			['config.add', ['dir_default_order', 't d']],
+			['config.add', ['dir_allow_bbcode', '1']],
+			['config.add', ['dir_allow_flash', '1']],
+			['config.add', ['dir_allow_links', '1']],
+			['config.add', ['dir_allow_smilies', '1']],
+			['config.add', ['dir_length_describe', '255']],
+			['config.add', ['dir_activ_banner', '1']],
+			['config.add', ['dir_banner_height', '60']],
+			['config.add', ['dir_banner_width', '480']],
+			['config.add', ['dir_activ_checkurl', '1']],
+			['config.add', ['dir_activ_pagerank', '1']],
+			['config.add', ['dir_activ_thumb', '1']],
+			['config.add', ['dir_activ_thumb_remote', '1']],
+			['config.add', ['dir_visual_confirm', '1']],
+			['config.add', ['dir_visual_confirm_max_attempts', '3']],
+			['config.add', ['dir_length_comments', '256']],
+			['config.add', ['dir_new_time', '7']],
+			['config.add', ['dir_comments_per_page', '10']],
+			['config.add', ['dir_storage_banner', '1']],
+			['config.add', ['dir_banner_filesize', '30000']],
+			['config.add', ['dir_thumb_service', 'http://www.apercite.fr/apercite/120x90/oui/oui/']],
+			['config.add', ['dir_thumb_service_reverse', '0']],
+			['config.add', ['dir_activ_rss', '1']],
+			['config.add', ['dir_recent_block', '1']],
+			['config.add', ['dir_recent_exclude', '1']],
+			['config.add', ['dir_recent_rows', '1']],
+			['config.add', ['dir_recent_columns', '5']],
+			['config.add', ['dir_root_path', './']],
+			['config.add', ['dir_activ_rewrite', '0']],
+
+			['module.add', [
+				'acp',
+				'ACP_CAT_DOT_MODS',
+				'ACP_DIRECTORY',
+			]],
+
+			['module.add', [
+				'acp',
+				'ACP_DIRECTORY',
+				[
+					'module_basename'      => '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module',
+					'modes'                => ['main', 'settings', 'cat', 'val'],
+				],
+			]],
+
+			['permission.add', ['u_comment_dir']],
+			['permission.add', ['u_search_dir']],
+			['permission.add', ['u_submit_dir']],
+			['permission.add', ['u_vote_dir']],
+			['permission.add', ['u_edit_comment_dir']],
+			['permission.add', ['u_delete_comment_dir']],
+			['permission.add', ['u_edit_dir']],
+			['permission.add', ['u_delete_dir']],
+			['permission.add', ['m_edit_dir']],
+			['permission.add', ['m_delete_dir']],
+			['permission.add', ['m_edit_comment_dir']],
+			['permission.add', ['m_delete_comment_dir']],
+
+			['permission.permission_set',
+				['ROLE_USER_FULL',
+					[
+						'u_comment_dir',
+						'u_search_dir',
+						'u_submit_dir',
+						'u_vote_dir',
+						'u_edit_comment_dir',
+						'u_delete_comment_dir',
+						'u_edit_dir',
+						'u_delete_dir',
+					],
+				],
+			],
+
+			['permission.permission_set',
+				['ROLE_MOD_FULL',
+					[
+						'm_edit_dir',
+						'm_delete_dir',
+						'm_edit_comment_dir',
+						'm_delete_comment_dir',
+					],
+				],
+			],
+
+			['custom', [[&$this, 'create_directories']]],
+		];
+	}
+
+	public function revert_data()
+	{
+		return [
+			['custom', [[&$this, 'remove_directories']]],
+		];
+	}
+
+	/**
+	 * Create directories for banners/icons uploaded.
+	 *
+	 * @return null
+	 */
+	public function create_directories()
+	{
+		$directories = [
+			'files/ext/ernadoo/phpbbdirectory/banners/',
+			'files/ext/ernadoo/phpbbdirectory/icons/',
+		];
+
+		foreach ($directories as $dir) {
+			if (!file_exists($this->phpbb_root_path.$dir)) {
+				@mkdir($this->phpbb_root_path.$dir, 0777, true);
+				phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
+			}
+		}
+	}
+
+	/**
+	 * Remove directories for banners/icons uploaded.
+	 *
+	 * @return null
+	 */
+	public function remove_directories()
+	{
+		$dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
+
+		$this->_recursive_rmdir($dir);
+	}
+
+	/**
+	 * Attempts to remove recursively the directory named by dirname.
+	 *
+	 * @author Mehdi Kabab <http://pioupioum.fr>
+	 * @copyright Copyright (C) 2009 Mehdi Kabab
+	 * @license http://www.gnu.org/licenses/gpl.html  GNU GPL version 3 or later
+	 *
+	 * @param string $dirname Path to the directory.
+	 *
+	 * @return null
+	 */
+	private function _recursive_rmdir($dirname)
+	{
+		if (is_dir($dirname) && !is_link($dirname)) {
+			$iterator = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($dirname),
+				\RecursiveIteratorIterator::CHILD_FIRST
+			);
+
+			while ($iterator->valid()) {
+				if (!$iterator->isDot()) {
+					if ($iterator->isFile()) {
+						unlink($iterator->getPathName());
+					} elseif ($iterator->isDir()) {
+						rmdir($iterator->getPathName());
+					}
+				}
+
+				$iterator->next();
+			}
+			unset($iterator); // Fix for Windows.
+
+			rmdir($dirname);
+		}
+	}
 }

Braces +15 added lines, -7 removed lines

@@ -267,8 +267,10 @@ 
             'files/ext/ernadoo/phpbbdirectory/icons/',
         ];
 
-        foreach ($directories as $dir) {
-            if (!file_exists($this->phpbb_root_path.$dir)) {
+        foreach ($directories as $dir)
+        {
+            if (!file_exists($this->phpbb_root_path.$dir))
+            {
                 @mkdir($this->phpbb_root_path.$dir, 0777, true);
                 phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
             }
@@ -300,17 +302,23 @@ 
      */
     private function _recursive_rmdir($dirname)
     {
-        if (is_dir($dirname) && !is_link($dirname)) {
+        if (is_dir($dirname) && !is_link($dirname))
+        {
             $iterator = new \RecursiveIteratorIterator(
                 new \RecursiveDirectoryIterator($dirname),
                 \RecursiveIteratorIterator::CHILD_FIRST
             );
 
-            while ($iterator->valid()) {
-                if (!$iterator->isDot()) {
-                    if ($iterator->isFile()) {
+            while ($iterator->valid())
+            {
+                if (!$iterator->isDot())
+                {
+                    if ($iterator->isFile())
+                    {
                         unlink($iterator->getPathName());
-                    } elseif ($iterator->isDir()) {
+                    }
+                    elseif ($iterator->isDir())
+                    {
                         rmdir($iterator->getPathName());
                     }
                 }

migrations/converter/convert_notifications.php

Indentation +46 added lines, -46 removed lines

@@ -12,56 +12,56 @@
  */
 class convert_notifications extends \phpbb\db\migration\migration
 {
-    /**
-     * Skip this migration if phpbb_directory_notifications table does not exist.
-     *
-     * @return bool True if table does not exist
-     */
-    public function effectively_installed()
-    {
-        return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications');
-    }
+	/**
+	 * Skip this migration if phpbb_directory_notifications table does not exist.
+	 *
+	 * @return bool True if table does not exist
+	 */
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications');
+	}
 
-    public static function depends_on()
-    {
-        return [
-            '\ernadoo\phpbbdirectory\migrations\v10x\v1_0_0',
-        ];
-    }
+	public static function depends_on()
+	{
+		return [
+			'\ernadoo\phpbbdirectory\migrations\v10x\v1_0_0',
+		];
+	}
 
-    /**
-     * Add or update data in the database.
-     *
-     * @return array Array of table data
-     */
-    public function update_data()
-    {
-        return [
-            ['custom', [[&$this, 'copy_from_notifications']]],
-        ];
-    }
+	/**
+	 * Add or update data in the database.
+	 *
+	 * @return array Array of table data
+	 */
+	public function update_data()
+	{
+		return [
+			['custom', [[&$this, 'copy_from_notifications']]],
+		];
+	}
 
-    /**
-     * Copy category track from 3.0.x table.
-     *
-     * @return null
-     */
-    public function copy_from_notifications()
-    {
-        $sql = 'SELECT n_user_id, n_cat_id
+	/**
+	 * Copy category track from 3.0.x table.
+	 *
+	 * @return null
+	 */
+	public function copy_from_notifications()
+	{
+		$sql = 'SELECT n_user_id, n_cat_id
 			FROM '.$this->table_prefix.'directory_notifications';
-        $result = $this->db->sql_query($sql);
+		$result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
-            $data = [
-                'cat_id'           => (int) $row['n_cat_id'],
-                'user_id'          => (int) $row['n_user_id'],
-                'notify_status'    => 1,
-            ];
+		while ($row = $this->db->sql_fetchrow($result)) {
+			$data = [
+				'cat_id'           => (int) $row['n_cat_id'],
+				'user_id'          => (int) $row['n_user_id'],
+				'notify_status'    => 1,
+			];
 
-            $sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data);
-            $this->db->sql_query($sql);
-        }
-        $this->db->sql_freeresult($result);
-    }
+			$sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data);
+			$this->db->sql_query($sql);
+		}
+		$this->db->sql_freeresult($result);
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
 			FROM '.$this->table_prefix.'directory_notifications';
         $result = $this->db->sql_query($sql);
 
-        while ($row = $this->db->sql_fetchrow($result)) {
+        while ($row = $this->db->sql_fetchrow($result))
+        {
             $data = [
                 'cat_id'           => (int) $row['n_cat_id'],
                 'user_id'          => (int) $row['n_user_id'],