From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 27 Jan 2010 14:03:19 +0000 (+0000)
Subject: Reverted last commit
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0de0b1a8c3ad3c1b18c57f276c7d8fb65ac0c8c;p=gosa.git

Reverted last commit


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

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index 1d671454b..4d6fb1ddb 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 __construct(&$config)
+  function CopyPasteHandler(&$config)
   {
     $this->config = &$config;	
     $this->current= NULL;
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 1c6133238..9c9bd5071 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -137,7 +137,7 @@ class MultiSelectWindow{
 
 
 	/* Contrucktion */
-	function __construct(&$config, $filterName, $module)
+	function MultiSelectWindow(&$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 ac0e034e3..aafd2e5ed 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 __construct(&$config, $dn, &$parent)
+	function SnapShotDialog(&$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 b26bea8ef..d371db5fc 100644
--- a/gosa-core/include/class_SnapshotHandler.inc
+++ b/gosa-core/include/class_SnapshotHandler.inc
@@ -29,7 +29,7 @@ class SnapshotHandler {
 
 
   /* Create handler  */
-  function __construct(&$config)
+  function SnapshotHandler(&$config)
   {
     $this->config = &$config;	
     $config = $this->config;
diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index f7f0d284c..b74463f09 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 __construct(&$config, $parent, $dn= NULL)
+  function acl (&$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 b893c60b6..cd588c3bd 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 __construct()
+  function certificate()
   {
     $this->data= "";
     $this->type= false;
diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index ae1b6b08e..106e4995a 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 __construct($filename, $basedir= "")
+  function config($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 9ee04d284..a477eff43 100644
--- a/gosa-core/include/class_divSelectBox.inc
+++ b/gosa-core/include/class_divSelectBox.inc
@@ -29,7 +29,8 @@ class divSelectBox {
 	// Members for page managment
   var $height=200;
 
-	function __construct(){
+	// Added php 4 constructor
+	function divSelectBox(){
 		$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 284b62379..9a3f69991 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 __construct($pageid){
+	function divlist($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 53b70bc84..efd72574e 100644
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -39,7 +39,7 @@ class filter {
   var $pid;
 
 
-  function __construct($filename)
+  function filter($filename)
   {
     global $config;
 
diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 497c05700..1f2baab3e 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 __construct($binddn,$bindpw, $hostname, $follow_referral= FALSE, $tls= FALSE)
+  function LDAP($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 131e58877..00a9e1090 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 __construct($filename)
+  function listing($filename)
   {
     global $config;
     global $class_mapping;
diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc
index 68210a887..ebaeff5a6 100644
--- a/gosa-core/include/class_log.inc
+++ b/gosa-core/include/class_log.inc
@@ -42,7 +42,7 @@ class log {
 
     \sa log()
    */
-  function __construct($action,$objecttype,$object,$changes_array = array(),$result = "")
+  function log($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 23459d25f..952e8ec38 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 __construct(&$config, $dn= NULL, $object= NULL)
+  function plugin (&$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 fe46dbbc3..a4440087e 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 __construct(&$config, &$ui)
+	function pluglist(&$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 989f40852..a30758ebc 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 __construct($data= array(), $displayData= null, $reorderable= false)
+  public function sortableListing($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 cba2cedf9..e1a2954bb 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 __construct(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
+  function tabs(&$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 ac194684b..1d5cefee5 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 __construct(&$config, $userdn){
+  function userinfo(&$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 9f000a3a0..5c7b07657 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 __construct($headline, $header, $entries, $columns= array()) {
+  function csvExporter($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 14f9fffc7..d1c836e79 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 __construct($headline, $header, $entries, $columns= array()) {
+  function pdfExporter($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 a4c1d4333..91d87d8df 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 __construct($config)
-  {
-  }
-  
-  function is_available()
-  {
-    return true;
-  }
-  
-  
-  function generate_hash($pwd)
-  {
-    return $pwd;       
-  }
+	function passwordMethodClear($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 f7da6d109..62b1a0848 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 __construct($config)
+  function passwordMethodCrypt($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 70a894e97..41903a14a 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 __construct($config)  
+	function passwordMethodMd5($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 19aaac34b..8d73b2557 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 __construct($config)
+  function passwordMethodsha($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 e444b41c5..135675d5f 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 __construct($config)
+  function passwordMethodsmd5($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 104829249..8c0b987b5 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 __construct($config)
+  function passwordMethodssha($config)
   {
   }
 
diff --git a/gosa-core/include/password-methods/class_password-methods.inc b/gosa-core/include/password-methods/class_password-methods.inc
index d7b83519d..cde47c38e 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 __construct($config)
+  function passwordMethod($config)
   {
   }
 
diff --git a/gosa-core/plugins/admin/acl/class_aclRole.inc b/gosa-core/plugins/admin/acl/class_aclRole.inc
index f61127f56..5f96b0dea 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 __construct(&$config,  $dn= NULL)
+  function aclrole (&$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 924e48c33..78e514f1e 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 __construct(&$config, $dn)
+	function department (&$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 0cc181bde..c53844ae6 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 __construct(&$config, $dn= NULL)
+  function group (&$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 73ff658c4..995c51670 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 __construct(&$config, $dn= NULL)
+  function ogroup (&$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 17c75b838..d121b0b0c 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 __construct(&$config, $dn= NULL)
+  function reference (&$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 7d56a1297..94f23a194 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 __construct(&$config, $dn= NULL)
+  function user (&$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 f6793b8dd..f0b288b75 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 __construct(&$config, $dn= NULL, $parent= NULL)
+  function password(&$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 30afe2022..2bd4f5fac 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 __construct(&$config, $dn= NULL)
+  function posixAccount (&$config, $dn= NULL)
   {
     global $class_mapping;
 
diff --git a/gosa-core/setup/class_setup.inc b/gosa-core/setup/class_setup.inc
index 41c574064..4f7c68b32 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 __construct()
+  function setup()
   {
     $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 223f00e54..69977840f 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 __construct()
+  function setup_step()
   {
   }
 
diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 177412823..d231c4025 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 __construct()
+  function Step_Checks()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Config1.inc b/gosa-core/setup/class_setupStep_Config1.inc
index 32d6618f5..7d585f3d0 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 __construct()
+  function Step_Config1()
   {
     $this->update_strings();
 
diff --git a/gosa-core/setup/class_setupStep_Config2.inc b/gosa-core/setup/class_setupStep_Config2.inc
index 05b07e505..1bf1d2ff5 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 __construct()
+  function Step_Config2()
   {
     $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 8680f55b6..22cf4ad54 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 __construct()
+  function Step_Config3()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Feedback.inc b/gosa-core/setup/class_setupStep_Feedback.inc
index 3a4154f0f..d655c2e5e 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 __construct()
+  function Step_Feedback()
   {
     $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 aab897755..a64fbcd05 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 __construct()
+  function Step_Finish()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Language.inc b/gosa-core/setup/class_setupStep_Language.inc
index 04bc1ca6a..47e868878 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 __construct()
+  function Step_Language()
   {
     $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 3ec85e9c3..03525da83 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 __construct()
+  function Step_Ldap()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_License.inc b/gosa-core/setup/class_setupStep_License.inc
index 09d480a9f..9667e254b 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 __construct()
+  function Step_License()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index f0b7e26a2..eee96634b 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 __construct()
+  function Step_Migrate()
   {
     $this->update_strings(); 
   }
diff --git a/gosa-core/setup/class_setupStep_Schema.inc b/gosa-core/setup/class_setupStep_Schema.inc
index 8779bccf5..c4784593f 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 __construct()
+  function Step_Schema()
   {
     $this->update_strings();
   }
diff --git a/gosa-core/setup/class_setupStep_Welcome.inc b/gosa-core/setup/class_setupStep_Welcome.inc
index 48f6b2eef..f5104f1a0 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 __construct()
+  function Step_Welcome()
   {
     $this->is_enabled     = TRUE;
     $this->is_active      = TRUE;