Some changes

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

diff --git a/plugins/admin/systems/class_printerPPDDialog.inc b/plugins/admin/systems/class_printerPPDDialog.inc
index f944b7a0485f4bb2f7cd10a3f8fa6fc8f89c0f52..c63a68a1d6b8af77398954e14feb1a6df1d70c6f 100644 (file)
--- a/plugins/admin/systems/class_printerPPDDialog.inc
+++ b/plugins/admin/systems/class_printerPPDDialog.inc
@@ -76,7 +76,6 @@ class printerPPDDialog extends plugin
   }
 
 
-
   function execute()
   {
     /* Call parent execute */
@@ -105,6 +104,8 @@ class printerPPDDialog extends plugin
       }
     }
 
+    // PPD selection / upload / dialog handling 
+
     /* Is there a new PPD file uploaded ? */
     if((isset($_FILES['NewPPDFile']))&&(isset($_POST['SubmitNewPPDFile']))){
       $file = ($_FILES['NewPPDFile']);
@@ -117,33 +118,17 @@ class printerPPDDialog extends plugin
       }
     }
 
-
-    /* Open a dialog that allow us to select different PPDs
-     */
+    /* Open a dialog that allow us to select different PPDs */
     if(isset($_POST['SelectPPD'])){
       $this->dialog= new printerPPDSelectionDialog($this->config,$this->dn,$this->ppdList,$this->ppdListHeader,$this->selectedPPD);
     }
 
-    /* The selection dialog fpr PPDs is canceled
-     */
+    /* The selection dialog fpr PPDs is canceled */
     if(isset($_POST['ClosePPDSelection'])){
       unset($this->dialog);
       $this->dialog=NULL;
     }
 
-    /* A new PPDs was selected in the PPDs selection Dialog
-     * Perform a Check. If everything is fine, use the new PPD.
-     */
-    if(isset($_POST['SavePPDSelection'])){
-      if(!isset($_POST['PPDselection'])){
-        print_red(_("Please select a valid ppd."));
-      }else{
-        $this->SelectPPD($_POST['PPDselection']);
-        unset($this->dialog);
-        $this->dialog=NULL;
-      }
-    }
-
     /* Div Selection */ 
     if((isset($_GET['act']))&&($_GET['act']=="use")){
       $this->SelectPPD(base64_decode($_GET['id']));
@@ -152,13 +137,14 @@ class printerPPDDialog extends plugin
 
     }
 
-    /* if a dialog is open, print the dialog instead of this class
-     */
+    /* if a dialog is open, print the dialog instead of this class */
     if($this->dialog!=NULL){
       $display = $this->dialog->execute();
       return($display);
     }
 
+    // ENDE  PPD selection / upload / dialog handling 
+
     /* Give smarty the information it needs */
     $smarty->assign("ppdString" ,$this->getPPDInformation());
     $tmp= $this->generateProperties();
@@ -373,6 +359,7 @@ class printerPPDDialog extends plugin
     }
   }
 
+
   /* Return selected ppd path, if none is selected then false */
   function save()
   {
@@ -380,6 +367,7 @@ class printerPPDDialog extends plugin
     return($this->pathToModified.$this->selectedPPD['link']);
   }
 
+
   /* Get Information for a single PPD entry 
    * This will be shown on top of template
    */
@@ -392,6 +380,7 @@ class printerPPDDialog extends plugin
     return($str) ; 
   }
 
+
   /* Display all options from the selected ppd file */
   function generateProperties()
   { 
@@ -426,7 +415,6 @@ class printerPPDDialog extends plugin
         /* Add attributes of the current category */
         foreach($obj as $attr => $settings){
 
-
           /* Skip all entries beginning with _ */
           if($attr[0] == "_") continue;  
 

diff --git a/plugins/admin/systems/printerPPDSelectionDialog.tpl b/plugins/admin/systems/printerPPDSelectionDialog.tpl
index 581c77ed34ad89746eb4d746c3cef4ba89c8e602..b6cad00b806da274e4031654c6d163971d9ee723 100644 (file)
--- a/plugins/admin/systems/printerPPDSelectionDialog.tpl
+++ b/plugins/admin/systems/printerPPDSelectionDialog.tpl
@@ -41,8 +41,6 @@
 </table>
 
 <p class="plugbottom">
-<input type="submit" name="SavePPDSelection" value="{t}Select{/t}">
-  &nbsp;
 <input type="submit" name="ClosePPDSelection" value="{t}Close{/t}">
 </p>
 <!--