Changeset 6521

Timestamp:

08/31/08 15:52:25 (3 months ago)

Author:

p_lindheimer

Message:

• closes #3131 requires r6519
  
• trimmed module.xml changelog
  
• added global variable RECORDING_STATE, used as master override
  to disabled all extension's recording settings.
  
• Added GUI setting in page.settings.php for RECORDING_STATE and
  redid most of the formatting for the whole page
  
• moved macro-record-enable to auto-generation and created stub
  macro if RECORDING_STATE is disabled
  
• changed agi recordingcheck to return to 'record' instead of 999
  but kept the priority 999 to avoid bugs for people who have
  broken systems and don't update their agi script
  
• tweaked a couple parts of dialparties.agi to remove a loop and and
  some other minor changes.
  
• requires the additions to extentions.class.php r6519
  

Files:

• modules/branches/2.5/core/agi-bin/dialparties.agi (modified) (4 diffs)
• modules/branches/2.5/core/agi-bin/recordingcheck (modified) (3 diffs)
• modules/branches/2.5/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.5/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.5/core/install.php (modified) (1 diff)
• modules/branches/2.5/core/module.xml (modified) (2 diffs)
• modules/branches/2.5/core/page.general.php (modified) (18 diffs)
• modules/branches/2.5/core/page.routing.php (modified) (1 diff)

modules/branches/2.5/core/agi-bin/dialparties.agi

@@ -234 +234 @@
-$astvarlibdir     = get_var( $AGI, "ASTVARLIBDIR" );
-// If this isn't a ring group, check to see if the user has call screening on
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-// IF THE FIRST EXTENSION IS CALL FORWARD ENABLED (put in logic) then we don't do master mode
@@ -309 +305 @@
-// Now check for DND
-foreach ( $ext as $k ) {
-trpos($k,"#")==0
+ubstr($k,-1)=='#'
-                // no point in doing if cf is enabled
-                $dnd = $AGI->database_get('DND',$k);
@@ -414 +410 @@
-        // if CF is not in use and $dndprimary is not set otherwise $extnum has been cleared and nothing to do
-        //
-trpos($k,"#")==0
+ubstr($k,-1)=='#'
-                // CW is not in use or CFB is in use on this extension, then we need to check!
-                if ( ($exthascw == 0) || ($exthascfb == 1) || ($exthascfu == 1) ) {
@@ -497 +493 @@
-                        }
-                        // Update Caller ID for calltrace application
-trpos($k,"#")==0
+ubstr($k,-1)=='#'
-                                if ( isset($cidnum) && is_numeric($cidnum) ) {
-                                        $rc = $AGI->database_put('CALLTRACE', $k, $cidnum);

modules/branches/2.5/core/agi-bin/recordingcheck

@@ -65 +65 @@
-                                        $agi->verbose("CALLFILENAME=g{$exten}-{$timestamp}-{$uniqueid}");
-                                        $agi->set_variable("CALLFILENAME","g{$exten}-{$timestamp}-{$uniqueid}");
-999
+'record'
-                                        exit(0);
-                                }
@@ -94 +94 @@
-                        $agi->verbose("CALLFILENAME=OUT{$exten['data']}-{$timestamp}-{$uniqueid}");
-                        $agi->set_variable("CALLFILENAME","OUT{$exten['data']}-{$timestamp}-{$uniqueid}");
-999
+'record'
-                        exit(0);
-                } else {
@@ -118 +118 @@
-                        $agi->verbose("CALLFILENAME={$timestamp}-{$uniqueid}");
-                        $agi->set_variable("CALLFILENAME","{$timestamp}-{$uniqueid}");
-999
+'record'
-                        exit(0);        
-                } else {

modules/branches/2.5/core/etc/extensions.conf

@@ -673 +673 @@
-;                    if set to "BYPASS" then this trunk will be skipped
-;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-; This macro is for dev purposes and just dumps channel/app variables.  Useful when designing new contexts. 

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

@@ -1140 +1140 @@
-                        );
-
+                        $disable_recording = false;
+
-                        $sql = "SELECT * FROM globals";
-                        $globals = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
@@ -1154 +1156 @@
-                                                unset($amp_conf_globals[$index]);
-                                        }
+                                }
+                                if (($global['variable'] == 'RECORDING_STATE') && (strtoupper($global['value']) == 'DISABLED')) {
+                                        $disable_recording = true;
-                                }
-                        }
@@ -1196 +1201 @@
-                                        $ext->addGlobal("PREFIX_TRUNK_$trunkname",count($entries));
-                                }
+                        }
+
+                        // Generate macro-record-enable, if recording is disabled then we just make it a stub
+                        // Otherwise we make it right
+                        //
+                        $context = 'macro-record-enable';
+                        $exten = 's';
+                        if ($disable_recording) {
+                                $ext->add($context, $exten, '', new ext_macroexit());
+                        } else {
+                                $ext->add($context, $exten, '', new ext_gotoif('$["${BLINDTRANSFER}" = ""]', 'check'));
+                                $ext->add($context, $exten, '', new ext_resetcdr('w'));
+                                $ext->add($context, $exten, '', new ext_stopmonitor());
+                                $ext->add($context, $exten, 'check', new ext_agi('recordingcheck,${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)},${UNIQUEID}'));
+                                $ext->add($context, $exten, '', new ext_macroexit());
+                                // keep this 999 in case people have issues updating their recording script
+                                $ext->add($context, $exten, 'record', new ext_mixmonitor('${MIXMON_DIR}${CALLFILENAME}.${MIXMON_FORMAT}','','${MIXMON_POST}'),'1',998);
-                        }
-

