diff --git a/core/config.class.inc.php b/core/config.class.inc.php index a244c9ca0..c564a1dcf 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -14,6 +14,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +define('ITOP_APPLICATION', 'iTop'); define('ITOP_VERSION', '$ITOP_VERSION$'); define('ITOP_REVISION', '$WCREV$'); define('ITOP_BUILD_DATE', '$WCNOW$'); diff --git a/doc/itop-documentation.htm b/doc/itop-documentation.htm index 7f8a0a2f3..5a2bc9331 100644 --- a/doc/itop-documentation.htm +++ b/doc/itop-documentation.htm @@ -62,11 +62,36 @@ a.internal { a.internal:hover { text-decoration: underline; } +.code { + background-color: #ccc; + padding: 10px; + border: 1px solid #999; + font-family: Courier, Courier-New, monospace; +}
+

Completing the iTop installation

+

In order to operate properly, iTop maintenance operations and asynchronous tasks must be executed on a regular basis. +In order to ease the installation, all the background tasks have been grouped to be launched from a single file: webservices/cron.php +which is called from either cron.bat or cron.sh depending on the operating system. This file must then be scheduled to be executed on a regular basis.

+

Scheduling cron.bat on Windows

+
    +
  1. Edit the content of cron.bat to supply the correct user name and password to connect to iTop

    +
  2. Use schedtask.exe or the 'at' command to schedule cron.bat to run every minute.
    3. +
+ +

Scheduling cron.sh on Linux/Unix

+
    +
  1. Edit the content of cron.sh to supply the correct user name and password to connect to iTop

    +
  2. Add the following line to the crontab file:
    +(Adjust the path /var/www/itop/webservices to the correct location for iTop)

    +
    * * * * * /var/www/itop/webservices/cron.sh > /dev/null 2>&1
    +
    3. +
+

iTop Modules

diff --git a/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php index dee08021a..62da35283 100644 --- a/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php @@ -54,7 +54,7 @@ SetupWebPage::AddModule( // Documentation // - 'doc.manual_setup' => '', // No manual installation required + 'doc.manual_setup' => '/doc/itop-documentation.htm#Installation', // Some manual installation required 'doc.more_information' => '/doc/itop-documentation.htm#ConfigMgmt', // Default settings diff --git a/modules/itop-profiles-itil/module.itop-profiles-itil.php b/modules/itop-profiles-itil/module.itop-profiles-itil.php index 37ad030ff..1043f61f0 100644 --- a/modules/itop-profiles-itil/module.itop-profiles-itil.php +++ b/modules/itop-profiles-itil/module.itop-profiles-itil.php @@ -303,7 +303,7 @@ class CreateITILProfilesInstaller extends ModuleInstallerAPI { if ($bFirstInstall) { - // Makae sure we create these special profiles only once + // Make sure we create these special profiles only once URP_Profiles::DoCreateAdminProfile(); URP_Profiles::DoCreateUserPortalProfile(); } diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php index 886e8f301..80081e8dd 100644 --- a/setup/ajax.dataloader.php +++ b/setup/ajax.dataloader.php @@ -166,7 +166,7 @@ try foreach($aAvailableModules as $sModuleId => $aModule) { - if (($sModuleId != 'iTop') && in_array($sModuleId, $aSelectedModules) && + if (($sModuleId != ROOT_MODULE) && in_array($sModuleId, $aSelectedModules) && isset($aAvailableModules[$sModuleId]['installer']) ) { $sModuleInstallerClass = $aAvailableModules[$sModuleId]['installer']; diff --git a/setup/index.php b/setup/index.php index 64f4f4466..289440f7f 100644 --- a/setup/index.php +++ b/setup/index.php @@ -410,7 +410,7 @@ function PopulateDataFilesList(SetupWebPage $oP, $aParamValues, $oConfig) foreach($aAvailableModules as $sModuleId => $aModule) { - if (($sModuleId != 'iTop') && $aModule['visible']) + if (($sModuleId != ROOT_MODULE) && $aModule['visible']) { if (in_array($sModuleId, $aParamValues['module'])) { @@ -575,17 +575,17 @@ function WelcomeAndCheckPrerequisites(SetupWebPage $oP, $aParamValues, $iCurrent $oConfig->WriteToFile(TMP_CONFIG_FILE); $aVersion = AnalyzeInstallation($oConfig); - if (!empty($aVersion['iTop']['version_db'])) + if (!empty($aVersion[ROOT_MODULE]['version_db'])) { $aPreviousParams = array('mode', 'db_server', 'db_user', 'db_pwd','db_name', 'new_db_name', 'db_prefix'); $sMode = 'upgrade'; - if ($aVersion['iTop']['version_db'] == $aVersion['iTop']['version_code']) + if ($aVersion[ROOT_MODULE]['version_db'] == $aVersion[ROOT_MODULE]['version_code']) { - $oP->ok("Version {$aVersion['iTop']['version_db']} of iTop detected.
The same version of the application will be reinstalled."); + $oP->ok("Version ".$aVersion[ROOT_MODULE]['version_db']." of iTop detected.
The same version of the application will be reinstalled."); } else { - $oP->ok("Version {$aVersion['iTop']['version_db']} of iTop detected.
The application will be upgraded to version {$aVersion['iTop']['version_code']}"); + $oP->ok("Version ".$aVersion[ROOT_MODULE]['version_db']." of iTop detected.
The application will be upgraded to version ".$aVersion[ITOP_APPLICATION]['version_code']."."); } AddHiddenParam($oP, 'db_server', $oConfig->GetDBHost()); AddHiddenParam($oP, 'db_user', $oConfig->GetDBUser()); @@ -611,9 +611,9 @@ function WelcomeAndCheckPrerequisites(SetupWebPage $oP, $aParamValues, $iCurrent { $oP->add("

What do you want to do?

\n"); $sChecked = ($aParamValues['mode'] == 'install') ? 'checked' : ''; - $oP->p(" Install a new iTop\n"); + $oP->p(""); $sChecked = ($aParamValues['mode'] == 'upgrade') ? 'checked' : ''; - $oP->p(" Upgrade an existing iTop instance\n"); + $oP->p(""); $oP->add("

Next: Licence agreement

\n"); $oP->add("\n"); $aPreviousParams = array('mode'); @@ -680,9 +680,9 @@ function DatabaseServerSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep) $aForm = array(); $aForm[] = array('label' => "Server name$sRedStar:", 'input' => "", 'help' => 'E.g. "localhost", "dbserver.mycompany.com" or "192.142.10.23"'); - $aForm[] = array('label' => "User name$sRedStar:", 'input' => "", + $aForm[] = array('label' => "User name$sRedStar:", 'input' => "", 'help' => 'The account must have the following privileges on the database: SELECT, INSERT, UPDATE, DELETE, CREATE, ALTER, CREATE VIEW, TRIGGER'); - $aForm[] = array('label' => 'Password:', 'input' => ""); + $aForm[] = array('label' => 'Password:', 'input' => ""); $oP->form($aForm); $oP->add("\n"); $oP->add("

Next: Database instance Selection

\n"); @@ -721,7 +721,7 @@ function DatabaseInstanceSelection(SetupWebPage $oP, $aParamValues, $iCurrentSte if ($aDatabases === false) { // Connection failed, invalid credentials ? Go back - $oP->add("\n"); + $oP->add("\n"); } else { @@ -734,6 +734,18 @@ function DatabaseInstanceSelection(SetupWebPage $oP, $aParamValues, $iCurrentSte $oP->add("
Select the database instance to use for iTop*\n"); $aForm = array(); $bExistingChecked = false; + $sChecked = ''; + $sDBName = ''; + // If the 'Create Database' option was checked... and the database still does not exist + if (!$bExistingChecked && !empty($aParamValues['new_db_name'])) + { + $sChecked = 'checked'; + $sDBName = $aParamValues['new_db_name']; + } + if ($aParamValues['mode'] == 'install') + { + $aForm[] = array('label' => " "); + } if (is_array($aDatabases)) { foreach($aDatabases as $sDBName) @@ -752,18 +764,6 @@ function DatabaseInstanceSelection(SetupWebPage $oP, $aParamValues, $iCurrentSte $aForm[] = array('label' => " "); $oP->add_ready_script("$('#current_db_name').click( function() { $('#current_db').attr('checked', true); });"); } - $sChecked = ''; - $sDBName = ''; - // If the 'Create Database' option was checked... and the database still does not exist - if (!$bExistingChecked && !empty($aParamValues['new_db_name'])) - { - $sChecked = 'checked'; - $sDBName = $aParamValues['new_db_name']; - } - if ($aParamValues['mode'] == 'install') - { - $aForm[] = array('label' => " "); - } $oP->add('
'); $oP->form($aForm); $oP->add('
'); @@ -777,7 +777,7 @@ function DatabaseInstanceSelection(SetupWebPage $oP, $aParamValues, $iCurrentSte } else { - $aForm[] = array('label' => "The following prefix is used for all tables: "); + $aForm[] = array('label' => "The following prefix is used for the iTop tables: "); } $oP->form($aForm); @@ -819,8 +819,15 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf // Form goes here if ($aParamValues['mode'] == 'upgrade') { - $iPrevStep = 1; // depends on where we came from - if (empty($aAvailableModules['iTop']['version_db'])) + if (file_exists(FINAL_CONFIG_FILE)) + { + $iPrevStep = 1; // depends on where we came from + } + else + { + $iPrevStep = 3; + } + if (empty($aAvailableModules[ROOT_MODULE]['version_db'])) { $oP->error("Unable to detect the previous installation of iTop. The upgrade cannot continue.\n"); $oP->add("\n"); @@ -830,13 +837,14 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf $oP->add("\n"); return; } + $oP->ok("iTop version ".$aAvailableModules[ROOT_MODULE]['version_db']." detected.\n"); $oP->add("

Customize your iTop installation to fit your needs

\n"); $oP->add("
Select the iTop modules you want to install or upgrade:\n"); } else { $iPrevStep = 3; // depends on where we came from - if (!empty($aAvailableModules['iTop']['version_db'])) + if (!empty($aAvailableModules[ROOT_MODULE]['version_db'])) { $oP->error("A instance of iTop already exists. Please select the \"Upgrade\" mode to upgrade it.\n"); $oP->add("
\n"); @@ -849,7 +857,7 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf $oP->add("

Customize your iTop installation to fit your needs

\n"); $oP->add("
Select the iTop modules you want to install:\n"); } - $oP->add("
"); + $oP->add("
"); $sRedStar = '*'; $index = 0; $aSelectedModules = $aParamValues['module']; @@ -864,7 +872,8 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf } foreach($aAvailableModules as $sModuleId => $aModule) { - if ($sModuleId == 'iTop') continue; // Convention: the version number of the application is stored as a module named 'iTop' + if ($sModuleId == ROOT_MODULE) continue; // Convention: the version number of the application is stored as a module named ROOT_MODULE + $sModuleLabel = $aModule['label']; $sModuleHelp = $aModule['doc.more_information']; //$sClass = ($aModule['mandatory']) ? 'class="read-only"' : ''; @@ -952,7 +961,7 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf $oP->add("
\n"); if ($aParamValues['mode'] == 'upgrade') { - $oP->add("

Next: Upgrade summary

\n"); + $oP->add("

Next: Sample data selection

\n"); AddHiddenParam($oP, 'operation', 'step6'); } else @@ -962,7 +971,7 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf } $oP->add("
\n"); $oP->add("\n"); - $oP->add("\n"); + $oP->add("\n"); $oP->add("
\n"); $oP->add("\n"); $oP->add_ready_script("$('.read-only').click( function() { $(this).attr('checked','checked'); } );"); @@ -978,11 +987,10 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf function AdminAccountDefinition(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $oConfig) { $sNextOperation = 'step'.($iCurrentStep+1); - $iPrevStep = 4; $aParamValues['previous_step'] = $iCurrentStep; // Come back here $oP->set_title("Administrator account definition"); - $oP->add("
\n"); + $oP->add("\n"); $oP->add("\n"); AddParamsToForm($oP, $aParamValues, array('auth_user', 'auth_pwd', 'language')); @@ -1016,8 +1024,8 @@ function AdminAccountDefinition(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oP->add("
\n"); $oP->add("

Next: Sample data selection

\n"); $oP->add("\n"); - $oP->add("\n"); - $oP->add("\n"); + $oP->add("\n"); + $oP->add("\n"); $oP->add("
\n"); // Form goes here @@ -1083,16 +1091,8 @@ function SampleDataSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, Con $oP->add("

Next: Installation summary

\n"); $oP->add("\n"); $oP->add("\n"); - $oP->add("\n"); + $oP->add("\n"); $oP->add("
\n"); - - // End of visible form - $oP->add("\n"); - // Hidden form submitted when moving on to the next page, once all the data files - // have been processed - $oP->add("
\n"); - AddParamsToForm($oP, $aParamValues, array('sample_data')); - $oP->add("\n"); $oP->add("
\n"); } @@ -1116,7 +1116,7 @@ function DisplaySummary(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $ case 'install': foreach($aAvailableModules as $sModuleId => $aModule) { - if (($sModuleId != 'iTop') && $aModule['visible']) + if (($sModuleId != ROOT_MODULE) && $aModule['visible'] && ($aModule['category'] != 'authentication')) { if (in_array($sModuleId, $aParamValues['module'])) { @@ -1125,37 +1125,53 @@ function DisplaySummary(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $ } } $oP->set_title('Installation Summary'); - $oP->add("

iTop version ".$aAvailableModules['iTop']['version_code']." will be installed in the database: ".$oConfig->GetDBName()." on server: ".$oConfig->GetDBHost().".".'

'); + $oP->add("

iTop version ".$aAvailableModules[ROOT_MODULE]['version_code']." will be installed.

"); + $oP->add('
'); + + // Database information + $sPrefix = ''; + if ($oConfig->GetDBSubname() != '') + { + $sPrefix = " (prefix: ".$oConfig->GetDBSubname().")"; + } + $oP->collapsible('db', "Database", array($oConfig->GetDBName()." on server: ".$oConfig->GetDBHost().$sPrefix)); + if (count($aInstall) > 0) { - $oP->add('

Modules to install

'); + $iCount = count($aInstall); + $aItems = array(); foreach($aInstall as $sModuleId => $aModule) { - $oP->p(' '.$aModule['label'].' version '.$aModule['version_code']); + $aItems[] = $aModule['label'].' version '.$aModule['version_code']; } + $oP->collapsible('install', "$iCount module(s) will be installed", $aItems, ($iCount < 5)); } - $oP->add('

Sample data

'); + + // Sample data if ($aParamValues['sample_data'] != 'no') { - $oP->p('Sample data will be loaded for the new modules installed.'); + $sSampleData = 'Sample data will be loaded for the newly installed modules.'; } else { - $oP->p('No sample data will be loaded.'); + $sSampleData = 'No sample data will be loaded.'; } - $oP->add('

Administrator account

'); - $oP->p('Login:'.htmlentities($aParamValues['auth_user'], ENT_QUOTES, 'UTF-8')); - $oP->add('

Default application language:

'); + $oP->collapsible('sample_data', "Sample Data", array($sSampleData)); + + // Admin account + $oP->collapsible('admin_account', "Administrator account", array('Login:'.htmlentities($aParamValues['auth_user'], ENT_QUOTES, 'UTF-8'))); + // Default language $aAvailableLanguages = Dict::GetLanguages(); - $oP->p($aAvailableLanguages[$aParamValues['language']]['description']." (".$aAvailableLanguages[$aParamValues['language']]['localized_description'].")"); + $oP->collapsible('language', "Default application language", array( $aAvailableLanguages[$aParamValues['language']]['description']." (".$aAvailableLanguages[$aParamValues['language']]['localized_description'].")")); $oP->add('
'); - $oP->add("
\n"); + $oP->add("\n"); $oP->add("\n"); AddParamsToForm($oP, $aParamValues); $oP->add("\n"); $oP->add("\n"); + // Note: the Next >> button is NOT a submit, since moving to the next page is triggered asynchronously $oP->add("\n"); $oP->add("
\n"); $oP->add("
\n"); @@ -1165,7 +1181,7 @@ function DisplaySummary(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $ foreach($aAvailableModules as $sModuleId => $aModule) { - if (($sModuleId != 'iTop') && $aModule['visible']) + if (($sModuleId != ROOT_MODULE) && $aModule['visible'] && ($aModule['category'] != 'authentication')) { if (in_array($sModuleId, $aParamValues['module'])) { @@ -1191,57 +1207,77 @@ function DisplaySummary(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $ } } $oP->set_title('Upgrade Summary'); - $oP->add("

iTop instance: database: ".$oConfig->GetDBName()." on server: ".$oConfig->GetDBHost().", version ".$aAvailableModules['iTop']['version_db'].'

'); - $oP->add('

Will be upgraded to '.$aAvailableModules['iTop']['version_code'].'

'); + $oP->add("

The application will be upgraded from version ".$aAvailableModules[ROOT_MODULE]['version_db'].' to version '.$aAvailableModules[ROOT_MODULE]['version_code'].'

'); $oP->add('
'); + + // Database information + $sPrefix = ''; + if ($oConfig->GetDBSubname() != '') + { + $sPrefix = " (prefix: ".$oConfig->GetDBSubname().")"; + } + $oP->collapsible('db', "Database", array($oConfig->GetDBName()." on server: ".$oConfig->GetDBHost().$sPrefix)); + + // Modules summary, per "type" (install, uninstall...) if (count($aUpgrade) > 0) { - $oP->add('

Modules to upgrade

'); + $iCount = count($aUpgrade); + $aItems = array(); foreach($aUpgrade as $sModuleId => $aModule) { - $oP->add(' '.$aModule['label'].' version '.$aModule['version_db'].' to version '.$aModule['version_code']); + $aItems[] = $aModule['label'].' version '.$aModule['version_db'].' to version '.$aModule['version_code']; } + $oP->collapsible('upgrade', "$iCount module(s) will be upgraded", $aItems, ($iCount < 5)); } if (count($aInstall) > 0) { - $oP->add('

Modules to install

'); + $iCount = count($aInstall); + $aItems = array(); foreach($aInstall as $sModuleId => $aModule) { - $oP->p(' '.$aModule['label'].' version '.$aModule['version_code']); + $aItems[] = $aModule['label'].' version '.$aModule['version_code']; } + $oP->collapsible('install', "$iCount module(s) will be installed", $aItems, ($iCount < 5)); } if (count($aUninstall) > 0) { - $oP->add('

Modules to remove

'); + $iCount = count($aUninstall); + $aItems = array(); foreach($aUninstall as $sModuleId => $aModule) { - $oP->p(' '.$aModule['label'].' '.$sModuleId.' version '.$aModule['version_db']); + $aItems[] = $aModule['label'].' version '.$aModule['version_db']; } + $oP->collapsible('uninstall', "$iCount module(s) will be removed", $aItems, true /* always open */); } if (count($aUnchanged) > 0) { - $oP->add('

Modules that will remain unchanged

'); + $iCount = count($aUnchanged); + $aItems = array(); foreach($aUnchanged as $sModuleId => $aModule) { - $oP->p(' '.$aModule['label'].' version '.$aModule['version_db']); + $aItems[] = $aModule['label'].' version '.$aModule['version_db']; } + $oP->collapsible('unchanged', "$iCount module(s) will remain unchanged", $aItems, ($iCount < 5)); } - $oP->add('

Sample data

'); + // Sample data if ($aParamValues['sample_data'] != 'no') { - $oP->p('Sample data will be loaded for the new modules installed.'); + $sSampleData = 'Sample data will be loaded for the newly installed modules.'; } else { - $oP->p('No sample data will be loaded.'); + $sSampleData = 'No sample data will be loaded.'; } + $oP->collapsible('sample_data', "Sample Data", array($sSampleData)); + $oP->add('
'); - $oP->add("
\n"); + $oP->add("\n"); $oP->add("\n"); AddParamsToForm($oP, $aParamValues); $oP->add("\n"); - $oP->add("\n"); - $oP->add("\n"); + $oP->add("\n"); + // Note: the Next >> button is NOT a submit, since moving to the next page is triggered asynchronously + $oP->add("\n"); $oP->add("
\n"); $oP->add("
\n"); break; @@ -1249,6 +1285,13 @@ function DisplaySummary(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $ default: $oP->error("Unsupported mode $sMode"); } + // Hidden form submitted when moving on to the next page, once all the data files + // have been processed + $oP->add("
\n"); + AddParamsToForm($oP, $aParamValues); + $oP->add("\n"); + $oP->add("
\n"); + $oP->add("
\n"); $oP->add_linked_script('./jquery.progression.js'); PopulateDataFilesList($oP, $aParamValues, $oConfig); @@ -1333,7 +1376,7 @@ function SetupFinished(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $o $oP->add("
\n"); // Check if there are some manual steps required: - $aAvailableModules = GetAvailableModules($oP); + $aAvailableModules = AnalyzeInstallation($oConfig); $aManualSteps = array(); foreach($aParamValues['module'] as $sModuleId) { @@ -1350,6 +1393,7 @@ function SetupFinished(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $o { $oP->p("Manual instructions for $sModuleLabel"); } + $oP->add("

Congratulations for installing iTop

"); } else { diff --git a/setup/setup.js b/setup/setup.js index 35988ec1c..49e2a1c30 100644 --- a/setup/setup.js +++ b/setup/setup.js @@ -8,6 +8,7 @@ function NameIsValid(name) function DoGoBack(iStep) { $('input[name=operation]').val('step'+iStep); + $(':button').attr('disabled', 'disabled'); $('#theForm').submit(); // Submit the form return true; } @@ -117,9 +118,13 @@ function DoSubmit(sMsg, iStep) bResult = false; } } - if (bResult && (sMsg != '')) + if (bResult) { - $('#setup').block({message: ' '+sMsg}); + $(':button').attr('disabled', 'disabled'); + if ((sMsg != '')) + { + $('#setup').block({message: ' '+sMsg}); + } } return bResult; } @@ -130,7 +135,7 @@ function DoUpdateDBSchema() { // Call the asynchronous page that performs the creation/update of the DB Schema $('#log').html(''); - $('#setup').block({message: '

Updating DB schema...

0%

'}); + $('#setup').block({message: '

Updating DB schema...

0%

'}); $('#progress').progression( {Current:5, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} ); $('#log').load( 'ajax.dataloader.php', { @@ -158,7 +163,7 @@ function DoUpdateProfiles(response, status, xhr) { // Call the asynchronous page that performs the creation/update of the DB Schema $('#log').html(''); - $('#setup').block({message: '

Updating Profiles...

0%

'}); + $('#setup_msg').text('Updating Profiles...'); $('#progress').progression( {Current:40, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} ); $('#log').load( 'ajax.dataloader.php', { @@ -208,7 +213,7 @@ function DoLoadDataAsynchronous(response, status, xhr) else { $('#log').html(''); - $('#setup').block({message: '

Loading data...

0%

'}); + $('#setup_msg').text('Loading data...'); $('#progress').progression( {Current: 60, Maximum: 100, aBackgroundImg: 'orange-progress.gif', aTextColor: '#000000'} ); // $('#log').ajaxError( // function(e, xhr, settings, exception) diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index 061efc871..6045d1763 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -29,6 +29,7 @@ define('INSTALL_LOG_FILE', APPROOT.'/setup.log'); define ('MODULE_ACTION_OPTIONAL', 1); define ('MODULE_ACTION_MANDATORY', 2); define ('MODULE_ACTION_IMPOSSIBLE', 3); +define ('ROOT_MODULE', '_Root_'); // Convention to store IN MEMORY the name/version of the root module i.e. application date_default_timezone_set('Europe/Paris'); class SetupWebPage extends NiceWebPage @@ -158,6 +159,16 @@ table.formTable { line-height: 20px; text-align: center; margin: 5px; +} +h3.clickable { + background: url(../images/plus.gif) no-repeat left; + padding-left:16px; + cursor: hand; +} +h3.clickable.open { + background: url(../images/minus.gif) no-repeat left; + padding-left:16px; + cursor: hand; } "); } @@ -216,6 +227,22 @@ table.formTable { $this->add("\n"); } + public function collapsible($sId, $sTitle, $aItems, $bOpen = true) + { + $this->add("

$sTitle

"); + $this->p(''); + $this->add_ready_script("$('#{$sId}').click( function() { $(this).toggleClass('open'); $('#{$sId}_list').toggle();} );\n"); + if (!$bOpen) + { + $this->add_ready_script("$('#{$sId}').toggleClass('open'); $('#{$sId}_list').toggle();\n"); + } + } + public function output() { $this->s_content = "

 {$this->s_title}

\n
{$this->s_content}\n
\n"; @@ -252,6 +279,7 @@ table.formTable { fclose($hLogFile); } } + static $m_aModuleArgs = array( 'label' => 'One line description shown during the interactive setup', @@ -451,9 +479,11 @@ function GetAvailableModules($oP = null) function AnalyzeInstallation($oConfig) { $aRes = array( - 'iTop' => array( + ROOT_MODULE => array( 'version_db' => '', + 'name_db' => '', 'version_code' => ITOP_VERSION.'.'.ITOP_REVISION, + 'name_code' => ITOP_APPLICATION, ) ); @@ -463,30 +493,30 @@ function AnalyzeInstallation($oConfig) list($sModuleName, $sModuleVersion) = GetModuleName($sModuleId); $sModuleAppVersion = $aModuleInfo['itop_version']; - $aModuleInfo['version_db'] = ''; - $aModuleInfo['version_code'] = $sModuleVersion; + $aModuleInfo['version_db'] = ''; + $aModuleInfo['version_code'] = $sModuleVersion; if (!in_array($sModuleAppVersion, array('1.0.0', '1.0.1', '1.0.2'))) { // This module is NOT compatible with the current version - $aModuleInfo['install'] = array( - 'flag' => MODULE_ACTION_IMPOSSIBLE, - 'message' => 'the module is not compatible with the current version of the application' - ); + $aModuleInfo['install'] = array( + 'flag' => MODULE_ACTION_IMPOSSIBLE, + 'message' => 'the module is not compatible with the current version of the application' + ); } elseif ($aModuleInfo['mandatory']) { - $aModuleInfo['install'] = array( - 'flag' => MODULE_ACTION_MANDATORY, - 'message' => 'the module is part of the application' - ); + $aModuleInfo['install'] = array( + 'flag' => MODULE_ACTION_MANDATORY, + 'message' => 'the module is part of the application' + ); } else { - $aModuleInfo['install'] = array( - 'flag' => MODULE_ACTION_OPTIONAL, - 'message' => '' - ); + $aModuleInfo['install'] = array( + 'flag' => MODULE_ACTION_OPTIONAL, + 'message' => '' + ); } $aRes[$sModuleName] = $aModuleInfo; } @@ -504,28 +534,33 @@ function AnalyzeInstallation($oConfig) // Build the list of installed module (get the latest installation) // - $aInstallByModule = array(); // array of => array ('installed' => timestamp, 'version' => ) + $aInstallByModule = array(); // array of => array ('installed' => timestamp, 'version' => ) foreach ($aSelectInstall as $aInstall) - { - //$aInstall['comment']; // unsused - //$aInstall['parent_id']; // unsused - $iInstalled = strtotime($aInstall['installed']); - $sModuleName = $aInstall['name']; - $sModuleVersion = $aInstall['version']; + { + //$aInstall['comment']; // unsused + $iInstalled = strtotime($aInstall['installed']); + $sModuleName = $aInstall['name']; + $sModuleVersion = $aInstall['version']; - if ($sModuleName == 'itop') + if ($aInstall['parent_id'] == 0) { - $aRes['iTop']['version_db'] = $sModuleVersion; - continue; + $sModuleName = ROOT_MODULE; } - if (array_key_exists($sModuleName, $aInstallByModule)) - { - if ($iInstalled < $aInstallByModule[$sModuleName]['installed']) + if (array_key_exists($sModuleName, $aInstallByModule)) { - continue; - } + if ($iInstalled < $aInstallByModule[$sModuleName]['installed']) + { + continue; + } } + + if ($aInstall['parent_id'] == 0) + { + $aRes[$sModuleName]['version_db'] = $sModuleVersion; + $aRes[$sModuleName]['name_db'] = $aInstall['name']; + } + $aInstallByModule[$sModuleName]['installed'] = $iInstalled; $aInstallByModule[$sModuleName]['version'] = $sModuleVersion; } @@ -534,26 +569,28 @@ function AnalyzeInstallation($oConfig) // foreach ($aInstallByModule as $sModuleName => $aModuleDB) { - if (!array_key_exists($sModuleName, $aRes)) - { - // A module was installed, it is not proposed in the new build... skip - continue; - } - $aRes[$sModuleName]['version_db'] = $aModuleDB['version']; + if ($sModuleName == ROOT_MODULE) continue; // Skip the main module + + if (!array_key_exists($sModuleName, $aRes)) + { + // A module was installed, it is not proposed in the new build... skip + continue; + } + $aRes[$sModuleName]['version_db'] = $aModuleDB['version']; - if ($aRes[$sModuleName]['install']['flag'] == MODULE_ACTION_MANDATORY) - { - $aRes[$sModuleName]['uninstall'] = array( - 'flag' => MODULE_ACTION_IMPOSSIBLE, - 'message' => 'the module is part of the application' - ); + if ($aRes[$sModuleName]['install']['flag'] == MODULE_ACTION_MANDATORY) + { + $aRes[$sModuleName]['uninstall'] = array( + 'flag' => MODULE_ACTION_IMPOSSIBLE, + 'message' => 'the module is part of the application' + ); } else { - $aRes[$sModuleName]['uninstall'] = array( - 'flag' => MODULE_ACTION_OPTIONAL, - 'message' => '' - ); + $aRes[$sModuleName]['uninstall'] = array( + 'flag' => MODULE_ACTION_OPTIONAL, + 'message' => '' + ); } } @@ -641,7 +678,7 @@ function RecordInstallation(Config $oConfig, $aSelectedModules) { // Record main installation $oInstallRec = new ModuleInstallation(); - $oInstallRec->Set('name', 'itop'); + $oInstallRec->Set('name', ITOP_APPLICATION); $oInstallRec->Set('version', ITOP_VERSION.'.'.ITOP_REVISION); $oInstallRec->Set('comment', "Done by the setup program\nBuilt on ".ITOP_BUILD_DATE); $oInstallRec->Set('parent_id', 0); // root module