diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 6289c14e4d6ca82effc5a6fab51754d8f5d9e1f0..4bdc571207cee108f746b8061558a37254958fa4 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -54,7 +54,7 @@ class passwordRecovery {
   var $usealternates;
 
   /* Constructor */
-  function passwordRecovery()
+  function __construct()
   {
     global $config, $ssl;
     /* Destroy old session if exists.
@@ -152,8 +152,6 @@ class passwordRecovery {
     } else {
       $this->uid = "";
     }
-
-
   }
 
   function execute()
@@ -401,7 +399,6 @@ class passwordRecovery {
 
   function isValidPassword($new_password, $repeated_password)
   {
-    //$MinDiffer = $this->config->get_cfg_value("passwordMinDiffer", 0);
     $MinLength = $this->config->get_cfg_value("passwordMinLength", 0);
 
     if ($new_password != $repeated_password) {
diff --git a/html/getbin.php b/html/getbin.php
index 937af46e3412dc0c40a97a75193747709cb70fc8..199611380cab45bc9c62db5de3de8987bcc28836 100644
--- a/html/getbin.php
+++ b/html/getbin.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
@@ -21,18 +20,18 @@
 */
 
 /* 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");
 
 error_reporting (0);
 session_cache_limiter("private");
 session::start();
-session::global_set('errorsAlreadyPosted',array());
+session::global_set('errorsAlreadyPosted', array());
 
 /* Logged in? Simple security check */
-if (!session::global_is_set('ui')){
-  new log("security","unknown","",array(),"Error: getbin.php called without session") ;
+if (!session::global_is_set('ui')) {
+  new log("security", "unknown", "", array(), "Error: getbin.php called without session");
   header ("Location: index.php");
   exit;
 }
@@ -52,6 +51,4 @@ if (session::is_set('binaryfile')) {
 
 echo session::get('binary');
 error_reporting (E_ALL | E_STRICT);
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>
diff --git a/include/class_SnapShotDialog.inc b/include/class_SnapShotDialog.inc
index 7ed7297312c841d2eee1f2cc835c85cbe43c2c6a..bcb494c3c856d6a88c1d838fcc57bc21d912548a 100644
--- a/include/class_SnapShotDialog.inc
+++ b/include/class_SnapShotDialog.inc
@@ -157,7 +157,6 @@ class SnapShotDialog extends plugin
 
       /* Should we only display all snapshots of already deleted objects
                 or the snapshots for the given object dn */
-      $res = array();
       $tmp = array();
       if ($this->display_all_removed_objects) {
         $snap_shot_bases = $this->snapHandler->getSnapshotBases();
diff --git a/include/class_acl.inc b/include/class_acl.inc
index d9c2bca857fb8de36102a54b7f02d205f5c0232f..48112bb78dea9a0cb51d05c436496186bc43fca8 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -349,7 +349,7 @@ class acl extends plugin
       unset($attrs['gosaAclEntry']['count']);
 
       // Remove entry directly
-      foreach ($attrs['gosaAclEntry'] as $id => $entry) {
+      foreach ($attrs['gosaAclEntry'] as $entry) {
         $parts        = explode(':', $entry);
         $members      = explode(',', $parts[2]);
         $new_members  = array();
diff --git a/include/class_timezone.inc b/include/class_timezone.inc
index 91a96e524a4143a181551c1efbae68bff9577d90..e9ff8ab6ed02cd28a742b1d780dcd704d92652c3 100644
--- a/include/class_timezone.inc
+++ b/include/class_timezone.inc
@@ -40,31 +40,30 @@ class timezone {
   static public function get_default_timezone($stamp = NULL)
   {
     global $config;
-    $tz ="";
+    $tz = "";
 
     /* Default return value if zone could not be detected */
     $zone = array("name" => "unconfigured", "value" => 0);
 
     /* Use current timestamp if $stamp is not set */
-    if($stamp === NULL){
+    if ($stamp === NULL) {
       $stamp = time();
     }
 
     /* Is there a timezone configured in the fusiondirectory configuration (fusiondirectory.conf) */
-    if ($config->get_cfg_value("timezone") != ""){
-
+    if ($config->get_cfg_value("timezone") != "") {
       /* Get zonename */
       $tz = $config->get_cfg_value("timezone");
 
-      if(!@date_default_timezone_set($tz)){
+      if (!@date_default_timezone_set($tz)) {
         msg_dialog::display(_("Configuration error"), sprintf(_("The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot calculate correct timezone offset."), $tz), ERROR_DIALOG);
       }
       $tz_delta = date("Z", $stamp);
-      $tz_delta = $tz_delta / 3600 ;
-      return(array("name" => $tz, "value" => $tz_delta));
+      $tz_delta = $tz_delta / 3600;
+      return array("name" => $tz, "value" => $tz_delta);
 
     }
-    return($zone);
+    return $zone;
   }
 
 
@@ -78,6 +77,4 @@ class timezone {
     return DateTimeZone::listIdentifiers();
   }
 }
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>