From 0eff891afeef26c012d1dc151fde12bf1791bf46 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 20 Oct 2005 08:18:05 +0000 Subject: [PATCH] Removed Object_ from Templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1632 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_faiTemplate.inc | 10 ++- plugins/admin/fai/class_faiTemplateEntry.inc | 83 ++++++++++---------- plugins/admin/fai/faiTemplate.tpl | 1 + plugins/admin/fai/faiTemplateEntry.tpl | 22 +++--- 4 files changed, 59 insertions(+), 57 deletions(-) diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index bdd177d57..1ee396e19 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -194,10 +194,12 @@ class faiTemplate extends plugin */ function save_object() { - plugin::save_object(); - foreach($this->attributes as $attrs){ - if(isset($_POST[$attrs])){ - $this->$attrs = $_POST[$attrs]; + if(isset($_POST['FAItemplate_posted'])){ + plugin::save_object(); + foreach($this->attributes as $attrs){ + if(isset($_POST[$attrs])){ + $this->$attrs = $_POST[$attrs]; + } } } } diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc index d25a2dbed..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,21 +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->Object_FAImode= sprintf("%0.4s", $this->Object_FAImode)." "; + $this->FAImode= sprintf("%0.4s", $this->FAImode)." "; } function execute() @@ -59,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); @@ -86,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); @@ -101,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); @@ -110,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])){ @@ -142,36 +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."); } - 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."); } @@ -182,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)){ @@ -192,7 +191,7 @@ class faiTemplateEntry extends plugin } $tmp['dn'] = $this->dn; - $tmp['status'] = $this->Object_status; + $tmp['status'] = $this->status; return($tmp); } diff --git a/plugins/admin/fai/faiTemplate.tpl b/plugins/admin/fai/faiTemplate.tpl index ed3d004cd..e7e2a8fbe 100644 --- a/plugins/admin/fai/faiTemplate.tpl +++ b/plugins/admin/fai/faiTemplate.tpl @@ -49,3 +49,4 @@ + diff --git a/plugins/admin/fai/faiTemplateEntry.tpl b/plugins/admin/fai/faiTemplateEntry.tpl index aafae0ec4..1599ce924 100644 --- a/plugins/admin/fai/faiTemplateEntry.tpl +++ b/plugins/admin/fai/faiTemplateEntry.tpl @@ -5,11 +5,11 @@ {t}Name{/t}{$must}  -    +    {t}Description{/t}  - + @@ -25,30 +25,30 @@
- {$status} - {if $Object_FAItemplatePath} + {if $FAItemplatePath} {t}Save template{/t}... {/if}

- +  

- - +
@@ -58,21 +58,21 @@ -