Changeset 3254

Timestamp:

12/02/06 00:26:50 (5 years ago)

Author:

p_lindheimer

Message:

add the ability to set the moh class for outbound routes as well as for inbound routes and direct did routes

Files:

• freepbx/trunk/SQL/newinstall.sql (modified) (2 diffs)
• freepbx/trunk/SQL/newinstall.sqlite.sql (modified) (2 diffs)
• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (14 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.did.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.routing.php (modified) (3 diffs)
• freepbx/trunk/upgrades/2.3.0alpha/tables.php (added)

freepbx/trunk/SQL/newinstall.sql

@@ -262 +262 @@
-  `alertinfo` varchar(32) default NULL,
-  `channel` varchar(20) default NULL,
-
+
+
-) ENGINE=MyISAM;
-
@@ -365 +366 @@
-  `answer` tinyint(1) default NULL,
-  `wait` int(2) default NULL,
-
+
+
-) ENGINE=MyISAM;
-

freepbx/trunk/SQL/newinstall.sqlite.sql

@@ -185 +185 @@
-CREATE TABLE devices (id VARCHAR( 20 ) NOT NULL , tech VARCHAR( 10 ) NOT NULL , dial VARCHAR( 50 ) NOT NULL , devicetype VARCHAR( 5 ) NOT NULL , user VARCHAR( 50 ) , description VARCHAR( 50 ), emergency_cid VARCHAR( 100 ));
-
-
+, mohclass varchar(80) NOT NULL default 'default'
-
-
@@ -191 +191 @@
--- Need to incorporate their changes, comment out for now
---
-
+ , mohclass varchar(80) NOT NULL default 'default'
---
---

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -372 +372 @@
-exten => s,n,Set(OUTNUM=${OUTPREFIX_${DIAL_TRUNK}}${DIAL_NUMBER}) ; OUTNUM is the final dial number
-exten => s,n,Set(custom=${CUT(OUT_${DIAL_TRUNK},:,1)}) ; Custom trunks are prefixed with "AMP:"
-
+
+
+
+
+
+
+
+
-exten => s,n,Dial(${OUT_${DIAL_TRUNK}}/${OUTNUM},300,${DIAL_TRUNK_OPTIONS}) ; Regular Trunk Dial
-exten => s,n,Goto(s-${DIALSTATUS},1)
@@ -872 +879 @@
-exten => s,n,Goto(from-pstn,${DID},1)
-
+;------------------------------------------------------------------------
+; [macro-setmusic]
+;------------------------------------------------------------------------
+; CONTEXT:      macro-setmusic
+; PURPOSE:      to turn off moh on routes where it is not desired
+;
+;------------------------------------------------------------------------
+[macro-setmusic]
+exten => s,1,NoOp(Setting Outbound Route MoH To: ${ARG1})
+exten => s,2,SetMusicOnHold(${ARG1})
+;------------------------------------------------------------------------
+
-; ##########################################
-; ## Ring Groups with Confirmation macros ##

freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -191 +191 @@
-          // extensions_custom.conf
-          $ext->add($context, $exten, '', new ext_setvar('FROM_DID',$exten));
+
+          if (!empty($item['mohclass']) && trim($item['mohclass']) != 'default') {
+              $ext->add($context, $exten, '', new ext_setmusiconhold($item['mohclass']));
+          }
-
-          // If we require RINGING, signal it as soon as we enter.
@@ -299 +303 @@
-          $ext->add($context, $exten, '', new ext_setvar('FROM_DID',$exten));
-
+          if (!empty($item['mohclass']) && trim($item['mohclass']) != 'default') {
+            $ext->add($context, $exten, '', new ext_setmusiconhold($item['mohclass']));
+          }
-          
-          if ($item['faxexten'] != "default") {
@@ -381 +388 @@
-          if(strpos($exten['args'],"INTRACOMPANYROUTE") !== false)
-            $ext->add($outrt['application'], $exten['extension'], '', new ext_setvar("INTRACOMPANYROUTE",substr($exten['args'],18)));
+          if(strpos($exten['args'],"MOHCLASS") !== false)
+            $ext->add($outrt['application'], $exten['extension'], '', new ext_setvar("MOHCLASS",substr($exten['args'],9)));
-          if(strpos($exten['args'],"dialout-trunk") !== false)
-            $ext->add($outrt['application'], $exten['extension'], '', new ext_macro($exten['args']));
@@ -486 +495 @@
-  if (empty($existing)) {
-    $destination=${$goto_indicate0.'0'};
-) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$channel', '$ringing
+, mohclass) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$channel', '$ringing', '$mohclass
-    sql($sql);
-  } else {
@@ -1105 +1114 @@
-  
-  //insert into users table
-
+,mohclass
-  $sql.= "$extension\", \"";
-  $sql.= isset($password)?$password:'';
@@ -1135 +1144 @@
-  $sql.= "\", \"";
-  $sql.= isset($privacyman)?$privacyman:'';
-
+
+
-  $sql.= "\")";
-  sql($sql);
@@ -1244 +1254 @@
-
-function core_directdid_list(){
-
+mohclass, 
-  return sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-}
@@ -1830 +1840 @@
-
-
-
+
+
-  global $db;
-
@@ -1911 +1922 @@
-    }
-
+    // Next Priority (either first, second or third depending on above)
+    if(!empty($mohsilence) && trim($mohsilence) != 'default') {
+         $startpriority += 1;
+         $sql = "INSERT INTO extensions (context, extension, priority, application, args, descr) VALUES ";
+         $sql .= "('outrt-".$name."', ";
+         $sql .= "'".$pattern."', ";
+         $sql .= "'".$startpriority."', ";
+         $sql .= "'SetVar', ";
+         $sql .= "'MOHCLASS=".$mohsilence."', ";
+         $sql .= "'Do not play moh on this route')";
+         $result = $db->query($sql);
+        if(DB::IsError($result)) {
+             die($result->getMessage());
+        }
+    }
+
-    $first_trunk = 1;
-    foreach ($trunks as $priority => $trunk) {
@@ -1992 +2019 @@
-}
-
-
+, $mohsilence=""
-  core_routing_del($name);
-
+, $mohsilence
-}
-
@@ -2145 +2172 @@
-       }
-       return $intracompany;
+}
+
+//get mohsilence routing status for this route
+function core_routing_getroutemohsilence($route) {
+
+       global $db;
+       $sql = "SELECT DISTINCT args FROM extensions WHERE context = 'outrt-".$route."' AND (args LIKE 'MOHCLASS%') ";
+       $results = $db->getOne($sql);
+       if(DB::IsError($results)) {
+               die($results->getMessage());
+       }
+       if (preg_match('/^.*=(.*)/', $results, $matches)) {
+               $mohsilence = $matches[1];
+       } else {
+               $mohsilence = "";
+       }
+       return $mohsilence;
-}
-
@@ -2239 +2283 @@
-    $currentcomponent->setoptlistopts('faxdestoptions', 'sort', false);
-
+    if (function_exists('music_list')) {
+        $tresults = music_list("/var/lib/asterisk/mohmp3");
+        if (isset($tresults[0])) {
+      foreach ($tresults as $tresult) {
+          $currentcomponent->addoptlistitem('mohclass', $tresult, $tresult);
+      }
+        $currentcomponent->setoptlistopts('mohclass', 'sort', false);
+        }
+    }
+
-    //get unique devices to finishoff faxdestoptions list
-    $devices = core_devices_list();
@@ -2262 +2316 @@
-  // Ensure variables possibly extracted later exist
-  $name = $directdid = $didalert = $outboundcid = $answer = null;
-
+$mohclass =  
-
-  // Init vars from $_REQUEST[]
@@ -2334 +2388 @@
-    $currentcomponent->addguielem($section, new gui_textbox('directdid', $directdid, 'Direct DID', "The direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>Leave this field blank to disable the direct DID feature for this extension. All non-numeric characters will be stripped."), 3);
-    $currentcomponent->addguielem($section, new gui_textbox('didalert', $didalert, 'DID Alert Info', "Alert Info can be used for distinctive ring on SIP phones. Set this value to the desired Alert Info to be sent to the phone when this DID is called. Leave blank to use default values. Will have no effect if no Direct DID is set"));
+    if (function_exists('music_list')) {
+        $currentcomponent->addguielem($section, new gui_selectbox('mohclass', $currentcomponent->getoptlist('mohclass'), $mohclass, 'Music on Hold', "Set the MoH class that will be used for calls that come in on this Direct DID. For example, choose a type appropriate for a originating country which may have announcements in their language. Only effects MoH class when the call came in from the Direct DID.", false));
+    }
-    $currentcomponent->addguielem($section, new gui_textbox('outboundcid', $outboundcid, 'Outbound CID', "Overrides the caller id when dialing out a trunk. Any setting here will override the common outbound caller id set in the Trunks admin.<br><br>Format: <b>\"caller name\" &lt;#######&gt;</b><br><br>Leave this field blank to disable the outbound callerid feature for this user.", '!isCallerID()', $msgInvalidOutboundCID, true));
-

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.did.php

