diff --git a/contrib/smarty/plugins/function.filePath.php b/contrib/smarty/plugins/function.filePath.php
index 977349e4bb4da451c7fd73e90d0c7282c6bda4c9..d2e9176dbfb63386ac8a11468e8c26d1d0926008 100644
--- a/contrib/smarty/plugins/function.filePath.php
+++ b/contrib/smarty/plugins/function.filePath.php
@@ -23,7 +23,7 @@ function smarty_function_filePath ($params, Smarty_Internal_Template $smarty)
   $default_theme = 'breezy';
 
   /* Set theme */
-  if (isset ($config)) {
+  if (isset($config)) {
     $theme = $config->get_cfg_value('theme', $default_theme);
   } else {
     $theme = $default_theme;
diff --git a/contrib/smarty/plugins/function.iconPath.php b/contrib/smarty/plugins/function.iconPath.php
index d87335bea805dc8acd91788e02bf8be8e151db59..08ee4012775a5ba813b00a50a538c8e9b3aebde9 100644
--- a/contrib/smarty/plugins/function.iconPath.php
+++ b/contrib/smarty/plugins/function.iconPath.php
@@ -23,7 +23,7 @@ function smarty_function_iconPath ($params)
 
   /* Set theme */
   $theme = IconTheme::$default_theme;
-  if (isset ($config)) {
+  if (isset($config)) {
     $theme = $config->get_cfg_value("theme");
   }
 
diff --git a/html/autocomplete.php b/html/autocomplete.php
index 87f6778384849d2fd8a5f2cb34d7dd3100df6b23..86f4b9b3a48035559ec9394a6a0b119391a14d04 100644
--- a/html/autocomplete.php
+++ b/html/autocomplete.php
@@ -20,9 +20,9 @@
 */
 
 /* Basic setup, remove eventually registered sessions */
-@require_once ("../include/php_setup.inc");
-@require_once ("functions.inc");
-@require_once ("variables.inc");
+@require_once("../include/php_setup.inc");
+@require_once("functions.inc");
+@require_once("variables.inc");
 
 session_cache_limiter("private");
 session::start();
diff --git a/html/getbin.php b/html/getbin.php
index eabf89b32e057e66582c7c02eb70408776cf689b..edc9413b7e763b311cf975714aa9f442b16e106f 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -43,7 +43,7 @@ header('Pragma: no-cache');
 header('Cache-Control: post-check=0, pre-check=0');
 
 $key = 'binary';
-if (isset ($_GET['key'])) {
+if (isset($_GET['key'])) {
   $key .= $_GET['key'];
 }
 
diff --git a/html/index.php b/html/index.php
index 5f36aaff300550c4458add4aec0f58fb74ad11ba..2fe92ef1a4c65d750d5f397c2b04af8e148c9d12 100644
--- a/html/index.php
+++ b/html/index.php
@@ -20,10 +20,10 @@
 */
 
 /* Load required includes */
-require_once ("../include/php_setup.inc");
-require_once ("functions.inc");
-require_once ("variables.inc");
-require_once ("class_logging.inc");
+require_once("../include/php_setup.inc");
+require_once("functions.inc");
+require_once("variables.inc");
+require_once("class_logging.inc");
 
 /* Set headers */
 header('Content-type: text/html; charset=UTF-8');
diff --git a/html/main.php b/html/main.php
index 2fea060b69d7044f683d4ea9fdd7b8d5f13d207e..5a489b0c795f9432be49e4da5feadd8d48355bdc 100644
--- a/html/main.php
+++ b/html/main.php
@@ -20,9 +20,9 @@
 */
 
 /* Basic setup, remove eventually registered sessions */
-require_once ("../include/php_setup.inc");
-require_once ("functions.inc");
-require_once ("variables.inc");
+require_once("../include/php_setup.inc");
+require_once("functions.inc");
+require_once("variables.inc");
 
 /* Set headers */
 header('Content-type: text/html; charset=UTF-8');
diff --git a/html/progress.php b/html/progress.php
index 8b247b80b9fc8a58e9c7bd5962b5735b241630db..5c5ae04fd1ef94c9177e8e26038a5b3df653fc31 100644
--- a/html/progress.php
+++ b/html/progress.php
@@ -24,10 +24,10 @@ session_cache_limiter("private");
 
 /* Check for parameter completenes */
 if (!isset($_GET['x']) || !isset($_GET['y']) || !isset($_GET['p'])) {
-  die ("Missing parameters!");
+  die("Missing parameters!");
 }
 if (!is_numeric($_GET['x']) || !is_numeric($_GET['y'])) {
-  die ("Parameters must be numeric!");
+  die("Parameters must be numeric!");
 }
 
 $p = (int)($_GET['p']);
@@ -76,7 +76,7 @@ if (!function_exists("imagecreate")) {
   /* Draw image in GD image stream */
   $im = imagecreate($x, $y);
   if (!$im) {
-    die ('Cannot Initialize new GD image stream');
+    die('Cannot Initialize new GD image stream');
   }
 
   /* Set colors */
diff --git a/html/setup.php b/html/setup.php
index 50112ffc63f36b02e9eef0ac3dc0b2b750aaa5d3..f9ef8a8af5a2831fe48fec79f51d62e0f4b1a280 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -20,9 +20,9 @@
 */
 
 /* Get standard functions */
-require_once ("../include/php_setup.inc");
-require_once ("functions.inc");
-require_once ("variables.inc");
+require_once("../include/php_setup.inc");
+require_once("functions.inc");
+require_once("variables.inc");
 
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
diff --git a/include/class_filter.inc b/include/class_filter.inc
index cd46381be205af7a4cf46dbe9ae9c20ebb0e0830..6f5a776921a052fb66a5e2fad6554f54c124ed71 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -335,7 +335,7 @@ class filter
   function render ()
   {
     /* If template is not filled, we display nothing */
-    if (!isset ($this->xmlData['definition']['template'])) {
+    if (!isset($this->xmlData['definition']['template'])) {
       return "";
     }
 
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 431723505dfe81abdb35d2b35893c34f99c17e77..7f6ff508ca666be5b50480fd389ddf6e33a18a80 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1374,7 +1374,7 @@ class LDAP
     /* Build LDAP connection */
     $ds = ldap_connect($server);
     if (!$ds) {
-      die ('Can\'t bind to LDAP. No check possible!');
+      die('Can\'t bind to LDAP. No check possible!');
     }
     ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
     ldap_bind($ds, $admin, $password);
diff --git a/include/class_listing.inc b/include/class_listing.inc
index 1e4913c8b7540e113ef72f5856857c2aaa501cb3..fd1a034a393059a3ba0b319599287523a371e069 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -1431,7 +1431,7 @@ class listing
     global $ui;
 
     if (isset($action['acl'])) {
-      if (isset ($action['aclInfos'])) {
+      if (isset($action['aclInfos'])) {
         $aclInfos = $action['aclInfos'];
       } else {
         /* First time we check permission for this action */
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 806fb5f785ca886a88c620f1a4a29da66d574a99..e23764cff1db93f3ac4a64cd7c2c7007298c789e 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -559,7 +559,7 @@ class pluglist
       }
       if (is_file("$plugin_dir/main.inc")) {
         $display = '';
-        require ("$plugin_dir/main.inc");
+        require("$plugin_dir/main.inc");
       } elseif (is_callable(array($plugin, 'mainInc'))) {
         $plugin::mainInc();
       } else {
diff --git a/include/class_templateHandling.inc b/include/class_templateHandling.inc
index c2cf79ed92d3e455a83634531e977b7de1e692ae..db1af78fc7e4fc6f0f15f63ebf9ed323ace61bee 100644
--- a/include/class_templateHandling.inc
+++ b/include/class_templateHandling.inc
@@ -613,7 +613,7 @@ class templateHandling
       if (!is_array($values)) {
         $values = array($values);
       }
-      unset ($values['count']);
+      unset($values['count']);
       foreach ($values as $value) {
         $offset = 0;
         while (preg_match('/%([^%\|]+\|)?([^%]+)%/', $value, $m, PREG_OFFSET_CAPTURE, $offset)) {
diff --git a/include/functions.inc b/include/functions.inc
index 4a1df7444940aea2ccde658db1141863d993bcb1..d06ba538decd1e89e33130e5e15be329f0ba5684 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -25,12 +25,12 @@
  */
 
 /* Define common locations and variables */
-require_once ('variables.inc');
+require_once('variables.inc');
 
 /* Include required files */
-require_once (CACHE_DIR.'/'.CLASS_CACHE);
-require_once ('functions_debug.inc');
-require_once ('accept-to-gettext.inc');
+require_once(CACHE_DIR.'/'.CLASS_CACHE);
+require_once('functions_debug.inc');
+require_once('accept-to-gettext.inc');
 
 /* Define constants for debugging */
 define('DEBUG_TRACE',    1); /*! Debug level for tracing of common actions (save, check, etc.) */
@@ -234,7 +234,7 @@ function get_template_path ($filename = '', $plugin = FALSE, $path = '')
   $default_theme = 'breezy';
 
   /* Set theme */
-  if (isset ($config)) {
+  if (isset($config)) {
     $theme = $config->get_cfg_value('theme', $default_theme);
   } else {
     $theme = $default_theme;
diff --git a/include/php_setup.inc b/include/php_setup.inc
index a091892ea1bb41c4d61323c7ff975c523d6fc025..f8c0dbd288b009228cdb9104c2632f9871c05220 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -24,7 +24,7 @@
  * \file php_setup.inc
  * Source code for php_setup
  */
-require_once ("variables.inc");
+require_once("variables.inc");
 
 function html_trace ($errstr = "")
 {
@@ -36,7 +36,7 @@ function html_trace ($errstr = "")
     'LDAP/__construct'  => array(1),
   );
   if (!function_exists('debug_backtrace')) {
-    return array ('', '');
+    return array('', '');
   }
   $trace = array_slice(debug_backtrace(), 1);
 
diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 55e05b89982657b8e9a92d04d3306766b9c25e1d..0e61b1436f2f7b3a3f6698cdce349124f22a4981 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -695,7 +695,7 @@ class simpleManagement
     if (static::$skipTemplates) {
       return;
     }
-    if (isset ($target[0])) {
+    if (isset($target[0])) {
       $dn = $target[0];
     } else {
       $dn = NULL;
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 03e0cd804e3b115875ae987919d79cb2ce5867c4..bfead1c099120ad4537a99974821367df0d51e67 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -1168,7 +1168,7 @@ class simplePlugin
       if (is_array($this->attrs[$index]) &&
           (count($this->attrs[$index]) == 0) &&
           !isset($this->saved_attributes[$index])) {
-        unset ($this->attrs[$index]);
+        unset($this->attrs[$index]);
         continue;
       }
 
@@ -1177,7 +1177,7 @@ class simplePlugin
           isset($this->saved_attributes[$index]) &&
           !is_array($this->saved_attributes[$index]) &&
           ($this->attrs[$index] == $this->saved_attributes[$index])) {
-        unset ($this->attrs[$index]);
+        unset($this->attrs[$index]);
         continue;
       }
 
@@ -1186,7 +1186,7 @@ class simplePlugin
           isset($this->saved_attributes[$index]) &&
           is_array($this->saved_attributes[$index]) &&
           !array_differs($this->attrs[$index], $this->saved_attributes[$index])) {
-        unset ($this->attrs[$index]);
+        unset($this->attrs[$index]);
         continue;
       }
     }