X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiTemplateEntry.inc;h=160047b5dd2efd42b8c1cfaa3f947e1cadae0c1a;hb=e30063fbf3326ed504e4a78919fb86e82b720712;hp=0399e5d8d5407ff9e1d9234ca3328594594ab4e1;hpb=b71ee632e82bd020a315386d123de454aed04122;p=gosa.git

diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc
index 0399e5d8d..160047b5d 100644
--- a/plugins/admin/fai/class_faiTemplateEntry.inc
+++ b/plugins/admin/fai/class_faiTemplateEntry.inc
@@ -9,22 +9,22 @@ class faiTemplateEntry extends plugin
 
   /* attribute list for save action */
   var $ignore_account= TRUE;
-  var $attributes   = array("Object_cn","Object_description","Object_FAItemplateFile","Object_FAItemplatePath","Object_FAImode","Object_user","Object_group","Object_binary","Object_FAIowner");
+  var $attributes   = array("cn","description","FAItemplateFile","FAItemplatePath","FAImode","user","group","binary","FAIowner");
   var $objectclasses= array();
 
   var $orig_cn              = "";
 
-  var $Object_dn            = "";
-  var $Object_cn            = "";
-  var $Object_FAItemplateFile   = "";
-  var $Object_FAItemplatePath   = "";
-  var $Object_description   = "";
-  var $Object_status        = "new";
-  var $Object_FAImode       = "0640";
-  var $Object_FAIowner      = "root.root";
-  var $Object_user          = "root";
-  var $Object_group         = "root";
-  var $Object_binary        = false;
+  var $dn            = "";
+  var $cn            = "";
+  var $FAItemplateFile   = "";
+  var $FAItemplatePath   = "";
+  var $description   = "";
+  var $status        = "new";
+  var $FAImode       = "0640";
+  var $FAIowner      = "root.root";
+  var $user          = "root";
+  var $group         = "root";
+  var $binary        = false;
   
   function faiTemplateEntry ($config, $dn= NULL,$object=false)
   {
@@ -33,19 +33,21 @@ class faiTemplateEntry extends plugin
       $this->orig_cn= $object['cn'];
       $this->dn=$object['dn'];
       foreach($object as $name=>$value){
-        $oname = "Object_".$name;
+        $oname = $name;
         $this->$oname=$value;
       }
     }else{
-      $this->Object_status = "new";
+      $this->status = "new";
       $this->orig_cn       = false;
     }
-    $this->Object_user = explode( '.', $this->Object_FAIowner );
-    $this->Object_group = $this->Object_user[1];
-    $this->Object_user = $this->Object_user[0];
-    $_SESSION['binary'] = $this->Object_FAItemplateFile;
+    $this->user = explode( '.', $this->FAIowner );
+    $this->group = $this->user[1];
+    $this->user = $this->user[0];
+    $_SESSION['binary'] = $this->FAItemplateFile;
     $_SESSION['binarytype'] = 'octet-stream';
-    $_SESSION['binaryfile'] = basename( $this->Object_FAItemplatePath );
+    $_SESSION['binaryfile'] = basename( $this->FAItemplatePath );
+    
+    $this->FAImode= sprintf("%0.4s", $this->FAImode)." ";
   }
 
   function execute()
@@ -57,18 +59,18 @@ class faiTemplateEntry extends plugin
 
     if(isset($_POST['TmpFileUpload'])){
       if($str=file_get_contents($_FILES['FAItemplateFile']['tmp_name'])){
-        $this->Object_FAItemplateFile = $str;
+        $this->FAItemplateFile = $str;
 
         /* If we don't have a filename set it from upload filename. */
-        if( 0 == strlen( $this->Object_FAItemplatePath ) )
-          $this->Object_FAItemplatePath = $_FILES['FAItemplateFile']['name'];
+        if( 0 == strlen( $this->FAItemplatePath ) )
+          $this->FAItemplatePath = $_FILES['FAItemplateFile']['name'];
       }
     
     }
     
     $status= _("no file uploaded yet");
