diff options
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/forms.inc.php | 33 | ||||
| -rw-r--r-- | frontends/php/include/hosts.inc.php | 16 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 1 |
3 files changed, 36 insertions, 14 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 9eebc876..93528a70 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -206,6 +206,8 @@ if(isset($_REQUEST["httptestid"])) { $form->AddItemToBottomRow(SPACE); + $form->AddItemToBottomRow(new CButton("clone",S_CLONE)); + $form->AddItemToBottomRow(SPACE); $form->AddItemToBottomRow(new CButtonDelete(S_DELETE_SCENARIO_Q, url_param("form").url_param("httptestid").url_param('hostid'))); } @@ -1569,14 +1571,21 @@ } $frmRow = array(new CButton("save",S_SAVE)); - if(isset($_REQUEST["itemid"]) && !isset($limited)) + if(isset($_REQUEST["itemid"])) { array_push($frmRow, SPACE, - new CButtonDelete("Delete selected item?", - url_param("form").url_param("groupid").url_param("hostid").url_param("config"). - url_param("itemid")) - ); + new CButton("clone",S_CLONE)); + + if(!isset($limited)) + { + array_push($frmRow, + SPACE, + new CButtonDelete("Delete selected item?", + url_param("form").url_param("groupid").url_param("hostid").url_param("config"). + url_param("itemid")) + ); + } } array_push($frmRow, SPACE, @@ -2019,6 +2028,8 @@ if(isset($_REQUEST["triggerid"])) { $frmTrig->AddItemToBottomRow(SPACE); + $frmTrig->AddItemToBottomRow(new CButton("clone",S_CLONE)); + $frmTrig->AddItemToBottomRow(SPACE); $frmTrig->AddItemToBottomRow(new CButtonDelete("Delete trigger?", url_param("form").url_param("groupid").url_param("hostid"). url_param("triggerid"))); @@ -2225,6 +2236,8 @@ if(isset($_REQUEST["graphid"])) { $frmGraph->AddItemToBottomRow(SPACE); + $frmGraph->AddItemToBottomRow(new CButton("clone",S_CLONE)); + $frmGraph->AddItemToBottomRow(SPACE); $frmGraph->AddItemToBottomRow(new CButtonDelete(S_DELETE_GRAPH_Q,url_param("graphid"). url_param("groupid").url_param("hostid"))); } @@ -2805,6 +2818,8 @@ if(isset($_REQUEST["actionid"])) { $frmAction->AddItemToBottomRow(SPACE); + $frmAction->AddItemToBottomRow(new CButton('clone',S_CLONE)); + $frmAction->AddItemToBottomRow(SPACE); $frmAction->AddItemToBottomRow(new CButtonDelete("Delete selected action?", url_param("form").url_param("actiontype").url_param("actionid"). "&subject=".$subject)); @@ -3601,8 +3616,8 @@ $frmHost->AddItemToBottomRow(new CButton("save",S_SAVE)); if(isset($_REQUEST["hostid"])) { -// $frmHost->AddItemToBottomRow(SPACE); -// $frmHost->AddItemToBottomRow(new CButton("register","add items from template")); + $frmHost->AddItemToBottomRow(SPACE); + $frmHost->AddItemToBottomRow(new CButton("clone",S_CLONE)); $frmHost->AddItemToBottomRow(SPACE); $frmHost->AddItemToBottomRow( new CButtonDelete(S_DELETE_SELECTED_HOST_Q, @@ -3646,7 +3661,7 @@ if(isset($_REQUEST["groupid"]) && !isset($_REQUEST["form_refresh"])) { $name=$group["name"]; - $db_hosts=DBselect("select distinct h.hostid from hosts h, hosts_groups hg". + $db_hosts=DBselect("select distinct h.hostid,host from hosts h, hosts_groups hg". " where h.status<>".HOST_STATUS_DELETED. " and h.hostid=hg.hostid". " and hg.groupid=".$_REQUEST["groupid"]. @@ -3686,6 +3701,8 @@ if(isset($_REQUEST["groupid"])) { $frmHostG->AddItemToBottomRow(SPACE); + $frmHostG->AddItemToBottomRow(new CButton("clone",S_CLONE)); + $frmHostG->AddItemToBottomRow(SPACE); $frmHostG->AddItemToBottomRow( new CButtonDelete("Delete selected group?", url_param("form").url_param("config").url_param("groupid") diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php index 1d7e785d..044df43a 100644 --- a/frontends/php/include/hosts.inc.php +++ b/frontends/php/include/hosts.inc.php @@ -771,14 +771,18 @@ require_once "include/items.inc.php"; if($templateid != null) { - $db_tmp_apps = get_applications_by_hostid($db_app["templateid"]); - if(is_array($templateid)) + unset($skip); + $db_tmp_apps =& get_applications_by_hostid($db_app["templateid"]); + while($tmp_apps_data = DBfetch($db_tmp_apps)) { - if(!isset($templateid[$db_tmp_app["hostid"]])) - continue; + if(!isset($templateid[$tmp_app_data["hostid"]])) + { + $skip = true; + break; + } } - elseif($templateid != $db_tmp_app["hostid"]) - continue; + if(isset($skip)) continue; + } if($unlink_mode) diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 1fff5adb..5bfe0eba 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -974,6 +974,7 @@ "S_TRIGGER"=> "Trigger", "S_SERVER"=> "Server", "S_DELETE"=> "Delete", + "S_CLONE"=> "Clone", "S_DELETE_SELECTED"=> "Delete selected", "S_DELETE_SELECTED_SERVICES"=> "Delete selected services?", "S_DELETE_SELECTED_LINKS"=> "Delete selected links?", |