Changeset 7917

Timestamp:

08/02/09 22:51:36 (4 years ago)

Author:

p_lindheimer

Message:

Merged revisions 7697,7699-7701,7703-7707,7709-7710,7713-7722,7725-7731,7735-7736,7739-7740,7744-7751,7753-7758,7761,7763,7765-7769,7771-7774,7776-7785,7787,7789-7791,7793-7794,7798,7806,7808-7809,7811-7813,7816,7818-7821,7838,7858-7865,7867,7871,7875-7878,7881-7882,7886-7887,7889-7890,7892-7893,7895-7896,7901 via svnmerge from
http://svn.freepbx.org/modules/branches/2.6

........

r7697 | p_lindheimer | 2009-05-07 20:35:14 -0700 (Thu, 07 May 2009) | 1 line

fixes #3478 this appears to be an asterisk issue as it does not happen on all systems. Putting patch into 2.6 and after proper testing we can look at back porting it to 2.5

........

r7713 | mickecarlsson | 2009-05-08 12:38:29 -0700 (Fri, 08 May 2009) | 1 line

Fixed spelling errors in dialparties.agi

........

r7721 | xrobau | 2009-05-13 15:48:19 -0700 (Wed, 13 May 2009) | 2 lines

Apply fixes from #3423

........

r7728 | mickecarlsson | 2009-05-14 21:57:43 -0700 (Thu, 14 May 2009) | 1 line

Fixed spelling errors in extensions.conf

........

r7731 | xrobau | 2009-05-15 11:33:22 -0700 (Fri, 15 May 2009) | 2 lines

Minor tabindex warning cleanups

........

r7751 | p_lindheimer | 2009-05-26 12:42:42 -0700 (Tue, 26 May 2009) | 1 line

closes #3691 added usage of EXTENSION_STATE in dialparties in place of manager connection when present

........

r7753 | p_lindheimer | 2009-05-26 16:27:57 -0700 (Tue, 26 May 2009) | 1 line

use the STAT() function in place of the checksound.agi script for Asterisk 1.4+ systems, in vmx locater, to check for file

........

r7754 | p_lindheimer | 2009-05-26 17:11:23 -0700 (Tue, 26 May 2009) | 1 line

fixes #3693 change ZAP to DAHDI in trunk tech when generating config in ZAP2DAHDI compatibility mode

........

r7784 | p_lindheimer | 2009-06-01 12:19:05 -0700 (Mon, 01 Jun 2009) | 1 line

fixes #3705 so & can be used in sip and iax secrets, also modifies core_trunks_getDetails to provide a table of all the trunks from the new trunk table if no paramter is passed

........

r7838 | p_lindheimer | 2009-06-20 09:46:08 -0700 (Sat, 20 Jun 2009) | 1 line

add alwaysauthreject=yes to sip settings to enhance security

........

r7871 | p_lindheimer | 2009-06-26 22:04:39 -0700 (Fri, 26 Jun 2009) | 1 line

fix bug when accessing a stale page where the trunk no longer exists and no technology type is returned resulting in a sql query accessing a blank table

........

r7901 | p_lindheimer | 2009-07-25 08:43:58 -0700 (Sat, 25 Jul 2009) | 1 line

fixes #3792 create astman handle from AGI's unique 'new' function

........

Files:

• modules/branches/2.5 (modified) (1 prop)
• modules/branches/2.5/core/agi-bin/dialparties.agi (modified) (11 diffs)
• modules/branches/2.5/core/agi-bin/enumlookup.agi (modified) (5 diffs)
• modules/branches/2.5/core/etc/extensions.conf (modified) (14 diffs)
• modules/branches/2.5/core/functions.inc.php (modified) (16 diffs)
• modules/branches/2.5/core/module.xml (modified) (1 diff)
• modules/branches/2.5/core/page.did.php (modified) (1 diff)
• modules/branches/2.5/core/page.general.php (modified) (1 diff)
• modules/branches/2.5/core/page.routing.php (modified) (1 diff)

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

@@ -31 +31 @@
-require_once "phpagi-asmanager.php";
-
- 
- 
+
+
-$cidnum   = "";   // Caller ID Number for this call
-$cidname  = "";   // Caller ID Name for this call
-$timer    = "";   // Call timer for Dial command
-o
+O
-$rc       = "";   // Catch return code
-$priority = "";   // Next priority 
-$rgmethod = "";   // If Ring Group what ringing method was chosen
- // i
+// I
-$dsarray  = array();  // This will hold all the dial strings, used to check for duplicate extensions
-
@@ -59 +59 @@
-$cfignore    = strtoupper(trim($cfignore));
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -162 +168 @@
-
-// Clear it now so subsequent transfers don't honor it any longer
-ot th
+et thr
-// another level of local channels
-//
@@ -231 +237 @@
-    }
-  } else {
-g
+
-    $fmgrp_realprering = $fmgrp_prering;
-    array_unshift($ext,$fmgrp);
@@ -247 +253 @@
-  if (strlen($screen_call)) {
-    if($screen_call == 'nomemory' && $cidnum != '')  { // This can't go in the dialplan because macro-dial can get called multiple times
-c
+
-      // that could result in an arbitrary command being executed in this remove operation.
-      if (ctype_digit($cidnum)) {
@@ -261 +267 @@
-  }
-}
-IS
+HAVE
-// which means we reset the flag here after detecting that and just say we are not in master
-// mode and all is well. That means the loop below needs to be modified to detect the first
@@ -344 +350 @@
-  //
-  // if mastermode is set then the first extension will be examined and mastermode will be reset so that the others
-
+
+
-  //
-  // if cf unconditional was already detected on the primary, then mastermode will have been reset at this point
@@ -640 +647 @@
-  // Asterisk 1.6 uses , instead of | and 1.4 can't recieve a , in the ds.
-  //
-version_compare($ast_version, "1.6", "ge")) { 
+$ast_ge_16) {
-    $ds_seperator = ',';
-  } else {
@@ -690 +697 @@
-}
-
-
+
+
+
-
-// EOF dialparties.agi
@@ -711 +720 @@
-  
-  if (strpos($extnum,'#') != 0) {
-our
+rou
-    // If using call confirmation, need to put the # back into the new dialstring
-    // we then place all external calls (denoted with a # at the end) through
@@ -762 +771 @@
-function is_ext_avail( $extnum ) {
-  global $astman;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return $status;
-}

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

@@ -4 +4 @@
-// Replacement for Asterisk's ENUMLOOKUP function. 
-// Written by Rob Thomas <xrobau@gmail.com>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* --------WARNING---------
- * 
-
-
-
-
+
+
+
+
+
+
+
+
-
-require_once "phpagi.php";
@@ -21 +42 @@
-$lookup = get_var( $AGI, "DIAL_NUMBER" );
-
-
-
-
-
-
-
-
+
-
-$dialstr = "";
-
-
+  // Go through the ENUM providers and look for the number.
-  // Are we using php5 and can use get_dns_record?
-    if (function_exists("dns_get_record")) {
@@ -59 +74 @@
-      if (eregi('SIP|IAX', $row['tech'])) {
-        $URI = $row['URI'];
-
+
+
-      }
-    }
@@ -71 +87 @@
-  global $AGI;
-
-;
+
-  $arpa = "";
-  for ($i = 0; $i < strlen($lookup); $i++) {
@@ -144 +160 @@
-}
-
+function get_enum_providers() {
+  // parse enum.conf config file 
+  $localprefix_file = get_var($AGI, "ASTETCDIR")."/enum.conf"; 
+  if (file_exists($localprefix_file)) { 
+    $section="general"; 
+    parse_conf($localprefix_file, $conf, $section); 
+    if (count($conf) == 0) { 
+      $AGI->verbose("Could not parse config file $localprefix_file - using default e164.org", 0); 
+      return Array("e164.org");
+    } 
+  } else { 
+    $AGI->verbose("Could not open config file $localprefix_file - using default e164.org", 0); 
+    return Array("e164.org");
+  } 
+
+  $enums = Array(); 
+  // pickup search org from the conf array 
+  if (isset($conf["general"])) { 
+    foreach ($conf["general"] as $key=>$options) { 
+      if (isset($options["search"])) { 
+        foreach($options as $enumorgs) { 
+          $enums[]=$enumorgs; 
+        } // store each enumorg in array         
+      } // else, diff option  
+    } // else, this isn't the section we want 
+  } // else, no config for this section 
+}
+
+function parse_conf($filename, &$conf, &$section) { 
+  global $AGI; 
+  $AGI->verbose("Parsing config file $filename",3); 
+
+  if (is_null($conf)) { $conf = array(); } 
+
+  if (is_null($section)) { $section = "general"; } 
+
+  if (file_exists($filename)) { 
+    $fd = fopen($filename, "r"); 
+    while ($line = fgets($fd, 1024)) { 
+      if (preg_match("/^\s*([a-zA-Z0-9-_]+)\s*=>\s*(.*?)\s*([;#].*)?$/",$line,$matches)) { 
+        // name => => value 
+        // keep [] to allow for duplicate options like search 
+        // could extend options to include for example: 
+        // skipgateway => slow-sip-gateway.com 
+        // earlyexit => yes (to return only 1 enum from dns lookup)  
+        $conf[$section][][$matches[1]] = $matches[2]; 
+      } else if (preg_match("/^\s*\[(.+)\]/",$line,$matches)) { 
+        // section name 
+        $section = strtolower($matches[1]); 
+      } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) { 
+        // include another file 
+        if ($matches[1][0] == "/") { 
+          // absolute path 
+          $filename = $matches[1]; 
+        } else { 
+          // relative path 
+          $filename =  dirname($filename)."/".$matches[1]; 
+        } 
+        parse_conf($filename, $conf, $section); 
+      } 
+    }
+  }
+}
+
-?>

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

@@ -23 +23 @@
-; any custom dialplan SHOULD be put in extensions_custom.conf which will       *
-; not hurt a FreePBX generated dialplan. In some very rare and custom          *
-freepbx
+FreePBX
-; generates. If so anything in this file will do that.  If you come up with a  *
-; situation where you need to modify the existing dialplan or macro, please    *
@@ -43 +43 @@
-#include extensions_custom.conf
-
-     
+
-include => from-pstn
-
-[from-pstn]
-                     
+    
-include => ext-did
-include => ext-did-post-custom
-OIN (PL) for findmefollow if enabled, should be bo
+ION (PL) for findmefollow if enabled, should be be
-include => ext-did-catchall   ; THIS MUST COME AFTER ext-did
-exten => fax,1,Goto(ext-fax,in_fax,1)
@@ -57 +57 @@
-;
-; Required to assure that direct dids go to personal ring group before local extension.
-
+r
-; so that it can be modified if ext-local should take precedence in certain situations.
-; will have to decide what to do later.
@@ -101 +101 @@
-exten => s,n,Goto(s,a42)
-
-
+"
-;
-exten => s,n(a35),GotoIf($[$["${CALLTRACE_HUNT}" != "" ] & $["${RingGroupMethod}" = "memoryhunt" ]]?a36:a50)  
@@ -295 +295 @@
-; What to do on hangup.                                         
-[macro-hangupcall]
-exten => s,1,ResetCDR(vw)
-exten => s,n,NoCDR()
- 
-; Cleanup any remaining RG flag
-;
-n
+1
-exten => s,n,Noop(Cleaning Up Confirmation Flag: RG/${RINGGROUP_INDEX}/${CHANNEL})
-exten => s,n,DBDel(RG/${RINGGROUP_INDEX}/${CHANNEL})
@@ -350 +347 @@
-
-[macro-dialout-trunk-predial-hook]
-
+on
-; requirements that an installation may have.
-;
@@ -459 +456 @@
-; with congestion since there have been observed cases of the call continuing if not stopped with a 
-; congestion, and this provides a slightly more friendly 'sorry' message in case the user is
-a
+i
-;
-; Note: the following options are configurable in privacy.conf:
@@ -476 +473 @@
-exten => s,n(PRIVMGR),PrivacyManager()
-exten => s,n,GotoIf($["${PRIVACYMGRSTATUS}"="FAILED"]?fail)
-
+a
-exten => s,PRIVMGR+101(fail),Noop(STATUS: ${PRIVACYMGRSTATUS} CID: ${CALLERID(num)} ${CALLERID(name)} CALLPRES: ${CALLLINGPRES})
-exten => s,n,Playback(sorry-youre-having-problems)
@@ -490 +487 @@
-; try to playback using macro-tts-sayXXXXX (where XXXXX is text/digits/etc, same as
-; the macro below). If that macro exits with MACRO_OFFSET=100, then it's done, 
-
+o
-;
-; say text is purely for text-to-speech, there is no fallback
@@ -544 +541 @@
-[from-sip-external]
-;give external sip users congestion and hangup
-g
+
-; I do know what I'm doing. This is correct.
-exten => _.,1,NoOp(Received incoming SIP connection from unknown peer to ${EXTEN})
@@ -614 +611 @@
-[macro-dial-confirm]
-; This was written to make it easy to use macro-dial-confirm instead of macro-dial in generated dialplans.
-aters, with an additional parama
+eters, with an additional parame
-; ARG1 is the timeout
-; ARG2 is the DIAL_OPTIONS
@@ -635 +632 @@
-; USE_CONFIRMATION, RINGGROUP_INDEX
-;
-
+e
-;
-exten => s,n,Set(USE_CONFIRMATION=TRUE)
@@ -662 +659 @@
-;
-; ALERT_INFO is deprecated in Asterisk 1.4 but still used throughout the FreePBX dialplan and
-
+h
-; header if it is set.
-;
@@ -712 +709 @@
-;------------------------------------------------------------------------
-; This context is set as a target with FORWARD_CONTEXT when Call Forwarding is set to be
-
+r
-; CF is done in dialparties.agi but if a client device forwards a call, it will be caught
-; and blocked here.

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

@@ -216 +216 @@
-      $results2 = array();
-      foreach ($results2_pre as $element) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-          }
+        } else {
+          $results2[] = array('keyword'=>$element['keyword'],'data'=>$element['data']);
-        }
-      }
-      unset($results2_pre);
-
+      $context='';
-      foreach ($results2 as $result2) {
-$result2['data']
+strtolower($result2['data'])
-        if ($ver12) {
-
+
+
+
+
+
+
+
-        } else {
-          switch (strtolower($result2['keyword'])) {
@@ -239 +250 @@
-                $output .= "insecure=port\n";
-              else
-$option
+".$result2['data']."
-              break;
-            case 'allow':
-            case 'disallow':
-              if ($option != '')
-$option
+".$result2['data']."
-              break;
-            case 'record_in':
-            case 'record_out':
-              break;
+            case 'context':
+              $context = $result2['data'];
+              //fall-through
-            default:
-$option
+".$result2['data']."
-          }
-        }
@@ -347 +361 @@
-      $results2 = array();
-      foreach ($results2_pre as $element) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-          }
+        } else {
+          $results2[] = array('keyword'=>$element['keyword'],'data'=>$element['data']);
-        }
-      }
-      unset($results2_pre);
-
+      $context='';
-      foreach ($results2 as $result2) {
-$result2['data']
+strtolower($result2['data'])
-        if ($ver12) {
-
+
+
+
+
+
+
+
-        } else {
-          switch ($result2['keyword']) {
@@ -372 +397 @@
-                $output .= "transfer=mediaonly\n";
-              } else {
-$option
+".$result2['data']."
-              }
-              break;
@@ -378 +403 @@
-            case 'disallow':
-              if ($option != '')
-$option
+".$result2['data']."
-              break;
-            case 'record_in':
-            case 'record_out':
-              break;
+            case 'context':
+              $context = $option;
+              //fall-through
-            default:
-$option
+".$result2['data']."
-          }
-        }
+      }
+      switch (substr($id,0,8)) {
+        case 'tr-peer-':
+          if ($context == '') {
+            $output .= "context=from-trunk-iax2-$account\n";
+          }
+          break;
+        case 'tr-user-':
+          if ($context == '') {
+            $tn = substr($id, 8);
+            // this is a 'user' trunk, we need to get the name of the corresponding 'peer'
+            // trunk so we can set the context appropriately for the group count
+            //
+            $td = core_trunks_getDetails($tn);
+            if (isset($td['channelid'])) {
+              $output .= "context=from-trunk-iax2-".$td['channelid']."\n";
+            }
+          }
+          break;
+        default:
+          if ($call_limit) {
+            $output .= $call_limit;
+          }
-      }
-      $output .= $additional."\n";
@@ -630 +681 @@
-  global $core_conf;
-  global $chan_dahdi;
+  global $astman;;
-
-  $modulename = "core";
@@ -651 +703 @@
-          $core_conf->addSipGeneral('tos_audio','ef');   // Recommended setting from doc/ip-tos.txt
-          $core_conf->addSipGeneral('tos_video','af41'); // Recommended setting from doc/ip-tos.txt
+          $core_conf->addSipGeneral('alwaysauthreject','yes');
-        } else {
-          $core_conf->addSipGeneral('tos','0x68'); // This really doesn't do anything with astersk not running as root
@@ -1179 +1232 @@
-      foreach($globals as $global) {
-        $value = $global['value'];
-        if ($chan_dahdi && substr($value, 0, 4) === 'ZAP/') {
-          $value = 'DAHDI/' . substr($value, 4);
-        }
-        $ext->addGlobal($global['variable'],$value);
-
@@ -1228 +1278 @@
-        $ext->addGlobal('CALLINGPRES_35', 'prohib');
-        $ext->addGlobal('CALLINGPRES_67', 'unavailable');
+      }
+
+      // This checks if we have func_extstate loaded, if so we set the global which dialparties
+      // can use (and any other AGI script) to determine that this function exists and not connect
+      // to the manager to get the information
+      //
+      if (version_compare($version, '1.4', 'ge') && version_compare($version, '1.6', 'lt')) {
+        $response = $astman->send_request('Command', array('Command' => 'module show like func_extstate'));
+        if (preg_match('/1 modules loaded/', $response['data'])) {
+          $ext->addGlobal('HAS_EXTENSION_STATE', 'TRUE');
+        }
-      }
-
@@ -2086 +2147 @@
-      // If the required voicemail file does not exist, then abort and go to normal voicemail behavior
-      //
-
-
-
+
+
-      //
-      //exten => vmx,n,Macro(get-vmcontext,${ARG1})
@@ -2094 +2154 @@
-      //;exten => vmx,n,TrySystem(/bin/ls ${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.[wW][aA][vV])
-      //$ext->add('macro-vm', 'vmx', '', new ext_trysystem('/bin/ls ${ASTSPOOLDIR}/voicemail/${VMCONTEXT}/${ARG1}/${MODE}.[wW][aA][vV]'));
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-      // Get the repeat, timeout and loop times to use if they are overriden form the global settings
-
@@ -3632 +3693 @@
-  // conditionally, delete from iax or sip
-  switch (strtolower($tech)) {
+    case "iax2":
+      $tech = "iax";
+      // fall through
-    case "iax":
-    case "iax2":
@@ -3645 +3709 @@
-  //echo "editTrunk($trunknum, $channelid, $dialoutprefix, $maxchans, $outcid, $peerdetails, $usercontext, $userconfig, $register)";
-  $tech = core_trunks_getTrunkTech($trunknum);
+  if ($tech == "") {
+    return false;
+  }
-  core_trunks_del($trunknum, $tech);
-  core_trunks_backendAdd($trunknum, $tech, $channelid, $dialoutprefix, $maxchans, $outcid, $peerdetails, $usercontext, $userconfig, $register, $keepcid, $failtrunk, $disabletrunk);
@@ -3941 +4008 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE id = '9999$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -3977 +4044 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE id = '99999$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -3996 +4063 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE id = '9999999$trunknum'","getAll");

modules/branches/2.5/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-7
+8
-  <candisable>no</candisable>
-  <canuninstall>no</canuninstall>
-  <changelog>
-
+, #3478, #3423, #3691, #3693, #3705, #3792
-    *2.5.1.7* #3517, #3653, #3591
-    *2.5.1.6* #3439, #3526, #3534, moved macro-vm to auto-generation (WARNING: custom modification of macro-vm in extensions_custom.conf need to be moved to extensions_override_freepbx.conf

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

@@ -31 +31 @@
-$pricid = isset($_REQUEST['pricid'])?$_REQUEST['pricid']:'';
-
+$tabindex = 0;
+
-if (isset($_REQUEST['submitclear']) && isset($_REQUEST['goto0'])) {
-  $_REQUEST[$_REQUEST['goto0'].'0'] = '';

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

@@ -13 +13 @@
-
-$action = isset($_REQUEST['action'])?$_REQUEST['action']:'';
+$tabindex = 0;
-
-$cm =& cronmanager::create($db);

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

@@ -17 +17 @@
-$extdisplay=isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
-$action = isset($_REQUEST['action'])?$_REQUEST['action']:'';
+
+$tabindex = 0;
-
-$repotrunkdirection = isset($_REQUEST['repotrunkdirection'])?$_REQUEST['repotrunkdirection']:'';