Apply fixes from StyleCI

[ci skip] [skip ci]

1 files changed, 46 insertions, 64 deletions

diff --git a/src/controllers/FulltextController.php b/src/controllers/FulltextController.php
index eafb555a..12b8cad6 100644
--- a/src/controllers/FulltextController.php
+++ b/src/controllers/FulltextController.php
@@ -20,7 +20,7 @@ class FulltextController extends BaseController
         $action = $this->action;
         if ($action == 'tree') {
             return $this->doTree();
-        } else if ($action == 'subtree') {
+        } elseif ($action == 'subtree') {
             return $this->doSubTree($_REQUEST['what']);
         }
 
@@ -124,7 +124,6 @@ class FulltextController extends BaseController
         }
 
         return $this->printFooter();
-
     }
 
     public function doDefault($msg = '')
@@ -215,7 +214,6 @@ class FulltextController extends BaseController
      */
     public function doTree()
     {
-
         $conf = $this->conf;
         $misc = $this->misc;
         $lang = $this->lang;
@@ -247,7 +245,6 @@ class FulltextController extends BaseController
 
     public function doSubTree($what)
     {
-
         $conf = $this->conf;
         $misc = $this->misc;
         $lang = $this->lang;
@@ -293,7 +290,6 @@ class FulltextController extends BaseController
         ];
 
         return $this->printTree($items, $attrs, strtolower($what));
-
     }
 
     public function doDropConfig($confirm)
@@ -326,9 +322,7 @@ class FulltextController extends BaseController
             } else {
                 $this->doDefault($lang['strftsconfigdroppedbad']);
             }
-
         }
-
     }
 
     public function doDropDict($confirm)
@@ -363,14 +357,12 @@ class FulltextController extends BaseController
             } else {
                 $this->doViewDicts($lang['strftsdictdroppedbad']);
             }
-
         }
-
     }
 
-/**
- * Displays a screen where one can enter a new FTS configuration
- */
+    /**
+     * Displays a screen where one can enter a new FTS configuration
+     */
     public function doCreateConfig($msg = '')
     {
         $conf = $this->conf;
@@ -476,9 +468,9 @@ class FulltextController extends BaseController
         echo "</form>\n";
     }
 
-/**
- * Actually creates the new FTS configuration in the database
- */
+    /**
+     * Actually creates the new FTS configuration in the database
+     */
     public function doSaveCreateConfig()
     {
         $conf = $this->conf;
@@ -519,12 +511,11 @@ class FulltextController extends BaseController
         } else {
             $this->doCreateConfig($lang['strftsconfigcreatedbad']);
         }
-
     }
 
-/**
- * Display a form to permit editing FTS configuration properies.
- */
+    /**
+     * Display a form to permit editing FTS configuration properies.
+     */
     public function doAlterConfig($msg = '')
     {
         $conf = $this->conf;
@@ -585,9 +576,9 @@ class FulltextController extends BaseController
         }
     }
 
-/**
- * Save the form submission containing changes to a FTS configuration
- */
+    /**
+     * Save the form submission containing changes to a FTS configuration
+     */
     public function doSaveAlterConfig()
     {
         $conf   = $this->conf;
@@ -600,12 +591,11 @@ class FulltextController extends BaseController
         } else {
             $this->doAlterConfig($lang['strftsconfigalteredbad']);
         }
-
     }
 
-/**
- * View list of FTS parsers
- */
+    /**
+     * View list of FTS parsers
+     */
     public function doViewParsers($msg = '')
     {
         $conf = $this->conf;
@@ -642,9 +632,9 @@ class FulltextController extends BaseController
         //TODO: navlink to "create parser"
     }
 
-/**
- * View list of FTS dictionaries
- */
+    /**
+     * View list of FTS dictionaries
+     */
     public function doViewDicts($msg = '')
     {
         $conf = $this->conf;
@@ -726,9 +716,9 @@ class FulltextController extends BaseController
         $this->printNavLinks($navlinks, 'fulltext-viewdicts', get_defined_vars());
     }
 
-/**
- * View details of FTS configuration given
- */
+    /**
+     * View details of FTS configuration given
+     */
     public function doViewConfig($ftscfg, $msg = '')
     {
         $conf = $this->conf;
@@ -823,9 +813,9 @@ class FulltextController extends BaseController
         $this->printNavLinks($navlinks, 'fulltext-viewconfig', get_defined_vars());
     }
 
