Skip to content

Commit b31c514

Browse files
author
jwarnier
committed
Fix typos.
1 parent 9b82d29 commit b31c514

File tree

5 files changed

+40
-41
lines changed

5 files changed

+40
-41
lines changed

‎TODO.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Administration module
4141
--------------------------------------
4242

4343
- Add a firewall configuration form. Any suggestions for a good firewall
44-
script that runs on many linux distributions, or shall we stay with bastille
44+
script that runs on many Linux distributions, or shall we stay with Bastille
4545
firewall that is used in ISPConfig 2?
4646

4747

@@ -75,7 +75,7 @@ Remoting framework
7575
Interface
7676
--------------------------------------
7777

78-
- Enhance the list function to allow soorting by column
78+
- Enhance the list function to allow sorting by column
7979
- Enhance the paging in lists (e.g. like this: [1 2 3 4 ... 10])
8080
- Use graphical Icons in the lists for on / off columns.
8181
- Add a graphical delete button to the lists.

‎install/autoupdate.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
$conf_old = $conf;
7878
unset($conf);
7979

80-
if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
80+
if($dist['id'] == '') die('Linux distribution or version not recognized.');
8181

82-
//** Include the distribution specific installer class library and configuration
82+
//** Include the distribution-specific installer class library and configuration
8383
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
8484
include_once('dist/lib/'.$dist['id'].'.lib.php');
8585
include_once('dist/conf/'.$dist['id'].'.conf.php');
@@ -128,7 +128,7 @@
128128

129129
/*
130130
* Try to read the DB-admin settings
131-
*/
131+
*/
132132
$clientdb_host = '';
133133
$clientdb_user = '';
134134
$clientdb_password = '';
@@ -174,12 +174,12 @@
174174

175175
/*
176176
* dump the new Database and reconfigure the server.ini
177-
*/
177+
*/
178178
updateDbAndIni();
179179

180180
/*
181181
* Reconfigure all Services
182-
*/
182+
*/
183183
if($conf['services']['mail'] == true) {
184184
//** Configure postfix
185185
swriteln('Configuring Postfix');
@@ -306,4 +306,4 @@
306306

307307
echo "Update finished.\n";
308308

309-
?>
309+
?>

‎install/install.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
//** Get distribution identifier
7272
$dist = get_distname();
7373

74-
if($dist['id'] == '') die('Linux Distribution or Version not recognized.');
74+
if($dist['id'] == '') die('Linux distribution or version not recognized.');
7575

76-
//** Include the distribution specific installer class library and configuration
76+
//** Include the distribution-specific installer class library and configuration
7777
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
7878
include_once('dist/lib/'.$dist['id'].'.lib.php');
7979
include_once('dist/conf/'.$dist['id'].'.conf.php');
@@ -88,7 +88,7 @@
8888

8989
//** Check log file is writable (probably not root or sudo)
9090
if(!is_writable(dirname(ISPC_LOG_FILE))){
91-
die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n");
91+
die("ERROR: Cannot write to the ".dirname(ISPC_LOG_FILE)." directory. Are you root or sudo ?\n\n");
9292
}
9393

9494
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
@@ -116,59 +116,59 @@
116116
unset($tmp_out);
117117

118118
// Check if the mysql functions are loaded in PHP
119-
if(!function_exists('mysql_connect')) die('No PHP mysql functions available. Please ensure that the PHP mysql module is loaded.');
119+
if(!function_exists('mysql_connect')) die('No PHP MySQL functions available. Please ensure that the PHP MySQL module is loaded.');
120120

121121
//** Get MySQL root credentials
122122
$finished = false;
123123
do {
124124
$tmp_mysql_server_host = $inst->free_query('MySQL server hostname', $conf['mysql']['host']);
125125
$tmp_mysql_server_admin_user = $inst->free_query('MySQL root username', $conf['mysql']['admin_user']);
126126
$tmp_mysql_server_admin_password = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
127-
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
128-
$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
127+
$tmp_mysql_server_database = $inst->free_query('MySQL database to create', $conf['mysql']['database']);
128+
$tmp_mysql_server_charset = $inst->free_query('MySQL charset', $conf['mysql']['charset']);
129129

130130
//* Initialize the MySQL server connection
131131
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
132132
$conf['mysql']['host'] = $tmp_mysql_server_host;
133133
$conf['mysql']['admin_user'] = $tmp_mysql_server_admin_user;
134134
$conf['mysql']['admin_password'] = $tmp_mysql_server_admin_password;
135-
$conf['mysql']['database'] = $tmp_mysql_server_database;
136-
$conf['mysql']['charset'] = $tmp_mysql_server_charset;
135+
$conf['mysql']['database'] = $tmp_mysql_server_database;
136+
$conf['mysql']['charset'] = $tmp_mysql_server_charset;
137137
$finished = true;
138138
} else {
139-
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
139+
swriteln($inst->lng('Unable to connect to the specified MySQL server').' '.mysql_error());
140140
}
141141
} while ($finished == false);
142142
unset($finished);
143143

144-
// Resolve the IP address of the mysql hostname.
144+
// Resolve the IP address of the MySQL hostname.
145145
$tmp = explode(':',$conf['mysql']['host']);
146146
if(!$conf['mysql']['ip'] = gethostbyname($tmp[0])) die('Unable to resolve hostname'.$tmp[0]);
147147
unset($tmp);
148148

149149

150-
//** initializing database connection
150+
//** Initializing database connection
151151
include_once('lib/mysql.lib.php');
152152
$inst->db = new db();
153153

