Added Import button

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

diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 248595e9b77d5b4993c87fb76fd47575bf487bd7..365ccc98033127278636eb3df7d850ea7fd8e0e0 100644 (file)
--- a/plugins/personal/environment/class_environment.inc
+++ b/plugins/personal/environment/class_environment.inc
@@ -114,6 +114,7 @@ class environment extends plugin
           $tmp2['LogonLast'] = "";
         }
         $tmp2['LogonData']        = base64_decode($tmp[3]); 
+        $tmp2['LogonDescription'] = $tmp[4];
         $this->gotoLogonScripts[$tmp[0]]=$tmp2;
       }
     }
@@ -730,7 +731,8 @@ class environment extends plugin
       $this->attrs['gotoLogonScript'][] =   $script['LogonName']."|".
                                             $script['LogonOverload'].$script['LogonLast']."|".
                                             $script['LogonPriority']."|".
-                                            base64_encode($script['LogonData']); 
+                                            base64_encode($script['LogonData'])."|".
+                                            $script['LogonDescription'];
     }
 
     /* Prepare Shares */

diff --git a/plugins/personal/environment/class_logonManagementDialog.inc b/plugins/personal/environment/class_logonManagementDialog.inc
index 0587f834bb15c3284afd29f5a55076e9a0160a72..b2bdea79c99055ff37688bf3dda2201e3f084af7 100644 (file)
--- a/plugins/personal/environment/class_logonManagementDialog.inc
+++ b/plugins/personal/environment/class_logonManagementDialog.inc
@@ -8,15 +8,17 @@ class logonManagementDialog extends plugin
 
   /* attribute list for save action */
   var $ignore_account       = TRUE;
-  var $attributes           = array("LogonName","LogonPriority","LogonLast","LogonOverload","LogonData");
+  var $attributes           = array("LogonName","LogonPriority","LogonLast","LogonOverload","LogonData","LogonDescription");
   var $objectclasses        = array("whatever");
   var $use_existing         = false;  
 
-  var $LogonName      ="";  // Name for the LogonScript
-  var $LogonPriority  ="";  // Priority defines the order in which the scripts will be processed 
-  var $LogonLast      ="";  // Is this script marked as the last, all following scripts will be skipped
-  var $LogonOverload  ="";  // If Overload is activated this script is overlaodable by a group script with same prio
-  var $LogonData      ="";  // The script itself
+  var $LogonName        ="";  // Name for the LogonScript
+  var $LogonPriority    ="";  // Priority defines the order in which the scripts will be processed 
+  var $LogonLast        ="";  // Is this script marked as the last, all following scripts will be skipped
+  var $LogonOverload    ="";  // If Overload is activated this script is overlaodable by a group script with same prio
+  var $LogonData        ="";  // The script itself
+  var $LogonDescription ="";
+    
   var $nameIsEditable = true;
 
   var $real_LogonName = "";
@@ -26,13 +28,14 @@ class logonManagementDialog extends plugin
     plugin::plugin ($config, $dn);
     
     if($data){
-      $this->LogonName      = $data['LogonName'];
-      $this->LogonPriority  = $data['LogonPriority'];
-      $this->LogonOverload  = $data['LogonOverload'];
-      $this->LogonLast      = $data['LogonLast'];
-      $this->LogonData      = $data['LogonData'];
-      $this->nameIsEditable = false;
-      $this->real_LogonName = $data['LogonName'];
+      $this->LogonName        = $data['LogonName'];
+      $this->LogonPriority    = $data['LogonPriority'];
+      $this->LogonOverload    = $data['LogonOverload'];
+      $this->LogonLast        = $data['LogonLast'];
+      $this->LogonData        = $data['LogonData'];
+      $this->LogonDescription = $data['LogonDescription'];
+      $this->nameIsEditable   = false;
+      $this->real_LogonName   = $data['LogonName'];
     }
   }
 
@@ -41,6 +44,11 @@ class logonManagementDialog extends plugin
     $smarty= get_smarty();
     $display= "";
 
+    if((isset($_POST['StartImport']))&&(isset($_FILES['importFile']))){
+      $this->LogonData = file_get_contents($_FILES['importFile']['tmp_name']);
+      @unlink($_FILES['importFile']['tmp_name']);
+    }
+
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
       if($this->$attr){

diff --git a/plugins/personal/environment/logonManagement.tpl b/plugins/personal/environment/logonManagement.tpl
index acae9af5dfe93cf1349de070dc34726e48e9930a..209ef5c7eb4874e8427ff609fe8632aeb99c817a 100644 (file)
--- a/plugins/personal/environment/logonManagement.tpl
+++ b/plugins/personal/environment/logonManagement.tpl
@@ -13,6 +13,13 @@
                                                                <input type="text" value="{$LogonName}" name="LogonName" {$LogonNameACL}>
                                                        </td>
                                                </tr>
+                                               <tr>
+                                                       <td>{t}Description{/t}
+                                                       </td>
+                                                       <td>
+                                                               <input type="text" value="{$LogonDescription}" name="LogonDescription">
+                                                       </td>
+                                               </tr>
                                                <tr>
                                                        <td>{t}Priority{/t}
                                                        </td>
@@ -40,6 +47,15 @@
                                                        <td>{t}Overloadable{/t}
                                                        </td>
                                                </tr>
+                                               <tr>
+                                                       <td>
+                                                               {t}Import{/t}
+                                                       </td>
+                                                       <td>
+                                                               <input type="file" name="importFile" >
+                                                               <input type="submit" value="{t}Import{/t}" name="StartImport" >
+                                                       </td>
+                                               </tr>
                                        </table>
                        </td>
                </tr>