Changeset 13805

Timestamp:

03/14/12 14:33:02 (1 year ago)

Author:

p_lindheimer

Message:

provide option to leave mailbox= lines as some devices subscribe whether or not they have mailboxes leading to many notices in the logs re #5678

Files:

• freepbx/branches/2.10/libfreepbx.install.php (modified) (1 diff)
• modules/branches/2.10/core/functions.inc.php (modified) (2 diffs)

freepbx/branches/2.10/libfreepbx.install.php

@@ -2043 +2043 @@
-  $set['sortorder'] = 12;
-  $freepbx_conf->define_conf_setting('DEVICE_STRONG_SECRETS',$set);
+
+  // DEVICE_REMOVE_MAILBOX
+  $set['value'] = false;
+  $set['options'] = '';
+  $set['name'] = 'Remove mailbox Setting when no Voicemail';
+  $set['description'] = 'If set to true, any fixed device associated with a user that has no voicemail configured will have the "mailbox=" setting removed in the generated technology configuration file such as sip_additional.conf. This will not affect the value in the GUI.';
+  $set['readonly'] = 0;
+  $set['type'] = CONF_TYPE_BOOL;
+  $set['emptyok'] = 0;
+  $set['sortorder'] = 15;
+  $freepbx_conf->define_conf_setting('DEVICE_REMOVE_MAILBOX',$set);
-
-  // DEVICE_SIP_CANREINVITE

modules/branches/2.10/core/functions.inc.php

@@ -33 +33 @@
-  // map the actual vmcontext and user devicename if the device is fixed
-  private function map_dev_user($account, $keyword, $data) {
+    global $amp_conf;
-
-    if (!isset($this->dev_user_map)) {
@@ -45 +46 @@
-        case 'mailbox':
-          if ((empty($this->dev_user_map[$account]['vmcontext']) || $this->dev_user_map[$account]['vmcontext'] == 'novm') 
-
+ && $amp_conf['DEVICE_REMOVE_MAILBOX']
-            // they have no vm so don't put a mailbox=line
-            return "";