Changeset 3335

Timestamp:

12/17/06 21:34:55 (5 years ago)

Author:

qldrob

Message:

Manually merge #3332 from 2.2 into trunk.

Files:

• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (15 diffs)

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.
@@ -303 +299 @@
-          $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") {
@@ -388 +381 @@
-          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']));
@@ -495 +486 @@
-  if (empty($existing)) {
-    $destination=${$goto_indicate0.'0'};
-, mohclass) 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
-    sql($sql);
-  } else {
@@ -1114 +1105 @@
-  
-  //insert into users table
-,mohclass
+
-  $sql.= "$extension\", \"";
-  $sql.= isset($password)?$password:'';
@@ -1144 +1135 @@
-  $sql.= "\", \"";
-  $sql.= isset($privacyman)?$privacyman:'';
-
-
+
-  $sql.= "\")";
-  sql($sql);
@@ -1254 +1244 @@
-
-function core_directdid_list(){
-mohclass, 
+
-  return sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-}
@@ -1840 +1830 @@
-
-
-
-
+
-  global $db;
-
@@ -1922 +1911 @@
-    }
-
-    // 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) {
@@ -2019 +1992 @@
-}
-
-, $mohsilence=""
+
-  core_routing_del($name);
-, $mohsilence
+
-}
-
@@ -2172 +2145 @@
-       }
-       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;
-}
-
@@ -2283 +2239 @@
-    $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();
@@ -2316 +2262 @@
-  // Ensure variables possibly extracted later exist
-  $name = $directdid = $didalert = $outboundcid = $answer = null;
-$mohclass =  
+
-
-  // Init vars from $_REQUEST[]
@@ -2383 +2329 @@
-      $currentcomponent->addjsfunc('onsubmit()', "\treturn checkBlankUserPwd();\n", 9);
-    }
-DispName
+OutboundCID
-    
-    $section = 'Extension Options';
-    $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));
-
@@ -2691 +2634 @@
-                core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid);
-                needreload();
-
+
+
+
-        break;
-        case "del":
-                core_devices_del($extdisplay);
-                needreload();
-
+
+
+
-        break;
-        case "edit":  //just delete and re-add