@@ -126 +126 @@
-if (!isset($alertinfo))
-  $alertinfo = 0;
+if (!isset($mohclass))
+  $mohclass = 'default';
-?>
-          <option value="default" <?php  echo ($faxexten == 'default' ? 'SELECTED' : '')?>><?php echo _("freePBX default")?>
@@ -193 +195 @@
-      <td><input type="text" name="alertinfo" size="10" value="<?php echo ($alertinfo)?$alertinfo:'' ?>"></td>
-    </tr>
+<?php   if (function_exists('music_list')) { ?>
+    <tr>
+      <td><a href="#" class="info"><?php echo _("Music On Hold?")?><span><?php echo _("Set the MoH class that will be used for calls that come in on this route. For example, choose a type appropriate for routes coming in from a country which may have announcements in their language.")?></span></a></td>
+      <td>
+        &nbsp;&nbsp;<select name="mohclass"/>
+        <?php
+          $tresults = music_list("/var/lib/asterisk/mohmp3");
+          $cur = (isset($mohclass) && $mohclass != "" ? $mohclass : 'default');
+          echo '<option value="none">'._("No Music")."</option>";
+          if (isset($tresults[0])) {
+            foreach ($tresults as $tresult) {
+              echo '<option value="'.$tresult.'"'.($tresult == $cur ? ' SELECTED' : '').'>'.$tresult."</option>\n";
+            }
+          }
+        ?>    
+        </select>   
+      </td>
+    </tr>
+<?php } ?>
-    <tr>
-      <td><a href="#" class="info"><?php echo _("Signal RINGING")?><span><?php echo _('Some devices or providers require RINGING to be sent before ANSWER. You\'ll notice this happening if you can send calls directly to a phone, but if you send it to an IVR, it won\'t connect the call.')?></span></a>:</td>

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.routing.php

@@ -86 +86 @@
-$emergency = isset($_REQUEST["emergency"]) ? $_REQUEST["emergency"] : "";
-$intracompany = isset($_REQUEST["intracompany"]) ? $_REQUEST["intracompany"] : "";
+$mohsilence = isset($_REQUEST["mohsilence"]) ? $_REQUEST["mohsilence"] : "";
-
-//if submitting form, update database
-switch ($action) {
-  case "addroute":
-
+, $mohsilence
-    needreload();
-    redirect_standard();
-  break;
-  case "editroute":
-
+, $mohsilence
-    needreload();
-    redirect_standard('extdisplay');
@@ -253 +254 @@
-    $intracompany = core_routing_getrouteintracompany($extdisplay);
-  }
+
+  if (!isset($_REQUEST["mohsilence"])) {
+    $mohsilence = core_routing_getroutemohsilence($extdisplay);
+  }
-  
-  echo "<h2>"._("Edit Route")."</h2>";
@@ -320 +325 @@
-      <td><input type="checkbox" name="intracompany" value="yes" <?php echo ($intracompany ? "CHECKED" : "") ?> /></td>
-    </tr>
+<?php   if (function_exists('music_list')) { ?>
+    <tr>
+      <td><a href="#" class="info"><?php echo _("Music On Hold?")?><span><?php echo _("You can choose to disable Music on Hold for this route. This is useful for know conference bridge lines or other calls where you don't want to broadcast music when you put a call on hold. You can alternatively choose which music category to use. For example, choose a type appropriate for a destination country which may have announcements in the appropriate language.")?></span></a></td>
+      <td>
+        &nbsp;&nbsp;<select name="mohsilence"/>
+        <?php
+          $tresults = music_list("/var/lib/asterisk/mohmp3");
+          $cur = (isset($mohsilence) && $mohsilence != "" ? $mohsilence : 'default');
+          if (isset($tresults[0])) {
+            foreach ($tresults as $tresult) {
+              echo '<option value="'.$tresult.'"'.($tresult == $cur ? ' SELECTED' : '').'>'.$tresult."</option>\n";
+            }
+          }
+        ?>    
+        </select>   
+      </td>
+    </tr>
+<?php } ?>
-    <tr>
-      <td colspan="2">