Changeset 12324

Timestamp:

07/26/11 18:35:56 (2 years ago)

Author:

p_lindheimer

Message:

initial checkin of recordings infrastructure change. Probably breaks seeing the old recordings in ARI but it's a start. Also no migration code, the recording file is expecting there to be a new field in the CDR database which will need to be addressed by migration code. For testing this can simply be added. The field is: recordingfile and is a VARCHAR 255

Files:

• modules/branches/2.10/conferences/functions.inc.php (modified) (1 diff)
• modules/branches/2.10/core/etc/extensions.conf (modified) (1 diff)
• modules/branches/2.10/core/functions.inc.php (modified) (13 diffs)
• modules/branches/2.10/findmefollow/functions.inc.php (modified) (1 diff)
• modules/branches/2.10/queues/functions.inc.php (modified) (4 diffs)
• modules/branches/2.10/ringgroups/functions.inc.php (modified) (6 diffs)
• modules/branches/2.10/ringgroups/install.php (modified) (2 diffs)
• modules/branches/2.10/ringgroups/module.xml (modified) (2 diffs)
• modules/branches/2.10/ringgroups/page.ringgroups.php (modified) (6 diffs)

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

@@ -171 +171 @@
-          $ext->add($contextname, $roomnum, '', new ext_setvar('MAX_PARTICIPANTS', $roomusers));
-          $ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_MUSIC',$music));
-
-
-
+
-          $ext->add($contextname, $roomnum, '', new ext_gotoif('$["${DIALSTATUS}" = "ANSWER"]',($roomuserpin == '' && $roomadminpin == '' ? 'USER' : 'READPIN')));  
-          $ext->add($contextname, $roomnum, '', new ext_answer(''));

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

@@ -493 +493 @@
-;-------------------------------------------------------------------------------
-
-;-------------------------------------------------------------------------------
-; macro-rg-group: [DEPRECATED]
-;
-; Ring groups of phones
-; ARGS: comma separated extension list
-; 1 - Ring Group Strategy
-; 2 - ringtimer
-; 3 - prefix
-; 4 - extension list
-;
-[macro-rg-group]
-exten => s,1,Macro(user-callerid,SKIPTTL) ; already called from ringgroup
-exten => s,2,GotoIf($["${CALLERID(name):0:${LEN(${RGPREFIX})}}" != "${RGPREFIX}"]?4:3)  ; check for old prefix
-exten => s,3,Set(CALLERID(name)=${CALLERID(name):${LEN(${RGPREFIX})}}) ; strip off old prefix
-exten => s,4,Set(RGPREFIX=${ARG3})  ; set new prefix
-exten => s,5,Set(CALLERID(name)=${RGPREFIX}${CALLERID(name)})  ; add prefix to callerid name
-exten => s,6,Set(RecordMethod=Group)  ; set new prefix
-exten => s,7,Macro(record-enable,${MACRO_EXTEN},${RecordMethod})
-exten => s,8,Set(RingGroupMethod=${ARG1})     ;
-exten => s,9,Macro(dial,${ARG2},${DIAL_OPTIONS},${ARG4})
-exten => s,10,Set(RingGroupMethod='')     ;
-;-------------------------------------------------------------------------------
-
-;-------------------------------------------------------------------------------
-; macro-dialout: [DEPRECATED]
-;
-; dialout and strip the prefix
-;
-[macro-dialout]
-exten => s,1,Macro(user-callerid,SKIPTTL)
-exten => s,2,GotoIf($["${ECID${CALLERID(number)}}" = ""]?5)   ;check for CID override for exten
-exten => s,3,Set(CALLERID(all)=${ECID${CALLERID(number)}})
-exten => s,4,Goto(7)
-exten => s,5,GotoIf($["${OUTCID_${ARG1}}" = ""]?7)    ;check for CID override for trunk
-exten => s,6,Set(CALLERID(all)=${OUTCID_${ARG1}})
-exten => s,7,Set(length=${LEN(${DIAL_OUT_${ARG1}})})
-exten => s,8,Dial(${OUT_${ARG1}}/${ARG2:${length}})
-exten => s,9,Playtones(congestion)
-exten => s,10,Congestion(5)
-exten => s,109,Macro(outisbusy)
-;-------------------------------------------------------------------------------
-
-;-------------------------------------------------------------------------------
-; macro-dialout-default: [DEPRECATED]
-;
-; dialout using default OUT trunk - no prefix
-;
-[macro-dialout-default]
-exten => s,1,Macro(user-callerid,SKIPTTL)
-exten => s,2,Macro(record-enable,${CALLERID(number)},OUT)
-exten => s,3,Macro(outbound-callerid,${ARG1})
-exten => s,4,Dial(${OUT}/${ARG1})
-exten => s,5,Playtones(congestion)
-exten => s,6,Congestion(5)
-exten => s,105,Macro(outisbusy)
-;-------------------------------------------------------------------------------
-
-;-------------------------------------------------------------------------------

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