-    if(strlen($this->Object_FAItemplateFile)){
-      $status= sprintf(_("exists in database (size: %s bytes)"),strlen($this->Object_FAItemplateFile));
+    if(strlen($this->FAItemplateFile)){
+      $status= sprintf(_("exists in database (size: %s bytes)"),strlen($this->FAItemplateFile));
     }
     $smarty->assign("status",$status);
 
@@ -84,7 +86,7 @@ class faiTemplateEntry extends plugin
     }
 
     /* Assign file modes */
-    $tmode= "$this->Object_FAImode ";
+    $tmode= "$this->FAImode ";
     foreach (array("s", "u", "g", "o") as $type){
       $current= substr($tmode, 0, 1);
       $tmode=   preg_replace("/^./", "", $tmode);
@@ -99,7 +101,7 @@ class faiTemplateEntry extends plugin
       }
     }
 
-    $smarty->assign("Object_FAItemplateFile","");
+    $smarty->assign("FAItemplateFile","");
 
     $display.= $smarty->fetch(get_template_path('faiTemplateEntry.tpl', TRUE));
     return($display);
@@ -108,15 +110,15 @@ class faiTemplateEntry extends plugin
   /* Save data to object */
   function save_object()
   {
-    if (!isset($_POST['Object_FAItemplatePath'])){
+    if (!isset($_POST['FAItemplatePath'])){
       return;
     }
     if(isset($_POST['SubObjectFormSubmitted'])){
       foreach($this->attributes as $attrs){
-        if($attrs == "Object_FAItemplateFile") 
+        if($attrs == "FAItemplateFile") 
           continue;
-        if($attrs == "Object_FAIowner") {
-          $this->$attrs = $_POST["Object_user"] . '.' . $_POST["Object_group"];
+        if($attrs == "FAIowner") {
+          $this->$attrs = $_POST["user"] . '.' . $_POST["group"];
           continue;
         }
         if(isset($_POST[$attrs])){
@@ -140,39 +142,36 @@ class faiTemplateEntry extends plugin
       }
       $tmode= $tmode.$dest;
     }
-    $this->Object_FAImode= $tmode;
+    $this->FAImode= $tmode;
   }
 
   /* Check supplied data */
   function check()
   {
     $message= array();
-    if(empty($this->Object_FAItemplateFile)){
+    if(empty($this->FAItemplateFile)){
       $message[]=_("Please specify a value for attribute 'file'.");
     } 
 
-    if(empty($this->Object_FAItemplatePath)){
+    if(empty($this->FAItemplatePath)){
       $message[]=_("Please specify a value for attribute 'path'.");
     } 
   
-    if(empty($this->Object_cn)){
+    if(empty($this->cn)){
       $message[] = _("Please enter a name.");
     }
-    elseif(preg_match("/[^0-9a-z]/i",$this->Object_cn)){
-      $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
-    }
 
-    if(empty($this->Object_user)){
+    if(empty($this->user)){
       $message[] = _("Please enter a user.");
     }
-    elseif(preg_match("/[^0-9a-z]/i",$this->Object_user)){
+    elseif(preg_match("/[^0-9a-z]/i",$this->user)){
       $message[] = _("Please enter a valid user. Only a-Z 0-9 are allowed.");
     }
 
-    if(empty($this->Object_group)){
+    if(empty($this->group)){
       $message[] = _("Please enter a group.");
     }
-    elseif(preg_match("/[^0-9a-z]/i",$this->Object_group)){
+    elseif(preg_match("/[^0-9a-z]/i",$this->group)){
       $message[] = _("Please enter a valid group. Only a-Z 0-9 are allowed.");
     }
 
@@ -183,8 +182,7 @@ class faiTemplateEntry extends plugin
   {
     $tmp=array();
     foreach($this->attributes as $attrs){ 
-      $attr = preg_replace("/^Object_/","",$attrs);
-      $tmp[$attr] = $this->$attrs;
+      $tmp[$attrs] = $this->$attrs;
     }
 
     if(($this->orig_cn)&&($tmp['cn']!=$this->orig_cn)){
@@ -193,7 +191,7 @@ class faiTemplateEntry extends plugin
     }
   
     $tmp['dn']      = $this->dn;  
-    $tmp['status']  = $this->Object_status;  
+    $tmp['status']  = $this->status;  
 
     return($tmp);
   }