Skip to content

Commit faf3f50

Browse files
tbrehmtbrehm
committed
Fixed some bugs and missing descriptions in dns manager.
Fixed bugs in installer. A backup file of the database is stored in /root during update.
1 parent a753a43 commit faf3f50

File tree

6 files changed

+161
-151
lines changed

6 files changed

+161
-151
lines changed

‎install/install.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868

6969
//** Install logfile
7070
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
71+
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
7172

7273
//****************************************************************************************************
7374
//** Installer Interface
@@ -140,7 +141,7 @@
140141
//* Configure postfix
141142
$inst->configure_postfix();
142143

143-
//* Configure postfix
144+
//* Configure jailkit
144145
swriteln('Configuring Jailkit');
145146
$inst->configure_jailkit();
146147

@@ -271,6 +272,12 @@
271272
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
272273
}
273274

275+
//** Configure Jailkit
276+
if(strtolower($inst->simple_query('Configure Jailkit', array('y','n'),'y') ) == 'y') {
277+
swriteln('Configuring Jailkit');
278+
$inst->configure_jailkit();
279+
}
280+
274281
//** Configure Pureftpd
275282
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
276283
swriteln('Configuring Pureftpd');

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public function configure_database()
132132
$this->error('Stopped: Database already contains some tables.');
133133
} else {
134134
if($cf['admin_password'] == '') {
135-
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null",
135+
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
136136
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
137137
} else {
138-
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null",
138+
caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null",
139139
__FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql');
140140
}
141141
$db_tables = $this->db->getTables();

‎install/update.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
//** Installer/updater logfile
5454
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
55+
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));
5556

5657
//** Check for ISPConfig 2.x versions
5758
if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
@@ -144,7 +145,7 @@
144145
}
145146

146147
// create a backup copy of the ispconfig database in the root folder
147-
$backup_db_name = '/root/ispconfig_db_backup_'.date('Y-m-d').'.sql';
148+
$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
148149
copy('existing_db.sql',$backup_db_name);
149150
exec("chmod 700 $backup_db_name");
150151
exec("chown root:root $backup_db_name");
@@ -157,9 +158,11 @@
157158
$tpl_ini_array = ini_to_array(rf('tpl/server.ini.master'));
158159

159160
// update the new template with the old values
160-
foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
161-
foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
162-
$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
161+
if(is_array($old_ini_array)) {
162+
foreach($old_ini_array as $tmp_section_name => $tmp_section_content) {
163+
foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) {
164+
$tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content;
165+
}
163166
}
164167
}
165168

‎interface/lib/classes/plugin_listview.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function onShow() {
7676
if($field['formtype'] == "SELECT") {
7777
if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {
7878
// Set a additional image variable for bolean fields
79-
$rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'list_icon_true.png':'list_icon_false.png';
79+
$rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png';
8080
}
8181
//* substitute value for select field
8282
@$rec[$key] = $field['value'][$rec[$key]];

‎interface/web/dns/templates/dns_a_list.htm‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
<div class="pnl_toolsarea">
2-
<fieldset><legend>Tools</legend>
3-
<div class="buttons">
4-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
5-
<span>A</span>
6-
</button>
7-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
8-
<span>ALIAS</span>
9-
</button>
10-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
11-
<span>CNAME</span>
12-
</button>
13-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
14-
<span>HINFO</span>
15-
</button>
16-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
17-
<span>MX</span>
18-
</button>
19-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
20-
<span>NS</span>
21-
</button>
22-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
23-
<span>PTR</span>
24-
</button>
25-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
26-
<span>RP</span>
27-
</button>
28-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
29-
<span>SRV</span>
30-
</button>
31-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
32-
<span>TXT</span>
33-
</button>
34-
</div>
35-
</fieldset>
36-
</div>
37-
38-
<div class="pnl_listarea">
39-
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
40-
<table class="list">
41-
<thead>
42-
<tr>
43-
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
44-
<th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
45-
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
46-
<th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
47-
<th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
48-
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
49-
</tr>
50-
<tr>
51-
<td class="tbl_col_active"><select name="search_active" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
52-
<td class="tbl_col_type"><select name="search_server_id" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
53-
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
54-
<td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
55-
<td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
56-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
57-
</tr>
58-
</thead>
59-
<tbody>
60-
<tmpl_loop name="records">
61-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
62-
<td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
63-
<td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
64-
<td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
65-
<td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
66-
<td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
67-
<td class="tbl_col_buttons">
68-
<div class="buttons icons16">
69-
<a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
70-
</div>
71-
</td>
72-
</tr>
73-
</tmpl_loop>
74-
</tbody>
75-
<tfoot>
76-
<tr>
77-
<td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
78-
</tr>
79-
</tfoot>
80-
</table>
81-
</fieldset>
82-
</div>
1+
<div class="pnl_toolsarea">
2+
<fieldset><legend>Tools</legend>
3+
<div class="buttons">
4+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');">
5+
<span>A</span>
6+
</button>
7+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');">
8+
<span>ALIAS</span>
9+
</button>
10+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');">
11+
<span>CNAME</span>
12+
</button>
13+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');">
14+
<span>HINFO</span>
15+
</button>
16+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');">
17+
<span>MX</span>
18+
</button>
19+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');">
20+
<span>NS</span>
21+
</button>
22+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');">
23+
<span>PTR</span>
24+
</button>
25+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');">
26+
<span>RP</span>
27+
</button>
28+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');">
29+
<span>SRV</span>
30+
</button>
31+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');">
32+
<span>TXT</span>
33+
</button>
34+
</div>
35+
</fieldset>
36+
</div>
37+
38+
<div class="pnl_listarea">
39+
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
40+
<table class="list">
41+
<thead>
42+
<tr>
43+
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
44+
<th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
45+
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
46+
<th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
47+
<th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
48+
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
49+
</tr>
50+
<tr>
51+
<td class="tbl_col_active"><select name="search_active" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td>
52+
<td class="tbl_col_type"><select name="search_server_id" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td>
53+
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
54+
<td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
55+
<td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
56+
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
57+
</tr>
58+
</thead>
59+
<tbody>
60+
<tmpl_loop name="records">
61+
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
62+
<td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td>
63+
<td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
64+
<td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
65+
<td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="data"}</a></td>
66+
<td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
67+
<td class="tbl_col_buttons">
68+
<div class="buttons icons16">
69+
<a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
70+
</div>
71+
</td>
72+
</tr>
73+
</tmpl_loop>
74+
</tbody>
75+
<tfoot>
76+
<tr>
77+
<td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
78+
</tr>
79+
</tfoot>
80+
</table>
81+
</fieldset>
82+
</div>

0 commit comments

Comments
 (0)