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 1d671454b1a763314d95da975c67517488fcc30c..4d6fb1ddb04928d4e27061661fa2e7dfc6607ba6 100644 (file)
--- 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 1c61332387d9aa782c815d96a3f154f8da645905..9c9bd5071763836acd638b6201d0f0a983b95fd5 100644 (file)
--- 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 ac0e034e3ad59257ae4ccfca76756082cab86b5d..aafd2e5ed191f02a9d09caee0bf04acce97d3594 100644 (file)
--- 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 b26bea8ef49d67b132249706f7747bebbf3b946d..d371db5fcdd3d0b142a28ac27612722598b8abf1 100644 (file)
--- 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 f7f0d284cfc6fa1cf76fbc58194b26c26a1da6e1..b74463f09c95b18cf4d461b81f67d2fab3d6b4a2 100644 (file)
--- 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 b893c60b6d7101b798ba9fa59e01cedfd1d531dc..cd588c3bd7e9918aea485842ff468be5cd7af75f 100644 (file)
--- 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 ae1b6b08edd9e3ef5893aa01974b010cc4dd74be..106e4995a53766703f923e1711e06c1d52c303d8 100644 (file)
--- 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 9ee04d284ded0b8e4e63be59edc98c488cbd9f9e..a477eff43057b7f1b6cb0cefd1e7719cb7469fd6 100644 (file)
--- 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 284b62379c3a925f0e2ec23078b85f132ec10354..9a3f6999154c4d686f136d41646feaf3a06464ac 100644 (file)
--- 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 53b70bc843e5468de1d0dbb16e5a1e86e635d719..efd72574e18683c237523fd59872278ea2f73ec6 100644 (file)
--- 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 497c05700eb3b3db5b93d78c9ca35aa528822af5..1f2baab3e41cfef1fa6d308329bb6b7b27c4fcd6 100644 (file)
--- 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 131e58877aa2deb3c6e5f3b538fea491e7d68434..00a9e1090d7d3d1dc99d0477fa44bb59e48e7c98 100644 (file)
--- 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 68210a88781719ca3a2ed6c4397e593e7503bb5a..ebaeff5a611b0eaf079a05c1f0ed3c178a1336aa 100644 (file)
--- 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 23459d25f500d8bb98605c299370e8e198384f75..952e8ec3870953e1bb50296ee5d21ac1d299400c 100644 (file)
--- 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 fe46dbbc372877b6ec50a9ed556f163a39b2de0a..a4440087e4d2ca0987c6471442cb2e461f569f1f 100644 (file)
--- 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 989f4085234a3d09765eeb3a13b0c01edfa28098..a30758ebc3c3ccba455edc2e079eeecb61530b65 100644 (file)
--- 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 cba2cedf9c1188e7b1b4d4082113411863bbffbb..e1a2954bb3d3b6d8162382a976bd2b8553a68c7b 100644 (file)
--- 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 ac194684bb0de7e588a47837541eec31ea7cf402..1d5cefee532f4bdd4f55b1cffee8623d8cd8442d 100644 (file)
--- 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 9f000a3a0f9bd4ff776256504ed158f99071afc7..5c7b07657cea62f4959b93fb6e07d22cea50ef7f 100644 (file)
--- 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 14f9fffc732d21c682bec1632007ca9827a79dcf..d1c836e79e0296e0db033ac865126d856744bd59 100644 (file)
--- 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 a4c1d4333594d68619c44bcbb29323ea546c2d23..91d87d8dfc0788544e18894e717d5c768f19dd8c 100644 (file)
--- 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 f7da6d1091e2663518b5eff2489783d00f774cb7..62b1a084857a0b9d69d4006dfcd2a173bed3fed9 100644 (file)
--- 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 70a894e971983be99f0d937909ec16fdc8567fcf..41903a14aac4f6d78f8e991a800bbfb05fe2a0e0 100644 (file)
--- 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 19aaac34bb881a5470f9a19e9d4af429d289d2c0..8d73b2557bb2c8d6836ed4c6ab803f54dca88861 100644 (file)
--- 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 e444b41c56bbb4c40b4cf88fbeac13000c128ee6..135675d5fb74e698c3775a4103690b6b7f63993c 100644 (file)
--- 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 104829249f6f6f18f467e5197ab06b1cb1830269..8c0b987b5109452f1381e4fc43f4f2c6eaf20381 100644 (file)
--- 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 d7b83519d2f977d8689d6e594ad733564dc26365..cde47c38ee56f835040f0626c086058172ea29f1 100644 (file)
--- 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 f61127f567f7db9de40ac7aa65ae2ee6b951441e..5f96b0dea1bda890c2ce83412e2cc720995bafea 100644 (file)
--- 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 924e48c331551ebe0282e242892a5793bc2f826c..78e514f1e2af041e3b302cd4d85cb3c5cc4e9713 100644 (file)
--- 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 0cc181bdea582ea9f4c99308fb21a828347827dc..c53844ae674d74a5290da7f68b5f21f906390a29 100644 (file)
--- 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 73ff658c441532d56c9364977a7eb846bf697c67..995c51670d1e377749e4ce9bd5f1c0d72f76d083 100644 (file)
--- 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 17c75b838959c5549c92d5d5e5822e3e5fc48035..d121b0b0c7bface60e20b305f62dda6026e54b93 100644 (file)
--- 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 7d56a1297fe923afd26ddb5c1b8434a65cdd9e35..94f23a194be1ed74f4a782732e89dee53b915ec5 100644 (file)
--- 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 f6793b8dd82908e9ae2c4c9b35b36f82e770c0f1..f0b288b755dc085b9bacc7663fdae68ee3227623 100644 (file)
--- 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 30afe202297539011b3e4db5142d0dc93860bc1c..2bd4f5fac4abff81c49ae30ed94df352ee296778 100644 (file)
--- 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 41c57406482ae6a5426198cce9964f292caa94fc..4f7c68b326a3ad989cf71b732858535c4eb48dc8 100644 (file)
--- 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 223f00e54a36e5d0206ce6b7a8344f9f824a3fb1..69977840fbdce088ef9e31f5b03d687e7f2d76d1 100644 (file)
--- 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 1774128235da20f4a941edecc60d922d7aa47862..d231c4025cf63a1cfd52db8d8a744147ea35dbf3 100644 (file)
--- 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 32d6618f59bf0c0329a9d7fbc031e6075137bde5..7d585f3d028cbe999c143209b1c13c14946585e2 100644 (file)
--- 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 05b07e5051d80511a959c7acb6df47ec07c71ece..1bf1d2ff5c13f3d81c4a7dbced193141a828edfb 100644 (file)
--- 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 8680f55b629336ee86e96e59d3df7e1d17ed13c7..22cf4ad54d4941aa704dec4722f257abd9cbb116 100644 (file)
--- 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 3a4154f0fadf335715c81ed89dd31846e1a32865..d655c2e5e79d756cc72786eff4b9e6db1af16df8 100644 (file)
--- 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 aab897755bf1db9c94af855795ce0ccb24782c73..a64fbcd05923e6b33d260f267773b05c56558737 100644 (file)
--- 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 04bc1ca6a7f9a82c2120619aa15d5385a37d5dff..47e8688780ff46f17a3fe1a8e8f692e1e6b41386 100644 (file)
--- 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 3ec85e9c364f49c5c020221eb28ce33e888512ac..03525da833329b87746a20781aef3dcd88181401 100644 (file)
--- 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 09d480a9f79c01ba06e527fed647133d57150444..9667e254bc559c886d05181d8c5ed6de07f57f91 100644 (file)
--- 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 f0b7e26a2c522ca6597ce47cd33d30f105c562e8..eee96634b8a0a00639d281b519b2c7445f3e615b 100644 (file)
--- 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 8779bccf5a0f679a1792333bdab91747f5428245..c4784593f6d927503cc4bad9b4534662807c0828 100644 (file)
--- 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 48f6b2eefce3bcc9a1edae8cc654e196b03ac886..f5104f1a02e1705b57803ad9ad6ae7de0a0e77b8 100644 (file)
--- 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;