Commit 653c5c85 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.1' into 'stable-3.1'

Stable 3.1



See merge request !413
parents 4be945bb a636a177
......@@ -198,6 +198,13 @@ class sites_web_vhost_domain_plugin {
//* If the domain name has been changed, we will have to change all subdomains + APS instances
if(!empty($page_form->dataRecord["domain"]) && !empty($page_form->oldDataRecord["domain"]) && $page_form->dataRecord["domain"] != $page_form->oldDataRecord["domain"]) {
//* Change SSL Domain
$tmp=$app->db->queryOneRecord("SELECT ssl_domain FROM web_domain WHERE domain_id = ?", $page_form->id);
if($tmp['ssl_domain'] != '') {
$plain=str_replace($page_form->oldDataRecord["domain"], $page_form->dataRecord["domain"], $tmp);
$app->db->query("UPDATE web_domain SET ssl_domain = ? WHERE domain_id = ?", $plain, $page_form->id);
}
$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"]);
foreach($records as $rec) {
$subdomain = str_replace($page_form->oldDataRecord["domain"], $page_form->dataRecord["domain"], $rec['domain']);
......
......@@ -63,7 +63,7 @@ $liste["item"][] = array( 'field' => "server_id",
'prefix' => "%",
'suffix' => "%",
'datasource' => array ( 'type' => 'SQL',
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND mirror_server_id = 0 ORDER BY server_name',
'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
'keyfield'=> 'server_id',
'valuefield'=> 'server_name'
),
......
......@@ -69,7 +69,9 @@ $form["tabs"]['mailuser'] = array (
'type' => 'TOLOWER')
),
'validators' => array (
0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'cc_error_isemail'),
0 => array ( 'type' => 'REGEX',
'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',
'errmsg'=> 'cc_error_isemail'),
),
'default' => '',
'value' => '',
......
......@@ -17,7 +17,9 @@
<tr>
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
<th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th>
<!--
<th data-column="type"><tmpl_var name="type_txt"></th>
-->
<th data-column="sys_groupid"><tmpl_var name="sys_groupid_txt"></th>
<th data-column="server_id"><tmpl_var name="server_id_txt"></th>
<th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th>
......@@ -28,7 +30,9 @@
<tr>
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
<td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
<!--
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
-->
<td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
<td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
......@@ -44,7 +48,9 @@
<tr>
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
<!--
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
-->
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
<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>
<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 @@
</tbody>
<tfoot>
<tr>
<td colspan="9"><tmpl_var name="paging"></td>
<td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
......
......@@ -34,7 +34,9 @@
<tr>
<th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
<th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th>
<!--
<th data-column="type"><tmpl_var name="type_txt"></th>
-->
<th data-column="server_id"><tmpl_var name="server_id_txt"></th>
<th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th>
<th data-column="database_user"><tmpl_var name="database_user_txt"></th>
......@@ -44,7 +46,9 @@
<tr>
<td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
<td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
<!--
<td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
-->
<td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
<td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
<td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
......@@ -59,7 +63,9 @@
<tr>
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
<!--
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
-->
<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>
<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>
<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 @@
</tbody>
<tfoot>
<tr>
<td colspan="8"><tmpl_var name="paging"></td>
<td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment