Skip to content

Commit 69c8533

Browse files
author
pedro_morgan
committed
Cleaned up config.inc.php to some pear style
1 parent b649557 commit 69c8533

File tree

1 file changed

+42
-54
lines changed

1 file changed

+42
-54
lines changed

interface/lib/config.inc.php

Lines changed: 42 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -37,77 +37,65 @@
3737
$conf['app_version'] = '3.0.0';
3838
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns';
3939

40+
4041
//** Database Settings
41-
$conf["db_type"] = 'mysql';
42-
$conf["db_host"] = 'localhost';
43-
$conf["db_database"] = 'ispconfig3';
44-
$conf["db_user"] = 'root';
45-
$conf["db_password"] = '';
42+
$conf['db_type'] = 'mysql';
43+
$conf['db_host'] = 'localhost';
44+
$conf['db_database'] = 'ispconfig3';
45+
$conf['db_user'] = 'root';
46+
$conf['db_password'] = '';
4647

4748

48-
/*
49-
Path Settings (Do not change!)
50-
*/
51-
49+
//** Path Settings (Do not change!)
5250
$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
53-
$conf["fs_div"] = "/"; // File system divider, \\ on windows and / on linux and unix
54-
$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
55-
$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
51+
$conf["fs_div"] = '/'; // File system divider, \\ on windows and / on linux and unix
52+
$conf["classpath"] = $conf['rootpath'].$conf['fs_div'].'lib'.$conf['fs_div'].'classes';
53+
$conf["temppath"] = $conf['rootpath'].$conf['fs_div'].'temp';
5654

5755

58-
define("DIR_TRENNER",$conf["fs_div"]);
59-
define("SERVER_ROOT",$conf["rootpath"]);
60-
define("INCLUDE_ROOT",SERVER_ROOT.DIR_TRENNER."lib");
61-
define("CLASSES_ROOT",INCLUDE_ROOT.DIR_TRENNER."classes");
56+
define('DIR_TRENNER',$conf['fs_div']);
57+
define('SERVER_ROOT',$conf['rootpath']);
58+
define('INCLUDE_ROOT',SERVER_ROOT.DIR_TRENNER.'lib');
59+
define('CLASSES_ROOT',INCLUDE_ROOT.DIR_TRENNER.'classes');
6260

63-
define("DB_TYPE",$conf["db_type"]);
64-
define("DB_HOST",$conf["db_host"]);
65-
define("DB_DATABASE",$conf["db_database"]);
66-
define("DB_USER",$conf["db_user"]);
67-
define("DB_PASSWORD",$conf["db_password"]);
61+
define('DB_TYPE', $conf['db_type']);
62+
define('DB_HOST', $conf['db_host']);
63+
define('DB_DATABASE',$conf['db_database']);
64+
define('DB_USER', $conf['db_user']);
65+
define('DB_PASSWORD', $conf['db_password']);
6866

6967

70-
/*
71-
External programs
72-
*/
73-
68+
//** External programs
7469
//$conf["programs"]["convert"] = "/usr/bin/convert";
75-
$conf["programs"]["wput"] = $conf["rootpath"]."\\tools\\wput\\wput.exe";
76-
77-
78-
/*
79-
Themes
80-
*/
70+
// ?? WTF ?? pedro
71+
$conf['programs']['wput'] = $conf['rootpath']."\\tools\\wput\\wput.exe";
8172

82-
$conf["theme"] = 'default';
83-
$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
84-
$conf["logo"] = 'themes/default/images/mydnsconfig_logo.gif';
8573

86-
/*
87-
Default Language
88-
*/
74+
//** Themes
75+
$conf['theme'] = 'default';
76+
$conf['html_content_encoding'] = 'text/html; charset=iso-8859-1';
77+
$conf['logo'] = 'themes/default/images/mydnsconfig_logo.gif';
8978

79+
//** Default Language
9080
$conf["language"] = 'en';
9181

82+
//** Auto Load Modules
83+
$conf['start_db'] = true;
84+
$conf['start_session'] = true;
9285

93-
/*
94-
Auto Load Modules
95-
*/
96-
97-
$conf["start_db"] = true;
98-
$conf["start_session"] = true;
9986

100-
/*
101-
DNS Settings
102-
*/
87+
//** DNS Settings
10388

104-
$conf["auto_create_ptr"] = 1; // Automatically create PTR records?
105-
$conf["default_ns"] = 'ns1.example.com.'; // must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
106-
$conf["default_mbox"] = 'admin.example.com.'; // Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
107-
$conf["default_ttl"] = 86400;
108-
$conf["default_refresh"] = 28800;
109-
$conf["default_retry"] = 7200;
110-
$conf["default_expire"] = 604800;
111-
$conf["default_minimum_ttl"] = 86400;
89+
//* Automatically create PTR records?
90+
$conf['auto_create_ptr'] = 1;
91+
//* must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
92+
$conf['default_ns'] = 'ns1.example.com.';
93+
//* Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
94+
$conf['default_mbox'] = 'admin.example.com.';
95+
$conf['default_ttl'] = 86400;
96+
$conf['default_refresh'] = 28800;
97+
$conf['default_retry'] = 7200;
98+
$conf['default_expire'] = 604800;
99+
$conf['default_minimum_ttl'] = 86400;
112100

113101
?>

0 commit comments

Comments
 (0)