Skip to content

Commit 653c5c8

Browse files
author
Till Brehm
committed
Merge branch 'stable-3.1' into 'stable-3.1'
 Stable 3.1 See merge request !413
2 parents 4be945b + a636a17 commit 653c5c8

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

‎interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,13 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
198198

199199
//* If the domain name has been changed, we will have to change all subdomains + APS instances
200200
if(!empty($page_form->dataRecord["domain"]) && !empty($page_form->oldDataRecord["domain"]) && $page_form->dataRecord["domain"] != $page_form->oldDataRecord["domain"]) {
201+
//* Change SSL Domain
202+
$tmp=$app->db->queryOneRecord("SELECT ssl_domain FROM web_domain WHERE domain_id = ?", $page_form->id);
203+
if($tmp['ssl_domain'] != '') {
204+
$plain=str_replace($page_form->oldDataRecord["domain"], $page_form->dataRecord["domain"], $tmp);
205+
$app->db->query("UPDATE web_domain SET ssl_domain = ? WHERE domain_id = ?", $plain, $page_form->id);
206+
}
207+
201208
$records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE (type = 'subdomain' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND domain LIKE ?", "%." . $page_form->oldDataRecord["domain"]);
202209
foreach($records as $rec) {
203210
$subdomain = str_replace($page_form->oldDataRecord["domain"], $page_form->dataRecord["domain"], $rec['domain']);

‎interface/web/admin/list/firewall.list.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
'prefix' => "%",
6464
'suffix' => "%",
6565
'datasource' => array ( 'type' => 'SQL',
66-
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
66+
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
6767
'keyfield'=> 'server_id',
6868
'valuefield'=> 'server_name'
6969
),

‎interface/web/mailuser/form/mail_user_cc.tform.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@
6969
'type' => 'TOLOWER')
7070
),
7171
'validators' => array (
72-
0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'cc_error_isemail'),
72+
0 => array ( 'type' => 'REGEX',
73+
'regex' => '/^(\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,1}(,\s*\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\.[a-z\-]{2,10}){0,}$/i',
74+
'errmsg'=> 'cc_error_isemail'),
7375
),
7476
'default' => '',
7577
'value' => '',

‎interface/web/sites/templates/database_admin_list.htm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
1717
<tr>
1818
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
1919
<th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th>
20+
<!--
2021
<th data-column="type"><tmpl_var name="type_txt"></th>
22+
-->
2123
<th data-column="sys_groupid"><tmpl_var name="sys_groupid_txt"></th>
2224
<th data-column="server_id"><tmpl_var name="server_id_txt"></th>
2325
<th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th>
@@ -28,7 +30,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
2830
<tr>
2931
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
3032
<td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
33+
<!--
3134
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
35+
-->
3236
<td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
3337
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
3438
<td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
@@ -44,7 +48,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
4448
<tr>
4549
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
4650
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
51+
<!--
4752
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
53+
-->
4854
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
4955
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
5056
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='parent_domain_id'}">{tmpl_var name="parent_domain_id"}</a></td>
@@ -67,7 +73,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
6773
</tbody>
6874
<tfoot>
6975
<tr>
70-
<td colspan="9"><tmpl_var name="paging"></td>
76+
<td colspan="8"><tmpl_var name="paging"></td>
7177
</tr>
7278
</tfoot>
7379
</table>

‎interface/web/sites/templates/database_list.htm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
3434
<tr>
3535
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
3636
<th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th>
37+
<!--
3738
<th data-column="type"><tmpl_var name="type_txt"></th>
39+
-->
3840
<th data-column="server_id"><tmpl_var name="server_id_txt"></th>
3941
<th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th>
4042
<th data-column="database_user"><tmpl_var name="database_user_txt"></th>
@@ -44,7 +46,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
4446
<tr>
4547
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
4648
<td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
49+
<!--
4750
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
51+
-->
4852
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
4953
<td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
5054
<td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
@@ -59,7 +63,9 @@ <h1><tmpl_var name="list_head_txt"></h1>
5963
<tr>
6064
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
6165
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
66+
<!--
6267
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
68+
-->
6369
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
6470
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='parent_domain_id'}">{tmpl_var name="parent_domain_id"}</a></td>
6571
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='database_user_id'}">{tmpl_var name="database_user_id"}</a></td>
@@ -81,7 +87,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
8187
</tbody>
8288
<tfoot>
8389
<tr>
84-
<td colspan="8"><tmpl_var name="paging"></td>
90+
<td colspan="7"><tmpl_var name="paging"></td>
8591
</tr>
8692
</tfoot>
8793
</table>

0 commit comments

Comments
 (0)