From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 28 Dec 2009 12:33:33 +0000 (+0000)
Subject: Updated opsi generic
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7495db49f61b33201a23decd1f3f44eb5ce4f1b5;p=gosa.git

Updated opsi generic
- Do not use DEFAULT as property value, use CURRENT


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

diff --git a/gosa-plugins/opsi/admin/opsi/class_opsi.inc b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
index 4c7415fb1..7109f91c1 100644
--- a/gosa-plugins/opsi/admin/opsi/class_opsi.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
@@ -436,7 +436,7 @@ class opsi extends gosaSupportDaemon
     /* Add properties */
     $data['item'] = array();
     foreach($cfg as $name => $value){
-      $data['item'][] = "<name>".$name."</name><value>".$value['DEFAULT']."</value>";
+      $data['item'][] = "<name>".$name."</name><value>".$value['CURRENT']."</value>";
     }  
 
     /* Query SI server */
diff --git a/gosa-plugins/opsi/admin/opsi/class_opsiProperties.inc b/gosa-plugins/opsi/admin/opsi/class_opsiProperties.inc
index f44cce8bf..0917e88b6 100644
--- a/gosa-plugins/opsi/admin/opsi/class_opsiProperties.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsiProperties.inc
@@ -50,7 +50,7 @@ class opsiProperties extends plugin
     if(preg_match("/w/",$acl)){
       foreach($this->cfg as $name => $value){
         if(isset($_POST['value_'.$name])){
-          $this->cfg[$name]['DEFAULT'] = validate(get_post('value_'.$name));
+          $this->cfg[$name]['CURRENT'] = validate(get_post('value_'.$name));
         }
       }
     }
diff --git a/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc b/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
index a22ad30ee..d57f77623 100644
--- a/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
@@ -537,12 +537,12 @@ class opsiGeneric extends plugin
      */
     $res = array();
     foreach($c2 as $name => $value){
-      if(!isset($c1[$name]) || $c1[$name]['DEFAULT'] != $c2[$name]['DEFAULT']){
+      if(!isset($c1[$name]) || $c1[$name]['CURRENT'] != $c2[$name]['CURRENT']){
         $res[$name] = $c2[$name];
       }
     }
     foreach($c1 as $name => $value){
-      if(!isset($c2[$name]) || $c2[$name]['DEFAULT'] != $c1[$name]['DEFAULT']){
+      if(!isset($c2[$name]) || $c2[$name]['CURRENT'] != $c1[$name]['CURRENT']){
         $res[$name] = $c1[$name];
       }
     }
diff --git a/gosa-plugins/opsi/admin/opsi/properties.tpl b/gosa-plugins/opsi/admin/opsi/properties.tpl
index fe7d4e08f..ff49f8c7d 100644
--- a/gosa-plugins/opsi/admin/opsi/properties.tpl
+++ b/gosa-plugins/opsi/admin/opsi/properties.tpl
@@ -18,11 +18,11 @@
 			{if $item.VALUE_CNT}
 				<select name="value_{$key}" style='width:180px;'>
 				{foreach from=$item.VALUE key=k item=i}
-					<option {if $item.DEFAULT == $i} selected {/if} value="{$i}">{$i}</option>
+					<option {if $item.CURRENT == $i} selected {/if} value="{$i}">{$i}</option>
 				{/foreach}
 				</select>
 			{else}
-				<input type='input' name='value_{$key}' value="{$item.DEFAULT}" style='width:280px;'>
+				<input type='input' name='value_{$key}' value="{$item.CURRENT}" style='width:280px;'>
 			{/if}
 {/render}
 		</td>