diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php index fc088ecf4f..7be631ec2e 100755 --- a/main/install/install_db.inc.php +++ b/main/install/install_db.inc.php @@ -1,15 +1,15 @@ 0) -{ - $no=mysql_errno(); - $msg=mysql_error(); +if (mysql_errno() > 0) { + $no = mysql_errno(); + $msg = mysql_error(); - echo '
['.$no.'] – '.$msg.'
+ echo '
['.$no.'] – '.$msg.'
The MySQL server doesn\'t work or login / pass is bad.

Please check these values:

- host : '.$dbHostForm.'
- user : '.$dbUsernameForm.'
- password : '.str_repeat('*',strlen($dbPassForm)).'

+ host : '.$dbHostForm.'
+ user : '.$dbUsernameForm.'
+ password : '.str_repeat('*', strlen($dbPassForm)).'

Please go back to step 3.

'; @@ -55,129 +53,102 @@ mysql_query("SET SESSION character_set_server='utf8';"); mysql_query("SET SESSION collation_server='utf8_general_ci';"); mysql_query("SET CHARACTER SET 'utf8';"); -if($urlForm[strlen($urlForm)-1] != '/') -{ - $urlForm=$urlForm.'/'; +if ($urlForm[strlen($urlForm)-1] != '/') { + $urlForm = $urlForm.'/'; } switch ($encryptPassForm) { case 'md5' : - $passToStore=md5($passForm); - break; + $passToStore = md5($passForm); + break; case 'sha1' : - $passToStore=sha1($passForm); - break; + $passToStore = sha1($passForm); + break; case 'none' : - $passToStore=($passForm); - break; + $passToStore = $passForm; + break; } -/* -if($encryptPassForm) -{ - $passToStore=md5($passForm); -} -else -{ - $passToStore=($passForm); -}*/ -$dbPrefixForm=eregi_replace('[^a-z0-9_-]','',$dbPrefixForm); +$dbPrefixForm = eregi_replace('[^a-z0-9_-]', '', $dbPrefixForm); -$dbNameForm=eregi_replace('[^a-z0-9_-]','',$dbNameForm); -$dbStatsForm=eregi_replace('[^a-z0-9_-]','',$dbStatsForm); -$dbUserForm=eregi_replace('[^a-z0-9_-]','',$dbUserForm); +$dbNameForm = eregi_replace('[^a-z0-9_-]', '', $dbNameForm); +$dbStatsForm = eregi_replace('[^a-z0-9_-]', '', $dbStatsForm); +$dbUserForm = eregi_replace('[^a-z0-9_-]', '', $dbUserForm); -if(!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm,$dbNameForm)) -{ - $dbNameForm=$dbPrefixForm.$dbNameForm; +if (!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm, $dbNameForm)) { + $dbNameForm = $dbPrefixForm.$dbNameForm; } -if(!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm,$dbStatsForm)) -{ - $dbStatsForm=$dbPrefixForm.$dbStatsForm; +if (!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm, $dbStatsForm)) { + $dbStatsForm = $dbPrefixForm.$dbStatsForm; } -if(!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm,$dbUserForm)) -{ - $dbUserForm=$dbPrefixForm.$dbUserForm; +if (!empty($dbPrefixForm) && !ereg('^'.$dbPrefixForm, $dbUserForm)) { + $dbUserForm = $dbPrefixForm.$dbUserForm; } -$mysqlMainDb=$dbNameForm; -$mysqlStatsDb=$dbStatsForm; -$mysqlUserDb=$dbUserForm; +$mysqlMainDb = $dbNameForm; +$mysqlStatsDb = $dbStatsForm; +$mysqlUserDb = $dbUserForm; -if(empty($mysqlMainDb) || $mysqlMainDb == 'mysql' || $mysqlMainDb == $dbPrefixForm) -{ +if (empty($mysqlMainDb) || $mysqlMainDb == 'mysql' || $mysqlMainDb == $dbPrefixForm) { $mysqlMainDb=$dbPrefixForm.'main'; } -if(empty($mysqlStatsDb) || $mysqlStatsDb == 'mysql' || $mysqlStatsDb == $dbPrefixForm) -{ +if (empty($mysqlStatsDb) || $mysqlStatsDb == 'mysql' || $mysqlStatsDb == $dbPrefixForm) { $mysqlStatsDb=$dbPrefixForm.'stats'; } -if(empty($mysqlUserDb) || $mysqlUserDb == 'mysql' || $mysqlUserDb == $dbPrefixForm) -{ +if (empty($mysqlUserDb) || $mysqlUserDb == 'mysql' || $mysqlUserDb == $dbPrefixForm) { $mysqlUserDb=$dbPrefixForm.'user'; } -$result=mysql_query("SHOW VARIABLES LIKE 'datadir'") or die(mysql_error()); +$result = mysql_query("SHOW VARIABLES LIKE 'datadir'") or die(mysql_error()); -$mysqlRepositorySys=mysql_fetch_array($result); -$mysqlRepositorySys=$mysqlRepositorySys['Value']; +$mysqlRepositorySys = mysql_fetch_array($result); +$mysqlRepositorySys = $mysqlRepositorySys['Value']; -if(!$singleDbForm) -{ +if (!$singleDbForm) { mysql_query("DROP DATABASE IF EXISTS `$mysqlMainDb`") or die(mysql_error()); } mysql_query("CREATE DATABASE IF NOT EXISTS `$mysqlMainDb`") or die(mysql_error()); -if($mysqlStatsDb == $mysqlMainDb && $mysqlUserDb == $mysqlMainDb) -{ - $singleDbForm=true; +if($mysqlStatsDb == $mysqlMainDb && $mysqlUserDb == $mysqlMainDb) { + $singleDbForm = true; } /** * CREATING THE STATISTICS DATABASE */ -if($mysqlStatsDb != $mysqlMainDb) -{ - if(!$singleDbForm) - { +if ($mysqlStatsDb != $mysqlMainDb) { + if (!$singleDbForm) { // multi DB mode AND tracking has its own DB so create it mysql_query("DROP DATABASE IF EXISTS `$mysqlStatsDb`") or die(mysql_error()); mysql_query("CREATE DATABASE `$mysqlStatsDb`") or die(mysql_error()); - } - else - { + } else { // single DB mode so $mysqlStatsDb MUST BE the SAME than $mysqlMainDb - $mysqlStatsDb=$mysqlMainDb; + $mysqlStatsDb = $mysqlMainDb; } } /** * CREATING THE USER DATABASE */ -if($mysqlUserDb != $mysqlMainDb) -{ - if(!$singleDbForm) - { +if ($mysqlUserDb != $mysqlMainDb) { + if (!$singleDbForm) { // multi DB mode AND user data has its own DB so create it mysql_query("DROP DATABASE IF EXISTS `$mysqlUserDb`") or die(mysql_error()); mysql_query("CREATE DATABASE `$mysqlUserDb`") or die(mysql_error()); - } - else - { + } else { // single DB mode so $mysqlUserDb MUST BE the SAME than $mysqlMainDb - $mysqlUserDb=$mysqlMainDb; + $mysqlUserDb = $mysqlMainDb; } } -include("../lang/english/create_course.inc.php"); +include '../lang/english/create_course.inc.php'; -if($languageForm != 'english') -{ - include("../lang/$languageForm/create_course.inc.php"); +if ($languageForm != 'english') { + include '../lang/$languageForm/create_course.inc.php'; } /** @@ -221,5 +192,3 @@ fill_track_countries_table($track_countries_table); mysql_select_db($mysqlUserDb) or die(mysql_error()); load_database_script('dokeos_user.sql'); - -?> diff --git a/main/install/install_files.inc.php b/main/install/install_files.inc.php index 783694f1e2..6b6f8ad81c 100755 --- a/main/install/install_files.inc.php +++ b/main/install/install_files.inc.php @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/main/install/install_functions.inc.php b/main/install/install_functions.inc.php index 6f822fc839..56997d8b26 100755 --- a/main/install/install_functions.inc.php +++ b/main/install/install_functions.inc.php @@ -3,12 +3,9 @@ * This function prints class=active_step $current_step=$param * @author Patrick Cool , Ghent University */ -function step_active($param) -{ +function step_active($param) { global $current_step; - - if ($param==$current_step) - { + if ($param == $current_step) { echo 'class="current_step" '; } } @@ -17,13 +14,12 @@ function step_active($param) * This function displays the Step X of Y - * @return string String that says 'Step X of Y' with the right values */ -function display_step_sequence() -{ +function display_step_sequence() { global $current_step; global $total_steps; - return get_lang('Step'.$current_step).' – '; } + /** * This function checks if a php extension exists or not and returns an HTML * status string. @@ -33,86 +29,70 @@ function display_step_sequence() * @param string Text to show when extension is available (defaults to 'KO') * @param boolean Whether this extension is optional (in this case show unavailable text in orange rather than red) * @return string HTML string reporting the status of this extension. Language-aware. - * @author Christophe Gesche + * @author Christophe Gesché * @author Patrick Cool , Ghent University * @author Yannick Warnier * @version Dokeos 1.8.1, May 2007 */ -function check_extension($extension_name,$return_success='Yes',$return_failure='No',$optional=false) -{ - if(extension_loaded($extension_name)) - { +function check_extension($extension_name, $return_success = 'Yes', $return_failure = 'No', $optional = false) { + if (extension_loaded($extension_name)) { return ''.$return_success.''; - } - else - { - if($optional===true) - { + } else { + if ($optional === true) { return ''.$return_failure.''; - } - else - { + } else { return ''.$return_failure.''; } } } - /** * This function checks whether a php setting matches the recommended value * * @author Patrick Cool , Ghent University * @version Dokeos 1.8, august 2006 */ -function check_php_setting($php_setting, $recommended_value, $return_success=false, $return_failure=false) -{ +function check_php_setting($php_setting, $recommended_value, $return_success = false, $return_failure = false) { $current_php_value = get_php_setting($php_setting); - if ( $current_php_value== $recommended_value) - { + if ($current_php_value == $recommended_value) { return ''.$current_php_value.' '.$return_success.''; - } - else - { + } else { return ''.$current_php_value.' '.$return_failure.''; } } + /** - * Enter description here... + * Returns a textual value ('ON' or 'OFF') based on a requester 2-state ini- configuration setting. * * @param string $val a php ini value * @return boolean: ON or OFF * @author Joomla */ function get_php_setting($val) { - $r = (ini_get($val) == '1' ? 1 : 0); + $r = ini_get($val) == '1' ? 1 : 0; return $r ? 'ON' : 'OFF'; } /** * This function checks if the given folder is writable */ -function check_writable($folder) -{ - if (is_writable('../'.$folder)) - { +function check_writable($folder) { + if (is_writable('../'.$folder)) { return ''.get_lang('Writable').''; - } - else - { + } else { return ''.get_lang('NotWritable').''; } } /** - * this function returns a string "FALSE" or "TRUE" according to the variable in parameter + * This function returns a string "true" or "false" according to the passed parameter. * - * @param integer $var the variable to convert - * @return string the string "FALSE" or "TRUE" - * @author Christophe Gesche + * @param integer $var The variable to present as text + * @return string the string "true" or "false" + * @author Christophe Gesché */ -function trueFalse($var) -{ - return $var?'true':'false'; +function trueFalse($var) { + return $var ? 'true' : 'false'; } /** @@ -121,12 +101,11 @@ function trueFalse($var) * @param string File path * @return array The lines of the file returned as an array */ -function file_to_array($filename) -{ - $fp = fopen($filename, "rb"); +function file_to_array($filename) { + $fp = fopen($filename, 'rb'); $buffer = fread($fp, filesize($filename)); fclose($fp); - $result = explode('
',nl2br($buffer)); + $result = explode('
', nl2br($buffer)); return $result; } @@ -268,9 +247,8 @@ function get_config_param($param,$updatePath='') * @param string Name of param we want * @return mixed The parameter value or null if not found */ -function get_config_param_from_db($host,$login,$pass,$db_name,$param='') -{ - $mydb = mysql_connect($host,$login,$pass); +function get_config_param_from_db($host, $login, $pass, $db_name, $param = '') { + $mydb = mysql_connect($host, $login, $pass); // The system has not been designed to use special SQL modes that were introduced since MySQL 5 @mysql_query("set session sql_mode='';"); @@ -278,9 +256,11 @@ function get_config_param_from_db($host,$login,$pass,$db_name,$param='') $myconnect = mysql_select_db($db_name); $sql = "SELECT * FROM settings_current WHERE variable = '$param'"; $res = mysql_query($sql); - if($res===false){return null;} - if(mysql_num_rows($res)>0) - { + if ($res === false) { + return null; + } + + if (mysql_num_rows($res) > 0) { $row = mysql_fetch_array($res); $value = $row['selected_value']; return $value; @@ -293,23 +273,23 @@ function get_config_param_from_db($host,$login,$pass,$db_name,$param='') * @todo function does not belong here, move to code library, * also see infocours.php which contains similar function */ -function get_language_folder_list($dirname) -{ - if ($dirname[strlen($dirname)-1] != '/') $dirname .= '/'; +function get_language_folder_list($dirname) { + if ($dirname[strlen($dirname)-1] != '/') { + $dirname .= '/'; + } $handle = opendir($dirname); $language_list = array(); - while ($entries = readdir($handle)) - { - if ($entries=='.' || $entries=='..' || $entries=='CVS' || $entries == '.svn') continue; - if (is_dir($dirname.$entries)) - { + while ($entries = readdir($handle)) { + if ($entries == '.' || $entries == '..' || $entries=='CVS' || $entries == '.svn') { + continue; + } + if (is_dir($dirname.$entries)) { $language_list[] = $entries; } } closedir($handle); - return $language_list; } @@ -319,13 +299,11 @@ function get_language_folder_list($dirname) ============================================================================== */ - /** -* Displays a form (drop down menu) so the user can select -* his/her preferred language. -*/ -function display_language_selection_box() -{ + * Displays a form (drop down menu) so the user can select + * his/her preferred language. + */ +function display_language_selection_box() { //get language list $dirname = '../lang/'; $language_list = get_language_folder_list($dirname); @@ -339,10 +317,12 @@ function display_language_selection_box() echo "\t\t -, Ghent University */ -function display_requirements($installType, $badUpdatePath, $updatePath='', $update_from_version_8=array(), $update_from_version_6=array()) -{ +function display_requirements($installType, $badUpdatePath, $updatePath = '', $update_from_version_8 = array(), $update_from_version_6 = array()) { echo '

'.display_step_sequence().get_lang('Requirements')."

\n"; echo ''.get_lang('ReadThoroughly').'
'; @@ -395,14 +374,11 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd '.get_lang('PHPVersion').'>= 5.0 '; - if (phpversion() < '5.0') - { - echo ''.get_lang('PHPVersionError').''; - } - else - { - echo ''.get_lang('PHPVersionOK'). ' '.phpversion().''; - } + if (phpversion() < '5.0') { + echo ''.get_lang('PHPVersionError').''; + } else { + echo ''.get_lang('PHPVersionOK'). ' '.phpversion().''; + } echo ' @@ -568,109 +544,97 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd echo ' '; echo ''; - if($installType == 'update' && (empty($updatePath) || $badUpdatePath)) - { - if($badUpdatePath) - { ?> + if ($installType == 'update' && (empty($updatePath) || $badUpdatePath)) { + if ($badUpdatePath) { ?>
- !
- Chamilo . + !
+ Chamilo .
'; } ?> - - + +
::
- + - +
the user will have to adjust the permissions manually - if(count($notwritable)>0) - { - $error=true; + if (count($notwritable) > 0) { + $error = true; echo '
'; echo get_lang('Warning').':
'; - printf(get_lang('NoWritePermissionPleaseReadInstallGuide'),'',' '); + printf(get_lang('NoWritePermissionPleaseReadInstallGuide'), '', ' '); echo '
    '; - foreach ($notwritable as $value) - { + foreach ($notwritable as $value) { echo '
  • '.$value.'
    • '; } echo '
'; echo '
'; } // check wether a Dokeos configuration file already exists. - elseif(file_exists('../inc/conf/configuration.php')) - { + elseif(file_exists('../inc/conf/configuration.php')) { echo '
'; echo get_lang('WarningExistingDokeosInstallationDetected'); echo '
'; @@ -684,14 +648,14 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd '.get_lang('UpgradeFromDokeos18x').''; echo ''; echo '

'; } @@ -702,8 +666,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath='', $upd * - an "I accept" button named step3 to proceed to step 3; * - a "Back" button named step1 to go back to the first step. */ -function display_license_agreement() -{ +function display_license_agreement() { echo '

'.display_step_sequence().get_lang('Licence').'

'; echo '

'.get_lang('DokeosLicenseInfo').'

'; echo '

'.get_lang('PrintVers').'

'; @@ -744,17 +707,14 @@ function display_license_agreement() * @param string Additional attribute for the element * @return void Direct output */ -function display_database_parameter($install_type, $parameter_name, $form_field_name, $parameter_value, $extra_notice, $display_when_update = true, $tr_attribute='') +function display_database_parameter($install_type, $parameter_name, $form_field_name, $parameter_value, $extra_notice, $display_when_update = true, $tr_attribute = '') { echo "\n"; echo "$parameter_name  \n"; - if ($install_type == INSTALL_TYPE_UPDATE && $display_when_update) - { + if ($install_type == INSTALL_TYPE_UPDATE && $display_when_update) { echo ''.$parameter_value."\n"; - } - else - { - if ($form_field_name=='dbPassForm') { + } else { + if ($form_field_name == 'dbPassForm') { $inputtype = 'password'; } else { $inputtype = 'text'; @@ -762,7 +722,7 @@ function display_database_parameter($install_type, $parameter_name, $form_field_ //Slightly limit the length of the database prefix to avoid //having to cut down the databases names later on - if ($form_field_name=='dbPrefixForm') { + if ($form_field_name == 'dbPrefixForm') { $maxlength = '15'; } else { $maxlength = MAX_FORM_FIELD_LENGTH; @@ -779,72 +739,58 @@ function display_database_parameter($install_type, $parameter_name, $form_field_ * regarding the databases - login and password, names, prefixes, single * or multiple databases, tracking or not... */ -function display_database_settings_form($installType, $dbHostForm, $dbUsernameForm, $dbPassForm, $dbPrefixForm, $enableTrackingForm, $singleDbForm, $dbNameForm, $dbStatsForm, $dbScormForm, $dbUserForm) -{ - if($installType == 'update') { +function display_database_settings_form($installType, $dbHostForm, $dbUsernameForm, $dbPassForm, $dbPrefixForm, $enableTrackingForm, $singleDbForm, $dbNameForm, $dbStatsForm, $dbScormForm, $dbUserForm) { + if ($installType == 'update') { global $_configuration, $update_from_version_6; - if(in_array($_POST['old_version'],$update_from_version_6)) { + if (in_array($_POST['old_version'],$update_from_version_6)) { $dbHostForm = get_config_param('dbHost'); $dbUsernameForm = get_config_param('dbLogin'); $dbPassForm = get_config_param('dbPass'); $dbPrefixForm = get_config_param('dbNamePrefix'); - $enableTrackingForm=get_config_param('is_trackingEnabled'); - $singleDbForm =get_config_param('singleDbEnabled'); - $dbNameForm =get_config_param('mainDbName'); - $dbStatsForm =get_config_param('statsDbName'); - $dbScormForm =get_config_param('scormDbName'); - $dbUserForm =get_config_param('user_personal_database'); - $dbScormExists=true; - } - else - { - $dbHostForm=$_configuration['db_host']; - $dbUsernameForm=$_configuration['db_user']; - $dbPassForm=$_configuration['db_password']; - $dbPrefixForm=$_configuration['db_prefix']; - $enableTrackingForm=$_configuration['tracking_enabled']; - $singleDbForm=$_configuration['single_database']; - $dbNameForm=$_configuration['main_database']; - $dbStatsForm=$_configuration['statistics_database']; - $dbScormForm=$_configuration['scorm_database']; - $dbUserForm=$_configuration['user_personal_database']; - - $dbScormExists=true; + $enableTrackingForm = get_config_param('is_trackingEnabled'); + $singleDbForm = get_config_param('singleDbEnabled'); + $dbNameForm = get_config_param('mainDbName'); + $dbStatsForm = get_config_param('statsDbName'); + $dbScormForm = get_config_param('scormDbName'); + $dbUserForm = get_config_param('user_personal_database'); + $dbScormExists = true; + } else { + $dbHostForm = $_configuration['db_host']; + $dbUsernameForm = $_configuration['db_user']; + $dbPassForm = $_configuration['db_password']; + $dbPrefixForm = $_configuration['db_prefix']; + $enableTrackingForm = $_configuration['tracking_enabled']; + $singleDbForm = $_configuration['single_database']; + $dbNameForm = $_configuration['main_database']; + $dbStatsForm = $_configuration['statistics_database']; + $dbScormForm = $_configuration['scorm_database']; + $dbUserForm = $_configuration['user_personal_database']; + $dbScormExists = true; } - if(empty($dbScormForm)) - { - if($singleDbForm) - { - $dbScormForm=$dbNameForm; - } - else - { - $dbScormForm=$dbPrefixForm.'scorm'; - - $dbScormExists=false; + if (empty($dbScormForm)) { + if ($singleDbForm) { + $dbScormForm = $dbNameForm; + } else { + $dbScormForm = $dbPrefixForm.'scorm'; + $dbScormExists = false; } } - if(empty($dbUserForm)) - { - if($singleDbForm) - { - $dbUserForm=$dbNameForm; - } - else - { - $dbUserForm=$dbPrefixForm.'chamilo_user'; + if (empty($dbUserForm)) { + if ($singleDbForm) { + $dbUserForm = $dbNameForm; + } else { + $dbUserForm = $dbPrefixForm.'chamilo_user'; } } - echo "

" . display_step_sequence() .get_lang("DBSetting") . "

"; - echo get_lang("DBSettingUpgradeIntro"); - }else{ - if(empty($dbPrefixForm)) //make sure there is a default value for db prefix - { + echo '

' . display_step_sequence() .get_lang('DBSetting') . '

'; + echo get_lang('DBSettingUpgradeIntro'); + } else { + if (empty($dbPrefixForm)) { //make sure there is a default value for db prefix $dbPrefixForm = 'chamilo_'; } - echo "

" . display_step_sequence() .get_lang("DBSetting") . "

"; - echo get_lang("DBSettingIntro"); + echo '

' . display_step_sequence() .get_lang('DBSetting') . '

'; + echo get_lang('DBSettingIntro'); } ?> @@ -857,7 +803,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo - +   @@ -876,24 +822,23 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo //database prefix display_database_parameter($installType, get_lang('DbPrefixForm'), 'dbPrefixForm', $dbPrefixForm, get_lang('DbPrefixCom')); //fields for the four standard Chamilo databases - echo 'show-hide '.get_lang('OptionalParameters','').''; - display_database_parameter($installType, get_lang('MainDB'), 'dbNameForm', $dbNameForm, ' ',null,'id="optional_param1" style="display:none;"'); - display_database_parameter($installType, get_lang('StatDB'), 'dbStatsForm', $dbStatsForm, ' ',null,'id="optional_param2" style="display:none;"'); - if($installType == 'update' && in_array($_POST['old_version'],$update_from_version_6)) - { - display_database_parameter($installType, get_lang('ScormDB'), 'dbScormForm', $dbScormForm, ' ',null,'id="optional_param3" style="display:none;"'); + echo 'show-hide '.get_lang('OptionalParameters', '').''; + display_database_parameter($installType, get_lang('MainDB'), 'dbNameForm', $dbNameForm, ' ', null, 'id="optional_param1" style="display:none;"'); + display_database_parameter($installType, get_lang('StatDB'), 'dbStatsForm', $dbStatsForm, ' ', null, 'id="optional_param2" style="display:none;"'); + if ($installType == 'update' && in_array($_POST['old_version'],$update_from_version_6)) { + display_database_parameter($installType, get_lang('ScormDB'), 'dbScormForm', $dbScormForm, ' ', null, 'id="optional_param3" style="display:none;"'); } - display_database_parameter($installType, get_lang('UserDB'), 'dbUserForm', $dbUserForm, ' ',null,'id="optional_param4" style="display:none;"'); + display_database_parameter($installType, get_lang('UserDB'), 'dbUserForm', $dbUserForm, ' ', null, 'id="optional_param4" style="display:none;"'); ?> - - + + - /> - /> + /> + /> @@ -903,11 +848,11 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo - + - onclick="show_hide_tracking_and_user_db(this.id);" /> - onclick="show_hide_tracking_and_user_db(this.id);" /> + onclick="javascript: show_hide_tracking_and_user_db(this.id);" /> + onclick="javascript: show_hide_tracking_and_user_db(this.id);" /> @@ -916,8 +861,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo - +