Changeset 8269

Timestamp:

08/31/09 21:44:46 (2 years ago)

Author:

p_lindheimer

Message:

closes #3529 move macro-systemrecording from core to recording module and change tmp folder location to Asterisk spool directory

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (1 diff)
• modules/branches/2.6/core/module.xml (modified) (2 diffs)
• modules/branches/2.6/recordings/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/recordings/module.xml (modified) (2 diffs)

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

@@ -1995 +1995 @@
-      //$ext->add($context, $exten, 'checkname', new ext_execif('$[ $[ "${CALLERID(number)}" = "${REALCALLERIDNUM}" ] & $[ "${CALLERID(name)}" = "" ] ]', 'Set', 'CALLERID(name)=${REALCALLERIDNAME}'));
-
-      
-
-      $context = 'macro-systemrecording';
-      
-      //exten => s,1,Set(RECFILE=${IF($["${ARG2}" = ""]?/tmp/${AMPUSER}-ivrrecording:${ARG2})})
-      $ext->add($context, 's', '', new ext_setvar('RECFILE','${IF($["${ARG2}" = ""]?/tmp/${AMPUSER}-ivrrecording:${ARG2})}'));
-      $ext->add($context, 's', '', new ext_execif('$["${ARG3}" != ""]','Authenticate','${ARG3}'));
-      $ext->add($context, 's', '', new ext_goto(1, '${ARG1}'));
-      
-      $exten = 'dorecord';
-      
-      // Delete all versions of the current sound file (does not consider languages though
-      // otherwise you might have some versions that are not re-recorded
-      //
-      $ext->add($context, $exten, '', new ext_system('rm ${ASTVARLIBDIR}/sounds/${RECFILE}.*'));
-      $ext->add($context, $exten, '', new ext_record('${RECFILE}:wav'));
-      $ext->add($context, $exten, '', new ext_wait(1));
-      $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
-
-      $exten = 'docheck';
-      
-      $ext->add($context, $exten, '', new ext_playback('beep'));
-      if ($ast_ge_14) {
-        $ext->add($context, $exten, 'dc_start', new ext_background('${RECFILE},m,${CHANNEL(language)},macro-systemrecording'));
-      } else {
-        $ext->add($context, $exten, 'dc_start', new ext_background('${RECFILE},m,${LANGUAGE},macro-systemrecording'));
-      }
-      $ext->add($context, $exten, '', new ext_wait(1));
-      $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
-
-      $exten = 'confmenu';
-      if ($ast_ge_14) {
-        $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star&astcc-followed-by-pound,m,${CHANNEL(language)},macro-systemrecording'));
-      } else {
-        $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star&astcc-followed-by-pound,m,${LANGUAGE},macro-systemrecording'));
-      }
-      $ext->add($context, $exten, '', new ext_read('RECRESULT', '', 1, '', '', 4));
-      $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x*"]', 'dorecord,1'));
-      $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x1"]', 'docheck,2'));
-      $ext->add($context, $exten, '', new ext_goto(1));
-      
-      $ext->add($context, '1', '', new ext_goto('dc_start', 'docheck'));
-      $ext->add($context, '*', '', new ext_goto(1, 'dorecord'));
-      
-      $ext->add($context, 't', '', new ext_playback('goodbye'));
-      $ext->add($context, 't', '', new ext_hangup());
-      
-      $ext->add($context, 'i', '', new ext_playback('pm-invalid-option'));
-      $ext->add($context, 'i', '', new ext_goto(1, 'confmenu'));
-
-      $ext->add($context, 'h', '', new ext_hangup());
-
-      
-      $context = 'from-zaptel';
-      $exten = '_X.';

modules/branches/2.6/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.6.0beta2.3* #3529
-    *2.6.0beta2.2* #3722, #3848, #3841, #3700
-    *2.6.0beta2.1* #3844 (revert #3423), #3846, #3849

modules/branches/2.6/recordings/functions.inc.php

@@ -3 +3 @@
-// Source and Destination Dirctories for recording
-global $recordings_astsnd_path; // PHP5 needs extra convincing of a global
-
+
+
-$recordings_astsnd_path = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk';
-$recordings_astsnd_path .= "/sounds/";
@@ -10 +11 @@
-  global $ext;  // is this the best way to pass this?
-  global $recordings_save_path;
+  global $version;
+
+  $ast_ge_14 = version_compare($version, '1.4', 'ge');
-  
-  $modulename = "recordings";
@@ -71 +75 @@
-        }
-      }
+
+      // moved from modules/core to modules/recordings
+      // since it really belongs here and not there
+      // also provides direct access to $recordings_save_path
+      // which removes a hard-coded value in the macro
+
+      $context = 'macro-systemrecording';
+      
+      $ext->add($context, 's', '', new ext_setvar('RECFILE','${IF($["${ARG2}" = ""]?'.$recordings_save_path.'${AMPUSER}-ivrrecording:${ARG2})}'));
+      $ext->add($context, 's', '', new ext_execif('$["${ARG3}" != ""]','Authenticate','${ARG3}'));
+      $ext->add($context, 's', '', new ext_goto(1, '${ARG1}'));
+      
+      $exten = 'dorecord';
+      
+      // Delete all versions of the current sound file (does not consider languages though
+      // otherwise you might have some versions that are not re-recorded
+      //
+      $ext->add($context, $exten, '', new ext_system('rm ${ASTVARLIBDIR}/sounds/${RECFILE}.*'));
+      $ext->add($context, $exten, '', new ext_record('${RECFILE}:wav'));
+      $ext->add($context, $exten, '', new ext_wait(1));
+      $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
+
+      $exten = 'docheck';
+      
+      $ext->add($context, $exten, '', new ext_playback('beep'));
+      if ($ast_ge_14) {
+        $ext->add($context, $exten, 'dc_start', new ext_background('${RECFILE},m,${CHANNEL(language)},macro-systemrecording'));
+      } else {
+        $ext->add($context, $exten, 'dc_start', new ext_background('${RECFILE},m,${LANGUAGE},macro-systemrecording'));
+      }
+      $ext->add($context, $exten, '', new ext_wait(1));
+      $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
+
+      $exten = 'confmenu';
+      if ($ast_ge_14) {
+        $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star&astcc-followed-by-pound,m,${CHANNEL(language)},macro-systemrecording'));
+      } else {
+        $ext->add($context, $exten, '', new ext_background('to-listen-to-it&press-1&to-rerecord-it&press-star&astcc-followed-by-pound,m,${LANGUAGE},macro-systemrecording'));
+      }
+      $ext->add($context, $exten, '', new ext_read('RECRESULT', '', 1, '', '', 4));
+      $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x*"]', 'dorecord,1'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x1"]', 'docheck,2'));
+      $ext->add($context, $exten, '', new ext_goto(1));
+      
+      $ext->add($context, '1', '', new ext_goto('dc_start', 'docheck'));
+      $ext->add($context, '*', '', new ext_goto(1, 'dorecord'));
+      
+      $ext->add($context, 't', '', new ext_playback('goodbye'));
+      $ext->add($context, 't', '', new ext_hangup());
+      
+      $ext->add($context, 'i', '', new ext_playback('pm-invalid-option'));
+      $ext->add($context, 'i', '', new ext_goto(1, 'confmenu'));
+
+      $ext->add($context, 'h', '', new ext_hangup());
+
-    break;
-  }

modules/branches/2.6/recordings/module.xml

@@ -2 +2 @@
-  <rawname>recordings</rawname>
-  <name>Recordings</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  <description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
-  <changelog>
+    *3.3.9.3* #3529
-    *3.3.9.2* #3779
-    *3.3.9.1* localizations, misc