Changeset 2763

Timestamp:

10/18/06 05:58:23 (7 years ago)

Author:

diego_iastrubni

Message:

this patch removes an obosolete code:

if ($extstate > 0 && $extstate != 4)
{

/// blabla bla
...
if ( ($extstate == 4) )
{
}

}

as you see, the inner if is not reached at all. time to remove...

i also modified the format of the indentations, removed trailing spaces, trhe general purpose is to make the file
more readable by removing empty lines (you see more code on screen, which should help debug this crap).

todo:
remove comments from the code, to more readable central places. move code into functions...

Files:

• freepbx/trunk/amp_conf/agi-bin/dialparties.agi (modified) (32 diffs)

freepbx/trunk/amp_conf/agi-bin/dialparties.agi

@@ -1 +1 @@
-#!/usr/bin/php -q
-<?php 
-
+
-// Copyright (C) 2003 Zac Sprackett <zsprackett-asterisk@sprackett.com>
-//
@@ -18 +18 @@
-// info@coalescentsystems.ca
-// 
-
+
+
-
-$config = parse_amportal_conf( "/etc/amportal.conf" );
@@ -27 +28 @@
-$debug = 4;
-
-="";      
-=""; 
-="";   
-="";  
-="";    
-=""; 
-="";       
-=""; 
-=""; 
- = array(); 
+   = "";   
+  = "";   
+    = "";   
+ = "";   
+   = "";   
+  = "";   
+    = "";   
+  = "";   
+  = "";   
+ = array();  
-
-$AGI = new AGI();
-0
+1
-
-$priority = get_var( $AGI, "priority" ) + 1;
-
+, 1
-
-// Caller ID info is stored in $request in AGI class, passed from Asterisk
@@ -51 +52 @@
-// From this point forward, Set KEEPCID in the channel so subsequent calls, CF, etc. retain the incoming
-// CID that get sent down channel local.
-
-
+
-
-$timer    = get_var( $AGI, "ARG1" );
@@ -58 +58 @@
-$rgmethod = get_var( $AGI, "RingGroupMethod" );
-
- 
-  
+  
+ 
-
-if (empty($timer))  $timer    = 0;
@@ -65 +65 @@
-if (empty($rgmethod)) $rgmethod = "none";
-
-  
+ 
-
-debug("Methodology of ring is  '$rgmethod'", 1);
-
-debug("USE_CONFIRMATION:  '$use_confirmation'", 4);
-debug("RINGGROUP_INDEX:   '$ringgroup_index'", 4);
@@ -75 +74 @@
-// master mode.
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-} else 
-
-
-
+
-
-// call confirmation only works with ringall and ringall-prim. The javascripts in ringgroups
@@ -102 +96 @@
-}
-
-
-
-// Start with Arg Count set to 3 as two args are used
-$arg_cnt = 3;
- ($arg = get_var($AGI,"ARG". $arg_cnt)) 
-
- 
+$arg = get_var($AGI,"ARG". $arg_cnt)
+
+
-  {  // not sure why, dialparties will get stuck in a loop if noresponse
-    debug("get_variable got a \"noresponse\"!  Exiting",3);
@@ -137 +129 @@
-  $cf  = $AGI->database_get('CF',$k);
-  $cf  = $cf['data'];
- 
+
-  {
-    // append a hash sign so we can send out on chan_local below.
@@ -151 +143 @@
-      debug("Primary ext is CF so disabling mastermode if it was set", 4);
-    }
-
-
-
+
+
-    debug("Extension $k cf is disabled", 3);
-  }
-  $count++;
-}
@@ -163 +153 @@
-// sort of flag that says master mode DND so skip everything else below (set them all to "").
-//
-
-
-// Hacky.
@@ -170 +159 @@
-// Now check for DND
-foreach ( $ext as $k )
-
-
+
-  if ( (strpos($k,"#")==0) )
-   
+
-    // no point in doing if cf is enabled
-    $dnd = $AGI->database_get('DND',$k);
@@ -191 +179 @@
-      }
-    } 
-
-
+
-      debug("Extension $k do not disturb is disabled", 3);
-    }
-  }
-  $count++;
@@ -200 +186 @@
-
-// Main calling loop
-
-$skipremaining = 0; // used to allow primary to ring but skip the rest
-
@@ -217 +202 @@
-  // if dnd was set on the primary then dndprimary will already be set resulting in a completly blanked out list
-  // since dnd on the primary means don't bother me on any.
-  //
-  //
-  //
-
-  // Don't bother checking these if we will be blanking the extnum anyhow
-  //
-  if ($skipremaining == 1)
-  {
@@ -229 +210 @@
-  if ($dndprimary == 0)
-  {
+    // TODO what are these comments...? do we need to remove them...?
-    $extnum    = $k;
-    $exthascw  = $AGI->database_get('CW', $extnum);// ? 1 : 0;
@@ -251 +233 @@
-    // above. If CF unconditional was set, we never get here because we alread reset mastermode. If DND
-    // were set then we never get here becasue didprimary was set
-
-    if ($mastermode == 1)
-    {
@@ -275 +256 @@
-      // should not be effected
-    }
-
-
-
-
-
-
+
-  else // $dndprimary == 1 so clear the extension
-  {
+    // clear the current extension if dndprimary has been set. This will only be the case if in mastermode so no need to check
+    // that. Use this to skip remaining extensions also if just ringing the primary.
-    $extnum = '';
-  }
-
-  // if CF is not in use or $dndprimary is set so $extnum has been cleared and nothing to do
-  //
-  if ( (strpos($k,"#")==0) || $dndprimary == 1)
-  {
@@ -306 +283 @@
-            $extnum = $extcfu . '#';   # same method as the normal cf, i.e. send to Local
-        }
- 
+
-        {
-          debug("Extension $extnum has call forward on no answer set and is unavailable",1);
@@ -313 +290 @@
-        }
-      }
- 
-  
+
+
-        debug("Checking CW and CFB status for extension $extnum",3);
-      
@@ -326 +303 @@
-            $extnum = $extcfb . '#';   # same method as the normal cf, i.e. send to Local
-          }
-
+
+
+
+
+
+
+
-          {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-          }
-        }
@@ -351 +319 @@
-        debug("ExtensionState for $extnum could not be read...assuming ok",3);
-      } 
- 
+
-      {
-        debug("Extension $extnum is available",1);
@@ -382 +350 @@
-          if ($rc['result'] == 1) 
-          {
-DbS
- 
- 
+dbs
+
+
-          {
-            debug("Failed to DbSet CALLTRACE/$k to $cidnum ({$rc['result']})", 1);
-          }
- 
- 
+
+
-        {
-          // We don't care about retval, this key may not exist
@@ -402 +370 @@
-    }
-  }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    $AGI->set_variable(CALLTRACE_HUNT,$cidnum);
-    
-  foreach ($extarray as $k )
- 
+
-    // we loop through the original array to get the extensions in order of importance
- 
+
-    {
-      //If the original array is included in the extension hash then set variables
-      $myhuntmember="HuntMember"."$loops";
-
-
+
-        $AGI->set_variable($myhuntmember,$ext_hunt[$k]);
-      } 
-      elseif ($rgmethod == "memoryhunt") 
-      {
-        if ($loops==0) 
-        {
-          $dshunt =$ext_hunt[$k];
-
-
-
+
-          $dshunt .='&'.$ext_hunt[$k];
-        }
-        $AGI->set_variable($myhuntmember,$dshunt);
-      }
@@ -440 +403 @@
-}
-
-// chop $ds if length($ds); - removes trailing "&"
-$ds = chop($ds," &");
-
- 
+
-{
-  $AGI->noop('');
@@ -456 +418 @@
-    $AGI->set_variable("HuntMembers",$loops);
-    $AGI->set_priority(20); // dial command is at priority 20 where dialplan handles calling a ringgroup with strategy of "hunt" or "MemoryHunt"
- 
+
-  else
-  {
@@ -464 +426 @@
-      $ds .= $timer;
-      if (trim($use_confirmation) != "FALSE")
-      {
-        $AGI->set_variable('__RT',$timer);
-      }
-    }
-    $ds .= '|' . $dialopts; // pound to transfer, provide ringing
-    if (trim($use_confirmation) != "FALSE")
-    {
-      $AGI->set_variable('__RG_IDX',$ringgroup_index);
-    }
-    $AGI->set_variable('ds',$ds);
-    $AGI->set_priority(10); // dial command is at priority 10
@@ -481 +439 @@
-exit( 0 );
-
-
-// helper functions
-
-function get_var( $agi, $value)
-{
@@ -501 +457 @@
-  $dialstring = '';
-  
-
-
-
+
+
-    // "#" used to identify external numbers in forwards and callgourps
-    // If using call confirmation, need to put the # back into the new dialstring
@@ -517 +472 @@
-      $dialstring = 'Local/RG-'.$ringgroup_index.'-'.$extnum.'#@grps';
-    debug("Built External dialstring component for $extnum: $dialstring", 4);
- 
- 
+
+
-  {
-    $device_str = sprintf("%s/device", $extnum);
@@ -556 +511 @@
-
-function is_ext_avail( $extnum )
-  
+
-  global $config;
-    
@@ -579 +534 @@
-  $matches = array();
-  $matchpattern = '/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/';
- 
+
-  {
-    if (preg_match($matchpattern, $line, $matches))