From: hickert Date: Fri, 13 Apr 2007 07:17:55 +0000 (+0000) Subject: Renamed class names too. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2eba5d4da490a3922cd70ddfa6d5642564a624b9;p=gosa.git Renamed class names too. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6038 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/setup/class_setup.inc b/setup/class_setup.inc index 4b9af867d..c99eb17e8 100644 --- a/setup/class_setup.inc +++ b/setup/class_setup.inc @@ -31,15 +31,15 @@ class setup function setup() { - $this->o_steps[1] = new setup_step_1(); - $this->o_steps[2] = new setup_step_2(); - $this->o_steps[3] = new setup_step_3(); - $this->o_steps[4] = new setup_step_4(); - $this->o_steps[5] = new setup_step_5(); - $this->o_steps[6] = new setup_step_6(); - $this->o_steps[7] = new setup_step_6a(); - $this->o_steps[8] = new setup_step_7(); - $this->o_steps[9] = new setup_step_8(); + $this->o_steps[1] = new Step_Language(); + $this->o_steps[2] = new Step_Checks(); + $this->o_steps[3] = new Step_License(); + $this->o_steps[4] = new Step_Ldap(); + $this->o_steps[5] = new Step_Schema(); + $this->o_steps[6] = new Step_Config1(); + $this->o_steps[7] = new Step_Config2(); + $this->o_steps[8] = new Step_Config3(); + $this->o_steps[9] = new Step_Finish(); /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */ if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){ diff --git a/setup/class_setupStep_Checks.inc b/setup/class_setupStep_Checks.inc index b9bbfbf27..91613989d 100644 --- a/setup/class_setupStep_Checks.inc +++ b/setup/class_setupStep_Checks.inc @@ -20,13 +20,13 @@ */ -class setup_step_2 extends setup_step +class Step_Checks extends setup_step { var $basic_checks = array(); var $config_checks= array(); var $is_writeable = array(); - function setup_step_2() + function Step_Checks() { $this->update_strings(); } diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc index 9a7afae5a..11872bff3 100644 --- a/setup/class_setupStep_Config1.inc +++ b/setup/class_setupStep_Config1.inc @@ -20,7 +20,7 @@ */ -class setup_step_5 extends setup_step +class Step_Config1 extends setup_step { var $peopleou = "ou=people"; @@ -54,7 +54,7 @@ class setup_step_5 extends setup_step var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","mail","theme","errorlvl","cyrusunixstyle", "base_hook","base_hook_active"); - function setup_step_5() + function Step_Config1() { $this->update_strings(); diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc index 30dd7f931..b572ff74d 100644 --- a/setup/class_setupStep_Config2.inc +++ b/setup/class_setupStep_Config2.inc @@ -20,7 +20,7 @@ */ -class setup_step_6 extends setup_step +class Step_Config2 extends setup_step { var $strict = TRUE; var $governmentmode = FALSE; @@ -47,7 +47,7 @@ class setup_step_6 extends setup_step "samba_rid_active" => FALSE); var $attributes = array("strict","governmentmode","sambaidmapping","account_expiration"); - function setup_step_6() + function Step_Config2() { $this->update_strings(); } diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc index 728f5808a..1c21c6a97 100644 --- a/setup/class_setupStep_Config3.inc +++ b/setup/class_setupStep_Config3.inc @@ -20,7 +20,7 @@ */ -class setup_step_6a extends setup_step +class Step_Config3 extends setup_step { var $optional = array( "enableCopyPaste" => false, @@ -48,7 +48,7 @@ class setup_step_6a extends setup_step "smbhash" => 'SMBHASH'); - function setup_step_6a() + function Step_Config3() { $this->update_strings(); diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc index 44eeefcb6..c247596bb 100644 --- a/setup/class_setupStep_Finish.inc +++ b/setup/class_setupStep_Finish.inc @@ -20,14 +20,14 @@ */ -class setup_step_8 extends setup_step +class Step_Finish extends setup_step { var $create_backup = TRUE; var $gosa_conf_contrib = "/gosa.conf"; var $cfg_file_written = FALSE; var $last_backup_name = ""; - function setup_step_8() + function Step_Finish() { $this->update_strings(); } diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc index d7a759383..363b9b4df 100644 --- a/setup/class_setupStep_Language.inc +++ b/setup/class_setupStep_Language.inc @@ -20,7 +20,7 @@ */ -class setup_step_1 extends setup_step +class Step_Language extends setup_step { var $lang_selected = ""; /* Language selected from select box */ var $lang = "en_EN"; /* Detected language */ @@ -28,7 +28,7 @@ class setup_step_1 extends setup_step var $attributes = array("lang","lang_selected"); var $header_image = "images/system.png"; - function setup_step_1() + function Step_Language() { $this->lang = get_browser_language(); $this->lang_selected = ""; diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc index 3e3bc899a..6d09bd71c 100644 --- a/setup/class_setupStep_Ldap.inc +++ b/setup/class_setupStep_Ldap.inc @@ -20,7 +20,7 @@ */ -class setup_step_4 extends setup_step +class Step_Ldap extends setup_step { var $connection = "ldap://localhost:389"; var $location = "default"; @@ -38,7 +38,7 @@ class setup_step_4 extends setup_step var $attributes = array("connection","location","admin","password","base","tls"); - function setup_step_4() + function Step_Ldap() { $this->update_strings(); } diff --git a/setup/class_setupStep_License.inc b/setup/class_setupStep_License.inc index db861f868..956d76e70 100644 --- a/setup/class_setupStep_License.inc +++ b/setup/class_setupStep_License.inc @@ -20,12 +20,12 @@ */ -class setup_step_3 extends setup_step +class Step_License extends setup_step { var $license_found = false; var $License = ""; - function setup_step_3() + function Step_License() { $this->update_strings(); } diff --git a/setup/class_setupStep_Schema.inc b/setup/class_setupStep_Schema.inc index 6dba41c0a..bcfa7b56a 100644 --- a/setup/class_setupStep_Schema.inc +++ b/setup/class_setupStep_Schema.inc @@ -20,7 +20,7 @@ */ -class setup_step_7 extends setup_step +class Step_Schema extends setup_step { var $checked = array(); var $not_checked = array(); @@ -29,7 +29,7 @@ class setup_step_7 extends setup_step var $enable_schema_check = TRUE; var $samba_version = 3; - function setup_step_7() + function Step_Schema() { $this->update_strings(); }