154154
//** Begin with standard or expert installation
155155
if($install_mode == 'standard') {
156156

157-
//* Create the mysql database
157+
//* Create the MySQL database
158158
$inst->configure_database();
159159

160160
//* Insert the Server record into the database
161161
$inst->add_database_server_record();
162162

163-
//* Configure postfix
163+
//* Configure Postfix
164164
$inst->configure_postfix();
165165

166166
//* Configure jailkit
167167
swriteln('Configuring Jailkit');
168168
$inst->configure_jailkit();
169169

170170
if($conf['dovecot']['installed'] == true) {
171-
//* Configure dovecot
171+
//* Configure Dovecot
172172
swriteln('Configuring Dovecot');
173173
$inst->configure_dovecot();
174174
} else {
@@ -180,7 +180,7 @@
180180
swriteln('Configuring PAM');
181181
$inst->configure_pam();
182182

183-
//* Configure courier
183+
//* Configure Courier
184184
swriteln('Configuring Courier');
185185
$inst->configure_courier();
186186
}
@@ -218,8 +218,8 @@
218218
swriteln('Configuring Apache');
219219
$inst->configure_apache();
220220

221-
//** Configure vlogger
222-
swriteln('Configuring vlogger');
221+
//** Configure Vlogger
222+
swriteln('Configuring Vlogger');
223223
$inst->configure_vlogger();
224224

225225
//** Configure apps vhost
@@ -233,7 +233,7 @@
233233
//* Configure ISPConfig
234234
swriteln('Installing ISPConfig');
235235

236-
//** Customise the port ISPConfig runs on
236+
//** Customize the port ISPConfig runs on
237237
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
238238

239239
$inst->install_ispconfig();
@@ -243,7 +243,7 @@
243243
$inst->configure_dbserver();
244244

245245
//* Configure ISPConfig
246-
swriteln('Installing Crontab');
246+
swriteln('Installing ISPConfig crontab');
247247
$inst->install_crontab();
248248

249249
swriteln('Restarting services ...');
@@ -408,14 +408,14 @@
408408
}
409409

410410
//** Configure Apache
411-
swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the 'Configure Apache Server' option.\n");
411+
swriteln("\nHint: If this server shall run the ISPConfig interface, select 'y' in the 'Configure Apache Server' option.\n");
412412
if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {
413413
$conf['services']['web'] = true;
414414
swriteln('Configuring Apache');
415415
$inst->configure_apache();
416416

417-
//** Configure vlogger
418-
swriteln('Configuring vlogger');
417+
//** Configure Vlogger
418+
swriteln('Configuring Vlogger');
419419
$inst->configure_vlogger();
420420

421421
//** Configure apps vhost
@@ -430,7 +430,7 @@
430430
}
431431

432432
//** Configure ISPConfig :-)
433-
if(strtolower($inst->simple_query('Install ISPConfig Web-Interface',array('y','n'),'y')) == 'y') {
433+
if(strtolower($inst->simple_query('Install ISPConfig Web Interface',array('y','n'),'y')) == 'y') {
434434
swriteln('Installing ISPConfig');
435435

436436
//** We want to check if the server is a module or cgi based php enabled server
@@ -467,7 +467,7 @@
467467
$inst->configure_dbserver();
468468

469469
//* Configure ISPConfig
470-
swriteln('Installing Crontab');
470+
swriteln('Installing ISPConfig crontab');
471471
$inst->install_crontab();
472472
if($conf['apache']['init_script'] != '' && @is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
473473

@@ -479,4 +479,4 @@
479479
echo "Installation completed.\n";
480480

481481

482-
?>
482+
?>

‎install/update.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
//** Check for ISPConfig 2.x versions
6868
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
69-
die('This software can not be installed on a server wich runs ISPConfig 2.x.');
69+
die('This software cannot be installed on a server wich runs ISPConfig 2.x.');
7070
}
7171

7272
//** Get distribution identifier
@@ -76,9 +76,9 @@
7676
$conf_old = $conf;
7777
unset($conf);
7878

79-
if($dist['id'] == '') die('Linux Distribution or Version not recognized.');
79+
if($dist['id'] == '') die('Linux distribution or version not recognized.');
8080

81-
//** Include the distribution specific installer class library and configuration
81+
//** Include the distribution-specific installer class library and configuration
8282
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
8383
include_once('dist/lib/'.$dist['id'].'.lib.php');
8484
include_once('dist/conf/'.$dist['id'].'.conf.php');
@@ -88,7 +88,6 @@
8888
$conf['hostname'] = $tmp_out[0];
8989
unset($tmp_out);
9090

91-
9291
//** Set the mysql login information
9392
$conf["mysql"]["host"] = $conf_old["db_host"];
9493
$conf["mysql"]["database"] = $conf_old["db_database"];
@@ -286,13 +285,13 @@
286285
swriteln('Configuring Apps vhost');
287286
$inst->configure_apps_vhost();
288287
}
289-
288+
290289

291290
//* Configure DBServer
292291
swriteln('Configuring Database');
293292
$inst->configure_dbserver();
294293

295-
294+
296295
//if(@is_dir('/etc/Bastille')) {
297296
//* Configure Firewall
298297
swriteln('Configuring Firewall');

‎interface/lib/config.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
//** Paths (Do not change!)
8484
$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
85-
$conf["fs_div"] = "/"; // File system divider, "\\" on windows and "/"" on linux and unix
85+
$conf["fs_div"] = "/"; // File system separator (divider), "\\" on Windows and "/"" on Linux and UNIX
8686
$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
8787
$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
8888

@@ -138,4 +138,4 @@
138138
define("LOGLEVEL_WARN",1);
139139
define("LOGLEVEL_ERROR",2);
140140

141-
?>
141+
?>

0 commit comments

Comments
 (0)