From ecf891ab69b38ee1bcd0533d9a4f30d218c7e99c Mon Sep 17 00:00:00 2001 From: nveid <nveid@ispconfig3> Date: Mon, 21 Nov 2011 01:04:18 -0500 Subject: [PATCH] Added remoting API call: client_get_all @param -> session_id @return -> Array of all Client IDs on server --- interface/web/vm/openvz_vm_edit.php | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 42 insertions(+), 4 deletions(-) diff --git a/interface/web/vm/openvz_vm_edit.php b/interface/web/vm/openvz_vm_edit.php index f79a90b..eefe4f0 100644 --- a/interface/web/vm/openvz_vm_edit.php +++ b/interface/web/vm/openvz_vm_edit.php @@ -104,10 +104,10 @@ $records = $app->db->queryAllRecords($sql); $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']); $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>'; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($records)) { foreach( $records as $rec) { - $selected = @($rec["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "<option value='$rec[groupid]' $selected>$rec[name]</option>\r\n"; } } @@ -135,10 +135,10 @@ $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; $clients = $app->db->queryAllRecords($sql); $client_select = "<option value='0'></option>"; - $tmp_data_record = $app->tform->getDataRecord($this->id); + //$tmp_data_record = $app->tform->getDataRecord($this->id); if(is_array($clients)) { foreach( $clients as $client) { - $selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':''; + $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':''; $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n"; } } @@ -166,6 +166,44 @@ $app->tpl->setVar("edit_disabled", 0); } + // Datepicker + $date_format = $app->lng('conf_format_dateshort'); + $trans = array("d" => "dd", "m" => "mm", "Y" => "yy"); + $date_format = strtr($date_format, $trans); + $app->tpl->setVar("date_format", $date_format); + + $app->tpl->setVar("daynamesmin_su", $app->lng('daynamesmin_su')); + $app->tpl->setVar("daynamesmin_mo", $app->lng('daynamesmin_mo')); + $app->tpl->setVar("daynamesmin_tu", $app->lng('daynamesmin_tu')); + $app->tpl->setVar("daynamesmin_we", $app->lng('daynamesmin_we')); + $app->tpl->setVar("daynamesmin_th", $app->lng('daynamesmin_th')); + $app->tpl->setVar("daynamesmin_fr", $app->lng('daynamesmin_fr')); + $app->tpl->setVar("daynamesmin_sa", $app->lng('daynamesmin_sa')); + + $app->tpl->setVar("daynames_sunday", $app->lng('daynames_sunday')); + $app->tpl->setVar("daynames_monday", $app->lng('daynames_monday')); + $app->tpl->setVar("daynames_tuesday", $app->lng('daynames_tuesday')); + $app->tpl->setVar("daynames_wednesday", $app->lng('daynames_wednesday')); + $app->tpl->setVar("daynames_thursday", $app->lng('daynames_thursday')); + $app->tpl->setVar("daynames_friday", $app->lng('daynames_friday')); + $app->tpl->setVar("daynames_saturday", $app->lng('daynames_saturday')); + + $app->tpl->setVar("monthnamesshort_jan", $app->lng('monthnamesshort_jan')); + $app->tpl->setVar("monthnamesshort_feb", $app->lng('monthnamesshort_feb')); + $app->tpl->setVar("monthnamesshort_mar", $app->lng('monthnamesshort_mar')); + $app->tpl->setVar("monthnamesshort_apr", $app->lng('monthnamesshort_apr')); + $app->tpl->setVar("monthnamesshort_may", $app->lng('monthnamesshort_may')); + $app->tpl->setVar("monthnamesshort_jun", $app->lng('monthnamesshort_jun')); + $app->tpl->setVar("monthnamesshort_jul", $app->lng('monthnamesshort_jul')); + $app->tpl->setVar("monthnamesshort_aug", $app->lng('monthnamesshort_aug')); + $app->tpl->setVar("monthnamesshort_sep", $app->lng('monthnamesshort_sep')); + $app->tpl->setVar("monthnamesshort_oct", $app->lng('monthnamesshort_oct')); + $app->tpl->setVar("monthnamesshort_nov", $app->lng('monthnamesshort_nov')); + $app->tpl->setVar("monthnamesshort_dec", $app->lng('monthnamesshort_dec')); + + $app->tpl->setVar("datepicker_nextText", $app->lng('datepicker_nextText')); + $app->tpl->setVar("datepicker_prevText", $app->lng('datepicker_prevText')); + parent::onShowEnd(); } -- Gitblit v1.9.1