ErnadoO / ext-phpbb-directory

controller/categories.php

Braces +38 added lines, -17 removed lines

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

controller/comments.php

Braces +57 added lines, -26 removed lines

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

controller/acp/cat.php

Braces +165 added lines, -76 removed lines

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

controller/acp/main.php

Braces +45 added lines, -22 removed lines

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

controller/acp/settings.php

Braces +23 added lines, -11 removed lines

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

controller/acp/validation.php

Braces +30 added lines, -14 removed lines

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

controller/search.php

Braces +48 added lines, -23 removed lines

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

controller/links.php

Braces +77 added lines, -36 removed lines

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

language/fr/directory.php

Braces +4 added lines, -2 removed lines

@@ -9,11 +9,13 @@
 /**
  * DO NOT CHANGE.
  */
-if (!defined('IN_PHPBB')) {
+if (!defined('IN_PHPBB'))
+{
     exit;
 }
 
-if (empty($lang) || !is_array($lang)) {
+if (empty($lang) || !is_array($lang))
+{
     $lang = [];
 }