Changeset 11110

Timestamp:

01/25/11 13:33:58 (2 years ago)

Author:

p_lindheimer

Message:

use existing attributes on define_conf_setting if setting exists and attributes not sepcified re #4740

Files:

• freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (2 diffs)

freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php

@@ -66 +66 @@
-  'FOPPASSWORD'    => array(CONF_TYPE_TEXT, 'passw0rd'),
-  'FOPSORT'        => array(CONF_TYPE_SELECT, 'extension'),
-INT, 'LOG_ERR
+SELECT, 'FILE
-  'NOOPTRACE'      => array(CONF_TYPE_INT, '1'),
-  'ARI_ADMIN_PASSWORD' => array(CONF_TYPE_TEXT, 'ari_password'),
@@ -680 +680 @@
-      die_freepbx(sprintf(_("you can't convert an existing type, keyword [%s]"),$keyword));
-    }
+    // If not a new setting, default appropriate values that have not been set for us
+    //
+    if (!$new_setting) {
+      if (!isset($vars['name'])) {
+        $vars['name'] = $this->db_conf_store[$keyword]['name'];
+      }
+      if (!isset($vars['level'])) {
+        $vars['level'] = $this->db_conf_store[$keyword]['level'];
+      }
+      if (!isset($vars['description'])) {
+        $vars['description'] = $this->db_conf_store[$keyword]['description'];
+      }
+      if (!isset($vars['options'])) {
+        $vars['options'] = $this->db_conf_store[$keyword]['options'];
+      }
+      if (!isset($vars['readlonly'])) {
+        $vars['readlonly'] = $this->db_conf_store[$keyword]['readlonly'];
+      }
+      if (!isset($vars['hidden'])) {
+        $vars['hidden'] = $this->db_conf_store[$keyword]['hidden'];
+      }
+      if (!isset($vars['category'])) {
+        $vars['category'] = $this->db_conf_store[$keyword]['category'];
+      }
+    }
-    if (!isset($vars['value']) || !isset($vars['defaultval'])) {
-      die_freepbx(sprintf(_("missing value and/or defaultval required for [%s]"),$keyword));