From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 27 Jan 2010 13:47:00 +0000 (+0000)
Subject: PHP5 flush
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bd3a64a768d3876b0688c77cc07e144d7ebf4f44;p=gosa.git

PHP5 flush


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15377 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 4d6fb1ddb..1d671454b 100644
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -44,7 +44,7 @@ class CopyPasteHandler {
 
 
   /* Create CP handler  */
-  function CopyPasteHandler(&$config)
+  function __construct(&$config)
   {
     $this->config = &$config;	
     $this->current= NULL;
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 9c9bd5071..1c6133238 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -137,7 +137,7 @@ class MultiSelectWindow{
 
 
 	/* Contrucktion */
-	function MultiSelectWindow(&$config, $filterName, $module)
+	function __construct(&$config, $filterName, $module)
 	{
 		$this->config = &$config;
 		$this->module = $module;
diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc
index aafd2e5ed..ac0e034e3 100644
--- a/gosa-core/include/class_SnapShotDialog.inc
+++ b/gosa-core/include/class_SnapShotDialog.inc
@@ -40,7 +40,7 @@ class SnapShotDialog extends plugin
   var $last_list = array();
 
 	
-	function SnapShotDialog(&$config, $dn, &$parent)
+	function __construct(&$config, $dn, &$parent)
 	{
     plugin::plugin($config,$dn);
     $this->parent 	= &$parent;
diff --git a/gosa-core/include/class_SnapshotHandler.inc b/gosa-core/include/class_SnapshotHandler.inc
index d371db5fc..b26bea8ef 100644
--- a/gosa-core/include/class_SnapshotHandler.inc
+++ b/gosa-core/include/class_SnapshotHandler.inc
@@ -29,7 +29,7 @@ class SnapshotHandler {
 
 
   /* Create handler  */
-  function SnapshotHandler(&$config)
+  function __construct(&$config)
   {
     $this->config = &$config;	
     $config = $this->config;
diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index b74463f09..f7f0d284c 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -53,7 +53,7 @@ class acl extends plugin
   var $myAclObjects = array();
   var $acl_category = "acl/";
 
-  function acl (&$config, $parent, $dn= NULL)
+  function __construct(&$config, $parent, $dn= NULL)
   {
     /* Include config object */
     plugin::plugin($config, $dn);
diff --git a/gosa-core/include/class_certificate.inc b/gosa-core/include/class_certificate.inc
index cd588c3bd..b893c60b6 100644
--- a/gosa-core/include/class_certificate.inc
+++ b/gosa-core/include/class_certificate.inc
@@ -34,7 +34,7 @@ class certificate
   var $error;
 
   /* Initialize all vars*/ 
-  function certificate()
+  function __construct()
   {
     $this->data= "";
     $this->type= false;
diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 106e4995a..ae1b6b08e 100644
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -69,7 +69,7 @@ class config  {
    *  \param string 'basedir' base directory
    *
    * */
-  function config($filename, $basedir= "")
+  function __construct($filename, $basedir= "")
   {
     $this->parser = xml_parser_create();
     $this->basedir= $basedir;
diff --git a/gosa-core/include/class_divSelectBox.inc b/gosa-core/include/class_divSelectBox.inc
index a477eff43..9ee04d284 100644
--- a/gosa-core/include/class_divSelectBox.inc
+++ b/gosa-core/include/class_divSelectBox.inc
@@ -29,8 +29,7 @@ class divSelectBox {
 	// Members for page managment
   var $height=200;
 
-	// Added php 4 constructor
-	function divSelectBox(){
+	function __construct(){
 		$this->s_summary                = "";
 		$this->a_entries                = array();
 		$this->cols                     = 0;
diff --git a/gosa-core/include/class_divlist.inc b/gosa-core/include/class_divlist.inc
index 9a3f69991..284b62379 100644
--- a/gosa-core/include/class_divlist.inc
+++ b/gosa-core/include/class_divlist.inc
@@ -41,7 +41,7 @@ class divlist {
   var $fix_list_for_plugins = FALSE;
   
 	// Added php 4 constructor
-	function divlist($pageid){
+	function __construct($pageid){
 
 		$this->i_currentPage    = 0;
 		$this->i_entriesPerPage = 10;
diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index efd72574e..53b70bc84 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -39,7 +39,7 @@ class filter {
   var $pid;
 
 
-  function filter($filename)
+  function __construct($filename)
   {
     global $config;
 
diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 1f2baab3e..497c05700 100644
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -49,7 +49,7 @@ class LDAP{
   var $referrals= array();
   var $max_ldap_query_time = 0;   // 0, empty or negative values will disable this check 
 
-  function LDAP($binddn,$bindpw, $hostname, $follow_referral= FALSE, $tls= FALSE)
+  function __construct($binddn,$bindpw, $hostname, $follow_referral= FALSE, $tls= FALSE)
   {
     global $config;
     $this->follow_referral= $follow_referral;
diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 00a9e1090..131e58877 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -55,7 +55,7 @@ class listing {
   var $scrollPosition= 0;
 
 
-  function listing($filename)
+  function __construct($filename)
   {
     global $config;
     global $class_mapping;
diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index ebaeff5a6..68210a887 100644
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -42,7 +42,7 @@ class log {
 
     \sa log()
    */
-  function log($action,$objecttype,$object,$changes_array = array(),$result = "")
+  function __construct($action,$objecttype,$object,$changes_array = array(),$result = "")
   {
     if(!is_array($changes_array)){
       trigger_error("log(string,string,string,array(),bool). Forth parameter must be an array.");
diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc
index 952e8ec38..23459d25f 100644
--- a/gosa-core/include/class_plugin.inc
+++ b/gosa-core/include/class_plugin.inc
@@ -139,7 +139,7 @@ class plugin
     \param dn Distinguished name to initialize plugin from
     \sa plugin()
    */
-  function plugin (&$config, $dn= NULL, $object= NULL)
+  function __construct(&$config, $dn= NULL, $object= NULL)
   {
     /* Configuration is fine, allways */
     $this->config= &$config;	
diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index a4440087e..fe46dbbc3 100644
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -34,7 +34,7 @@ class pluglist {
         var $allowed_plugins = array();
         var $silly_cache= array();
 
-	function pluglist(&$config, &$ui)
+	function __construct(&$config, &$ui)
 	{
 		$this->ui= &$ui;
 		$this->config= &$config;
diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc
index a30758ebc..989f40852 100644
--- a/gosa-core/include/class_sortableListing.inc
+++ b/gosa-core/include/class_sortableListing.inc
@@ -53,7 +53,7 @@ class sortableListing {
   private $acl= "";
   private $modified= false;
 
-  public function sortableListing($data= array(), $displayData= null, $reorderable= false)
+  public function __construct($data= array(), $displayData= null, $reorderable= false)
   {
     global $config;
 
diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc
index e1a2954bb..cba2cedf9 100644
--- a/gosa-core/include/class_tabs.inc
+++ b/gosa-core/include/class_tabs.inc
@@ -43,7 +43,7 @@ class tabs
   var $hide_refs = FALSE;
   var $hide_acls = FALSE;
   
-  function tabs(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
+  function __construct(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
   {
     /* Save dn */
     $this->dn= $dn;
diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 1d5cefee5..ac194684b 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -43,7 +43,7 @@ class userinfo
 
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
-  function userinfo(&$config, $userdn){
+  function __construct(&$config, $userdn){
     $this->config= &$config;
     $ldap= $this->config->get_ldap_link();
     $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag', 'gosaLoginRestriction'));
diff --git a/gosa-core/include/exporter/class_cvsExporter.inc b/gosa-core/include/exporter/class_cvsExporter.inc
index 5c7b07657..9f000a3a0 100644
--- a/gosa-core/include/exporter/class_cvsExporter.inc
+++ b/gosa-core/include/exporter/class_cvsExporter.inc
@@ -4,7 +4,7 @@ class csvExporter
 {
   var $result;
 
-  function csvExporter($headline, $header, $entries, $columns= array()) {
+  function __construct($headline, $header, $entries, $columns= array()) {
     // If no preset, render all columns
     if (!count($columns)) {
       foreach ($header as $index => $dummy) {
diff --git a/gosa-core/include/exporter/class_pdfExporter.inc b/gosa-core/include/exporter/class_pdfExporter.inc
index d1c836e79..14f9fffc7 100644
--- a/gosa-core/include/exporter/class_pdfExporter.inc
+++ b/gosa-core/include/exporter/class_pdfExporter.inc
@@ -12,7 +12,7 @@ class pdfExporter
 {
   var $result;
 
-  function pdfExporter($headline, $header, $entries, $columns= array()) {
+  function __construct($headline, $header, $entries, $columns= array()) {
     // Bail out if no FPDF available
     if(!class_exists('FPDF')) {
       die(_("No PDF export possible: there is no FPDF library installed."));
diff --git a/gosa-core/include/password-methods/class_password-methods-clear.inc b/gosa-core/include/password-methods/class_password-methods-clear.inc
index 91d87d8df..a4c1d4333 100644
--- a/gosa-core/include/password-methods/class_password-methods-clear.inc
+++ b/gosa-core/include/password-methods/class_password-methods-clear.inc
@@ -24,20 +24,20 @@ class passwordMethodClear extends passwordMethod
 {
   var $lockable = FALSE;
 
-	function passwordMethodClear($config)
-	{
-	}
-
-	function is_available()
-	{
-		return true;
-	}
-
-
-	function generate_hash($pwd)
-	{
-		return $pwd;       
-	}
+  function __construct($config)
+  {
+  }
+  
+  function is_available()
+  {
+    return true;
+  }
+  
+  
+  function generate_hash($pwd)
+  {
+    return $pwd;       
+  }
 
   
   function get_hash_name()
diff --git a/gosa-core/include/password-methods/class_password-methods-crypt.inc b/gosa-core/include/password-methods/class_password-methods-crypt.inc
index 62b1a0848..f7da6d109 100644
--- a/gosa-core/include/password-methods/class_password-methods-crypt.inc
+++ b/gosa-core/include/password-methods/class_password-methods-crypt.inc
@@ -22,7 +22,7 @@
 
 class passwordMethodCrypt extends passwordMethod
 {
-  function passwordMethodCrypt($config)
+  function __construct($config)
   {
   }
 
diff --git a/gosa-core/include/password-methods/class_password-methods-md5.inc b/gosa-core/include/password-methods/class_password-methods-md5.inc
index 41903a14a..70a894e97 100644
--- a/gosa-core/include/password-methods/class_password-methods-md5.inc
+++ b/gosa-core/include/password-methods/class_password-methods-md5.inc
@@ -22,7 +22,7 @@
 
 class passwordMethodMd5 extends passwordMethod
 {
-	function passwordMethodMd5($config)  
+	function __construct($config)  
 	{
 	}
 
diff --git a/gosa-core/include/password-methods/class_password-methods-sha.inc b/gosa-core/include/password-methods/class_password-methods-sha.inc
index 8d73b2557..19aaac34b 100644
--- a/gosa-core/include/password-methods/class_password-methods-sha.inc
+++ b/gosa-core/include/password-methods/class_password-methods-sha.inc
@@ -22,7 +22,7 @@
 
 class passwordMethodsha extends passwordMethod
 {
-  function passwordMethodsha($config)
+  function __construct($config)
   {
   }
 
diff --git a/gosa-core/include/password-methods/class_password-methods-smd5.inc b/gosa-core/include/password-methods/class_password-methods-smd5.inc
index 135675d5f..e444b41c5 100644
--- a/gosa-core/include/password-methods/class_password-methods-smd5.inc
+++ b/gosa-core/include/password-methods/class_password-methods-smd5.inc
@@ -22,7 +22,7 @@
 
 class passwordMethodsmd5 extends passwordMethod
 {
-  function passwordMethodsmd5($config)
+  function __construct($config)
   {
   }
 
diff --git a/gosa-core/include/password-methods/class_password-methods-ssha.inc b/gosa-core/include/password-methods/class_password-methods-ssha.inc
index 8c0b987b5..104829249 100644
--- a/gosa-core/include/password-methods/class_password-methods-ssha.inc
+++ b/gosa-core/include/password-methods/class_password-methods-ssha.inc
@@ -22,7 +22,7 @@
 
 class passwordMethodssha extends passwordMethod
 {
-  function passwordMethodssha($config)
+  function __construct($config)
   {
   }
 
diff --git a/gosa-core/include/password-methods/class_password-methods.inc b/gosa-core/include/password-methods/class_password-methods.inc
index cde47c38e..d7b83519d 100644
--- a/gosa-core/include/password-methods/class_password-methods.inc
+++ b/gosa-core/include/password-methods/class_password-methods.inc
@@ -29,7 +29,7 @@ class passwordMethod
   var $lockable = TRUE;
 
   // Konstructor
-  function passwordMethod($config)
+  function __construct($config)
   {
   }
 
diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index 5f96b0dea..f61127f56 100644
--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
+++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
@@ -55,7 +55,7 @@ class aclrole extends acl
   var $orig_base;
   var $base ="";
 
-  function aclrole (&$config,  $dn= NULL)
+  function __construct(&$config,  $dn= NULL)
   {
     /* Include config object */
     plugin::plugin($config, $dn);
diff --git a/gosa-core/plugins/admin/departments/class_department.inc b/gosa-core/plugins/admin/departments/class_department.inc
index 78e514f1e..924e48c33 100644
--- a/gosa-core/plugins/admin/departments/class_department.inc
+++ b/gosa-core/plugins/admin/departments/class_department.inc
@@ -56,7 +56,7 @@ class department extends plugin
   var $orig_base = "";
   var $orig_ou = "";
 
-	function department (&$config, $dn)
+	function __construct(&$config, $dn)
 	{
     /* Add the default structural obejct class 'locality' if this is a new entry
      */
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index c53844ae6..0cc181bde 100644
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -73,7 +73,7 @@ class group extends plugin
 
   var $multiple_support = TRUE;
 
-  function group (&$config, $dn= NULL)
+  function __construct(&$config, $dn= NULL)
   {
      /* Set rfc2307bis flag */
      if ($config->get_cfg_value("rfc2307bis") == "true"){
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 995c51670..73ff658c4 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -67,7 +67,7 @@ class ogroup extends plugin
   var $attributes= array("cn", "description", "gosaGroupObjects","member","accessTo","trustModel");
   var $objectclasses= array("top", "gosaGroupOfNames");
 
-  function ogroup (&$config, $dn= NULL)
+  function __construct(&$config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
     $this->orig_dn= $dn;
diff --git a/gosa-core/plugins/generic/references/class_reference.inc b/gosa-core/plugins/generic/references/class_reference.inc
index d121b0b0c..17c75b838 100644
--- a/gosa-core/plugins/generic/references/class_reference.inc
+++ b/gosa-core/plugins/generic/references/class_reference.inc
@@ -30,7 +30,7 @@ class reference extends plugin
   var $fold= array();
   var $objectCache= array();
 
-  function reference (&$config, $dn= NULL)
+  function __construct(&$config, $dn= NULL)
   {
 	/* Include config object */
 	$this->config= &$config;
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 94f23a194..7d56a1297 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -130,7 +130,7 @@ class user extends plugin
 
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
-  function user (&$config, $dn= NULL)
+  function __construct(&$config, $dn= NULL)
   {
     global $lang;
 
diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index f0b288b75..f6793b8dd 100644
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -26,7 +26,7 @@ class password extends plugin
   var $plHeadline     = "Password";
   var $plDescription  = "Change user password";
 
-  function password(&$config, $dn= NULL, $parent= NULL)
+  function __construct(&$config, $dn= NULL, $parent= NULL)
   {
     plugin::plugin($config, $dn, $parent);
   }
diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 2bd4f5fac..30afe2022 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -103,7 +103,7 @@ class posixAccount extends plugin
 
   /* constructor, if 'dn' is set, the node loads the given
      'dn' from LDAP */
-  function posixAccount (&$config, $dn= NULL)
+  function __construct(&$config, $dn= NULL)
   {
     global $class_mapping;
 
diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 4f7c68b32..41c574064 100644
--- a/gosa-core/setup/class_setup.inc
+++ b/gosa-core/setup/class_setup.inc
@@ -31,7 +31,7 @@ class setup
   var $o_steps  = array(); 
   var $captured_values = array();
 
-  function setup()
+  function __construct()
   {
     $i = 1; 
     $this->o_steps[$i++] = new Step_Welcome();
diff --git a/gosa-core/setup/class_setupStep.inc b/gosa-core/setup/class_setupStep.inc
index 69977840f..223f00e54 100644
--- a/gosa-core/setup/class_setupStep.inc
+++ b/gosa-core/setup/class_setupStep.inc
@@ -35,7 +35,7 @@ class setup_step extends plugin
   var $parent       = NULL;
   var $dialog       = FALSE;
   
-  function setup_step()
+  function __construct()
   {
   }
 
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index d231c4025..177412823 100644
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -27,7 +27,7 @@ class Step_Checks extends setup_step
   var $is_writeable = array();
   var $header_image = "images/setup/system.png";
 
-  function Step_Checks()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Config1.inc b/gosa-core/setup/class_setupStep_Config1.inc
index 7d585f3d0..32d6618f5 100644
--- a/gosa-core/setup/class_setupStep_Config1.inc
+++ b/gosa-core/setup/class_setupStep_Config1.inc
@@ -58,7 +58,7 @@ class Step_Config1 extends setup_step
   var $attributes = array("compressed","peopleou","groupou","peopledn","uidbase","encryption","theme","krbsasl",
                           "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
-  function Step_Config1()
+  function __construct()
   {
     $this->update_strings();
 
diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 1bf1d2ff5..05b07e505 100644
--- a/gosa-core/setup/class_setupStep_Config2.inc
+++ b/gosa-core/setup/class_setupStep_Config2.inc
@@ -56,7 +56,7 @@ class Step_Config2 extends setup_step
   var $attributes = array("mail_attrib","governmentmode","sambaidmapping","cyrusunixstyle","mail","timezone");
   var $called = FALSE;
 
-  function Step_Config2()
+  function __construct()
   {
     $this->update_strings();
     $this->mail_methods = $this->get_available_mail_classes();
diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index 22cf4ad54..8680f55b6 100644
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -70,7 +70,7 @@ class Step_Config3 extends setup_step
 
   var $attributes = array("errorlvl");
 
-  function Step_Config3()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index d655c2e5e..3a4154f0f 100644
--- a/gosa-core/setup/class_setupStep_Feedback.inc
+++ b/gosa-core/setup/class_setupStep_Feedback.inc
@@ -54,7 +54,7 @@ class Step_Feedback  extends setup_step
                           "first_use","use_since","distribution","web_server","php_version","ldap_server","object_count","want_to_see_next");
   
 
-  function Step_Feedback()
+  function __construct()
   {
     $this->is_enabled     = TRUE;
     $this->is_active      = TRUE;
diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc
index a64fbcd05..aab897755 100644
--- a/gosa-core/setup/class_setupStep_Finish.inc
+++ b/gosa-core/setup/class_setupStep_Finish.inc
@@ -26,7 +26,7 @@ class Step_Finish extends setup_step
   var $cfg_file_written = FALSE;
   var $header_image = "images/setup/server.png";
 
-  function Step_Finish()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Language.inc b/gosa-core/setup/class_setupStep_Language.inc
index 47e868878..04bc1ca6a 100644
--- a/gosa-core/setup/class_setupStep_Language.inc
+++ b/gosa-core/setup/class_setupStep_Language.inc
@@ -28,7 +28,7 @@ class Step_Language extends setup_step
   var $attributes     = array("lang","lang_selected");
   var $header_image   = "images/setup/locale.png";
 
-  function Step_Language()
+  function __construct()
   {
     $this->lang           = get_browser_language();
     $this->lang_selected  = "";
diff --git a/gosa-core/setup/class_setupStep_Ldap.inc b/gosa-core/setup/class_setupStep_Ldap.inc
index 03525da83..3ec85e9c3 100644
--- a/gosa-core/setup/class_setupStep_Ldap.inc
+++ b/gosa-core/setup/class_setupStep_Ldap.inc
@@ -42,7 +42,7 @@ class Step_Ldap extends setup_step
 
   var $header_image= "images/setup/ldap.png";
 
-  function Step_Ldap()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_License.inc b/gosa-core/setup/class_setupStep_License.inc
index 9667e254b..09d480a9f 100644
--- a/gosa-core/setup/class_setupStep_License.inc
+++ b/gosa-core/setup/class_setupStep_License.inc
@@ -29,7 +29,7 @@ class Step_License extends setup_step
   var $attributes     = array("accepted");
   
 
-  function Step_License()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index eee96634b..f0b7e26a2 100644
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -117,7 +117,7 @@ class Step_Migrate extends setup_step
   var $rootOC_migrate_dialog = FALSE;
   var $rootOC_details = array();
 	
-  function Step_Migrate()
+  function __construct()
   {
     $this->update_strings(); 
   }
diff --git a/gosa-core/setup/class_setupStep_Schema.inc b/gosa-core/setup/class_setupStep_Schema.inc
index c4784593f..8779bccf5 100644
--- a/gosa-core/setup/class_setupStep_Schema.inc
+++ b/gosa-core/setup/class_setupStep_Schema.inc
@@ -31,7 +31,7 @@ class Step_Schema extends setup_step
 
   var $found_ocs = 0; 
  
-  function Step_Schema()
+  function __construct()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Welcome.inc b/gosa-core/setup/class_setupStep_Welcome.inc
index f5104f1a0..48f6b2eef 100644
--- a/gosa-core/setup/class_setupStep_Welcome.inc
+++ b/gosa-core/setup/class_setupStep_Welcome.inc
@@ -26,7 +26,7 @@ class Step_Welcome  extends setup_step
   var $attributes     = array();
   var $header_image   = "images/setup/welcome.png";
 
-  function Step_Welcome()
+  function __construct()
   {
     $this->is_enabled     = TRUE;
     $this->is_active      = TRUE;