modules/branches/2.5/core/install.php

@@ -228 +228 @@
-}
-
+// Add variable RECORDING_STATE use to globally disable recording
+// TODO: move this to the upgrade script so it only has to be done
+//       once in a major upgrade when we move to next major release
+//
+outn("Checking for Global var RECORDING_STATE..");
+$nrows = $db->getOne("SELECT count(*) from globals where variable='RECORDING_STATE'");
+if (!$nrows) {
+        $db->query("insert into globals values ('RECORDING_STATE', 'ENABLED')");
+        out("Created");
+} else {
+        out("Already exists!");
+}
+
-?>

modules/branches/2.5/core/module.xml

@@ -4 +4 @@
-        <category>Basic</category>
-        <name>Core</name>
-1
+3
-        <candisable>no</candisable>
-        <canuninstall>no</canuninstall>
-        <changelog>
+                *2.5.0rc2.3* #3130, #2750, #3128, #3131 (requires r6519) added master recording disable (can be performance booster)
+                *2.5.0rc2.2* lots of changed to be updated
-                *2.5.0rc2.1* #3115, #3116 remove warning and add t option to nv_faxdetect
-                *2.5.0rc2.0* #3091, #3099, #3100 Added return from voicemail/busy to IVR support, added CID Priority Route Inbound Route option
@@ -23 +25 @@
-                *2.4.0.2* #2702, #2759, #2763, #2801, #2747, #2828, #2604, #2841, #2835 - review svn log or tickets for details
-                *2.4.0.1* #2693 fix DID editing creating new DID route introduced from #2664 fix
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        </changelog>
-        <depends>

modules/branches/2.5/core/page.general.php

