Changeset 11010

Timestamp:

01/18/11 15:53:25 (2 years ago)

Author:

p_lindheimer

Message:

get rid of UINT, adds validation and method to check results of last update re #4740, this checking may momentarily break stuff as it has not been tested with setting values, about to do that so fixes to come shortly

Files:

• freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (13 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php (modified) (1 diff)
• freepbx/trunk/libfreepbx.install.php (modified) (75 diffs)
• modules/branches/2.9/core/advancedsettings.js (modified) (1 diff)
• modules/branches/2.9/core/page.advancedsettings.php (modified) (2 diffs)
• modules/branches/2.9/dashboard/install.php (modified) (8 diffs)

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

@@ -4 +4 @@
-define("CONF_TYPE_DIR",    'dir');
-define("CONF_TYPE_INT",    'int');
-define("CONF_TYPE_UINT",   'uint');
-define("CONF_TYPE_SELECT", 'select');
-
@@ -25 +24 @@
-  'AMPDBNAME'      => array(CONF_TYPE_TEXT, 'asterisk'),
-  'AMPENGINE'      => array(CONF_TYPE_SELECT, 'asterisk'),
-U
+
-  'ASTMANAGERHOST' => array(CONF_TYPE_TEXT, 'localhost'),
-  'AMPDBHOST'      => array(CONF_TYPE_TEXT, 'localhost'),
@@ -34 +33 @@
-  'FOPPASSWORD'    => array(CONF_TYPE_TEXT, 'passw0rd'),
-  'FOPSORT'        => array(CONF_TYPE_SELECT, 'extension'),
-U
-U
+
+
-  'ARI_ADMIN_PASSWORD' => array(CONF_TYPE_TEXT, 'ari_password'),
-  'CFRINGTIMERDEFAULT' => array(CONF_TYPE_SELECT, '0'),
@@ -77 +76 @@
-
-  // Time Conditions (2.9 New)
-U
+
-  'TCMAINT'        => array(CONF_TYPE_BOOL, true),
-
@@ -98 +97 @@
-  var $parsed_from_db = false;
-  var $amportal_canwrite;
+
+  // This will be set with any update/define to provide feedback that can be optionally used inside or outside of
+  // the class. The structure should be:
+  // $last_update_status[$keyword]['validated']   true/false
+  // $last_update_status[$keyword]['saved']       true/false
+  // $last_update_status[$keyword]['orig_value']  value submitted
+  // $last_update_status[$keyword]['saved_value'] value submitted
+  // $last_update_status[$keyword]['msg']         error message
+  var $last_update_status;
+
+  // Internal reference pointer to the internal $last_update_status[$keyword]
+  // e.g. $this->_last_update_status =& $last_update_status[$keyword];
+  //
+  var $_last_update_status;
+
-
-  // access should always be through create so only one copy is ever running
@@ -123 +137 @@
-      die_freepbx(_('fatal error reading freepbx_settings')); 
-    }
+    unset($this->last_update_status);
-    foreach($db_raw as $setting) {
+      $this->last_update_status[$setting['keyword']]['validated'] = false;
+      $this->last_update_status[$setting['keyword']]['saved'] = false;
+      $this->last_update_status[$setting['keyword']]['orig_value'] = $setting['value'];
+      $this->last_update_status[$setting['keyword']]['saved_value'] = $setting['value'];
+      $this->last_update_status[$setting['keyword']]['msg'] = '';
+      $this->_last_update_status =& $this->last_update_status[$setting['keyword']];
+
-      $this->db_conf_store[$setting['keyword']] = $setting;
-      $this->db_conf_store[$setting['keyword']]['modified'] = false;
@@ -129 +151 @@
-      // note the reference assignment, if it's actually the authoritative source
-      $this->conf[$setting['keyword']] =& $this->db_conf_store[$setting['keyword']]['value'];
+
+      // The assumption is that the database settings were validated on input. We are not going to throw errors when
+      // reading them back but the last_update_status array is available for debugging purposes to review.
+      //
-      if (!$setting['emptyok'] && $setting['value'] == '') {
-value'], $setting['type'], $setting['defaultval
+defaultval'], $setting['type'], $setting['emptyok'], $setting['options
-      } else {
-
+, $setting['options']
-      }
-    }
@@ -301 +327 @@
-  }
-
+  function get_last_update_status() {
+    return $this->last_update_status;
+  }
+
-  // used to insert or update an existing setting such as in an install
-  // script. $vars will include some required fields and we are strict
@@ -311 +341 @@
-  //        different then the initial value???
-  //
+
-  function define_conf_setting($keyword,$vars,$commit=false) {
-    global $amp_conf;
+
+    unset($this->last_update_status);
+    $this->last_update_status[$keyword]['validated'] = false;
+    $this->last_update_status[$keyword]['saved'] = false;
+    $this->last_update_status[$keyword]['orig_value'] = $vars['value'];
+    $this->last_update_status[$keyword]['saved_value'] = $vars['value'];
+    $this->last_update_status[$keyword]['msg'] = '';
+
+    $this->_last_update_status =& $this->last_update_status[$keyword];
+
-    $attributes = array(
-      'keyword' => '',
@@ -336 +377 @@
-      die_freepbx(sprintf(_("missing value and/or defaultval required for [%s]"),$keyword));
-    } else {
-      // validate even if already set, catches coding errors early even though we don't use it
-      $value = $this->_prepare_conf_value($vars['value'], $vars['type'] ,$vars['emptyok']);
-      $attributes['value'] = $new_setting ? $value : $this->db_conf_store[$keyword];
-      $attributes['defaultval'] = $this->_prepare_conf_value($vars['defaultval'], $vars['type'] ,$vars['emptyok']);
-      $attributes['keyword'] = $keyword;
-      $attributes['type'] = $vars['type'];
-    }
-
+
+
-      if (!isset($vars['options']) || $vars['options'] == '') { 
-        die_freepbx(sprintf(_("missing options for keyword [%] required if type is select"),$keyword));
-      } else {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (isset($vars['level'])) {
-      $attributes['level'] = (int) $vars['level'] > 0 ? ((int) $vars['level'] < 10 ? (int) $vars['level'] : 10) : 0;
@@ -368 +430 @@
-      }
-    }
+
+    // validate even if already set, catches coding errors early even though we don't use it
+    $value = $this->_prepare_conf_value($vars['value'], $vars['type'] ,$attributes['emptyok'], $attributes['options']);
+    $attributes['value'] = $new_setting ? $value : $this->db_conf_store[$keyword];
+    $attributes['defaultval'] = $this->_prepare_conf_value($vars['defaultval'], $vars['type'] ,$attributes['emptyok'], $attributes['options']);
+
+    // Let's be really stict here, if anything violated validation, we fail!
+    // This method is only called to define new settings, this catches programming errors early on.
+    // 
+    if (!$this->_last_update_status['validated']) {
+      die_freepbx(
+        sprintf(_("method define_conf_setting() failed to pass validation for keyword [%s] setting value [%s], error msg if supplied [%s]"),
+        $keyword, $vars['value'], $this->_last_update_status['msg'])
+      );
+    }
+
-    if ($new_setting || $attributes != $this->db_conf_store[$keyword]) {
-      if (!$new_setting) {
@@ -395 +473 @@
-      die_freepbx(_("called set_conf_values with a non-array"));
-    }
+    unset($this->last_update_status);
-    foreach($update_arr as $keyword => $value) {
-      if (!isset($this->db_conf_store[$keyword])) {
-        die_freepbx(sprintf(_("trying to set keyword [%s] to [%s] on unitialized setting"),$keyword, $value));
-      } 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $this->db_conf_store[$keyword]['value'] = $prep_value;
-        $this->db_conf_store[$keyword]['modified'] = true;
@@ -412 +509 @@
-  }
-
-
+, $options = false
-    switch ($type) {
+
-    case CONF_TYPE_BOOL:
-      $ret = $value ? 1 : 0;
+      $this->_last_update_status['validated'] = true;
-      break;
+
+    case CONF_TYPE_SELECT:
+      $val_arr = explode(',',$options);
+      if (in_array($value,$val_arr)) {
+        $ret = $value;
+        $this->_last_update_status['validated'] = true;
+      } else {
+        $ret = null;
+        $this->_last_update_status['validated'] = false;
+        $this->_last_update_status['msg'] = _("Invalid value supplied to select");
+        $this->_last_update_status['saved_value'] = $ret;
+        $this->_last_update_status['saved'] = false;
+  file_put_contents("/tmp/freepbx_debug.log","SELECT failed: [$value] ".print_r($val_arr,true),FILE_APPEND);
+        dbug($value);
+        dbug($val_arr);
+        //
+        // NOTE: returning from function early!
+        return $ret;
+      }
+      break;
+
+    case CONF_TYPE_DIR:
+      // we don't consider trailing '/' in a directory an error for validation purposes
+      $value = rtrim($value,'/');
+      // NOTE: fallthrough to CONF_TYPE_TEXT, NO break on purpose!
+      //       |
+      //       |
+      //       V
-    case CONF_TYPE_TEXT:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      break;
-
-
-
+
-    case CONF_TYPE_INT:
-      $ret = $emptyok && $value == '' ? '' : (int) $value;
+
+      if ($options != '' && $ret != '') {
+        $range = is_array($options) ? $options : explode(',',$options);
+        switch ($ret) {
+        case $ret < $range[0]:
+          $ret = $range[0];
+          $this->_last_update_status['validated'] = false;
+          $this->_last_update_status['msg'] = sprintf(_("Value [%s] out of range, changed to [%s]"),$value,$ret);
+        break;
+        case $ret > $range[1]:
+          $ret = $range[1];
+          $this->_last_update_status['validated'] = false;
+          $this->_last_update_status['msg'] = sprintf(_("Value [%s] out of range, changed to [%s]"),$value,$ret);
+        break;
+        default:
+          $this->_last_update_status['validated'] = (string) $ret === (string) $value;
+        break;
+        }
+      } else {
+        $this->_last_update_status['validated'] = (string) $ret === (string) $value;
+      }
-      break;
-
-
-
+
-    default:
-      die_freepbx(sprintf(_("unknown type: [%s]"),$type));
-      break;
-    }
+    $this->_last_update_status['saved_value'] = $ret;
+    $this->_last_update_status['saved'] = true;
-    return $ret;
-  }

freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php

@@ -73 +73 @@
-$version = $version ? $version : getversion();
-$version_tag = '?load_version='.urlencode($version);
-
-// TODO: append ?load_version=$version (and for module specific $load_version=$view_module_version) to end of images, js, etc.
-//       to get these to load, per moshe's suggestion
-
-if ($amp_conf['BRAND_IMAGE_HIDE_NAV_BACKGROUND']) {

freepbx/trunk/libfreepbx.install.php

@@ -413 +413 @@
-  $set['options'] = '0,1,2,3,4,5,6,7,8,9,10';
-  $set['description'] = 'This will filter which settings that are displayed on this Advanced Settings page. The higher the level, the more obscure settings will be shown. Settings at higher levels are unlikely to be of interest to most users and could be more volatile to breaking your system if set wrong.';
+  $set['emptyok'] = 0;
-  $set['level'] = 0;
-  $set['readonly'] = 0;
@@ -423 +424 @@
-  $set['value'] = false;
-  $set['description'] = 'This will display settings that are normally hidden by the system. These settings are often internally used settings that are not of interest to most users.';
+  $set['emptyok'] = 0;
-  $set['level'] = 0;
-  $set['readonly'] = 0;
@@ -433 +435 @@
-  $set['value'] = false;
-  $set['description'] = 'This will display settings that are readonly. These settings are often internally used settings that are not of interest to most users. Since they are readonly they can only be viewed.';
+  $set['emptyok'] = 0;
-  $set['level'] = 0;
-  $set['readonly'] = 0;
@@ -449 +452 @@
-  $set['options'] = 'asterisk';
-  $set['description'] = 'The telephony backend engine being used, asterisk is the only option currently.';
+  $set['emptyok'] = 0;
-  $set['level'] = 3;
-  $set['readonly'] = 1;
@@ -460 +464 @@
-  $set['options'] = 'database,none,webserver';
-  $set['description'] = 'Authentication type to use for web admin. If type set to <b>database</b>, the primary AMP admin credentials will be the AMPDBUSER/AMPDBPASS above. When using database you can create users that are restricted to only certain module pages. When set to none, you should make sure you have provided security at the apache level. When set to webserver, FreePBX will expect authentication to happen at the apache level, but will take the user credentials and apply any restrictions as if it were in database mode.';
+  $set['emptyok'] = 0;
-  $set['level'] = 3;
-  $set['type'] = CONF_TYPE_SELECT;
@@ -469 +474 @@
-  $set['options'] = 'extensions,deviceanduser';
-  $set['description'] = 'Sets the extension behavior in FreePBX.  If set to <b>extensions</b>, Devices and Users are administered together as a unified Extension, and appear on a single page. If set to <b>deviceanduser</b>, Devices and Users will be administered seperately. Devices (e.g. each individual line on a SIP phone) and Users (e.g. <b>101</b>) will be configured independent of each other, allowing association of one User to many Devices, or allowing Users to login and logout of Devices.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_SELECT;
-  $freepbx_conf->define_conf_setting('AMPEXTENSIONS',$set);
@@ -475 +481 @@
-  $set['value'] = '007';
-  $set['description'] = 'Defaults to 077 allowing only the asterisk user to have any permission on VM files. If set to something like 007, it would allow the group to have permissions. This can be used if setting apache to a different user then asterisk, so that the apache user (and thus ARI) can have access to read/write/delete the voicemail files. If changed, some of the voicemail directory structures may have to be manually changed.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -488 +495 @@
-  $freepbx_conf->define_conf_setting('AMPWEBADDRESS',$set);
-  $set['level'] = 0;
-  $set['emptyok'] = 0;
-
-  // ARI_ADMIN_USERNAME
@@ -496 +502 @@
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('ARI_ADMIN_USERNAME',$set);
-  $set['emptyok'] = 0;
-
-  // ARI_ADMIN_PASSWORD
-  $set['value'] = 'ari_password';
-  $set['description'] = 'This is the default admin password to allow an administrator to login to ARI bypassing all security. Change this to a secure password.Default = not set';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('ARI_ADMIN_PASSWORD',$set);
@@ -507 +513 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user Asterisk should be running as, used by freepbx_engine. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -515 +522 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user group Asterisk should be running as, used by freepbx_engine. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -523 +531 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user your httpd should be running as, used by freepbx_engine. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -531 +540 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user group your httpd should be running as, used by freepbx_engine. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -539 +549 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user that various device directories should be set to, used by freepbx_engine. Examples include /dev/zap, /dev/dahdi, /dev/misdn, /dev/mISDN and /dev/dsp. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -547 +558 @@
-  $set['value'] = 'asterisk';
-  $set['description'] = 'The user group that various device directories should be set to, used by freepbx_engine. Examples include /dev/zap, /dev/dahdi, /dev/misdn, /dev/mISDN and /dev/dsp. Most systems should not change this.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 4;
@@ -561 +573 @@
-  $set['value'] = true;
-  $set['description'] = 'Generate the bad-number context which traps any bogus number or feature code and plays a message to the effect. If you use the Early Dial feature on some Grandstream phones, you will want to set this to false.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $set['level'] = 2;
@@ -569 +582 @@
-  $set['value'] = true;
-  $set['description'] = 'For extensions that have CW enabled, report unanswered CW calls as <b>busy</b> (resulting in busy voicemail greeting). If set to no, unanswered CW calls simply report as <b>no-answer</b>.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('CWINUSEBUSY',$set);
@@ -575 +589 @@
-  $set['value'] = false;
-  $set['description'] = 'If set to true, FreePBX will check if you have chan_dadhi installed. If so, it will automatically use all your ZAP configuration settings (devices and trunks) and silently convert them, under the covers, to DAHDI so no changes are needed. The GUI will continue to refer to these as ZAP but it will use the proper DAHDI channels. This will also keep Zap Channel DIDs working.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('ZAP2DAHDICOMPAT',$set);
@@ -581 +596 @@
-  $set['value'] = false;
-  $set['description'] = 'If true, Core will not statically generate hints, but instead make a call to the AMPBIN php script, and generate_hints.php through an Asterisk #exec call. This requires Asterisk.conf to be configured with <b>execincludes=yes<b> set in the [options] section.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('DYNAMICHINTS',$set);
@@ -587 +603 @@
-  $set['value'] = true;
-  $set['description'] = 'Enable call waiting by default when an extension is created (Default is yes). Set to <b>no</b> to if you dont want phones to be commissioned with call waiting already enabled. The user would then be required to dial the CW feature code (*70 default) to enable their phone. Most installations should leave this alone. It allows multi-line phones to receive multiple calls on their line appearances.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('ENABLECW',$set);
@@ -593 +610 @@
-  $set['value'] = false;
-  $set['description'] = 'When set to true, a beep is played instead of confirmation message when activating/de-activating: CallForward, CallWaiting, DayNight, DoNotDisturb and FindMeFollow.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('FCBEEPONLY',$set);
@@ -599 +617 @@
-  $set['value'] = false;
-  $set['description'] = 'If this is set, it assumes that you are running Asterisk 1.4 or higher and want to take advantage of the func_devstate.c backport available from Asterisk 1.6. This allows custom hints to be created to support BLF for server side feature codes such as daynight, followme, etc';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('USEDEVSTATE',$set);
@@ -605 +624 @@
-  $set['value'] = false;
-  $set['description'] = 'Setting this flag will generate the required global variable so that enumlookup.agi will use Google DNS 8.8.8.8 when performing an ENUM lookup. Not all DNS deals with NAPTR record, but Google does. There is a drawback to this as Google tracks every lookup. If you are not comfortable with this, do not enable this setting. Please read Google FAQ about this: <b>http://code.google.com/speed/public-dns/faq.html#privacy</b>.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $set['level'] = 2;
@@ -613 +633 @@
-  $set['value'] = false;
-  $set['description'] = 'Normally FreePBX auto-generates a custom context that may be usable for adding custom dialplan to modify the normal behavior of FreePBX. It takes a good understanding of how Asterisk processes these includes to use this and in many of the cases, there is no useful application. All includes will result in a WARNING in the Asterisk log if there is no context found to include though it results in no errors. If you know that you want the includes, you can set this to true. If you comment it out FreePBX will revert to legacy behavior and include the contexts.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $set['level'] = 2;
@@ -623 +644 @@
-  $set['options'] = '0,1,2,3,4,5,6,7,8,9,10';
-  $set['description'] = 'Some modules will generate lots of Noop() commands proceeded by a [TRACE](trace_level) that can be used during development or while trying to trace call flows. These Noop() commands serve no other purpose so if you do not want to see excessive Noop()s in your dialplan you can set this to 0. The higher the number the more detailed level of trace Noop()s will be generated';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_SELECT;
-  $freepbx_conf->define_conf_setting('NOOPTRACE',$set);
@@ -629 +651 @@
-  $set['value'] = false;
-  $set['description'] = 'If this value is set to true, then calls going out your outbound routes that originate from outside your PBX and were subsequently forwarded through a call forward, ring group, follow-me or other means, will have a SIP diversion header added to the call with the original incoming DID assuming there is a DID available. This is useful with some carriers that may require this under certain circumstances.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('DIVERSIONHEADER',$set);
@@ -640 +663 @@
-  $set['options'] = $opts;
-  $set['description'] = 'This is the default time in seconds to try and connect a call that has been call forwaded by the server side CF, CFU and CFB options. (If your phones use client side CF such as SIP redirects, this will not have any affect) If set to the default of 0, it will use the standard ring timer. If set to -1 it will ring the forwarded number with no limit which is consistent with the behavior of some existing PBX systems. If set to any other value, it will ring for that duration before diverting the call to the users voicemail if they have one. This can be overriden for each extension.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_SELECT;
-  $freepbx_conf->define_conf_setting('CFRINGTIMERDEFAULT',$set);
@@ -652 +676 @@
-  $set['value'] = '/var/lib/asterisk/bin';
-  $set['description'] = 'Location of the FreePBX command line scripts.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -659 +684 @@
-  $set['value'] = '/usr/sbin';
-  $set['description'] = 'Where (root) command line scripts are located.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -666 +692 @@
-  $set['value'] = '/var/www/html';
-  $set['description'] = 'The path to Apache webroot (leave off trailing slash).';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -673 +700 @@
-  $set['value'] = '/var/lib/asterisk/agi-bin';
-  $set['description'] = 'This is the default directory for Asterisks agi files.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -680 +708 @@
-  $set['value'] = '/etc/asterisk';
-  $set['description'] = 'This is the default directory for Asterisks configuration files.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -687 +716 @@
-  $set['value'] = '/var/log/asterisk';
-  $set['description'] = 'This is the default directory for Asterisks log files.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -694 +724 @@
-  $set['value'] = '/usr/lib/asterisk/modules';
-  $set['description'] = 'This is the default directory for Asterisks modules.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -701 +732 @@
-  $set['value'] = '/var/spool/asterisk';
-  $set['description'] = 'This is the default directory for Asterisks spool directory.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -708 +740 @@
-  $set['value'] = '/var/run/asterisk';
-  $set['description'] = 'This is the default directory for Asterisks run files.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -715 +748 @@
-  $set['value'] = '/var/lib/asterisk';
-  $set['description'] = 'This is the default directory for Asterisks lib files.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -722 +756 @@
-  $set['value'] = '/var/www/cgi-bin ';
-  $set['description'] = 'The path to Apache cgi-bin dir (leave off trailing slash).';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -729 +764 @@
-  $set['value'] = 'moh';
-  $set['description'] = 'This is the subdirectory for the MoH files/directories which is located in ASTVARLIBDIR if not specified it will default to mohmp3 for backward compatibility.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -743 +779 @@
-  $set['value'] = true;
-  $set['description'] = 'When set to the default value of true, all requests into FreePBX that might possibly add/edit/delete settings will be validated to assure the request is coming from the server. This will protect the system from CSRF (cross site request forgery) attacks. It will have the effect of preventing legitimately entering URLs that could modify settings which can be allowed by changing this field to false.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('CHECKREFERER',$set);
@@ -749 +786 @@
-  $set['value'] = false;
-  $set['description'] = 'Module Admin normally tries to get its online information through direct file open type calls to URLs that go back to the freepbx.org server. If it fails, typically because of content filters in firewalls that dont like the way PHP formats the requests, the code will fall back and try a wget to pull the information. This will often solve the problem. However, in such environment there can be a significant timeout before the failed file open calls to the URLs return and there are often 2-3 of these that occur. Setting this value will force FreePBX to avoid the attempt to open the URL and go straight to the wget calls.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('MODULEADMINWGET',$set);
@@ -755 +793 @@
-  $set['value'] = true;
-  $set['description'] = 'Controls if the menu items in the admin interface are sorted by category (true) or sorted alphebetically with no categories shown (false). Defaults = true';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('USECATEGORIES',$set);
@@ -761 +800 @@
-  $set['value'] = false;
-  $set['description'] = 'Precede browser title with the server name.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('SERVERINTITLE',$set);
@@ -767 +807 @@
-  $set['value'] = true;
-  $set['description'] = 'When set to false, will bypass the confirm on Reload Box.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('RELOADCONFIRM',$set);
@@ -773 +814 @@
-  $set['value'] = false;
-  $set['description'] = 'Setting either of these to true will result in retrieve_conf aborting during a reload if an extension conflict is detected or a destination is detected. It is usually better to allow the reload to go through and then correct the problem but these can be set if a more strict behavior is desired.';
+  $set['emptyok'] = 0;
-  $set['level'] = 3;
-  $set['type'] = CONF_TYPE_BOOL;
@@ -781 +823 @@
-  $set['value'] = false;
-  $set['description'] = 'Setting either of these to true will result in retrieve_conf aborting during a reload if an extension conflict is detected or a destination is detected. It is usually better to allow the reload to go through and then correct the problem but these can be set if a more strict behavior is desired.';
+  $set['emptyok'] = 0;
-  $set['level'] = 3;
-  $set['type'] = CONF_TYPE_BOOL;
@@ -789 +832 @@
-  $set['value'] = true;
-  $set['description'] = 'If false, then the Destination Registry will not report unknown destinations as errors. This should be left to the default true and custom destinations should be moved into the new custom apps registry.';
+  $set['emptyok'] = 0;
-  $set['level'] = 2;
-  $set['type'] = CONF_TYPE_BOOL;
@@ -803 +847 @@
-  $set['value'] = 'amp111';
-  $set['description'] = 'Password for accessing the Asterisk Manager Interface (AMI), you must change this in manager.conf if changed here.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 2;
@@ -811 +856 @@
-  $set['value'] = 'admin';
-  $set['description'] = 'Username for accessing the Asterisk Manager Interface (AMI), you must change this in manager.conf if changed here.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 2;
@@ -819 +865 @@
-  $set['value'] = 'localhost';
-  $set['description'] = 'Hostname for the Asterisk Manager';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $set['level'] = 2;
-  $freepbx_conf->define_conf_setting('ASTMANAGERHOST',$set);
-  $set['level'] = 0;
-
-  $set['type'] = CONF_TYPE_UINT;
-
-  // ASTMANAGERPORT
-  $set['value'] = '5038';
-  $set['description'] = 'Port for the Asterisk Manager';
-
+
+
+
-  $set['level'] = 2;
-  $freepbx_conf->define_conf_setting('ASTMANAGERPORT',$set);
@@ -837 +884 @@
-  $set['value'] = '';
-  $set['description'] = 'Optional port for an Asterisk Manager Proxy';
-
-
+
+
+
-  $set['level'] = 2;
-  $freepbx_conf->define_conf_setting('ASTMANAGERPROXYPORT',$set);
-  $set['level'] = 0;
-  $set['emptyok'] = 0;
-
-
@@ -854 +901 @@
-  $set['value'] = '/tmp/freepbx_debug.log';
-  $set['description'] = 'Full path and name of FreePBX debug file. Used by the dbug() funciton by developers.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('FPBXDBUGFILE',$set);
@@ -860 +908 @@
-  $set['value'] = false;
-  $set['description'] = 'This enables several debug features geared towards developers, including some page load timing information, some debug information in Module Admin, use of original CSS files and other future capabilities will be enabled.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('DEVEL',$set);
@@ -866 +915 @@
-  $set['value'] = false;
-  $set['description'] = 'Forces the "Apply Configuration Changes" reload bar to always be present even when not necessary.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('DEVELRELOAD',$set);
@@ -875 +925 @@
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('PRE_RELOAD',$set);
-  $set['emptyok'] = 0;
-
-  // POST_RELOAD
@@ -883 +932 @@
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('POST_RELOAD',$set);
-  $set['emptyok'] = 0;
-
-  // POST_RELOAD_DEBUG
-  $set['value'] = false;
-  $set['description'] = 'Display debug output for script used if POST_RELOAD is used.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('POST_RELOAD_DEBUG',$set);
@@ -894 +943 @@
-  $set['value'] = '';
-  $set['description'] = 'If this directory is defined, retrieve_conf will check for a file called <i>retrieve_conf_post_custom</i> and if that file exists, it will be included after other processing thus having full access to the current environment for addtional customization.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_DIR;
-  $freepbx_conf->define_conf_setting('AMPLOCALBIN',$set);
@@ -900 +950 @@
-  $set['value'] = true;
-  $set['description'] = 'Whether or not to invoke the FreePBX log facility.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('AMPDISABLELOG',$set);
@@ -906 +957 @@
-  $set['value'] = false;
-  $set['description'] = 'Whether or not to include log messages marked as <b>devel-debug</b> in the log system.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('AMPENABLEDEVELDEBUG',$set);
@@ -913 +965 @@
-  $set['options'] = 'LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG, LOG_SQL,SQL';
-  $set['description'] = 'Where to log if enabled, SQL, LOG_SQL logs to old MySQL table, others are passed to syslog system to determine where to log.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_SELECT;
-  $freepbx_conf->define_conf_setting('AMPSYSLOGLEVEL',$set);
@@ -919 +972 @@
-  $set['value'] = false;
-  $set['description'] = 'Stops the automatic generation of a stripped CSS file that replaces the primary sheet, usually mainstyle.css.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('DISABLE_CSS_AUTOGEN',$set);
@@ -933 +987 @@
-  $set['options'] = 'extension,lastname';
-  $set['description'] = 'How FOP sort extensions. By Last Name [lastname] or by Extension [extension].';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_SELECT;
-  $freepbx_conf->define_conf_setting('FOPSORT',$set);
@@ -939 +994 @@
-  $set['value'] = '/var/www/html/panel';
-  $set['description'] = 'Path to the Flash Operator Panel webroot (leave off trailing slash).';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_DIR;
-  $set['level'] = 4;
@@ -947 +1003 @@
-  $set['value'] = 'passw0rd';
-  $set['description'] = 'Password for performing transfers and hangups in the Flash Operator Panel (FOP).';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('FOPPASSWORD',$set);
@@ -953 +1010 @@
-  $set['value'] = false;
-  $set['description'] = 'Set to true to disable FOP in interface and retrieve_conf.  Useful for sqlite3 or if you do not want FOP.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('FOPDISABLE',$set);
@@ -959 +1017 @@
-  $set['value'] = true;
-  $set['description'] = 'Set to true if you want FOP started by freepbx_engine (amportal_start), false otherwise.';
+  $set['emptyok'] = 0;
-  $set['type'] = CONF_TYPE_BOOL;
-  $freepbx_conf->define_conf_setting('FOPRUN',$set);
@@ -968 +1027 @@
-  $set['category'] = 'Remote CDR Database';
-  $set['level'] = 3;
-  $set['emptyok'] = 1;
-
-  // CDRDBHOST
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX.<br>Hostname of db server if not the same as AMPDBHOST.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBHOST',$set);
@@ -979 +1038 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX.<br>Name of database used for cdr records.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBNAME',$set);
@@ -985 +1045 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX.<br>Password for connecting to db if its not the same as AMPDBPASS.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBPASS',$set);
@@ -991 +1052 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX.<br>Port number for db host.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBPORT',$set);
@@ -997 +1059 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX. Name of the table in the db where the cdr is stored. cdr is default.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBTABLENAME',$set);
@@ -1003 +1066 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX. Defaults to your configured AMDBENGINE.';
+  $set['emptyok'] = 1;
-  $set['options'] = ',mysql,postgres';
-  $set['type'] = CONF_TYPE_SELECT;
@@ -1010 +1074 @@
-  $set['value'] = '';
-  $set['description'] = 'DO NOT set this unless you know what you are doing. Only used if you dont use the default values provided by FreePBX. Username to connect to db with if it is not the same as AMPDBUSER.';
+  $set['emptyok'] = 1;
-  $set['type'] = CONF_TYPE_TEXT;
-  $freepbx_conf->define_conf_setting('CDRDBUSER',$set);
@@ -1019 +1084 @@
-  $set['category'] = 'Styling and Logos';
-  $set['level'] = 1;
-  $set['emptyok'] = 0;
-
-  // AMPADMINLOGO
@@ -1158 +1222 @@
-  $module_migrate['AMPBACKUPSUDO'] = CONF_TYPE_BOOL;
-  $module_migrate['USEQUEUESTATE'] = CONF_TYPE_BOOL;
-U
-U
-U
-U
+
+
+
+
-  $module_migrate['AMPMPG123'] = CONF_TYPE_BOOL;
-  $module_migrate['PARKINGPATCH'] = CONF_TYPE_BOOL;

modules/branches/2.9/core/advancedsettings.js

@@ -35 +35 @@
-        mythis.attr({src: 'images/accept.png'});
-        if (data != 'ok') {
-
+ + 'Error Info:' + data
-        } else {
-          mythis.parent().delay(500).fadeOut();

modules/branches/2.9/core/page.advancedsettings.php

@@ -1 +1 @@
-<?php /* $Id */
-// TODO: Get rid of undefined in http log. Sigh
-
-$getvars = array('level', 
-
-$var[$v] = isset($_REQUEST[$v]) ? $_REQUE
-
+  $getvars = array(
+  
+  $var[$v] = isset($_POST[$v]) ? $_PO
+  
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  exit;
-}
-  echo '<script type="text/javascript">';
-  echo 'can_write_amportalconf = "'.$amp_conf['amportal_canwrite'] .'"; ';
@@ -77 +80 @@
-      case CONF_TYPE_DIR:
-      case CONF_TYPE_INT:
-      case CONF_TYPE_UINT:
-        $readonly = $c['readonly'] ? 'readonly="readonly"' : '';
-        echo '<input class="valueinput" id="'.$c['keyword'].'" type="text" size="60" value="'.$amp_conf[$c['keyword']].'" data-valueinput-orig="'.$amp_conf[$c['keyword']].'" '.$readonly.'/>';

modules/branches/2.9/dashboard/install.php

@@ -24 +24 @@
-  $set['value'] = 6;
-  $set['defaultval'] =& $set['value'];
+  $set['options'] = array(6,10,20,30,45,60,120,300,600);
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
@@ -29 +30 @@
-  $set['module'] = 'dashboard';
-  $set['category'] = 'GUI Behavior';
-1
+0
-  $set['description'] = 'Update rate in seconds of all sections of the System Status panel except the Info box.';
-UIN
+SELEC
-  $freepbx_conf->define_conf_setting('DASHBOARD_STATS_UPDATE_TIME',$set);
-
@@ -38 +39 @@
-  $set['value'] = 30;
-  $set['defaultval'] =& $set['value'];
+  $set['options'] = array(15,30,60,120,300,600);
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
@@ -43 +45 @@
-  $set['module'] = 'dashboard';
-  $set['category'] = 'GUI Behavior';
-1
+0
-  $set['description'] = 'Update rate in seconds of the Info section of the System Status panel.';
-UIN
+SELEC
-  $freepbx_conf->define_conf_setting('DASHBOARD_INFO_UPDATE_TIME',$set);
-
@@ -52 +54 @@
-  $set['value'] = '';
-  $set['defaultval'] =& $set['value'];
+  $set['options'] = array(1,65535);
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
@@ -59 +62 @@
-  $set['emptyok'] = 1;
-  $set['description'] = 'SSH port number configured on your system if not using the default port 22, this allows the dashboard monitoring to watch the poper port.';
-U
+
-  $freepbx_conf->define_conf_setting('SSHPORT',$set);
-
@@ -66 +69 @@
-  $set['value'] = '';
-  $set['defaultval'] =& $set['value'];
+  $set['options'] = array(0,3000);
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
@@ -73 +77 @@
-  $set['emptyok'] = 1;
-  $set['description'] = 'Use this to pre-set the scale for maximum calls on the Dashboard display. If not set, the the scale is dynamically sized based on the active calls on the system.';
-U
+
-  $freepbx_conf->define_conf_setting('MAXCALLS',$set);
-