Skip to content

Commit 8173c6f

Browse files
falkotimmefalkotimme
committed
- Added option to fill fields on SSL tab with client data by clicking on a link.
1 parent dcb1f40 commit 8173c6f

6 files changed

Lines changed: 90 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private function _query($sQuery = '') {
252252
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
253253
$this->securityScan($sQuery);
254254

255-
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
255+
$this->_iQueryId = @mysqli_query($this->_iConnId, $sQuery);
256256
if (!$this->_iQueryId) {
257257
$this->_sqlerror('Falsche Anfrage / Wrong Query', false, 'SQL-Query = ' . $sQuery);
258258
return false;

‎interface/web/sites/ajax_get_json.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,44 @@
201201
$json = json_encode($snippets);
202202
}
203203

204+
if($type == 'getclientssldata'){
205+
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", intval($web_id));
206+
$sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", intval($web['sys_groupid']));
207+
$client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", intval($sys_group['client_id']));
208+
if(is_array($client) && !empty($client)){
209+
if($client['telephone'] == '' && $client['mobile'] != '') $client['telephone'] = $client['mobile'];
210+
211+
$fname = '';
212+
$lname = '';
213+
$parts = preg_split("/\s+/", $client['contact_name']);
214+
if(sizeof($parts) == 2){
215+
$fname = $parts[0];
216+
$lname = $parts[1];
217+
}
218+
if(sizeof($parts) > 2){
219+
$fname = $parts[0].' ';
220+
for($i=1;$i<sizeof($parts);$i++){
221+
if($i == (sizeof($parts) - 1)){
222+
$lname .= $parts[$i];
223+
} else {
224+
if(preg_match('@^(von|van|ten|ter|zur|zu|auf|sieber)$@i', $parts[$i])){
225+
$lname .= implode(' ', array_slice($parts, $i));
226+
break;
227+
} else {
228+
$fname .= $parts[$i].' ';
229+
}
230+
}
231+
}
232+
}
233+
$fname = trim($fname);
234+
$lname = trim($lname);
235+
$client['fname'] = $fname;
236+
$client['lname'] = $lname;
237+
if(trim($client['company_name']) == '') $client['company_name'] = $fname.' '.$lname;
238+
}
239+
$json = $app->functions->json_encode($client);
240+
}
241+
204242
//}
205243

206244
header('Content-type: application/json');

‎interface/web/sites/lib/lang/de_web_vhost_domain.lng‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,7 @@ $wb['apache_directive_blocked_error'] = 'Die Apache Direktive wurde durch die Si
137137
$wb['btn_save_txt'] = 'Speichern';
138138
$wb['btn_cancel_txt'] = 'Abbrechen';
139139
$wb['enable_spdy_txt'] = 'Aktiviere SPDY';
140+
$wb['load_client_data_txt'] = 'Kundendaten übernehmen';
141+
$wb['load_my_data_txt'] = 'Meine Kontaktdaten laden';
142+
$wb['reset_client_data_txt'] = 'Daten verwerfen';
140143
?>

‎interface/web/sites/lib/lang/en_web_vhost_domain.lng‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,7 @@ $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invali
140140
$wb['btn_save_txt'] = "Save";
141141
$wb['btn_cancel_txt'] = "Cancel";
142142
$wb['enable_spdy_txt'] = 'Enable SPDY';
143+
$wb['load_client_data_txt'] = 'Load client details';
144+
$wb['load_my_data_txt'] = 'Load my contact details';
145+
$wb['reset_client_data_txt'] = 'Reset data';
143146
?>

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
1414

1515
<div class="pnl_formsarea">
1616
<fieldset class="inlineLabels">
17+
<tmpl_if name='show_helper_links'>
18+
<div class="ctrlHolder" id="show_helper_links" style="display:none;">
19+
<label></label>
20+
<a href="javascript:void(0);" id="load_data"><tmpl_if name='is_admin'>{tmpl_var name='load_client_data_txt'}</tmpl_else>{tmpl_var name='load_my_data_txt'}</tmpl_if></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:void(0);" id="reset_data">{tmpl_var name='reset_client_data_txt'}</a>
21+
</div>
22+
</tmpl_if>
1723
<div class="ctrlHolder">
1824
<label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
1925
<input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
@@ -37,7 +43,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
3743
</select>
3844
</div>
3945
<div class="ctrlHolder">
40-
<label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
46+
<label for="ssl_domain">{tmpl_var name='ssl_domain_txt'}</label>
4147
<select name="ssl_domain" id="ssl_domain" class="selectInput">
4248
{tmpl_var name='ssl_domain'}
4349
</select>
@@ -83,3 +89,29 @@ <h2><tmpl_var name="list_head_txt"></h2>
8389
</div>
8490

8591
</div>
92+
<script language="JavaScript" type="text/javascript">
93+
<tmpl_if name='show_helper_links'>
94+
if($("input[name=id]").val() > 0) $('#show_helper_links:hidden').show();
95+
96+
$('#reset_data').click(function(){
97+
$('#ssl_organisation').add('#ssl_locality').add('#ssl_state').add('#ssl_organisation_unit').val('');
98+
$('#ssl_country').val($("#ssl_country option:first").val());
99+
});
100+
$('#load_data').click(function(){
101+
loadClientData();
102+
});
103+
104+
105+
function loadClientData() {
106+
var web_id = $("input[name=id]").val();
107+
108+
jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {'web_id': web_id, 'type': "getclientssldata"}, function(data) {
109+
$('#ssl_organisation').val(data['company_name']);
110+
$('#ssl_locality').val(data['city']);
111+
$('#ssl_country').val(data['country']);
112+
$('#ssl_state').val(data['state']);
113+
$('#ssl_organisation_unit').val('IT');
114+
});
115+
}
116+
</tmpl_if>
117+
</script>

‎interface/web/sites/web_vhost_domain_edit.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ function onShowEnd() {
142142
$read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');
143143

144144
if($this->_vhostdomain_type != 'domain') $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
145+
146+
$is_admin = false;
145147

146148
//* Client: If the logged in user is not admin and has no sub clients (no reseller)
147149
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
@@ -451,6 +453,8 @@ function onShowEnd() {
451453

452454
//* Admin: If the logged in user is admin
453455
} else {
456+
457+
$is_admin = true;
454458

455459
if($this->_vhostdomain_type == 'domain') {
456460
// The user is admin, so we fill in all IP addresses of the server
@@ -700,6 +704,14 @@ function onShowEnd() {
700704
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
701705

702706
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
707+
$app->tpl->setVar("is_admin", $is_admin);
708+
709+
if($this->id > 0) {
710+
$tmp_web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", intval($this->id));
711+
$tmp_sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", intval($tmp_web['sys_groupid']));
712+
if(intval($tmp_sys_group['client_id']) > 0) $tmp_client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", intval($tmp_sys_group['client_id']));
713+
if(is_array($tmp_client) && !empty($tmp_client) && trim($this->dataRecord['ssl_organisation']) == '' && trim($this->dataRecord['ssl_locality']) == '' && trim($this->dataRecord['ssl_state']) == '' && trim($this->dataRecord['ssl_organisation_unit']) == '') $app->tpl->setVar("show_helper_links", true);
714+
}
703715

704716
parent::onShowEnd();
705717
}

0 commit comments

Comments
 (0)