@@ -20 +20 @@
-if ($action == 'editglobals') {
-        $globalfields = array(
+                  array($_REQUEST['RECORDING_STATE'],'RECORDING_STATE'),
-                  array($_REQUEST['MIXMON_FORMAT'],'MIXMON_FORMAT'),
-                                                array($_REQUEST['MIXMON_DIR'],'MIXMON_DIR'),
@@ -104 +105 @@
-
-<h5><?php echo _("Dialing Options")?></h5>
-
+
+
-        <a href=# class="info"><?php echo _("Asterisk Dial command options:")?><span><br>
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
@@ -112 +114 @@
-<?php echo _("W: Allow the calling user to start recording after pressing *1 (Asterisk v1.2)")?><br>
-        </span></a>
-
-
+
+
+
+
-        <a href=# class="info"><?php echo _("Asterisk Outbound Dial command options:")?><span><br>
-<?php echo _("t: Allow the called user to transfer the call by hitting #")?><br>
@@ -121 +125 @@
-<?php echo _("r: You SHOULD NOT use this option on outbound trunks")?><br>
-        </span></a>
-
-
+
+
+
+
-
-<h5><?php echo _("Call Recording")?></h5>
-
+
+
+
+
+
+
+
+
+
+
+
-  <a href=# class="info"><?php echo _("Call recording format:")?><span><br>
-  <?php echo _("Pick the format in which to save recorded calls")?><br>
-  </span></a>
+        </td><td align="right">
-  <select name="MIXMON_FORMAT" tabindex="<?php echo ++$tabindex;?>">
-  <option value="WAV"<?php if ($MIXMON_FORMAT == "WAV") echo " SELECTED"; ?>><?php echo _("WAV"); ?></option>
@@ -138 +155 @@
-  <option value="g729"<?php if ($MIXMON_FORMAT == "g729") echo " SELECTED"; ?>><?php echo _("g729"); ?></option>
-  </select>
-
+
+
-  <a href=# class="info"><?php echo _("Recording Location:")?><span><br>
-  <?php echo _("Override the default location where asterisk will store call recordings. Include the trailing /. Be sure to set proper permissions on the directory for the asterisk user.")?><br>
-  </span></a>
-
-
+
+
+
+
-  <a href=# class="info"><?php echo _("Run after record:")?><span><br>
-  <?php echo _("An optional script to be run after the call is hungup. You can include channel and MixMon variables like \${CALLFILENAME}, \${MIXMON_FORMAT} and \${MIXMON_DIR}. To ensure that you variables are properly escaped, use the following notation: ^{MY_VAR}")?><br>
-  </span></a>
-
-
-
+
+
+
+
-
-<h5><?php echo _("Voicemail")?></h5>
-
-
+
+
+
+
+
+
-        <input type="text" size="2" name="RINGTIMER" value="<?php  echo htmlspecialchars($RINGTIMER)?>" tabindex="<?php echo ++$tabindex;?>"/>
-
-
+
+
+
+
+
+
-        <input type="text" size="2" name="VM_PREFIX" value="<?php  echo htmlspecialchars($VM_PREFIX)?>" tabindex="<?php echo ++$tabindex;?>"/>
-
+
+
-        <?php echo _("Direct Dial to Voicemail message type:")?>
+        </td><td align="right">
-        <select name="VM_DDTYPE" tabindex="<?php echo ++$tabindex;?>">
-        <option value=""><?php echo _("Default"); ?></option>
-
-
-
-
+
+
-        <option value="s"<?php if ($VM_DDTYPE == "s") echo " SELECTED"; ?>><?php echo ("No Message"); ?></option>
-        </select>
-
-
+
+
+
-        <?php echo _("Use the specified amount of gain when recording the voicemail message."); ?><br><br>
-        <?php echo _("The units are whole-number decibels (dB)."); ?></span></a>
+        </td><td align="right">
-        <input type="text" size="2" name="VM_GAIN" value="<?php  echo htmlspecialchars($VM_GAIN)?>" tabindex="<?php echo ++$tabindex;?>"/>
-
-
-
+
+
+
+
+
+
+
-
-<h5><?php echo _("Voicemail VmX Locator")?></h5>
@@ -182 +217 @@
-                        <td>
-                        <a href=# class="info"><?php echo _("Default Context & Pri:")?><span>
-
-
-
-
-
+
+
+
+
-                </tr>
-                <tr>
@@ -193 +227 @@
-                        <?php echo _("This is the default location that a caller will be sent if they don't press any key (timeout) or press # which is interpreted as a timeout. Set this to 'dovm' to go to voicemail (default)."); ?></span></a>
-                        </td>
-><input type="text" size="18" name="VMX_TIMEDEST_CONTEXT" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_CONTEXT)?>" tabindex="<?php echo ++$tabindex;?>"/><small><?php echo _("context")?></small>
-><input type="text" size="4" name="VMX_TIMEDEST_EXT" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_EXT)?>" tabindex="<?php echo ++$tabindex;?>"/><small><?php echo _("exten")?></small>
-><input type="text" size="2" name="VMX_TIMEDEST_PRI" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_PRI)?>" tabindex="<?php echo ++$tabindex;?>"/
+ align="right"><input type="text" size="18" name="VMX_TIMEDEST_CONTEXT" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_CONTEXT)?>" tabindex="<?php echo ++$tabindex;?>"/>&nbsp;<small><?php echo _("context")?></small>&nbsp;
+ align="right"><input type="text" size="4" name="VMX_TIMEDEST_EXT" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_EXT)?>" tabindex="<?php echo ++$tabindex;?>"/>&nbsp;<small><?php echo _("exten")?></small>&nbsp;
+ align="right"><input type="text" size="2" name="VMX_TIMEDEST_PRI" value="<?php  echo htmlspecialchars($VMX_TIMEDEST_PRI)?>" tabindex="<?php echo ++$tabindex;?>"/></td><td
-                </tr>
-                <tr>
@@ -202 +236 @@
-                        <?php echo _("This is the default location that a caller will be sent if they press an invalid options too man times, as defined by the Maximum Loops count. Set this to 'dovm' to go to voicemail (default)."); ?></span></a>
-                        </td>
-><input type="text" size="18" name="VMX_LOOPDEST_CONTEXT" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_CONTEXT)?>" tabindex="<?php echo ++$tabindex;?>"/><small><?php echo _("context")?></small>
-><input type="text" size="4" name="VMX_LOOPDEST_EXT" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_EXT)?>" tabindex="<?php echo ++$tabindex;?>"/><small><?php echo _("exten")?></small>
-><input type="text" size="2" name="VMX_LOOPDEST_PRI" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_PRI)?>" tabindex="<?php echo ++$tabindex;?>"/
+ align="right"><input type="text" size="18" name="VMX_LOOPDEST_CONTEXT" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_CONTEXT)?>" tabindex="<?php echo ++$tabindex;?>"/>&nbsp;<small><?php echo _("context")?></small>&nbsp;
+ align="right"><input type="text" size="4" name="VMX_LOOPDEST_EXT" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_EXT)?>" tabindex="<?php echo ++$tabindex;?>"/>&nbsp;<small><?php echo _("exten")?></small>&nbsp;
+ align="right"><input type="text" size="2" name="VMX_LOOPDEST_PRI" value="<?php  echo htmlspecialchars($VMX_LOOPDEST_PRI)?>" tabindex="<?php echo ++$tabindex;?>"/></td><td
-                </tr>
-                <tr>
@@ -211 +245 @@
-                        <?php echo _("If this destination is voicemail, select whether or not to play the standard voicemail instructions or just beep."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_OPTS_TIMEOUT" tabindex="<?php echo ++$tabindex;?>">
-                                <option value=""  <?php  echo ($VMX_OPTS_TIMEOUT == '' ? 'SELECTED' : '') ?>><?php echo _("Std Instructions")?>
@@ -223 +257 @@
-                        <?php echo _("If this destination is voicemail, select whether or not to play the standard voicemail instructions or just beep."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_OPTS_LOOP" tabindex="<?php echo ++$tabindex;?>">
-                                <option value=""  <?php  echo ($VMX_OPTS_LOOP == '' ? 'SELECTED' : '') ?>><?php echo _("Std Instructions")?>
@@ -235 +269 @@
-                        <?php echo _("If a user defined option is to go to voicemail (using the 'dovm' extension) this is the default option if not specified by the user's settings."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_OPTS_DOVM" tabindex="<?php echo ++$tabindex;?>">
-                                <option value=""  <?php  echo ($VMX_OPTS_DOVM == '' ? 'SELECTED' : '') ?>><?php echo _("Std Instructions")?>
@@ -247 +281 @@
-                        <?php echo _("Time ot wait after message has played to timeout and/or repeat the message if no entry pressed."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_TIMEOUT" tabindex="<?php echo ++$tabindex;?>">
-<?php
@@ -265 +299 @@
-                        <?php echo _("Number of times to play the recorded message if the caller does not press any options and it times out."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_REPEAT" tabindex="<?php echo ++$tabindex;?>">
-<?php
@@ -283 +317 @@
-                        <?php echo _("Number of times to play invalid options and repeat the message upon receiving an undefined option."); ?></span></a>
-                        </td>
-align=right
+colspan="3" align="right"
-                        <select name="VMX_LOOPS" tabindex="<?php echo ++$tabindex;?>">
-<?php
@@ -297 +331 @@
-                </tr>
-        </table>
-<p>
-
-</p>
-
-<h5><?php echo _("Company Directory")?></h5>
-
-
+
+
+
+
-        <select name="DIRECTORY" tabindex="<?php echo ++$tabindex;?>">
-                <option value="first" <?php  echo ($DIRECTORY == 'first' ? 'SELECTED' : '')?>><?php echo _("first name")?>
@@ -309 +342 @@
-                <option value="both" <?php  echo ($DIRECTORY == 'both' ? 'SELECTED' : '')?>><?php echo _("first or last name")?>
-        </select> 
-
-
+
+
+
+
+
+
+
-        <a href=# class="info"><?php echo _("Operator Extension:")?><span>
-        <?php echo _("When users hit '0' in the directory, they are put through to this number. Note that it"); ?>
-        <?php echo _(" does NOT need to be an extension, it can be a Ring Group, or even an external number."); ?></span></a>
+        </td><td align="right">
-        <input type="text" size="10" name="OPERATOR_XTN" value="<?php  echo htmlspecialchars($OPERATOR_XTN)?>" tabindex="<?php echo ++$tabindex;?>"/>
-
+
+
+
-<h5><?php echo _("Fax Machine")?></h5>
-
+
+
-        <?php echo _("Extension of")?> <a class="info" href="#"><?php echo _("fax machine")?><span><?php echo _("Select 'system' to have the system receive and email faxes.<br>Selecting 'disabled' will result in incoming calls being answered more quickly.")?></span></a> <?php echo _("for receiving faxes:")?>
-        <!--<input type="text" size="8" name="FAX_RX" value="<?php  echo $FAX_RX?>"/>-->
+        </td><td align="right">
-        <select name="FAX_RX" tabindex="<?php echo ++$tabindex;?>">
-                <option value="disabled" <?php  echo ($FAX_RX == 'disabled' ? 'SELECTED' : '')?>><?php echo _("disabled")?>
@@ -333 +376 @@
-?>      
-        </select>
-
-
-
+
+
-        <a class="info" href="#"><?php echo _("Email address")?><span><?php echo _("Email address used if 'system' has been chosen for the fax extension above.")?></span></a> <?php echo _("to have faxes emailed to:")?>
-
-
-
+
+
+
+
-        <a class="info" href="#"><?php echo _("Email address")?><span><?php echo _("Email address that faxes appear to come from if 'system' has been chosen for the fax extension above.")?></span></a> <?php echo _("that faxes appear to come from:")?>
-
-
+
+
+
+
-<h5><?php echo _("International Settings")?></h5>
-
-
+
+
+
+
-        <?php   if (isset($TONEZONE) && strlen($TONEZONE)) 
-                general_display_zones($TONEZONE); 
@@ -351 +398 @@
-                general_display_zones('us'); 
-                ?>
-
-
-
+
+
+
+
-        <select name="TIMEFORMAT" tabindex="<?php echo ++$tabindex;?>">
-                <option value="IMp"><?php echo _("no"); ?></option>
-                <option value="kM" <?php echo (($TIMEFORMAT=="kM") ? 'selected="selected"' : '');?>><?php echo _("yes"); ?></option>
-        </select>
-
+
+
-<h5><?php echo _("Security Settings")?></h5>
-
+
+
-        <a href=# class="info"><?php echo _("Allow Anonymous Inbound SIP Calls?")?><span><br>
-<?php echo _("** WARNING **")?><br><br>
-<?php echo _("Setting this to 'yes' will potentially allow ANYBODY to call into your Asterisk server using the SIP protocol")?><br><br>
-<?php echo _("It should only be used if you fully understand the impact of allowing anonymous calls into your server")?><br>
-
+
+
-        <select name="ALLOW_SIP_ANON" tabindex="<?php echo ++$tabindex;?>">
-        <option value="no"><?php echo _("no"); ?></option>
-        <option <?php if ($ALLOW_SIP_ANON == "yes") echo "SELECTED "?>value="yes"><?php echo _("yes"); ?></option>
-        </select>
-
+
+
-
-<h5><?php echo _("Online Updates")?></h5>

modules/branches/2.5/core/page.routing.php

@@ -552 +552 @@
-?>
-                <tr>
- &nbsp 
+&nbsp;
-                        <td>
-                                <select id='trunkpri<?php echo $key ?>' name="trunkpriority[<?php echo $key ?>]">