Changeset 11003

Timestamp:

01/17/11 18:45:41 (2 years ago)

Author:

p_lindheimer

Message:

make category madatory even for modules, makes things more clear re #4740

Files:

• freepbx/trunk/amp_conf/htdocs/admin/libraries/freepbx_conf.class.php (modified) (3 diffs)
• modules/branches/2.9/backup/install.php (modified) (3 diffs)
• modules/branches/2.9/dashboard/install.php (modified) (4 diffs)
• modules/branches/2.9/daynight/install.php (modified) (1 diff)
• modules/branches/2.9/music/install.php (modified) (1 diff)
• modules/branches/2.9/parking/install.php (modified) (1 diff)
• modules/branches/2.9/queues/install.php (modified) (1 diff)
• modules/branches/2.9/recordings/install.php (modified) (1 diff)
• modules/branches/2.9/timeconditions/install.php (modified) (2 diffs)

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

@@ -343 +343 @@
-      $attributes['type'] = $vars['type'];
-    }
-    if (isset($vars['category']) && $vars['category'] == '' && (!isset($vars['module']) || $vars['module'] == '')) {
-      die_freepbx(_("You must set either a category or a module attribute"));
-    }
-    if ($vars['type'] == CONF_TYPE_SELECT) {
-      if (!isset($vars['options']) || $vars['options'] == '') { 
@@ -356 +353 @@
-      $attributes['level'] = (int) $vars['level'];
-    }
+    if (isset($vars['category']) && $vars['category']) {
+      $attributes['category'] = $vars['category'];
+    }
-    $optional = array('readonly', 'hidden', 'emptyok');
-    foreach ($optional as $atrib) {
@@ -362 +362 @@
-      }
-    }
-category', '
+
-    foreach ($optional as $atrib) {
-      if (isset($vars[$atrib])) {

modules/branches/2.9/backup/install.php

@@ -297 +297 @@
-  $set['level'] = 0;
-  $set['module'] = 'backup';
-
+Backup Module
-  $set['emptyok'] = 1;
-  $set['description'] = 'The From: field for emails when using the backup email feature.';
@@ -311 +311 @@
-  $set['level'] = 2;
-  $set['module'] = 'backup';
-
+Backup Module
-  $set['emptyok'] = 1;
-  $set['description'] = 'Specifies that sudo should be used with backup functions, requires proper sudo configuration which can constitute a security compromise when setup.';
@@ -325 +325 @@
-  $set['level'] = 2;
-  $set['module'] = 'backup';
-
+Backup Module
-  $set['emptyok'] = 1;
-  $set['description'] = 'Adds some advanced and somewhat unspported features to the backup utility. This needs further clarification (or to be removed?)';

modules/branches/2.9/dashboard/install.php

@@ -28 +28 @@
-  $set['level'] = 0;
-  $set['module'] = 'dashboard';
-
+GUI Behavior
-  $set['emptyok'] = 1;
-  $set['description'] = 'Update rate in seconds of all sections of the System Status panel except the Info box.';
@@ -42 +42 @@
-  $set['level'] = 0;
-  $set['module'] = 'dashboard';
-
+GUI Behavior
-  $set['emptyok'] = 1;
-  $set['description'] = 'Update rate in seconds of the Info section of the System Status panel.';
@@ -56 +56 @@
-  $set['level'] = 2;
-  $set['module'] = 'dashboard';
-
+System Setup
-  $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.';
@@ -70 +70 @@
-  $set['level'] = 2;
-  $set['module'] = 'dashboard';
-
+GUI Behavior
-  $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.';

modules/branches/2.9/daynight/install.php

@@ -90 +90 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+1
-  $set['module'] = 'daynight';
-
+Day Night Module
-  $set['emptyok'] = 0;
-  $set['description'] = 'By default, the Day/Night module will not hook Time Conditions allowing one to associate a daynight manual override with a time condition since time conditions have their own feature code as of version 2.9. If there is already an associaiton configured (on an upgraded system), this will have no affect for the Time Conditions that are effected. Setting this to true reverts the 2.8 and prior behavior by allowing for the use of a daynight toggle to be associated with a time conditon. This can be useful for two scenarios. First, to override a Time Condition without the automatic resetting that occurs with the built in Time Condition overrides. The second use is the ability to associate a single daynight toggle with multiple time conditions thus creating a <b>master switch</b> that can be used to override several possible call flows through different time conditions.';

modules/branches/2.9/music/install.php

@@ -49 +49 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+3
-  $set['module'] = 'music';
-
+System Setup
-  $set['emptyok'] = 0;
-  $set['description'] = 'When set to false, the MP3 files can be loaded and WAV files converted to MP3 in the MoH module. The default behavior of true assumes you have mpg123 loaded as well as sox and will convert MP3 files to WAV. This is highly recommended as MP3 files heavily tax the system and can cause instability on a busy phone system';

modules/branches/2.9/parking/install.php

@@ -97 +97 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+3
-  $set['module'] = 'parking';
-
+System Setup
-  $set['emptyok'] = 0;
-  $set['description'] = 'Set to generate some additional dialplan if using a particular patch that was available in Asterisk 1.2 and 1.4 to add behavior to parking like adding Alert Info and CID prepends to timed out parked calls. This patch is mostly obsoleted and the setting will probably go away at some point when Asterisk 1.6+ parking enhacements are added to the module.';

modules/branches/2.9/queues/install.php

@@ -524 +524 @@
-  $set['level'] = 3;
-  $set['module'] = 'queues';
-
+System Setup
-  $set['emptyok'] = 0;
-  $set['description'] = 'Setting this flag will generate the required dialplan to integrate with the following Asterisk patch: <b>https://issues.asterisk.org/view.php?id=15168</b>. This setting is obsolete on Asterisk 1.8+ systems where the hint state is now standard and always used. This asterisk patch is only available on Asterisk 1.4, trying to use this setting on Asterisk 1.6 will break some queue behavior and should be avoided';

modules/branches/2.9/recordings/install.php

@@ -143 +143 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+3
-  $set['module'] = 'recordings';
-
+System Setup
-  $set['emptyok'] = 1;
-  $set['description'] = 'Crypt key used by this recordings module when accessing the recording files. Change from the default of "moufdsuu3nma0" if desired.';

modules/branches/2.9/timeconditions/install.php

@@ -260 +260 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+1
-  $set['module'] = 'timeconditions';
-
+Time Condition Module
-  $set['emptyok'] = 0;
-  $set['description'] = 'The polling interval in seconds used by the Time Conditions manintenace task, launched by an Asterisk call file used to update Time Conditions override states as well as keep custom device state hint values up-to-date when being used with BLF. A shorter interval will assure that BLF keys states are accurate. The interval should be less than the shortest configured span between two time condition states, so that a manual overide during such a period is properly reset when the new period starts.';
@@ -275 +275 @@
-  $set['readonly'] = 0;
-  $set['hidden'] = 0;
-0
+1
-  $set['module'] = 'timeconditions';
-
+Time Condition Module
-  $set['emptyok'] = 0;
-  $set['description'] = 'If set to false, this will override the execution of the Time Conditons maintenace task launched by call files. If all the feature codes for time conditions are disabled, the maintenance task will not be launched anyhow. Setting this to false would be fairly un-common. You may want to set this temporarily if debugging a system to avoid the periodic dialplan running through the CLI that the maintenance task launches and can be distracting.';