-/**
- * Displays a screen where one can enter a details of a new FTS dictionary
- */
+    /**
+     * Displays a screen where one can enter a details of a new FTS dictionary
+     */
     public function doCreateDict($msg = '')
     {
         $conf = $this->conf;
@@ -947,9 +937,9 @@ class FulltextController extends BaseController
 			</script>\n";
     }
 
-/**
- * Actually creates the new FTS dictionary in the database
- */
+    /**
+     * Actually creates the new FTS dictionary in the database
+     */
     public function doSaveCreateDict()
     {
         $conf = $this->conf;
@@ -961,7 +951,6 @@ class FulltextController extends BaseController
         if ($_POST['formName'] == '') {
             $this->doCreateDict($lang['strftsdictneedsname']);
         } else {
-
             if (!isset($_POST['formIsTemplate'])) {
                 $_POST['formIsTemplate'] = false;
             }
@@ -995,13 +984,12 @@ class FulltextController extends BaseController
             } else {
                 $this->doCreateDict($lang['strftsdictcreatedbad']);
             }
-
         }
     }
 
-/**
- * Display a form to permit editing FTS dictionary properies.
- */
+    /**
+     * Display a form to permit editing FTS dictionary properies.
+     */
     public function doAlterDict($msg = '')
     {
         $conf = $this->conf;
@@ -1056,9 +1044,9 @@ class FulltextController extends BaseController
         }
     }
 
-/**
- * Save the form submission containing changes to a FTS dictionary
- */
+    /**
+     * Save the form submission containing changes to a FTS dictionary
+     */
     public function doSaveAlterDict()
     {
         $conf = $this->conf;
@@ -1072,12 +1060,11 @@ class FulltextController extends BaseController
         } else {
             $this->doAlterDict($lang['strftsdictalteredbad']);
         }
-
     }
 
-/**
- * Show confirmation of drop and perform actual drop of FTS mapping
- */
+    /**
+     * Show confirmation of drop and perform actual drop of FTS mapping
+     */
     public function doDropMapping($confirm)
     {
         $conf = $this->conf;
@@ -1103,13 +1090,11 @@ class FulltextController extends BaseController
 
             // Case of multiaction drop
             if (isset($_REQUEST['ma'])) {
-
                 foreach ($_REQUEST['ma'] as $v) {
                     $a = unserialize(htmlspecialchars_decode($v, ENT_QUOTES));
                     echo '<p>', sprintf($lang['strconfdropftsmapping'], $misc->printVal($a['mapping']), $misc->printVal($_REQUEST['ftscfg'])), "</p>\n";
                     printf('<input type="hidden" name="mapping[]" value="%s" />', htmlspecialchars($a['mapping']));
                 }
-
             } else {
                 echo '<p>', sprintf($lang['strconfdropftsmapping'], $misc->printVal($_REQUEST['mapping']), $misc->printVal($_REQUEST['ftscfg'])), "</p>\n";
                 echo '<input type="hidden" name="mapping" value="', htmlspecialchars($_REQUEST['mapping']), "\" />\n";
@@ -1222,9 +1207,9 @@ class FulltextController extends BaseController
         }
     }
 
-/**
- * Save the form submission containing changes to a FTS mapping
- */
+    /**
+     * Save the form submission containing changes to a FTS mapping
+     */
     public function doSaveAlterMapping()
     {
         $conf = $this->conf;
@@ -1239,12 +1224,11 @@ class FulltextController extends BaseController
         } else {
             $this->doAlterMapping($lang['strftsmappingalteredbad']);
         }
-
     }
 
-/**
- * Show the form to enter parameters of a new FTS mapping
- */
+    /**
+     * Show the form to enter parameters of a new FTS mapping
+     */
     public function doAddMapping($msg = '')
     {
         $conf = $this->conf;
@@ -1316,9 +1300,9 @@ class FulltextController extends BaseController
         }
     }
 
-/**
- * Save the form submission containing parameters of a new FTS mapping
- */
+    /**
+     * Save the form submission containing parameters of a new FTS mapping
+     */
     public function doSaveAddMapping()
     {
         $conf = $this->conf;
@@ -1333,7 +1317,5 @@ class FulltextController extends BaseController
         } else {
             $this->doAddMapping($lang['strftsmappingaddedbad']);
         }
-
     }
-
 }