From fc0599be79c79a5f5104bc3bee409f8e2cc95d33 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 19 May 2010 13:22:38 +0000
Subject: [PATCH] Removed old intermediate step to add services

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18555 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/systems/class_serverService.inc     | 26 ---------
 .../systems/services/ServiceAddDialog.tpl     | 35 ------------
 .../services/class_ServiceAddDialog.inc       | 56 -------------------
 3 files changed, 117 deletions(-)
 delete mode 100644 gosa-plugins/systems/admin/systems/services/ServiceAddDialog.tpl
 delete mode 100644 gosa-plugins/systems/admin/systems/services/class_ServiceAddDialog.inc

diff --git a/gosa-plugins/systems/admin/systems/class_serverService.inc b/gosa-plugins/systems/admin/systems/class_serverService.inc
index 711cc48ee..7cb9b9683 100644
--- a/gosa-plugins/systems/admin/systems/class_serverService.inc
+++ b/gosa-plugins/systems/admin/systems/class_serverService.inc
@@ -116,10 +116,8 @@ class ServerService extends management
         parent::__construct($config, $this->ui, "services", $headpage);
         $this->registerAction("new",                "newService");
         $this->registerAction("remove",             "removeService");
-        $this->registerAction("newServiceSelected", "newServiceSelected");
         $this->registerAction("saveService",        "saveService");
         $this->registerAction("cancelService",      "cancelEdit");
-        $this->registerAction("newServiceCancel",   "closeDialogs");
         $this->registerAction("restart",            "updateServiceStatus");
         $this->registerAction("stop",               "updateServiceStatus");
         $this->registerAction("start",              "updateServiceStatus");
@@ -132,8 +130,6 @@ class ServerService extends management
     function detectPostActions()
     {
         $action = management::detectPostActions();
-        if(isset($_POST['SaveServiceAdd']))   $action['action'] = "newServiceSelected";
-        if(isset($_POST['CancelServiceAdd'])) $action['action'] = "newServiceCancel";
         if(isset($_POST['SaveService']))      $action['action'] = "saveService";
         if(isset($_POST['CancelService']))    $action['action'] = "cancelService";
         if(preg_match("/^instantNew_/",$action['action'])){
@@ -180,28 +176,6 @@ class ServerService extends management
     }
 
 
-    /*! \brief  Let the user choose the new service to create.
-     */
-    function newService()
-    {
-        $this->dialog = TRUE;
-        $this->dialogObject = new ServiceAddDialog($this->config,$this->dn,$this);
-    }
-
-
-    /*! \brief  Create the selected service.
-     */
-    function newServiceSelected()
-    {
-        $this->closeDialogs();
-        $serv = $_POST['ServiceName'];
-        $this->plugins[$serv]->is_account = true;
-        $this->dialogObject  = $this->plugins[$serv];
-        $this->current = $serv;
-        $this->dialog = TRUE;
-    }
-
-
     /*! \brief  Create the selected service.
      */
     function instantNewService($action, $targets, $all)
diff --git a/gosa-plugins/systems/admin/systems/services/ServiceAddDialog.tpl b/gosa-plugins/systems/admin/systems/services/ServiceAddDialog.tpl
deleted file mode 100644
index 2943feaa2..000000000
--- a/gosa-plugins/systems/admin/systems/services/ServiceAddDialog.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div style="height:5px">&nbsp;</div>
-<div style="font-size:18px;">
-	{t}Adding a new service to the current server{/t}
-</div>
-<br>
-<p class="seperator">
-{t}This dialog allows you to add new services to the currenty edited server object. The box below shows all available but not already used services.{/t}
-<br>
-<br>
-</p>
-{if $Services} 
-<br>
-<br>{t}Service to add{/t} &nbsp;
-	<select name="ServiceName"  size=1>
-		<option value="" >&nbsp;</option>
-		{html_options options=$Services}
-	</select>
-{else}
-	<br>
-	{t}All available services are already in use.{/t}
-	<br>
-{/if}
-<br>
-<br>
-<br>
-<p class="seperator">
-<div style="width:100%; text-align:right;padding-top:8px;padding-bottom:3px;">
-    <button type='submit' name='SaveServiceAdd' {if !$Services} disabled {/if}
->{t}Continue{/t}</button>
-
-    &nbsp;
-    <button type='submit' name='CancelServiceAdd'>{msgPool type=cancelButton}</button>
-
-</div>
-
diff --git a/gosa-plugins/systems/admin/systems/services/class_ServiceAddDialog.inc b/gosa-plugins/systems/admin/systems/services/class_ServiceAddDialog.inc
deleted file mode 100644
index 63872dc78..000000000
--- a/gosa-plugins/systems/admin/systems/services/class_ServiceAddDialog.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * This code is part of GOsa (http://www.gosa-project.org)
- * Copyright (C) 2003-2008 GONICUS GmbH
- *
- * ID: $$Id$$
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-class ServiceAddDialog extends plugin{
-
-  var $cli_summary      = "This dialog is used to add services";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("config"=>"Config object" , "dn"=>"Object dn");
-
-  /* This plugin does not have any ocs */
-  var $objectclasses    = array();
-  var $parent           = NULL;
-
-  function ServiceAddDialog(&$config,$dn,$parent)
-  {
-    plugin::plugin($config);
-    $this->parent = $parent;
-  }
-
-  function execute()
-  {
-    plugin::execute();
-
-    $smarty = get_smarty();
-    $services = $this->parent->getAllUnusedServices();
-    natcasesort($services);
-    $smarty->assign("Services",$services);
-    return($smarty->fetch(get_template_path("ServiceAddDialog.tpl", TRUE,dirname(__FILE__))));
-  }
-
-  function check(){ return array();}
-  function save_object(){;}
-  function save(){}
-
-}
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
-- 
2.30.2