@@ -188 +188 @@
-  }
-
-
+
+
-    $this->_applicationmap[] = array('key' => $key, 'value' => $value);
+    //
+    // Now add it to the DYNAMIC_FEATURES
+    // TODO: one caveat, if we ever want to make such an application conditional, we will have to change
+    // this as for now it makes it for everyone.
+    //
+    if ($add_to_dynamic_features) {
+      $ext->_globals['DYNAMIC_FEATURES'] = empty($ext->_globals['DYNAMIC_FEATURES']) ? $key : $ext->_globals['DYNAMIC_FEATURES'] . ',' . $key;
+    }
-  }
-
@@ -197 +206 @@
-    if (isset($this->_applicationmap) && is_array($this->_applicationmap)) {
-      foreach ($this->_applicationmap as $values) {
-
+>
-      }
-    }
@@ -901 +910 @@
-        $code = $fcc->getCodeActive();
-        unset($fcc);
-
+// 
-        if ($code != '') {
-
+
+
+
-        }
+        // TODO: *** NEED TO MAKE THIS SETTABLE, PLACE HOLDER AND HARD CODED FOR NOW. CAN BE:
+        //           'caller' or 'callee' so for dev testing can be overridden in globals_custom.conf
+        $ext->addGlobal('REC_POLICY','caller'); // TODO: IMPLEMENT THIS
-
-        $fcc = new featurecode($modulename, 'disconnect');
@@ -1813 +1827 @@
-      }
-
+/* TODO: Replaced, will remove this after some additional testing
+ *
-      // Generate macro-record-enable, if recording is disabled then we just make it a stub
-      // Otherwise we make it right
@@ -1852 +1868 @@
-        $ext->add($context, $exten, '', new ext_macroexit());
-      }
+*/
+
+/*
+; ARG1: type
+;       exten, out, rg, q, conf
+; ARG2: called_exten
+; ARG3: action (if we know it)
+;       always, never (note dontcare only applies to extensions, group, etc. must specify yes/no)
+;
+ */
+      $context = 'sub-record-cancel';
+      $exten = 's';
+
+      $ext->add($context, $exten, '', new ext_execif('$["${REC_STATUS}"!="RECORDING"]','Return'));
+      $ext->add($context, $exten, '', new ext_stopmixmonitor());
+      $ext->add($context, $exten, '', new ext_set('__REC_STATUS',''));
+      // TODO: need to put in default form MINMON_DIR if not set like with conf
+      // $ext->add($context, $exten, '', new ext_set('MEETME_RECORDINGFILE','${IF($[${LEN(${MIXMON_DIR})}]?${MIXMON_DIR}:${ASTSPOOLDIR}/monitor/)}${YEAR}/${MONTH}/${DAY}/${CALLFILENAME}'));
+      // also need to know format so set/check that
+      //
+      $ext->add($context, $exten, '', new ext_set('MON_BASE','${IF($[${LEN(${MIXMON_DIR})}]?${MIXMON_DIR}:${ASTSPOOLDIR}/monitor/)}${YEAR}/${MONTH}/${DAY}/'));
+      $ext->add($context, $exten, '', new ext_set('MON_FMT','${IF($[${LEN(${MIXMON_FORMAT})}]?${MIXMON_FORMAT}:wav)}'));
+      $ext->add($context, $exten, '', new ext_execif('$[${LEN(${CALLFILENAME})} & ${STAT(f,${MON_BASE}${CALLFILENAME}.${MON_FMT})}]','System','rm -f ${MON_BASE}${CALLFILENAME}.${MON_FMT}'));
+      $ext->add($context, $exten, '', new ext_set('__CALLFILENAME',''));
+      $ext->add($context, $exten, '', new ext_set('CDR(recordingfile)',''));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+
+      $context = 'sub-record-check';
+      $exten = 's';
+
+      $ext->add($context, $exten, '', new ext_gotoif('$["${BLINDTRANSFER}" = ""]', 'check'));
+      $ext->add($context, $exten, '', new ext_resetcdr(''));
+      $ext->add($context, $exten, 'check', new ext_gotoif('$["${REC_STATUS}"!="RECORDING"]', 'next'));
+      $ext->add($context, $exten, '', new ext_set('CDR(recordingfile)','${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+      $ext->add($context, $exten, 'next', new ext_execif('$[!${LEN(${ARG1})}]','Return'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${REC_STATUS}"!=""]','${ARG1},1'));
+      $ext->add($context, $exten, '', new ext_set('__REC_STATUS','INITIALIZED'));
+      $ext->add($context, $exten, '', new ext_set('__REC_POLICY_MODE','${ARG3}'));
+      $ext->add($context, $exten, '', new ext_set('NOW','${EPOCH}'));
+      $ext->add($context, $exten, '', new ext_set('__DAY','${STRFTIME(${NOW},,%d)}'));
+      $ext->add($context, $exten, '', new ext_set('__MONTH','${STRFTIME(${NOW},,%m)}'));
+      $ext->add($context, $exten, '', new ext_set('__YEAR','${STRFTIME(${NOW},,%Y)}'));
+      $ext->add($context, $exten, '', new ext_set('__TIMESTR','${YEAR}${MONTH}${DAY}-${STRFTIME(${NOW},,%H%M%S)}'));
+      $ext->add($context, $exten, '', new ext_set('__FROMEXTEN','${IF($[${LEN(${AMPUSER})}]?${AMPUSER}:${IF($[${LEN(${REALCALLERIDNUM})}]?${REALCALLERIDNUM}:unknown)})}'));
+      $ext->add($context, $exten, '', new ext_set('__CALLFILENAME','${ARG1}-${ARG2}-${FROMEXTEN}-${TIMESTR}-${UNIQUEID}'));
+      $ext->add($context, $exten, '', new ext_goto('1','${ARG1}'));
+
+      $exten = 'rg';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','record,1',false,'${EXTEN},${REC_POLICY_MODE},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'q';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','recq,1',false,'${EXTEN},${ARG2},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'out';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_set('__REC_POLICY_MODE','${DB(AMPUSER/${FROMEXTEN}/recording/out/external)}'));
+      $ext->add($context, $exten, '', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','record,1',false,'exten,${ARG2},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'exten';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_set('__REC_POLICY_MODE','${IF($[${LEN(${FROM_DID})}]?${DB(AMPUSER/${ARG2}/recording/in/external)}:${DB(AMPUSER/${ARG2}/recording/in/internal)})}'));
+      $ext->add($context, $exten, '', new ext_execif('$[!${LEN(${ARG3})}]','Return'));
+
+      /* If callee doesn't care, then go to caller to make decision
+       * Otherwise, if caller doesn't care, the go to callee to make decision
+       * Otherwise, if relative priorities are equal, use the global REC_POLICY
+       * Otherwise, use whomever has a higher priority
+       */
+      $ext->add($context, $exten, '', new ext_gotoif('$["${REC_POLICY_MODE}"="dontcare"]', 'caller'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DB(AMPUSER/${FROMEXTEN}/recording/out/internal)}"="dontcare"]', 'callee'));
+      $ext->add($context, $exten, '', new ext_set('CALLER_PRI','${IF($[${LEN(${DB(AMPUSER/${FROMEXTEN}/recording/priority)})}])?${DB(AMPUSER/${FROMEXTEN}/recording/priority)}:0}'));
+      $ext->add($context, $exten, '', new ext_set('CALLEE_PRI','${IF($[${LEN(${DB(AMPUSER/${ARG2}/recording/priority)})}])?${DB(AMPUSER/${ARG2}/recording/priority)}:0}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${CALLER_PRI}"="${CALLEE_PRI}"]', '${REC_POLICY}','${IF($["${CALLER_PRI}">"${CALLEE_PRI}"]?caller:callee)}'));
+
+      $ext->add($context, $exten, 'callee', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','record,1',false,'${EXTEN},${ARG2},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+      $ext->add($context, $exten, 'caller', new ext_set('REC_POLICY_MODE','${DB(AMPUSER/${FROMEXTEN}/recording/out/internal)}'));
+      $ext->add($context, $exten, '', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','record,1',false,'${EXTEN},${ARG2},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      // For confernecing we will set the variables (since the actual meetme does the recording) in case an option were to exist to do on-demand recording
+      // of the conference which doesn't currenly seem like it is supported but might.
+      //
+      $exten = 'conf';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_gosub('1','recconf',false,'${EXTEN},${ARG2},${ARG2}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'page';
+      $ext->add($context, $exten, '', new ext_noop_trace('Recording Check ${EXTEN} ${ARG2}'));
+      $ext->add($context, $exten, '', new ext_gosubif('$["${REC_POLICY_MODE}"="always"]','recconf,1',false,'${EXTEN},${ARG2},${FROMEXTEN}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'record';
+      $ext->add($context, $exten, '', new ext_noop_trace('Setting up recording: ${ARG1}, ${ARG2}, ${ARG3}'));
+      $ext->add($context, $exten, '', new ext_set('AUDIOHOOK_INHERIT(MixMonitor)','yes'));
+      $ext->add($context, $exten, '', new ext_mixmonitor('${MIXMON_DIR}${YEAR}/${MONTH}/${DAY}/${CALLFILENAME}.${MIXMON_FORMAT}','','${MIXMON_POST}'));
+      $ext->add($context, $exten, '', new ext_set('__REC_STATUS','RECORDING'));
+      $ext->add($context, $exten, '', new ext_set('CDR(recordingfile)','${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'recq';
+      $ext->add($context, $exten, '', new ext_noop_trace('Setting up recording: ${ARG1}, ${ARG2}, ${ARG3}'));
+      $ext->add($context, $exten, '', new ext_set('AUDIOHOOK_INHERIT(MixMonitor)','yes'));
+      $ext->add($context, $exten, '', new ext_set('MONITOR_FILENAME','${MIXMON_DIR}${YEAR}/${MONTH}/${DAY}/${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_set('__REC_STATUS','RECORDING'));
+      $ext->add($context, $exten, '', new ext_set('CDR(recordingfile)','${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      $exten = 'recconf';
+      $ext->add($context, $exten, '', new ext_noop_trace('Setting up recording: ${ARG1}, ${ARG2}, ${ARG3}'));
+      $ext->add($context, $exten, '', new ext_set('__CALLFILENAME','${IF($[${MEETME_INFO(parties,${ARG2})}]?${DB(RECCONF/${ARG2})}:${ARG1}-${ARG2}-${ARG3}-${TIMESTR}-${UNIQUEID})}'));
+      $ext->add($context, $exten, '', new ext_execif('$[!${MEETME_INFO(parties,${ARG2})}]','Set','DB(RECCONF/${ARG2})=${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_set('MEETME_RECORDINGFILE','${IF($[${LEN(${MIXMON_DIR})}]?${MIXMON_DIR}:${ASTSPOOLDIR}/monitor/)}${YEAR}/${MONTH}/${DAY}/${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_set('MEETME_RECORDINGFORMAT','${MIXMON_FORMAT}'));
+      $ext->add($context, $exten, '', new ext_execif('$["${REC_POLICY_MODE}"!="always','Return'));
+      $ext->add($context, $exten, '', new ext_set('__REC_STATUS','RECORDING'));
+      $ext->add($context, $exten, '', new ext_set('CDR(recordingfile)','${CALLFILENAME}'));
+      $ext->add($context, $exten, '', new ext_return(''));
+
+      /* macro-one-touch-record */
+
+      $context = 'macro-one-touch-record';
+      $exten = 's';
+
+      $ext->add($context, $exten, '', new ext_execif('$["${THISEXTEN}"=""]','Set','THISEXTEN=${IF($["${REALCALLERIDNUM}"=""]?${DIALEDPEERNUMBER}:${FROMEXTEN})}'));
+      $ext->add($context, $exten, '', new ext_execif('$["${DB(AMPUSER/${THISEXTEN}/recording/ondemand)}"!="enabled"]','MacroExit'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${MASTER_CHANNEL(ONETOUCH_REC)}"="RECORDING"]', 'stoprec'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${MASTER_CHANNEL(REC_POLICY_MODE)}"="never"]', 'stopped'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${MASTER_CHANNEL(ONETOUCH_REC)}"="" & "${MASTER_CHANNEL(REC_STATUS)}"="RECORDING"]', 'recording'));
+      $ext->add($context, $exten, '', new ext_set('MASTER_CHANNEL(ONETOUCH_REC)','RECORDING'));
+      $ext->add($context, $exten, '', new ext_set('MASTER_CHANNEL(REC_STATUS)','RECORDING'));
+      $ext->add($context, $exten, '', new ext_noop_trace('THISEXTEN: ${THISEXTEN} CALLFILENAME: ${CALLFILENAME}'));
+      $ext->add($context, $exten, 'mixmon', new ext_set('AUDIOHOOK_INHERIT(MixMonitor)','yes'));
+      $ext->add($context, $exten, '', new ext_mixmonitor('${MIXMON_DIR}${YEAR}/${MONTH}/${DAY}/${CALLFILENAME}.${MIXMON_FORMAT}','a','${MIXMON_POST}'));
+      $ext->add($context, $exten, '', new ext_set('MASTER_CHANNEL(CDR(recordingfile))','${CALLFILENAME}'));
+      $ext->add($context, $exten, 'recording', new ext_playback('beep'));
+      $ext->add($context, $exten, '', new ext_gosub('sstate', false, false,'${FROMEXTEN},INUSE'));
+      $ext->add($context, $exten, '', new ext_gosub('sstate', false, false,'${DIALEDPEERNUMBER},INUSE'));
+      $ext->add($context, $exten, '', new ext_macroexit());
+
+      $ext->add($context, $exten, 'stoprec', new ext_stopmixmonitor());
+      $ext->add($context, $exten, '', new ext_set('MASTER_CHANNEL(ONETOUCH_REC)','PAUSED'));
+      $ext->add($context, $exten, '', new ext_set('MASTER_CHANNEL(REC_STATUS)','PAUSED'));
+      $ext->add($context, $exten, '', new ext_execif('$["${THISEXTEN}"=""]','Set','THISEXTEN=${IF($["${REALCALLERIDNUM}"=""]?${DIALEDPEERNUMBER}:${FROMEXTEN})}'));
+      $ext->add($context, $exten, '', new ext_noop_trace('THISEXTEN: ${THISEXTEN} CALLFILENAME: ${CALLFILENAME}'));
+      $ext->add($context, $exten, 'stopped', new ext_playback('beep&beep'));
+      $ext->add($context, $exten, '', new ext_gosub('sstate', false, false,'${FROMEXTEN},NOT_INUSE'));
+      $ext->add($context, $exten, '', new ext_gosub('sstate', false, false,'${DIALEDPEERNUMBER},NOT_INUSE'));
+      $ext->add($context, $exten, '', new ext_macroexit());
+
+      $ext->add($context, $exten, 'sstate', new ext_set('DEVICES','${DB(AMPUSER/${ARG1}/device)}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${DEVICES}"=""]', 'return'));
+      $ext->add($context, $exten, '', new ext_set('LOOPCNT','${FIELDQTY(DEVICES,&)}'));
+      $ext->add($context, $exten, '', new ext_set('ITER','1'));
+      $ext->add($context, $exten, 'begin', new ext_set('DEVICE_STATE(Custom:RECORDING${CUT(DEVICES,&,${ITER})})','${ARG2}'));
+      $ext->add($context, $exten, '', new ext_set('ITER','$[${ITER}+1]'));
+      $ext->add($context, $exten, '', new ext_gotoif('$[${ITER}<=${LOOPCNT}]', 'begin'));
+      $ext->add($context, $exten, 'return', new ext_return(''));
+
-
-      /* macro-prepend-cid */
@@ -1948 +2131 @@
-          }
-          $ext->add($context, $exten, '', new ext_set("_NODEST",""));
-macro('record-enable,${AMPUSER},OUT
+gosub('1','s','sub-record-check','out,${EXTEN}
-
-          $password = $route['password'];
@@ -3226 +3409 @@
-      $ext->add($mcontext,$exten,'', new ext_set("__PICKUPMARK", '${ARG2}'));
-      $ext->add($mcontext,$exten,'', new ext_set("RT", '${IF($["${ARG1}"!="novm" | "${DB(CFU/${EXTTOCALL})}"!="" | "${DB(CFB/${EXTTOCALL})}"!="" | ${ARG3} | ${ARG4} | ${ARG5}]?${RINGTIMER}:"")}'));
-macro('record-enable','${EXTTOCALL},IN
+gosub('1','s','sub-record-check','exten,${EXTTOCALL}
-
-      // If paging module is not present, then what happens?
@@ -3549 +3732 @@
-        $skip_label = $next_label;
-      }
-
-
+
+
+
+
-
-      /* macro-hangupcall */
@@ -4866 +5051 @@
-  //build the recording variable
-  $recording = "out=".$record_out."|in=".$record_in;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  //escape quotes and any other bad chars:
-  if(!get_magic_quotes_gpc()) {
@@ -4930 +5148 @@
-    $astman->database_put("AMPUSER",$extension."/answermode","\"".isset($answermode)?$answermode:'disabled'."\"");
-
+    $astman->database_put("AMPUSER",$extension."/recording/in/external","\"".$recording_in_external."\"");
+    $astman->database_put("AMPUSER",$extension."/recording/out/external","\"".$recording_out_external."\"");
+    $astman->database_put("AMPUSER",$extension."/recording/in/internal","\"".$recording_in_internal."\"");
+    $astman->database_put("AMPUSER",$extension."/recording/out/internal","\"".$recording_out_internal."\"");
+    $astman->database_put("AMPUSER",$extension."/recording/ondemand","\"".$recording_ondemand."\"");
+    $astman->database_put("AMPUSER",$extension."/recording/priority","\"".isset($recording_priority)?$recording_priority:'10'."\"");
+
-    switch ($call_screen) {
-      case '0':
@@ -5040 +5265 @@
-    $results['cfringtimer'] = (int) $astman->database_get("AMPUSER",$extension."/cfringtimer");
-    $results['concurrency_limit'] = (int) $astman->database_get("AMPUSER",$extension."/concurrency_limit");
+
+    $results['recording_in_external'] = strtolower($astman->database_get("AMPUSER",$extension."/recording/in/external"));
+    $results['recording_out_external'] = strtolower($astman->database_get("AMPUSER",$extension."/recording/out/external"));
+    $results['recording_in_internal'] = strtolower($astman->database_get("AMPUSER",$extension."/recording/in/internal"));
+    $results['recording_out_internal'] = strtolower($astman->database_get("AMPUSER",$extension."/recording/out/internal"));
+    $results['recording_ondemand'] = strtolower($astman->database_get("AMPUSER",$extension."/recording/ondemand"));
+    $results['recording_priority'] = (int) $astman->database_get("AMPUSER",$extension."/recording/priority");
+
-  } else {
-    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
@@ -6230 +6463 @@
-    $currentcomponent->setoptlistopts('recordoptions', 'sort', false);
-
+    $currentcomponent->addoptlistitem('recording_options', 'always', _("Always"));
+    $currentcomponent->addoptlistitem('recording_options', 'dontcare', _("Don't Care"));
+    $currentcomponent->addoptlistitem('recording_options', 'never', _("Never"));
+    $currentcomponent->setoptlistopts('recording_options', 'sort', false);
+
+    for ($i=0; $i <= 20; $i++) {
+      $currentcomponent->addoptlistitem('recording_priority_options', "$i", "$i");
+    }
+
+    $currentcomponent->addoptlistitem('recording_ondemand_options', 'disabled', _("Disable"));
+    $currentcomponent->addoptlistitem('recording_ondemand_options', 'enabled', _("Enable"));
+    $currentcomponent->setoptlistopts('recording_ondemand_options', 'sort', false);
+
-    $currentcomponent->addoptlistitem('callwaiting', 'enabled', _("Enable"));
-    $currentcomponent->addoptlistitem('callwaiting', 'disabled', _("Disable"));
@@ -6511 +6757 @@
-    $currentcomponent->addguielem($section, new gui_selectbox('record_in', $currentcomponent->getoptlist('recordoptions'), $record_in, _("Record Incoming"), _("Record all inbound calls received at this extension."), false));
-    $currentcomponent->addguielem($section, new gui_selectbox('record_out', $currentcomponent->getoptlist('recordoptions'), $record_out, _("Record Outgoing"), _("Record all outbound calls received at this extension."), false));
+
+    $recording_in_external = isset($recording_in_external) ? $recording_in_external : 'dontcare';
+    $recording_out_external = isset($recording_out_external) ? $recording_out_external : 'dontcare';
+    $recording_in_internal = isset($recording_in_internal) ? $recording_in_internal : 'dontcare';
+    $recording_out_internal = isset($recording_out_internal) ? $recording_out_internal : 'dontcare';
+    $recording_ondemand = isset($recording_ondemand) ? $recording_ondemand : 'disabled';
+    $recording_priority = isset($recording_priority) ? $recording_priority : '10';
+    $currentcomponent->addguielem($section, new gui_radio('recording_in_external', $currentcomponent->getoptlist('recording_options'), $recording_in_external, _('Inbound External Calls'), _("Recording of inbound calls from external sources.")));
+    $currentcomponent->addguielem($section, new gui_radio('recording_out_external', $currentcomponent->getoptlist('recording_options'), $recording_out_external, _('Outbound External Calls'), _("Recording of outbound calls to external sources.")));
+    $currentcomponent->addguielem($section, new gui_radio('recording_in_internal', $currentcomponent->getoptlist('recording_options'), $recording_in_internal, _('Inbound Internal Calls'), _("Recording of calls received from other extensions on the system.")));
+    $currentcomponent->addguielem($section, new gui_radio('recording_out_internal', $currentcomponent->getoptlist('recording_options'), $recording_out_internal, _('Outbound Internal Calls'), _("Recording of calls made to other extensions on the system.")));
+    $currentcomponent->addguielem($section, new gui_radio('recording_ondemand', $currentcomponent->getoptlist('recording_ondemand_options'), $recording_ondemand, _('On Demand Recording'), _("Enable or disable the ability to do on demand (one-touch) recording. The overall calling policy rules still apply and if calls are already being recorded they can not be paused.")));
+    $currentcomponent->addguielem($section, new gui_selectbox('recording_priority', $currentcomponent->getoptlist('recording_priority_options'), $recording_priority, _("Record Priority Policy"), _("Call recording policy priority relative to other extensions when there is a conflict between an extension wanting recording and the other not wanting it. On a tie the global policy (caller or callee) wins."), false));
-
-    $section = _("Optional Destinations");

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

@@ -133 +133 @@
-          // the list
-          $ext->add($contextname, $grpnum, '', new ext_macro('record-enable','${DB(AMPUSER/'."$grpnum/followme/grplist)}-$grpnum".',${RecordMethod}'));
+
+          // Note there is no cancel later as the special case of follow-me, if they say record, it should stick
+          $ext->add($contextname, $grpnum, '', new ext_gosub('1','s','sub-record-check','exten,${EXTEN}'));
-
-          // MODIFIED (PL)

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

@@ -401 +401 @@
-            $ext->add('ext-queues', $exten, '', new ext_setvar('__ALERT_INFO', str_replace(';', '\;', $alertinfo)));
-          }
-
-
+
+
+
-          if ($amp_conf['QUEUES_MIX_MONITOR']) {
-            $monitor_options = '';
@@ -474 +475 @@
-            $ext->add('ext-queues', $exten, '', new ext_macro('blkvm-clr'));
-          }
+          // cancel any recording previously requested
+          //
+          $ext->add('ext-queues', $exten, '', new ext_gosub('1','s','sub-record-cancel'));
-          // If we are here, disable the NODEST as we want things to resume as normal
-          //
@@ -587 +591 @@
-        foreach($userlist as $item) {
-          $ext->add($from_queue_exten_only, $item[0], '', new ext_setvar('RingGroupMethod', 'none'));
-         
+          
-          if ($has_extension_state) {
-            $ext->add($from_queue_exten_only, $item[0], '', new ext_macro('dial-one',',${DIAL_OPTIONS},'.$item[0]));
@@ -1356 +1360 @@
-  }
-}
-?>

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

@@ -89 +89 @@
-          $toolate_id = $grp['toolate_id'];
-          $ringing = $grp['ringing'];
+          $recording = $grp['recording'] == '' ? 'dontcare' : $grp['recording'];
-
-          if($ringing == 'Ring' || empty($ringing) ) {
@@ -141 +142 @@
-
-          // recording stuff
-
-
+
+
+
+
+
-
-          // group dial
@@ -162 +166 @@
-            $ext->add($contextname, $grpnum, 'DIALGRP', new ext_macro('dial',$grptime.",$dialopts,".$grplist));
-          }
+          $ext->add($contextname, $grpnum, '', new ext_gosub('1','s','sub-record-cancel'));
-          $ext->add($contextname, $grpnum, '', new ext_setvar('RingGroupMethod',''));
-
@@ -241 +246 @@
-}
-
-
+, $recording='dontcare'
-  global $db;
-  global $astman;
@@ -256 +261 @@
-  print_r($extens);
-
-) VALUES ('".$db->escapeSimple($grpnum)."', '".$db->escapeSimple($strategy)."', ".$db->escapeSimple($grptime).", '".$db->escapeSimple($grppre)."', '".$db->escapeSimple($grplist)."', '".$annmsg_id."', '".$db->escapeSimple($postdest)."', '".$db->escapeSimple($desc)."', '".$db->escapeSimple($alertinfo)."', '$needsconf', '$remotealert_id', '$toolate_id', '$ringing', '$cwignore', '$cfignore', '$cpickup
+, recording) VALUES ('".$db->escapeSimple($grpnum)."', '".$db->escapeSimple($strategy)."', ".$db->escapeSimple($grptime).", '".$db->escapeSimple($grppre)."', '".$db->escapeSimple($grplist)."', '".$annmsg_id."', '".$db->escapeSimple($postdest)."', '".$db->escapeSimple($desc)."', '".$db->escapeSimple($alertinfo)."', '$needsconf', '$remotealert_id', '$toolate_id', '$ringing', '$cwignore', '$cfignore', '$cpickup', '$recording
-  $results = sql($sql);
-
@@ -358 +363 @@
-  global $astman;
-
-
+, recording
-  if ($astman) {
-    $astdb_changecid = strtolower($astman->database_get("RINGGROUP",$grpnum."/changecid"));

modules/branches/2.10/ringgroups/install.php

@@ -23 +23 @@
-  `cfignore` VARCHAR ( 10 ), 
-  `cpickup` VARCHAR ( 10 ), 
+  `recording` VARCHAR ( 10 ) default 'dontcare', 
-  PRIMARY KEY  (`grpnum`) 
-) 
@@ -161 +162 @@
-  }
-
+  $sql = "SELECT recording FROM ringgroups";
+  $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+  if(DB::IsError($check)) {
+    // add new field
+    $sql = "ALTER TABLE ringgroups ADD recording VARCHAR( 10 ) default 'dontcare' ;";
+    $result = $db->query($sql);
+    if(DB::IsError($result)) { die_freepbx($result->getDebugInfo()); }
+    out(_("added field recording to ringgroups table"));
+  }
+
-  // Version 2.5 migrate to recording ids
-  //

modules/branches/2.10/ringgroups/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>Ring Groups</name>
-9.0.6
+10.0.0
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -12 +12 @@
-  </description>
-  <changelog>
+    *2.10.0.0* #5283 Overhaul Call Recording
-    *2.9.0.6* #5011
-    *2.9.0.5* spellings, locazliations

modules/branches/2.10/ringgroups/page.ringgroups.php

@@ -13 +13 @@
-
-$dispnum = 'ringgroups'; //used for switch on config.php
-
-isset($_REQUEST['action'])?$action = $_REQUEST['action']:$action='';
-//the extension we are currently displaying
@@ -34 +33 @@
-isset($_REQUEST['changecid'])?$changecid = $_REQUEST['changecid']:$changecid='default';
-isset($_REQUEST['fixedcid'])?$fixedcid = $_REQUEST['fixedcid']:$fixedcid='';
+isset($_REQUEST['recording'])?$recording = $_REQUEST['recording']:$recording='dontcare';
-
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
@@ -81 +81 @@
-        $conflict_url = framework_display_extension_usage_alert($usage_arr);
-
-
+,$recording
-        needreload();
-        redirect_standard();
@@ -97 +97 @@
-    if ($action == 'edtGRP') {
-      ringgroups_del($account); 
-
+,$recording
-      needreload();
-      redirect_standard('extdisplay');
@@ -146 +146 @@
-    $changecid   = isset($thisgrp['changecid'])   ? $thisgrp['changecid']   : 'default';
-    $fixedcid    = isset($thisgrp['fixedcid'])    ? $thisgrp['fixedcid']    : '';
+    $recording = $thisgrp['recording'];
-    unset($grpliststr);
-    unset($thisgrp);
@@ -438 +439 @@
-      </tr>
-      
+      <tr><td colspan="2"><h5><?php echo _("Call Recording") ?><hr></h5></td></tr>
+      <tr>
+        <td><a href="#" class="info"><?php echo _("Record Calls")?><span><?php echo _('You can always record calls that come into this ring group, never record them, or allow the extension that answers to do on-demand recording. If recording is denied then one-touch on demand recording will be blocked.')?></span></a></td>
+        <td><span class="radioset">
+          <input type="radio" id="record_always" name="recording" value="always" <?php echo ($recording=='always'?'checked':'');?>><label for="record_always"><?php echo _('Always'); ?></label>
+          <input type="radio" id="record_dontcare" name="recording" value="dontcare" <?php echo ($recording=='dontcare'?'checked':'');?>><label for="record_dontcare"><?php echo _('On Demand')?></label>
+          <input type="radio" id="record_never" name="recording" value="never" <?php echo ($recording=='never'?'checked':'');?>><label for="record_never"><?php echo _('Never'); ?></label>
+        </span></td>
+      </tr>
+
-<?php
-      // implementation of module hook