From b31c514ee2f1d25b4e5ff39bdef1765dbf14e106 Mon Sep 17 00:00:00 2001 From: jwarnier Date: Thu, 19 Aug 2010 22:09:42 +0000 Subject: [PATCH] Fix typos. --- TODO.txt | 4 +-- install/autoupdate.php | 12 ++++----- install/install.php | 50 ++++++++++++++++++------------------ install/update.php | 11 ++++---- interface/lib/config.inc.php | 4 +-- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/TODO.txt b/TODO.txt index 6e4d4878b..a8f6000fe 100644 --- a/TODO.txt +++ b/TODO.txt @@ -41,7 +41,7 @@ Administration module -------------------------------------- - Add a firewall configuration form. Any suggestions for a good firewall - script that runs on many linux distributions, or shall we stay with bastille + script that runs on many Linux distributions, or shall we stay with Bastille firewall that is used in ISPConfig 2? @@ -75,7 +75,7 @@ Remoting framework Interface -------------------------------------- -- Enhance the list function to allow soorting by column +- Enhance the list function to allow sorting by column - Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10]) - Use graphical Icons in the lists for on / off columns. - Add a graphical delete button to the lists. diff --git a/install/autoupdate.php b/install/autoupdate.php index d273c6aca..1629d6ac1 100644 --- a/install/autoupdate.php +++ b/install/autoupdate.php @@ -77,9 +77,9 @@ include_once("/usr/local/ispconfig/server/lib/config.inc.php"); $conf_old = $conf; unset($conf); -if($dist['id'] == '') die('Linux Dustribution or Version not recognized.'); +if($dist['id'] == '') die('Linux distribution or version not recognized.'); -//** Include the distribution specific installer class library and configuration +//** Include the distribution-specific installer class library and configuration if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php'); include_once('dist/lib/'.$dist['id'].'.lib.php'); include_once('dist/conf/'.$dist['id'].'.conf.php'); @@ -128,7 +128,7 @@ include_once('lib/mysql.lib.php'); /* * Try to read the DB-admin settings -*/ + */ $clientdb_host = ''; $clientdb_user = ''; $clientdb_password = ''; @@ -174,12 +174,12 @@ if($conf['mysql']['master_slave_setup'] != 'y') { /* * dump the new Database and reconfigure the server.ini -*/ + */ updateDbAndIni(); /* * Reconfigure all Services -*/ + */ if($conf['services']['mail'] == true) { //** Configure postfix swriteln('Configuring Postfix'); @@ -306,4 +306,4 @@ if($conf['services']['dns']) { echo "Update finished.\n"; -?> \ No newline at end of file +?> diff --git a/install/install.php b/install/install.php index adf7db276..b2f1e3b06 100644 --- a/install/install.php +++ b/install/install.php @@ -71,9 +71,9 @@ define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //** Get distribution identifier $dist = get_distname(); -if($dist['id'] == '') die('Linux Distribution or Version not recognized.'); +if($dist['id'] == '') die('Linux distribution or version not recognized.'); -//** Include the distribution specific installer class library and configuration +//** Include the distribution-specific installer class library and configuration if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php'); include_once('dist/lib/'.$dist['id'].'.lib.php'); include_once('dist/conf/'.$dist['id'].'.conf.php'); @@ -88,7 +88,7 @@ swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installe //** Check log file is writable (probably not root or sudo) if(!is_writable(dirname(ISPC_LOG_FILE))){ - die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n"); + die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n"); } if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) { @@ -116,7 +116,7 @@ $conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the ser unset($tmp_out); // Check if the mysql functions are loaded in PHP -if(!function_exists('mysql_connect')) die('No PHP mysql functions available. Please ensure that the PHP mysql module is loaded.'); +if(!function_exists('mysql_connect')) die('No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.'); //** Get MySQL root credentials $finished = false; @@ -124,43 +124,43 @@ do { $tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']); $tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']); $tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']); - $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']); - $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']); + $tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']); + $tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']); //* Initialize the MySQL server connection if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) { $conf['mysql']['host'] = $tmp_mysql_server_host; $conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user; $conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password; - $conf['mysql']['database'] = $tmp_mysql_server_database; - $conf['mysql']['charset'] = $tmp_mysql_server_charset; + $conf['mysql']['database'] = $tmp_mysql_server_database; + $conf['mysql']['charset'] = $tmp_mysql_server_charset; $finished = true; } else { - swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error()); + swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysql_error()); } } while ($finished == false); unset($finished); -// Resolve the IP address of the mysql hostname. +// Resolve the IP address of the MySQL hostname. $tmp = explode(':',$conf['mysql']['host']); if(!$conf['mysql']['ip'] = gethostbyname($tmp[0])) die('Unable to resolve hostname'.$tmp[0]); unset($tmp); -//** initializing database connection +//** Initializing database connection include_once('lib/mysql.lib.php'); $inst->db = new db(); //** Begin with standard or expert installation if($install_mode == 'standard') { - //* Create the mysql database + //* Create the MySQL database $inst->configure_database(); //* Insert the Server record into the database $inst->add_database_server_record(); - //* Configure postfix + //* Configure Postfix $inst->configure_postfix(); //* Configure jailkit @@ -168,7 +168,7 @@ if($install_mode == 'standard') { $inst->configure_jailkit(); if($conf['dovecot']['installed'] == true) { - //* Configure dovecot + //* Configure Dovecot swriteln('Configuring Dovecot'); $inst->configure_dovecot(); } else { @@ -180,7 +180,7 @@ if($install_mode == 'standard') { swriteln('Configuring PAM'); $inst->configure_pam(); - //* Configure courier + //* Configure Courier swriteln('Configuring Courier'); $inst->configure_courier(); } @@ -218,8 +218,8 @@ if($install_mode == 'standard') { swriteln('Configuring Apache'); $inst->configure_apache(); - //** Configure vlogger - swriteln('Configuring vlogger'); + //** Configure Vlogger + swriteln('Configuring Vlogger'); $inst->configure_vlogger(); //** Configure apps vhost @@ -233,7 +233,7 @@ if($install_mode == 'standard') { //* Configure ISPConfig swriteln('Installing ISPConfig'); - //** Customise the port ISPConfig runs on + //** Customize the port ISPConfig runs on $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080'); $inst->install_ispconfig(); @@ -243,7 +243,7 @@ if($install_mode == 'standard') { $inst->configure_dbserver(); //* Configure ISPConfig - swriteln('Installing Crontab'); + swriteln('Installing ISPConfig crontab'); $inst->install_crontab(); swriteln('Restarting services ...'); @@ -408,14 +408,14 @@ if($install_mode == 'standard') { } //** Configure Apache - swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the 'Configure Apache Server' option.\n"); + swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n"); if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') { $conf['services']['web'] = true; swriteln('Configuring Apache'); $inst->configure_apache(); - //** Configure vlogger - swriteln('Configuring vlogger'); + //** Configure Vlogger + swriteln('Configuring Vlogger'); $inst->configure_vlogger(); //** Configure apps vhost @@ -430,7 +430,7 @@ if($install_mode == 'standard') { } //** Configure ISPConfig :-) - if(strtolower($inst->simple_query('Install ISPConfig Web-Interface',array('y','n'),'y')) == 'y') { + if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') { swriteln('Installing ISPConfig'); //** We want to check if the server is a module or cgi based php enabled server @@ -467,7 +467,7 @@ if($install_mode == 'standard') { $inst->configure_dbserver(); //* Configure ISPConfig - swriteln('Installing Crontab'); + swriteln('Installing ISPConfig crontab'); $inst->install_crontab(); if($conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); @@ -479,4 +479,4 @@ if($install_mode == 'standard') { echo "Installation completed.\n"; -?> \ No newline at end of file +?> diff --git a/install/update.php b/install/update.php index 8246113f5..6f39b23a9 100644 --- a/install/update.php +++ b/install/update.php @@ -66,7 +66,7 @@ define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //** Check for ISPConfig 2.x versions if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) { - die('This software can not be installed on a server wich runs ISPConfig 2.x.'); + die('This software cannot be installed on a server wich runs ISPConfig 2.x.'); } //** Get distribution identifier @@ -76,9 +76,9 @@ include_once("/usr/local/ispconfig/server/lib/config.inc.php"); $conf_old = $conf; unset($conf); -if($dist['id'] == '') die('Linux Distribution or Version not recognized.'); +if($dist['id'] == '') die('Linux distribution or version not recognized.'); -//** Include the distribution specific installer class library and configuration +//** Include the distribution-specific installer class library and configuration if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php'); include_once('dist/lib/'.$dist['id'].'.lib.php'); include_once('dist/conf/'.$dist['id'].'.conf.php'); @@ -88,7 +88,6 @@ exec('hostname -f', $tmp_out); $conf['hostname'] = $tmp_out[0]; unset($tmp_out); - //** Set the mysql login information $conf["mysql"]["host"] = $conf_old["db_host"]; $conf["mysql"]["database"] = $conf_old["db_database"]; @@ -286,13 +285,13 @@ if($reconfigure_services_answer == 'yes') { swriteln('Configuring Apps vhost'); $inst->configure_apps_vhost(); } - + //* Configure DBServer swriteln('Configuring Database'); $inst->configure_dbserver(); - + //if(@is_dir('/etc/Bastille')) { //* Configure Firewall swriteln('Configuring Firewall'); diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index 7fc53f98e..26cfd03c6 100644 --- a/interface/lib/config.inc.php +++ b/interface/lib/config.inc.php @@ -82,7 +82,7 @@ define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache'); //** Paths (Do not change!) $conf["rootpath"] = substr(dirname(__FILE__),0,-4); -$conf["fs_div"] = "/"; // File system divider, "\\" on windows and "/"" on linux and unix +$conf["fs_div"] = "/"; // File system separator (divider), "\\" on Windows and "/"" on Linux and UNIX $conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes"; $conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp"; @@ -138,4 +138,4 @@ define("LOGLEVEL_DEBUG",0); define("LOGLEVEL_WARN",1); define("LOGLEVEL_ERROR",2); -?> \ No newline at end of file +?> -- GitLab