Commit 0d708b03 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Renamed setupStep classes for consistency

parent ba29274f
...@@ -26,13 +26,13 @@ require_once ("variables.inc"); ...@@ -26,13 +26,13 @@ require_once ("variables.inc");
require_once("../setup/class_setup.inc"); require_once("../setup/class_setup.inc");
require_once("../setup/class_setupStep.inc"); require_once("../setup/class_setupStep.inc");
require_once("../setup/class_setupStep_Welcome.inc"); require_once("../setup/class_setupStepWelcome.inc");
require_once("../setup/class_setupStep_Language.inc"); require_once("../setup/class_setupStepLanguage.inc");
require_once("../setup/class_setupStep_Checks.inc"); require_once("../setup/class_setupStepChecks.inc");
require_once("../setup/class_setupStep_Ldap.inc"); require_once("../setup/class_setupStepLdap.inc");
require_once("../setup/class_setupStep_Config.inc"); require_once("../setup/class_setupStepConfig.inc");
require_once("../setup/class_setupStep_Migrate.inc"); require_once("../setup/class_setupStepMigrate.inc");
require_once("../setup/class_setupStep_Finish.inc"); require_once("../setup/class_setupStepFinish.inc");
/* Set header */ /* Set header */
......
...@@ -56,13 +56,13 @@ class setup ...@@ -56,13 +56,13 @@ class setup
function __construct() function __construct()
{ {
$this->o_steps = array( $this->o_steps = array(
new Step_Welcome($this), new setupStepWelcome($this),
new Step_Language($this), new setupStepLanguage($this),
new Step_Checks($this), new setupStepChecks($this),
new Step_Ldap($this), new setupStepLdap($this),
new Step_Config_before_init($this), new setupStepConfig_before_init($this),
new Step_Migrate($this), new setupStepMigrate($this),
new Step_Finish($this), new setupStepFinish($this),
); );
$this->i_steps = count($this->o_steps); $this->i_steps = count($this->o_steps);
...@@ -79,9 +79,9 @@ class setup ...@@ -79,9 +79,9 @@ class setup
{ {
/* Display phpinfo() dialog when $_GET['info'] is set, /* Display phpinfo() dialog when $_GET['info'] is set,
* but only do this, if user is allowed to use the setup. * but only do this, if user is allowed to use the setup.
* If setupStep_Welcome is_completed, we are allowed to view those infos- * If setupsetupStepWelcome is_completed, we are allowed to view those infos-
*/ */
if (isset($_GET['info']) && preg_match("/Step_Welcome/i", get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()) { if (isset($_GET['info']) && preg_match("/setupStepWelcome/i", get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()) {
phpinfo(); phpinfo();
exit(); exit();
} }
...@@ -319,7 +319,7 @@ class setup ...@@ -319,7 +319,7 @@ class setup
function reBuildConfigStep ($completed = NULL) function reBuildConfigStep ($completed = NULL)
{ {
$this->o_steps[$this->i_config] = new Step_Config($this, $this->captured_values); $this->o_steps[$this->i_config] = new setupStepConfig($this, $this->captured_values);
if ($completed !== NULL) { if ($completed !== NULL) {
$this->o_steps[$this->i_config]->is_completed = $completed; $this->o_steps[$this->i_config]->is_completed = $completed;
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Checks extends setupStep class setupStepChecks extends setupStep
{ {
var $header_image = 'geticon.php?context=categories&icon=checks&size=48'; var $header_image = 'geticon.php?context=categories&icon=checks&size=48';
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Config_before_init extends setupStep class setupStepConfig_before_init extends setupStep
{ {
function update_strings() function update_strings()
{ {
...@@ -35,7 +35,7 @@ class Step_Config_before_init extends setupStep ...@@ -35,7 +35,7 @@ class Step_Config_before_init extends setupStep
} }
} }
class Step_Config extends configInLdap class setupStepConfig extends configInLdap
{ {
var $is_active = FALSE; var $is_active = FALSE;
var $is_enabled = FALSE; var $is_enabled = FALSE;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Finish extends setupStep class setupStepFinish extends setupStep
{ {
var $header_image = 'geticon.php?context=devices&icon=server&size=48'; var $header_image = 'geticon.php?context=devices&icon=server&size=48';
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Language extends setupStep class setupStepLanguage extends setupStep
{ {
var $header_image = 'geticon.php?context=applications&icon=config-language&size=48'; var $header_image = 'geticon.php?context=applications&icon=config-language&size=48';
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Ldap extends setupStep class setupStepLdap extends setupStep
{ {
var $header_image = 'geticon.php?context=places&icon=network-server&size=48'; var $header_image = 'geticon.php?context=places&icon=network-server&size=48';
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
/**************** /****************
* FUNCTIONS * FUNCTIONS
Step_Migrate - Constructor. setupStepMigrate - Constructor.
update_strings - Used to update the displayed step information. update_strings - Used to update the displayed step information.
initialize_checks - Initialize migration steps. initialize_checks - Initialize migration steps.
check_ldap_permissions - Check if the used admin account has full access to the ldap database. check_ldap_permissions - Check if the used admin account has full access to the ldap database.
...@@ -176,7 +176,7 @@ class StepMigrateCheck ...@@ -176,7 +176,7 @@ class StepMigrateCheck
} }
} }
class Step_Migrate extends setupStep class setupStepMigrate extends setupStep
{ {
var $header_image = "geticon.php?context=applications&icon=utilities-system-monitor&size=48"; var $header_image = "geticon.php?context=applications&icon=utilities-system-monitor&size=48";
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class Step_Welcome extends setupStep class setupStepWelcome extends setupStep
{ {
var $header_image = 'geticon.php?context=applications&icon=config-welcome&size=48'; var $header_image = 'geticon.php?context=applications&icon=config-welcome&size=48';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment