Updated fai copy&paste stuff

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5184 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 50f398e590ba4b1ddc3ddb790845942ecc7e82c1..8c783b56ac78baa7c12ffc32ee5a35dbfc9902cf 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -40,6 +40,7 @@ class faiHook extends plugin
   var $base             = "";
   var $release          = "";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode   = false;
 
   var $CopyPasteVars  = array("SubObjects","FAIstate");
 
@@ -374,7 +375,7 @@ class faiHook extends plugin
     $message= plugin::check();
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
       /* Check if current name is already used for fai scripts in selected release */
       $dn = 'cn='.$this->cn.",ou=hooks,".$this->release;

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index a0f77a551506e95a55a6c5ea05bdc952dda4d671..2bd6dd1567c24b14ca2c333f6404b58c6fc79b91 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -631,6 +631,9 @@ class faiManagement extends plugin
         if($this->CopyPasteHandler->copyCurrent){
           $this->CopyPasteHandler->SetVar("copy_paste_mode",  TRUE);
         }
+        if($this->CopyPasteHandler->cutCurrent){
+          $this->CopyPasteHandler->SetVar("cut_paste_mode",  TRUE);
+        }
     
         $release = "ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase'];
         if($_SESSION['faifilter']['branch']!="main"){

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 28897efac401d94173261e4b495c5faf2545aa60..40b340b3150103198f48c1dfb63c39cb39f2976c 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -64,6 +64,8 @@ class faiPackage extends plugin
   var $base             = "";
   var $release          = "";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode   = false;
+
   var $CopyPasteVars  = array("FAIstate","ConfiguredPackages","FAIdebianRelease","FAIdebianSection","FAIinstallMethod","mirror","servers","releases","sections","list","mirrors","usedPackages");
 
 
@@ -384,7 +386,7 @@ class faiPackage extends plugin
     }
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
       /* Check if current name is already used for fai scripts in selected release */
       $dn = 'cn='.$this->cn.",ou=packages,".$this->release;

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index 3376d600ede748bab48b7f21165728c657943091..9ea6a9c678f91dea545ab8d52c0174e8450d2ac4 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -23,6 +23,7 @@ class faiPartitionTable extends plugin
   var $base             = "";
   var $release          = "";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode  = false;
 
   var $CopyPasteVars  = array("disks","FAIstate");
 
@@ -322,7 +323,7 @@ class faiPartitionTable extends plugin
     $message= plugin::check();
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
       /* Check if current name is already used for fai scripts in selected release */
       $dn = 'cn='.$this->cn.",ou=disk,".$this->release;

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 6befbbdfd6cec63966b658a43804cd1d3c4be0c3..2df7bac2f60a375b3a7b04a9f85e786a6738f9ea 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -34,6 +34,7 @@ class faiProfile extends plugin
   var $base           = "";
   var $release        = "";
   var $copy_paste_mode= false;
+  var $cut_paste_mode = false;
 
   var $CopyPasteVars  = array("FAIclass","FAIclasses","FAIAllclasses","FAIstate");
 
@@ -388,7 +389,7 @@ class faiProfile extends plugin
     if($this->copy_paste_mode){
 
       /* If this is a new script, check if a script with this name already exists */
-      if(!empty($this->release) && $this->copy_paste_mode){
+      if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
         /* Check if current name is already used for fai scripts in selected release */
         $dn = 'cn='.$this->cn.",ou=profiles,".$this->release;

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index e70a404564d2f63b0c524e9b89ea5f26a9b6f7ec..e1c3ffbc753982273b0688054abdf12ee41d1df9 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -41,6 +41,7 @@ class faiScript extends plugin
   var $base             ="";
   var $release          ="";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode   = false;
   var $CopyPasteVars    = array("SubObjects","FAIstate");
 
 
@@ -347,7 +348,7 @@ class faiScript extends plugin
     $message= plugin::check();
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
      
       /* Check if current name is already used for fai scripts in selected release */ 
       $dn = 'cn='.$this->cn.",ou=scripts,".$this->release;

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 06945f10c3190a472a9392201e28323d3b6b7ad4..cb74de6b9202322bab3f9028c7af315bb3d79434 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -40,6 +40,7 @@ class faiTemplate extends plugin
   var $base             = "";
   var $release          = "";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode   = false;
 
   var $CopyPasteVars  = array("SubObjects","FAIstate");
 
@@ -344,7 +345,7 @@ class faiTemplate extends plugin
     $message= plugin::check();
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
       /* Check if current name is already used for fai scripts in selected release */
       $dn = 'cn='.$this->cn.",ou=templates,".$this->release;

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 39565634ae3260dfb449e4314574ff1c68899805..7f14681a6959ad24ceb4b608e7af9e341846ca8f 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -38,6 +38,7 @@ class faiVariable extends plugin
   var $base             = "";
   var $release          = "";
   var $copy_paste_mode  = false;
+  var $cut_paste_mode   = false;
 
   var $CopyPasteVars  = array("SubObjects","FAIstate");
 
@@ -272,7 +273,7 @@ class faiVariable extends plugin
     $message= plugin::check();
 
     /* If this is a new script, check if a script with this name already exists */
-    if(!empty($this->release) && $this->copy_paste_mode){
+    if(!empty($this->release) && ($this->copy_paste_mode || $this->cut_paste_mode) ){
 
       /* Check if current name is already used for fai scripts in selected release */
       $dn = 'cn='.$this->cn.",ou=variables,".$this->release;