mikopbx / Core

etc/asterisk/agi-bin/get_park_info.php

Indentation +8 added lines, -8 removed lines

@@ -12,21 +12,21 @@
 // Функция позволяет получить активные каналы. 
 // Возвращает ассоциативный массив. Ключ - Linkedid, значение - массив каналов. 
 function get_active_id_channels($EXTEN){
-	$ParkeeChannel = '';
-	$am 	  = Util::get_am('off');
+    $ParkeeChannel = '';
+    $am 	  = Util::get_am('off');
     if(!$am->logged_in()){
         return $ParkeeChannel;
     }
-	$res 	  = $am->ParkedCalls('default');
-	if(count($res['data'])==0) return $ParkeeChannel;
+    $res 	  = $am->ParkedCalls('default');
+    if(count($res['data'])==0) return $ParkeeChannel;
 	
     foreach($res['data']['ParkedCall'] as $park_row){
-	    if($park_row['ParkingSpace'] == $EXTEN){
-		    $ParkeeChannel = $park_row['ParkeeChannel'];
-	    }
+        if($park_row['ParkingSpace'] == $EXTEN){
+            $ParkeeChannel = $park_row['ParkeeChannel'];
+        }
     }
 
-	return $ParkeeChannel;
+    return $ParkeeChannel;
 }
 $agi = new AGI();
 $exten	= $agi->get_variable("EXTEN", 	true);

Spacing +8 added lines, -8 removed lines

@@ -11,17 +11,17 @@ 
 
 // Функция позволяет получить активные каналы. 
 // Возвращает ассоциативный массив. Ключ - Linkedid, значение - массив каналов. 
-function get_active_id_channels($EXTEN){
+function get_active_id_channels($EXTEN) {
 	$ParkeeChannel = '';
-	$am 	  = Util::get_am('off');
-    if(!$am->logged_in()){
+	$am = Util::get_am('off');
+    if (!$am->logged_in()) {
         return $ParkeeChannel;
     }
-	$res 	  = $am->ParkedCalls('default');
-	if(count($res['data'])==0) return $ParkeeChannel;
+	$res = $am->ParkedCalls('default');
+	if (count($res['data']) == 0) return $ParkeeChannel;
 	
-    foreach($res['data']['ParkedCall'] as $park_row){
-	    if($park_row['ParkingSpace'] == $EXTEN){
+    foreach ($res['data']['ParkedCall'] as $park_row) {
+	    if ($park_row['ParkingSpace'] == $EXTEN) {
 		    $ParkeeChannel = $park_row['ParkeeChannel'];
 	    }
     }
@@ -29,7 +29,7 @@ 
 	return $ParkeeChannel;
 }
 $agi = new AGI();
-$exten	= $agi->get_variable("EXTEN", 	true);
+$exten = $agi->get_variable("EXTEN", true);
 
 $PARK_CHAN = get_active_id_channels($exten);
 $agi->set_variable("__pt1c_IS_PARK", "1");		

Braces +3 added lines, -1 removed lines

@@ -18,7 +18,9 @@
         return $ParkeeChannel;
     }
 	$res 	  = $am->ParkedCalls('default');
-	if(count($res['data'])==0) return $ParkeeChannel;
+	if(count($res['data'])==0) {
+	    return $ParkeeChannel;
+	}
 	
     foreach($res['data']['ParkedCall'] as $park_row){
 	    if($park_row['ParkingSpace'] == $EXTEN){

etc/asterisk/agi-bin/phpagi.php

Spacing +105 added lines, -105 removed lines

@@ -8,13 +8,13 @@ 
  */
 
 if (!class_exists('AGI_AsteriskManager')) {
-    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi-asmanager.php');
+    require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'phpagi-asmanager.php');
 }
 
 define('AST_CONFIG_DIR', '/etc/asterisk/');
 define('AST_SPOOL_DIR', '/var/spool/asterisk/');
-define('AST_TMP_DIR', AST_SPOOL_DIR . '/tmp/');
-define('DEFAULT_PHPAGI_CONFIG', AST_CONFIG_DIR . '/phpagi.conf');
+define('AST_TMP_DIR', AST_SPOOL_DIR.'/tmp/');
+define('DEFAULT_PHPAGI_CONFIG', AST_CONFIG_DIR.'/phpagi.conf');
 
 define('AST_DIGIT_ANY', '0123456789#*');
 
@@ -122,7 +122,7 @@ 
      * @param string $config is the name of the config file to parse
      * @param array  $optconfig is an array of configuration vars and vals, stuffed into $this->config['phpagi']
      */
-    function __construct($config = NULL, $optconfig = array()){
+    function __construct($config = NULL, $optconfig = array()) {
         // load config
         if (!is_null($config) && file_exists($config)) $this->config = parse_ini_file($config, true); elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
 
@@ -167,7 +167,7 @@ 
 
         // open audio if eagi detected
         if ($this->request['agi_enhanced'] == '1.0') {
-            if (file_exists('/proc/' . getmypid() . '/fd/3')) $this->audio = fopen('/proc/' . getmypid() . '/fd/3', 'r'); elseif (file_exists('/dev/fd/3')) {
+            if (file_exists('/proc/'.getmypid().'/fd/3')) $this->audio = fopen('/proc/'.getmypid().'/fd/3', 'r'); elseif (file_exists('/dev/fd/3')) {
                 // may need to mount fdescfs
                 $this->audio = fopen('/dev/fd/3', 'r');
             } else
@@ -196,7 +196,7 @@ 
      *
      * @return array, see evaluate for return information.  ['result'] is 0 on success, -1 on failure.
      */
-    function answer(){
+    function answer() {
         return $this->evaluate('ANSWER');
     }
 
@@ -207,7 +207,7 @@ 
      * @param string $channel
      * @return array, see evaluate for return information. ['data'] contains description.
      */
-    function channel_status($channel = ''){
+    function channel_status($channel = '') {
         $ret = $this->evaluate("CHANNEL STATUS $channel");
         switch ($ret['result']) {
             case -1:
@@ -258,7 +258,7 @@ 
      * @param string $key
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise.
      */
-    function database_del($family, $key){
+    function database_del($family, $key) {
         return $this->evaluate("DATABASE DEL \"$family\" \"$key\"");
     }
 
@@ -270,7 +270,7 @@ 
      * @param string $keytree
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise.
      */
-    function database_deltree($family, $keytree = ''){
+    function database_deltree($family, $keytree = '') {
         $cmd = "DATABASE DELTREE \"$family\"";
         if ($keytree != '') $cmd .= " \"$keytree\"";
         return $this->evaluate($cmd);
@@ -284,7 +284,7 @@ 
      * @param string $key
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 failure. ['data'] holds the value
      */
-    function database_get($family, $key){
+    function database_get($family, $key) {
         return $this->evaluate("DATABASE GET \"$family\" \"$key\"");
     }
 
@@ -296,7 +296,7 @@ 
      * @param string $value
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
      */
-    function database_put($family, $key, $value){
+    function database_put($family, $key, $value) {
         $value = str_replace("\n", '\n', addslashes($value));
         return $this->evaluate("DATABASE PUT \"$family\" \"$key\" \"$value\"");
     }
@@ -311,7 +311,7 @@ 
      * @param string|int|float $pValue
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
      */
-    function set_global_var($pVariable, $pValue){
+    function set_global_var($pVariable, $pValue) {
         if (is_numeric($pValue)) return $this->evaluate("Set({$pVariable}={$pValue},g);"); else
             return $this->evaluate("Set({$pVariable}=\"{$pValue}\",g);");
     }
@@ -326,7 +326,7 @@ 
      * @param string|int|float $pValue
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
      */
-    function set_var($pVariable, $pValue){
+    function set_var($pVariable, $pValue) {
         if (is_numeric($pValue)) return $this->evaluate("Set({$pVariable}={$pValue});"); else
             return $this->evaluate("Set({$pVariable}=\"{$pValue}\");");
     }
@@ -341,7 +341,7 @@ 
      * @param mixed  $options
      * @return array, see evaluate for return information. ['result'] is whatever the application returns, or -2 on failure to find application
      */
-    function exec($application, $options){
+    function exec($application, $options) {
         if (is_array($options)) $options = join('|', $options);
         return $this->evaluate("EXEC $application $options");
     }
@@ -383,7 +383,7 @@ 
      *
      * This differs from other commands with return DTMF as numbers representing ASCII characters.
      */
-    function get_data($filename, $timeout = NULL, $max_digits = NULL){
+    function get_data($filename, $timeout = NULL, $max_digits = NULL) {
         return $this->evaluate(rtrim("GET DATA $filename $timeout $max_digits"));
     }
 
@@ -398,9 +398,9 @@ 
      * @param boolean $getvalue return the value only
      * @return array | string, see evaluate for return information. ['result'] is 0 if variable hasn't been set, 1 if it has. ['data'] holds the value. returns value if $getvalue is TRUE
      */
-    function get_variable($variable, $getvalue = FALSE){
+    function get_variable($variable, $getvalue = FALSE) {
         $res = $this->evaluate("GET VARIABLE $variable");
-        if ($getvalue == FALSE){
+        if ($getvalue == FALSE) {
             return ($res);
         }
         return trim($res['data']);
@@ -418,14 +418,14 @@ 
      * @param boolean $getvalue return the value only
      * @return array, see evaluate for return information. ['result'] is 0 if variable hasn't been set, 1 if it has. ['data'] holds the value.  returns value if $getvalue is TRUE
      */
-    function get_fullvariable($variable, $channel = '', $getvalue = FALSE){
+    function get_fullvariable($variable, $channel = '', $getvalue = FALSE) {
         if ($channel == '') {
             $req = $variable;
         } else {
-            $req = $variable . ' ' . $channel;
+            $req = $variable.' '.$channel;
         }
 
-        $res = $this->evaluate('GET VARIABLE FULL ' . $req);
+        $res = $this->evaluate('GET VARIABLE FULL '.$req);
 
         if ($getvalue == FALSE) return ($res);
 
@@ -447,7 +447,7 @@ 
      * @param string $channel
      * @return array, see evaluate for return information. ['result'] is 1 on success, -1 on failure.
      */
-    function hangup($channel = ''){
+    function hangup($channel = '') {
         return $this->evaluate("HANGUP $channel");
     }
 
@@ -458,7 +458,7 @@ 
      * @param string $string
      * @return array, see evaluate for return information.
      */
-    function noop($string = ""){
+    function noop($string = "") {
         return $this->evaluate("NOOP \"$string\"");
     }
 
@@ -471,7 +471,7 @@ 
      * @return array, see evaluate for return information. ['result'] is 0 on timeout or not supported, -1 on failure. Otherwise
      * it is the decimal value of the DTMF tone. Use chr() to convert to ASCII.
      */
-    function receive_char($timeout = -1){
+    function receive_char($timeout = -1) {
         return $this->evaluate("RECEIVE CHAR $timeout");
     }
 
@@ -491,7 +491,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on error, 0 on hangup, otherwise a decimal value of the
      * DTMF tone. Use chr() to convert to ASCII.
      */
-    function record_file($file, $format, $escape_digits = '', $timeout = -1, $offset = NULL, $beep = false, $silence = NULL){
+    function record_file($file, $format, $escape_digits = '', $timeout = -1, $offset = NULL, $beep = false, $silence = NULL) {
         $cmd = trim("RECORD FILE $file $format \"$escape_digits\" $timeout $offset");
         if ($beep) $cmd .= ' BEEP';
         if (!is_null($silence)) $cmd .= " s=$silence";
@@ -507,7 +507,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function say_digits($digits, $escape_digits = ''){
+    function say_digits($digits, $escape_digits = '') {
         return $this->evaluate("SAY DIGITS $digits \"$escape_digits\"");
     }
 
@@ -520,7 +520,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function say_number($number, $escape_digits = ''){
+    function say_number($number, $escape_digits = '') {
         return $this->evaluate("SAY NUMBER $number \"$escape_digits\"");
     }
 
@@ -533,7 +533,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function say_phonetic($text, $escape_digits = ''){
+    function say_phonetic($text, $escape_digits = '') {
         return $this->evaluate("SAY PHONETIC $text \"$escape_digits\"");
     }
 
@@ -546,7 +546,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function say_time($time = NULL, $escape_digits = ''){
+    function say_time($time = NULL, $escape_digits = '') {
         if (is_null($time)) $time = time();
         return $this->evaluate("SAY TIME $time \"$escape_digits\"");
     }
@@ -561,7 +561,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if the image is sent or
      * channel does not support image transmission.
      */
-    function send_image($image){
+    function send_image($image) {
         return $this->evaluate("SEND IMAGE $image");
     }
 
@@ -575,7 +575,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if the text is sent or
      * channel does not support text transmission.
      */
-    function send_text($text){
+    function send_text($text) {
         return $this->evaluate("SEND TEXT \"$text\"");
     }
 
@@ -589,7 +589,7 @@ 
      * @param integer $time until automatic hangup
      * @return array, see evaluate for return information.
      */
-    function set_autohangup($time = 0){
+    function set_autohangup($time = 0) {
         return $this->evaluate("SET AUTOHANGUP $time");
     }
 
@@ -605,7 +605,7 @@ 
      * number will be considered to be part of the name.
      * @return array, see evaluate for return information.
      */
-    function set_callerid($cid){
+    function set_callerid($cid) {
         return $this->evaluate("SET CALLERID $cid");
     }
 
@@ -622,7 +622,7 @@ 
      * @param string $context
      * @return array, see evaluate for return information.
      */
-    function set_context($context){
+    function set_context($context) {
         return $this->evaluate("SET CONTEXT $context");
     }
 
@@ -639,7 +639,7 @@ 
      * @param string $extension
      * @return array, see evaluate for return information.
      */
-    function set_extension($extension){
+    function set_extension($extension) {
         return $this->evaluate("SET EXTENSION $extension");
     }
 
@@ -651,7 +651,7 @@ 
      * @param string  $class
      * @return array, see evaluate for return information.
      */
-    function set_music($enabled = true, $class = ''){
+    function set_music($enabled = true, $class = '') {
         $enabled = ($enabled) ? 'ON' : 'OFF';
         return $this->evaluate("SET MUSIC $enabled $class");
     }
@@ -666,7 +666,7 @@ 
      * @param integer $priority
      * @return array, see evaluate for return information.
      */
-    function set_priority($priority){
+    function set_priority($priority) {
         return $this->evaluate("SET PRIORITY $priority");
     }
 
@@ -683,7 +683,7 @@ 
      * @param string $value
      * @return array, see evaluate for return information.
      */
-    function set_variable($variable, $value){
+    function set_variable($variable, $value) {
         $value = str_replace("\n", '\n', addslashes($value));
         return $this->evaluate("SET VARIABLE $variable \"$value\"");
     }
@@ -702,7 +702,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function stream_file($filename, $escape_digits = '', $offset = 0){
+    function stream_file($filename, $escape_digits = '', $offset = 0) {
         return $this->evaluate("STREAM FILE $filename \"$escape_digits\" $offset");
     }
 
@@ -713,7 +713,7 @@ 
      * @param string $setting can be on, off or mate
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 if the channel is not TDD capable.
      */
-    function tdd_mode($setting){
+    function tdd_mode($setting) {
         return $this->evaluate("TDD MODE $setting");
     }
 
@@ -732,7 +732,7 @@ 
      * @param integer $level from 1 to 4
      * @return array, see evaluate for return information.
      */
-    function verbose($message, $level = 1){
+    function verbose($message, $level = 1) {
         $ret = '';
         foreach (explode("\n", str_replace("\r\n", "\n", print_r($message, true))) as $msg) {
             @syslog(LOG_WARNING, $msg);
@@ -749,7 +749,7 @@ 
      * @return array, see evaluate for return information. ['result'] is 0 if wait completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function wait_for_digit($timeout = -1){
+    function wait_for_digit($timeout = -1) {
         return $this->evaluate("WAIT FOR DIGIT $timeout");
     }
 
@@ -771,7 +771,7 @@ 
      * @param $seconds ,allowed, 0 disables timeout
      * @return array, see evaluate for return information.
      */
-    function exec_absolutetimeout($seconds = 0){
+    function exec_absolutetimeout($seconds = 0) {
         return $this->exec('AbsoluteTimeout', $seconds);
     }
 
@@ -782,7 +782,7 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or if application requested hangup, or 0 on non-hangup exit.
      * @param string $args
      */
-    function exec_agi($command, $args){
+    function exec_agi($command, $args) {
         return $this->exec("AGI $command", $args);
     }
 
@@ -792,8 +792,8 @@ 
      * @param string $language code
      * @return array, see evaluate for return information.
      */
-    function exec_setlanguage($language = 'en'){
-        return $this->exec('Set', 'CHANNEL(language)=' . $language);
+    function exec_setlanguage($language = 'en') {
+        return $this->exec('Set', 'CHANNEL(language)='.$language);
     }
 
     /**
@@ -805,7 +805,7 @@ 
      * @param $exten
      * @return array, see evaluate for return information.
      */
-    function exec_enumlookup($exten){
+    function exec_enumlookup($exten) {
         return $this->exec('EnumLookup', $exten);
     }
 
@@ -825,8 +825,8 @@ 
      * @param string  $url
      * @return array, see evaluate for return information.
      */
-    function exec_dial($type, $identifier, $timeout = NULL, $options = NULL, $url = NULL){
-        return $this->exec('Dial', trim("$type/$identifier" . $this->option_delim . $timeout . $this->option_delim . $options . $this->option_delim . $url, $this->option_delim));
+    function exec_dial($type, $identifier, $timeout = NULL, $options = NULL, $url = NULL) {
+        return $this->exec('Dial', trim("$type/$identifier".$this->option_delim.$timeout.$this->option_delim.$options.$this->option_delim.$url, $this->option_delim));
     }
 
     /**
@@ -840,8 +840,8 @@ 
      * @param string $c ;
      * @return array, see evaluate for return information.
      */
-    function exec_goto($a, $b = NULL, $c = NULL){
-        return $this->exec('Goto', trim($a . $this->option_delim . $b . $this->option_delim . $c, $this->option_delim));
+    function exec_goto($a, $b = NULL, $c = NULL) {
+        return $this->exec('Goto', trim($a.$this->option_delim.$b.$this->option_delim.$c, $this->option_delim));
     }
 
 
@@ -860,10 +860,10 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function fastpass_say_digits(&$buffer, $digits, $escape_digits = ''){
+    function fastpass_say_digits(&$buffer, $digits, $escape_digits = '') {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_digits($digits, $escape_digits);
@@ -884,10 +884,10 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function fastpass_say_number(&$buffer, $number, $escape_digits = ''){
+    function fastpass_say_number(&$buffer, $number, $escape_digits = '') {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_number($number, $escape_digits);
@@ -908,10 +908,10 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function fastpass_say_phonetic(&$buffer, $text, $escape_digits = ''){
+    function fastpass_say_phonetic(&$buffer, $text, $escape_digits = '') {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_phonetic($text, $escape_digits);
@@ -932,10 +932,10 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function fastpass_say_time(&$buffer, $time = NULL, $escape_digits = ''){
+    function fastpass_say_time(&$buffer, $time = NULL, $escape_digits = '') {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_time($time, $escape_digits);
@@ -959,10 +959,10 @@ 
      * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
-    function fastpass_stream_file(&$buffer, $filename, $escape_digits = '', $offset = 0){
+    function fastpass_stream_file(&$buffer, $filename, $escape_digits = '', $offset = 0) {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->stream_file($filename, $escape_digits, $offset);
@@ -983,10 +983,10 @@ 
      * @param integer $frequency
      * @return array, see evaluate for return information.
      */
-    function fastpass_text2wav(&$buffer, $text, $escape_digits = '', $frequency = 8000){
+    function fastpass_text2wav(&$buffer, $text, $escape_digits = '', $frequency = 8000) {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->text2wav($text, $escape_digits, $frequency);
@@ -1008,10 +1008,10 @@ 
      * @param string $voice
      * @return array, see evaluate for return information.
      */
-    function fastpass_swift(&$buffer, $text, $escape_digits = '', $frequency = 8000, $voice = NULL){
+    function fastpass_swift(&$buffer, $text, $escape_digits = '', $frequency = 8000, $voice = NULL) {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->swift($text, $escape_digits, $frequency, $voice);
@@ -1031,10 +1031,10 @@ 
      * @param integer $frequency
      * @return array, see evaluate for return information.
      */
-    function fastpass_say_punctuation(&$buffer, $text, $escape_digits = '', $frequency = 8000){
+    function fastpass_say_punctuation(&$buffer, $text, $escape_digits = '', $frequency = 8000) {
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255).$escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_punctuation($text, $escape_digits, $frequency);
@@ -1081,7 +1081,7 @@ 
      *
      * This differs from other commands with return DTMF as numbers representing ASCII characters.
      */
-    function fastpass_get_data(&$buffer, $filename, $timeout = NULL, $max_digits = NULL){
+    function fastpass_get_data(&$buffer, $filename, $timeout = NULL, $max_digits = NULL) {
         if (is_null($max_digits) || strlen($buffer) < $max_digits) {
             if ($buffer == '') {
                 $res = $this->get_data($filename, $timeout, $max_digits);
@@ -1115,7 +1115,7 @@ 
      * @param $timeout
      * @return mixed key pressed on sucess, -1 on failure
      */
-    function menu($choices, $timeout = 2000){
+    function menu($choices, $timeout = 2000) {
         $keys = join('', array_keys($choices));
         $choice = NULL;
         while (is_null($choice)) {
@@ -1136,7 +1136,7 @@ 
 
             if (is_null($choice)) {
                 $ret = $this->get_data('beep', $timeout, 1);
-                if ($ret['code'] != AGIRES_OK || $ret['result'] == -1) $choice = -1; elseif ($ret['result'] != '' && strpos(' ' . $keys, $ret['result'])) $choice = $ret['result'];
+                if ($ret['code'] != AGIRES_OK || $ret['result'] == -1) $choice = -1; elseif ($ret['result'] != '' && strpos(' '.$keys, $ret['result'])) $choice = $ret['result'];
             }
         }
         return $choice;
@@ -1149,7 +1149,7 @@ 
      * @param string $extension
      * @param string $priority
      */
-    function setContext($context, $extension = 's', $priority = "1"){
+    function setContext($context, $extension = 's', $priority = "1") {
         $this->set_context($context);
         $this->set_extension($extension);
         $this->set_priority($priority);
@@ -1166,7 +1166,7 @@ 
      * @param string $callerid
      * @return array('Name'=>$name, 'Number'=>$number)
      */
-    function parse_callerid($callerid = NULL){
+    function parse_callerid($callerid = NULL) {
         if (is_null($callerid)) $callerid = $this->request['agi_callerid'];
 
         $ret = array('name' => '', 'protocol' => '', 'username' => '', 'host' => '', 'port' => '');
@@ -1209,13 +1209,13 @@ 
      * @param integer $frequency
      * @return array | bool, see evaluate for return information.
      */
-    function text2wav($text, $escape_digits = '', $frequency = 8000){
+    function text2wav($text, $escape_digits = '', $frequency = 8000) {
         $text = trim($text);
         if ($text == '') return true;
 
         $hash = md5($text);
-        $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
-        $fname .= 'text2wav_' . $hash;
+        $fname = $this->config['phpagi']['tempdir'].DIRECTORY_SEPARATOR;
+        $fname .= 'text2wav_'.$hash;
 
         // create wave file
         if (!file_exists("$fname.wav")) {
@@ -1237,7 +1237,7 @@ 
 
         // clean up old files
         $delete = time() - 2592000; // 1 month
-        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file) if (filemtime($file) < $delete) unlink($file);
+        foreach (glob($this->config['phpagi']['tempdir'].DIRECTORY_SEPARATOR.'text2wav_*') as $file) if (filemtime($file) < $delete) unlink($file);
 
         return $ret;
     }
@@ -1252,15 +1252,15 @@ 
      * @param $voice
      * @return array | bool, see evaluate for return information.
      */
-    function swift($text, $escape_digits = '', $frequency = 8000, $voice = NULL){
+    function swift($text, $escape_digits = '', $frequency = 8000, $voice = NULL) {
         if (!is_null($voice)) $voice = "-n $voice"; elseif (isset($this->config['cepstral']['voice'])) $voice = "-n {$this->config['cepstral']['voice']}";
 
         $text = trim($text);
         if ($text == '') return true;
 
         $hash = md5($text);
-        $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
-        $fname .= 'swift_' . $hash;
+        $fname = $this->config['phpagi']['tempdir'].DIRECTORY_SEPARATOR;
+        $fname .= 'swift_'.$hash;
 
         // create wave file
         if (!file_exists("$fname.wav")) {
@@ -1279,7 +1279,7 @@ 
 
         // clean up old files
         $delete = time() - 2592000; // 1 month
-        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file) if (filemtime($file) < $delete) unlink($file);
+        foreach (glob($this->config['phpagi']['tempdir'].DIRECTORY_SEPARATOR.'swift_*') as $file) if (filemtime($file) < $delete) unlink($file);
 
         return $ret;
     }
@@ -1298,7 +1298,7 @@ 
      * @param $mode
      * @return string
      */
-    function text_input($mode = 'NUMERIC'){
+    function text_input($mode = 'NUMERIC') {
         $alpha = array('k0' => ' ', 'k00' => ',', 'k000' => '.', 'k0000' => '?', 'k00000' => '0', 'k1' => '!', 'k11' => ':', 'k111' => ';', 'k1111' => '#', 'k11111' => '1', 'k2' => 'A', 'k22' => 'B', 'k222' => 'C', 'k2222' => '2', 'k3' => 'D', 'k33' => 'E', 'k333' => 'F', 'k3333' => '3', 'k4' => 'G', 'k44' => 'H', 'k444' => 'I', 'k4444' => '4', 'k5' => 'J', 'k55' => 'K', 'k555' => 'L', 'k5555' => '5', 'k6' => 'M', 'k66' => 'N', 'k666' => 'O', 'k6666' => '6', 'k7' => 'P', 'k77' => 'Q', 'k777' => 'R', 'k7777' => 'S', 'k77777' => '7', 'k8' => 'T', 'k88' => 'U', 'k888' => 'V', 'k8888' => '8', 'k9' => 'W', 'k99' => 'X', 'k999' => 'Y', 'k9999' => 'Z', 'k99999' => '9');
         $symbol = array('k0' => '=', 'k1' => '<', 'k11' => '(', 'k111' => '[', 'k1111' => '{', 'k11111' => '1', 'k2' => '@', 'k22' => '$', 'k222' => '&', 'k2222' => '%', 'k22222' => '2', 'k3' => '>', 'k33' => ')', 'k333' => ']', 'k3333' => '}', 'k33333' => '3', 'k4' => '+', 'k44' => '-', 'k444' => '*', 'k4444' => '/', 'k44444' => '4', 'k5' => "'", 'k55' => '`', 'k555' => '5', 'k6' => '"', 'k66' => '6', 'k7' => '^', 'k77' => '7', 'k8' => "\\", 'k88' => '|', 'k888' => '8', 'k9' => '_', 'k99' => '~', 'k999' => '9');
         $text = '';
@@ -1333,9 +1333,9 @@ 
                     $command = false;
                 }
                 if ($code == '') $command = true; elseif ($mode == 'NUMERIC') $text .= $code;
-                elseif ($mode == 'UPPERCASE' && isset($alpha['k' . $code])) $text .= $alpha['k' . $code];
-                elseif ($mode == 'LOWERCASE' && isset($alpha['k' . $code])) $text .= strtolower($alpha['k' . $code]);
-                elseif ($mode == 'SYMBOL' && isset($symbol['k' . $code])) $text .= $symbol['k' . $code];
+                elseif ($mode == 'UPPERCASE' && isset($alpha['k'.$code])) $text .= $alpha['k'.$code];
+                elseif ($mode == 'LOWERCASE' && isset($alpha['k'.$code])) $text .= strtolower($alpha['k'.$code]);
+                elseif ($mode == 'SYMBOL' && isset($symbol['k'.$code])) $text .= $symbol['k'.$code];
             }
             $this->say_punctuation($text);
         } while (substr($result['result'], -2) == '**');
@@ -1350,7 +1350,7 @@ 
      * @param integer $frequency
      * @return array, see evaluate for return information.
      */
-    function say_punctuation($text, $escape_digits = '', $frequency = 8000){
+    function say_punctuation($text, $escape_digits = '', $frequency = 8000) {
         $ret = "";
         for ($i = 0; $i < strlen($text); $i++) {
             switch ($text{$i}) {
@@ -1454,7 +1454,7 @@ 
                     $ret .= 'TILDE ';
                     break;
                 default:
-                    $ret .= $text{$i} . ' ';
+                    $ret .= $text{$i}.' ';
                     break;
             }
         }
@@ -1466,8 +1466,8 @@ 
      */
     function &new_AsteriskManager(){
         $this->asm = new AGI_AsteriskManager(NULL, $this->config);
-        $this->asm->pagi =& $this;
-        $this->config =& $this->asm->config;
+        $this->asm->pagi = & $this;
+        $this->config = & $this->asm->config;
         return $this->asm;
     }
 
@@ -1484,11 +1484,11 @@ 
      * @param string $command
      * @return array ('code'=>$code, 'result'=>$result, 'data'=>$data)
      */
-    function evaluate($command){
+    function evaluate($command) {
         $broken = array('code' => 500, 'result' => -1, 'data' => '');
 
         // write command
-        if (!@fwrite($this->out, trim($command) . "\n")) return $broken;
+        if (!@fwrite($this->out, trim($command)."\n")) return $broken;
         fflush($this->out);
 
         // Read result.  Occasionally, a command return a string followed by an extra new line.
@@ -1513,7 +1513,7 @@ 
         if ($str{0} == '-') // we have a multiline response!
         {
             $count = 0;
-            $str = substr($str, 1) . "\n";
+            $str = substr($str, 1)."\n";
             $line = fgets($this->in, 4096);
             while (substr($line, 0, 3) != $ret['code'] && $count < 5) {
                 $str .= $line;
@@ -1539,15 +1539,15 @@ 
             foreach ($parse as $token) {
                 if ($in_token) // we previously hit a token starting with ')' but not ending in ')'
                 {
-                    $ret['data'] .= ' ' . trim($token, '() ');
+                    $ret['data'] .= ' '.trim($token, '() ');
                     if ($token{strlen($token) - 1} == ')') $in_token = false;
                 } elseif ($token{0} == '(') {
                     if ($token{strlen($token) - 1} != ')') $in_token = true;
-                    $ret['data'] .= ' ' . trim($token, '() ');
+                    $ret['data'] .= ' '.trim($token, '() ');
                 } elseif (strpos($token, '=')) {
                     $token = explode('=', $token);
                     $ret[$token[0]] = $token[1];
-                } elseif ($token != '') $ret['data'] .= ' ' . $token;
+                } elseif ($token != '') $ret['data'] .= ' '.$token;
             }
             $ret['data'] = trim($ret['data']);
         }
@@ -1566,7 +1566,7 @@ 
      * @param string  $str
      * @param integer $vbl verbose level
      */
-    function conlog($str, $vbl = 1){
+    function conlog($str, $vbl = 1) {
         static $busy = false;
 
         if ($this->config['phpagi']['debug'] != false) {
@@ -1587,13 +1587,13 @@ 
      * @param string $checkpath path to check
      * @return string the path to the command
      */
-    function which($cmd, $checkpath = NULL){
+    function which($cmd, $checkpath = NULL) {
         global $_ENV;
         $chpath = is_null($checkpath) ? $_ENV['PATH'] : $checkpath;
 
         foreach (explode(':', $chpath) as $path) if (is_executable("$path/$cmd")) return "$path/$cmd";
 
-        if (is_null($checkpath)) return $this->which($cmd, '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:' . '/usr/X11R6/bin:/usr/local/apache/bin:/usr/local/mysql/bin');
+        if (is_null($checkpath)) return $this->which($cmd, '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:'.'/usr/X11R6/bin:/usr/local/apache/bin:/usr/local/mysql/bin');
         return false;
     }
 
@@ -1605,7 +1605,7 @@ 
      * @param integer $perms
      * @return boolean
      */
-    function make_folder($folder, $perms = 0755){
+    function make_folder($folder, $perms = 0755) {
         $f = explode(DIRECTORY_SEPARATOR, $folder);
         $base = '';
         for ($i = 0; $i < count($f); $i++) {
@@ -1632,10 +1632,10 @@ 
  * @param integer $line line number of error
  * @param array   $context variables in the current scope
  */
-function phpagi_error_handler($level, $message, $file, $line, $context){
+function phpagi_error_handler($level, $message, $file, $line, $context) {
     if (ini_get('error_reporting') == 0) return; // this happens with an @
 
-    @syslog(LOG_WARNING, $file . '[' . $line . ']: ' . $message);
+    @syslog(LOG_WARNING, $file.'['.$line.']: '.$message);
 
     global $phpagi_error_handler_email;
     if (function_exists('mail') && !is_null($phpagi_error_handler_email)) // generate email debugging information
@@ -1672,23 +1672,23 @@ 
         }
 
         // include variables
-        $message .= "\n\nContext:\n" . print_r($context, true);
-        $message .= "\n\nGLOBALS:\n" . print_r($GLOBALS, true);
-        $message .= "\n\nBacktrace:\n" . print_r(debug_backtrace(), true);
+        $message .= "\n\nContext:\n".print_r($context, true);
+        $message .= "\n\nGLOBALS:\n".print_r($GLOBALS, true);
+        $message .= "\n\nBacktrace:\n".print_r(debug_backtrace(), true);
 
         // include code fragment
         if (file_exists($file)) {
             $message .= "\n\n$file:\n";
             $code = @file($file);
-            for ($i = max(0, $line - 10); $i < min($line + 10, count($code)); $i++) $message .= ($i + 1) . "\t$code[$i]";
+            for ($i = max(0, $line - 10); $i < min($line + 10, count($code)); $i++) $message .= ($i + 1)."\t$code[$i]";
         }
 
         // make sure message is fully readable (convert unprintable chars to hex representation)
         $ret = '';
         for ($i = 0; $i < strlen($message); $i++) {
             $c = ord($message{$i});
-            if ($c == 10 || $c == 13 || $c == 9) $ret .= $message{$i}; elseif ($c < 16) $ret .= '\x0' . dechex($c);
-            elseif ($c < 32 || $c > 127) $ret .= '\x' . dechex($c);
+            if ($c == 10 || $c == 13 || $c == 9) $ret .= $message{$i}; elseif ($c < 16) $ret .= '\x0'.dechex($c);
+            elseif ($c < 32 || $c > 127) $ret .= '\x'.dechex($c);
             else
                 $ret .= $message{$i};
         }

Braces +221 added lines, -74 removed lines

@@ -124,22 +124,40 @@ 
      */
     function __construct($config = NULL, $optconfig = array()){
         // load config
-        if (!is_null($config) && file_exists($config)) $this->config = parse_ini_file($config, true); elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+        if (!is_null($config) && file_exists($config)) {
+            $this->config = parse_ini_file($config, true);
+        } elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) {
+            $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+        }
 
         // If optconfig is specified, stuff vals and vars into 'phpagi' config array.
-        foreach ($optconfig as $var => $val) $this->config['phpagi'][$var] = $val;
+        foreach ($optconfig as $var => $val) {
+            $this->config['phpagi'][$var] = $val;
+        }
 
         // add default values to config for uninitialized values
-        if (!isset($this->config['phpagi']['error_handler'])) $this->config['phpagi']['error_handler'] = true;
-        if (!isset($this->config['phpagi']['debug'])) $this->config['phpagi']['debug'] = false;
-        if (!isset($this->config['phpagi']['admin'])) $this->config['phpagi']['admin'] = NULL;
-        if (!isset($this->config['phpagi']['tempdir'])) $this->config['phpagi']['tempdir'] = AST_TMP_DIR;
+        if (!isset($this->config['phpagi']['error_handler'])) {
+            $this->config['phpagi']['error_handler'] = true;
+        }
+        if (!isset($this->config['phpagi']['debug'])) {
+            $this->config['phpagi']['debug'] = false;
+        }
+        if (!isset($this->config['phpagi']['admin'])) {
+            $this->config['phpagi']['admin'] = NULL;
+        }
+        if (!isset($this->config['phpagi']['tempdir'])) {
+            $this->config['phpagi']['tempdir'] = AST_TMP_DIR;
+        }
 
         // festival TTS config
-        if (!isset($this->config['festival']['text2wave'])) $this->config['festival']['text2wave'] = $this->which('text2wave');
+        if (!isset($this->config['festival']['text2wave'])) {
+            $this->config['festival']['text2wave'] = $this->which('text2wave');
+        }
 
         // swift TTS config
-        if (!isset($this->config['cepstral']['swift'])) $this->config['cepstral']['swift'] = $this->which('swift');
+        if (!isset($this->config['cepstral']['swift'])) {
+            $this->config['cepstral']['swift'] = $this->which('swift');
+        }
 
         ob_implicit_flush(true);
 
@@ -167,13 +185,18 @@ 
 
         // open audio if eagi detected
         if ($this->request['agi_enhanced'] == '1.0') {
-            if (file_exists('/proc/' . getmypid() . '/fd/3')) $this->audio = fopen('/proc/' . getmypid() . '/fd/3', 'r'); elseif (file_exists('/dev/fd/3')) {
+            if (file_exists('/proc/' . getmypid() . '/fd/3')) {
+                $this->audio = fopen('/proc/' . getmypid() . '/fd/3', 'r');
+            } elseif (file_exists('/dev/fd/3')) {
                 // may need to mount fdescfs
                 $this->audio = fopen('/dev/fd/3', 'r');
-            } else
-                $this->conlog('Unable to open audio stream');
+            } else {
+                            $this->conlog('Unable to open audio stream');
+            }
 
-            if ($this->audio) stream_set_blocking($this->audio, 0);
+            if ($this->audio) {
+                stream_set_blocking($this->audio, 0);
+            }
         }
 
         $this->conlog('AGI Request:');
@@ -272,7 +295,9 @@ 
      */
     function database_deltree($family, $keytree = ''){
         $cmd = "DATABASE DELTREE \"$family\"";
-        if ($keytree != '') $cmd .= " \"$keytree\"";
+        if ($keytree != '') {
+            $cmd .= " \"$keytree\"";
+        }
         return $this->evaluate($cmd);
     }
 
@@ -312,8 +337,11 @@ 
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
      */
     function set_global_var($pVariable, $pValue){
-        if (is_numeric($pValue)) return $this->evaluate("Set({$pVariable}={$pValue},g);"); else
-            return $this->evaluate("Set({$pVariable}=\"{$pValue}\",g);");
+        if (is_numeric($pValue)) {
+            return $this->evaluate("Set({$pVariable}={$pValue},g);");
+        } else {
+                    return $this->evaluate("Set({$pVariable}=\"{$pValue}\",g);");
+        }
     }
 
 
@@ -327,8 +355,11 @@ 
      * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
      */
     function set_var($pVariable, $pValue){
-        if (is_numeric($pValue)) return $this->evaluate("Set({$pVariable}={$pValue});"); else
-            return $this->evaluate("Set({$pVariable}=\"{$pValue}\");");
+        if (is_numeric($pValue)) {
+            return $this->evaluate("Set({$pVariable}={$pValue});");
+        } else {
+                    return $this->evaluate("Set({$pVariable}=\"{$pValue}\");");
+        }
     }
 
 
@@ -342,7 +373,9 @@ 
      * @return array, see evaluate for return information. ['result'] is whatever the application returns, or -2 on failure to find application
      */
     function exec($application, $options){
-        if (is_array($options)) $options = join('|', $options);
+        if (is_array($options)) {
+            $options = join('|', $options);
+        }
         return $this->evaluate("EXEC $application $options");
     }
 
@@ -427,7 +460,9 @@ 
 
         $res = $this->evaluate('GET VARIABLE FULL ' . $req);
 
-        if ($getvalue == FALSE) return ($res);
+        if ($getvalue == FALSE) {
+            return ($res);
+        }
 
         return ($res['data']);
 
@@ -493,8 +528,12 @@ 
      */
     function record_file($file, $format, $escape_digits = '', $timeout = -1, $offset = NULL, $beep = false, $silence = NULL){
         $cmd = trim("RECORD FILE $file $format \"$escape_digits\" $timeout $offset");
-        if ($beep) $cmd .= ' BEEP';
-        if (!is_null($silence)) $cmd .= " s=$silence";
+        if ($beep) {
+            $cmd .= ' BEEP';
+        }
+        if (!is_null($silence)) {
+            $cmd .= " s=$silence";
+        }
         return $this->evaluate($cmd);
     }
 
@@ -547,7 +586,9 @@ 
      * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
      */
     function say_time($time = NULL, $escape_digits = ''){
-        if (is_null($time)) $time = time();
+        if (is_null($time)) {
+            $time = time();
+        }
         return $this->evaluate("SAY TIME $time \"$escape_digits\"");
     }
 
@@ -863,11 +904,15 @@ 
     function fastpass_say_digits(&$buffer, $digits, $escape_digits = ''){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_digits($digits, $escape_digits);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}));
@@ -887,11 +932,15 @@ 
     function fastpass_say_number(&$buffer, $number, $escape_digits = ''){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_number($number, $escape_digits);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}));
@@ -911,11 +960,15 @@ 
     function fastpass_say_phonetic(&$buffer, $text, $escape_digits = ''){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_phonetic($text, $escape_digits);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}));
@@ -935,11 +988,15 @@ 
     function fastpass_say_time(&$buffer, $time = NULL, $escape_digits = ''){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_time($time, $escape_digits);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}));
@@ -962,11 +1019,15 @@ 
     function fastpass_stream_file(&$buffer, $filename, $escape_digits = '', $offset = 0){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->stream_file($filename, $escape_digits, $offset);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}), 'endpos' => 0);
@@ -986,11 +1047,15 @@ 
     function fastpass_text2wav(&$buffer, $text, $escape_digits = '', $frequency = 8000){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->text2wav($text, $escape_digits, $frequency);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}), 'endpos' => 0);
@@ -1011,11 +1076,15 @@ 
     function fastpass_swift(&$buffer, $text, $escape_digits = '', $frequency = 8000, $voice = NULL){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->swift($text, $escape_digits, $frequency, $voice);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}), 'endpos' => 0);
@@ -1034,11 +1103,15 @@ 
     function fastpass_say_punctuation(&$buffer, $text, $escape_digits = '', $frequency = 8000){
         $proceed = false;
         if ($escape_digits != '' && $buffer != '') {
-            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) $proceed = true;
+            if (!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer) - 1})) {
+                $proceed = true;
+            }
         }
         if ($buffer == '' || $proceed) {
             $res = $this->say_punctuation($text, $escape_digits, $frequency);
-            if ($res['code'] == AGIRES_OK && $res['result'] > 0) $buffer .= chr($res['result']);
+            if ($res['code'] == AGIRES_OK && $res['result'] > 0) {
+                $buffer .= chr($res['result']);
+            }
             return $res;
         }
         return array('code' => AGIRES_OK, 'result' => ord($buffer{strlen($buffer) - 1}));
@@ -1085,13 +1158,19 @@ 
         if (is_null($max_digits) || strlen($buffer) < $max_digits) {
             if ($buffer == '') {
                 $res = $this->get_data($filename, $timeout, $max_digits);
-                if ($res['code'] == AGIRES_OK) $buffer .= $res['result'];
+                if ($res['code'] == AGIRES_OK) {
+                    $buffer .= $res['result'];
+                }
                 return $res;
             } else {
                 while (is_null($max_digits) || strlen($buffer) < $max_digits) {
                     $res = $this->wait_for_digit();
-                    if ($res['code'] != AGIRES_OK) return $res;
-                    if ($res['result'] == ord('#')) break;
+                    if ($res['code'] != AGIRES_OK) {
+                        return $res;
+                    }
+                    if ($res['result'] == ord('#')) {
+                        break;
+                    }
                     $buffer .= chr($res['result']);
                 }
             }
@@ -1120,8 +1199,11 @@ 
         $choice = NULL;
         while (is_null($choice)) {
             foreach ($choices as $prompt) {
-                if ($prompt{0} == '*') $ret = $this->text2wav(substr($prompt, 1), $keys); else
-                    $ret = $this->stream_file($prompt, $keys);
+                if ($prompt{0} == '*') {
+                    $ret = $this->text2wav(substr($prompt, 1), $keys);
+                } else {
+                                    $ret = $this->stream_file($prompt, $keys);
+                }
 
                 if ($ret['code'] != AGIRES_OK || $ret['result'] == -1) {
                     $choice = -1;
@@ -1136,7 +1218,11 @@ 
 
             if (is_null($choice)) {
                 $ret = $this->get_data('beep', $timeout, 1);
-                if ($ret['code'] != AGIRES_OK || $ret['result'] == -1) $choice = -1; elseif ($ret['result'] != '' && strpos(' ' . $keys, $ret['result'])) $choice = $ret['result'];
+                if ($ret['code'] != AGIRES_OK || $ret['result'] == -1) {
+                    $choice = -1;
+                } elseif ($ret['result'] != '' && strpos(' ' . $keys, $ret['result'])) {
+                    $choice = $ret['result'];
+                }
             }
         }
         return $choice;
@@ -1167,7 +1253,9 @@ 
      * @return array('Name'=>$name, 'Number'=>$number)
      */
     function parse_callerid($callerid = NULL){
-        if (is_null($callerid)) $callerid = $this->request['agi_callerid'];
+        if (is_null($callerid)) {
+            $callerid = $this->request['agi_callerid'];
+        }
 
         $ret = array('name' => '', 'protocol' => '', 'username' => '', 'host' => '', 'port' => '');
         $callerid = trim($callerid);
@@ -1181,14 +1269,18 @@ 
 
         $callerid = explode('@', trim($callerid, '<> '));
         $username = explode(':', array_shift($callerid));
-        if (count($username) == 1) $ret['username'] = $username[0]; else {
+        if (count($username) == 1) {
+            $ret['username'] = $username[0];
+        } else {
             $ret['protocol'] = array_shift($username);
             $ret['username'] = join(':', $username);
         }
 
         $callerid = join('@', $callerid);
         $host = explode(':', $callerid);
-        if (count($host) == 1) $ret['host'] = $host[0]; else {
+        if (count($host) == 1) {
+            $ret['host'] = $host[0];
+        } else {
             $ret['host'] = array_shift($host);
             $ret['port'] = join(':', $host);
         }
@@ -1211,7 +1303,9 @@ 
      */
     function text2wav($text, $escape_digits = '', $frequency = 8000){
         $text = trim($text);
-        if ($text == '') return true;
+        if ($text == '') {
+            return true;
+        }
 
         $hash = md5($text);
         $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
@@ -1237,7 +1331,9 @@ 
 
         // clean up old files
         $delete = time() - 2592000; // 1 month
-        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file) if (filemtime($file) < $delete) unlink($file);
+        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file) {
+            if (filemtime($file) < $delete) unlink($file);
+        }
 
         return $ret;
     }
@@ -1253,10 +1349,16 @@ 
      * @return array | bool, see evaluate for return information.
      */
     function swift($text, $escape_digits = '', $frequency = 8000, $voice = NULL){
-        if (!is_null($voice)) $voice = "-n $voice"; elseif (isset($this->config['cepstral']['voice'])) $voice = "-n {$this->config['cepstral']['voice']}";
+        if (!is_null($voice)) {
+            $voice = "-n $voice";
+        } elseif (isset($this->config['cepstral']['voice'])) {
+            $voice = "-n {$this->config['cepstral']['voice']}";
+        }
 
         $text = trim($text);
-        if ($text == '') return true;
+        if ($text == '') {
+            return true;
+        }
 
         $hash = md5($text);
         $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
@@ -1279,7 +1381,9 @@ 
 
         // clean up old files
         $delete = time() - 2592000; // 1 month
-        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file) if (filemtime($file) < $delete) unlink($file);
+        foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file) {
+            if (filemtime($file) < $delete) unlink($file);
+        }
 
         return $ret;
     }
@@ -1332,10 +1436,17 @@ 
                     $code = substr($code, 1);
                     $command = false;
                 }
-                if ($code == '') $command = true; elseif ($mode == 'NUMERIC') $text .= $code;
-                elseif ($mode == 'UPPERCASE' && isset($alpha['k' . $code])) $text .= $alpha['k' . $code];
-                elseif ($mode == 'LOWERCASE' && isset($alpha['k' . $code])) $text .= strtolower($alpha['k' . $code]);
-                elseif ($mode == 'SYMBOL' && isset($symbol['k' . $code])) $text .= $symbol['k' . $code];
+                if ($code == '') {
+                    $command = true;
+                } elseif ($mode == 'NUMERIC') {
+                    $text .= $code;
+                } elseif ($mode == 'UPPERCASE' && isset($alpha['k' . $code])) {
+                    $text .= $alpha['k' . $code];
+                } elseif ($mode == 'LOWERCASE' && isset($alpha['k' . $code])) {
+                    $text .= strtolower($alpha['k' . $code]);
+                } elseif ($mode == 'SYMBOL' && isset($symbol['k' . $code])) {
+                    $text .= $symbol['k' . $code];
+                }
             }
             $this->say_punctuation($text);
         } while (substr($result['result'], -2) == '**');
@@ -1488,7 +1599,9 @@ 
         $broken = array('code' => 500, 'result' => -1, 'data' => '');
 
         // write command
-        if (!@fwrite($this->out, trim($command) . "\n")) return $broken;
+        if (!@fwrite($this->out, trim($command) . "\n")) {
+            return $broken;
+        }
         fflush($this->out);
 
         // Read result.  Occasionally, a command return a string followed by an extra new line.
@@ -1510,9 +1623,11 @@ 
         $ret['code'] = substr($str, 0, 3);
         $str = trim(substr($str, 3));
 
-        if ($str{0} == '-') // we have a multiline response!
+        if ($str{0} == '-') {
+            // we have a multiline response!
         {
             $count = 0;
+        }
             $str = substr($str, 1) . "\n";
             $line = fgets($this->in, 4096);
             while (substr($line, 0, 3) != $ret['code'] && $count < 5) {
@@ -1528,32 +1643,44 @@ 
 
         $ret['result'] = NULL;
         $ret['data'] = '';
-        if ($ret['code'] != AGIRES_OK) // some sort of error
+        if ($ret['code'] != AGIRES_OK) {
+            // some sort of error
         {
             $ret['data'] = $str;
+        }
             $this->conlog(print_r($ret, true));
         } else // normal AGIRES_OK response
         {
             $parse = explode(' ', trim($str));
             $in_token = false;
             foreach ($parse as $token) {
-                if ($in_token) // we previously hit a token starting with ')' but not ending in ')'
+                if ($in_token) {
+                    // we previously hit a token starting with ')' but not ending in ')'
                 {
                     $ret['data'] .= ' ' . trim($token, '() ');
-                    if ($token{strlen($token) - 1} == ')') $in_token = false;
+                }
+                    if ($token{strlen($token) - 1} == ')') {
+                        $in_token = false;
+                    }
                 } elseif ($token{0} == '(') {
-                    if ($token{strlen($token) - 1} != ')') $in_token = true;
+                    if ($token{strlen($token) - 1} != ')') {
+                        $in_token = true;
+                    }
                     $ret['data'] .= ' ' . trim($token, '() ');
                 } elseif (strpos($token, '=')) {
                     $token = explode('=', $token);
                     $ret[$token[0]] = $token[1];
-                } elseif ($token != '') $ret['data'] .= ' ' . $token;
+                } elseif ($token != '') {
+                    $ret['data'] .= ' ' . $token;
+                }
             }
             $ret['data'] = trim($ret['data']);
         }
 
         // log some errors
-        if ($ret['result'] < 0) $this->conlog("$command returned {$ret['result']}");
+        if ($ret['result'] < 0) {
+            $this->conlog("$command returned {$ret['result']}");
+        }
 
         return $ret;
     }
@@ -1570,9 +1697,11 @@ 
         static $busy = false;
 
         if ($this->config['phpagi']['debug'] != false) {
-            if (!$busy) // no conlogs inside conlog!!!
+            if (!$busy) {
+                // no conlogs inside conlog!!!
             {
                 $busy = true;
+            }
                 $this->verbose($str, $vbl);
                 $busy = false;
             }
@@ -1591,9 +1720,13 @@ 
         global $_ENV;
         $chpath = is_null($checkpath) ? $_ENV['PATH'] : $checkpath;
 
-        foreach (explode(':', $chpath) as $path) if (is_executable("$path/$cmd")) return "$path/$cmd";
+        foreach (explode(':', $chpath) as $path) {
+            if (is_executable("$path/$cmd")) return "$path/$cmd";
+        }
 
-        if (is_null($checkpath)) return $this->which($cmd, '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:' . '/usr/X11R6/bin:/usr/local/apache/bin:/usr/local/mysql/bin');
+        if (is_null($checkpath)) {
+            return $this->which($cmd, '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:' . '/usr/X11R6/bin:/usr/local/apache/bin:/usr/local/mysql/bin');
+        }
         return false;
     }
 
@@ -1633,18 +1766,23 @@ 
  * @param array   $context variables in the current scope
  */
 function phpagi_error_handler($level, $message, $file, $line, $context){
-    if (ini_get('error_reporting') == 0) return; // this happens with an @
+    if (ini_get('error_reporting') == 0) {
+        return;
+    }
+    // this happens with an @
 
     @syslog(LOG_WARNING, $file . '[' . $line . ']: ' . $message);
 
     global $phpagi_error_handler_email;
-    if (function_exists('mail') && !is_null($phpagi_error_handler_email)) // generate email debugging information
+    if (function_exists('mail') && !is_null($phpagi_error_handler_email)) {
+        // generate email debugging information
     {
         // decode error level
         switch ($level) {
             case E_WARNING:
             case E_USER_WARNING:
                 $level = "Warning";
+    }
                 break;
             case E_NOTICE:
             case E_USER_NOTICE:
@@ -1680,23 +1818,32 @@ 
         if (file_exists($file)) {
             $message .= "\n\n$file:\n";
             $code = @file($file);
-            for ($i = max(0, $line - 10); $i < min($line + 10, count($code)); $i++) $message .= ($i + 1) . "\t$code[$i]";
+            for ($i = max(0, $line - 10); $i < min($line + 10, count($code)); $i++) {
+                $message .= ($i + 1) . "\t$code[$i]";
+            }
         }
 
         // make sure message is fully readable (convert unprintable chars to hex representation)
         $ret = '';
         for ($i = 0; $i < strlen($message); $i++) {
             $c = ord($message{$i});
-            if ($c == 10 || $c == 13 || $c == 9) $ret .= $message{$i}; elseif ($c < 16) $ret .= '\x0' . dechex($c);
-            elseif ($c < 32 || $c > 127) $ret .= '\x' . dechex($c);
-            else
+            if ($c == 10 || $c == 13 || $c == 9) {
                 $ret .= $message{$i};
+            } elseif ($c < 16) {
+                $ret .= '\x0' . dechex($c);
+            } elseif ($c < 32 || $c > 127) {
+                $ret .= '\x' . dechex($c);
+            } else {
+                            $ret .= $message{$i};
+            }
         }
         $message = $ret;
 
         // send the mail if less than 5 errors
         static $mailcount = 0;
-        if ($mailcount < 5) @mail($phpagi_error_handler_email, $subject, $message);
+        if ($mailcount < 5) {
+            @mail($phpagi_error_handler_email, $subject, $message);
+        }
         $mailcount++;
     }
 }

etc/asterisk/agi-bin/cdr_connector.php

Indentation +215 added lines, -215 removed lines

@@ -18,12 +18,12 @@ 
  * @return array
  */
 function Event_dial($agi, $action){
-	$now = Util::get_now_date();
+    $now = Util::get_now_date();
     $data = array();
 	
-	// Уточним канал, на случай очереди.
+    // Уточним канал, на случай очереди.
     $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
-	$orign_chan     = $agi->get_variable("orign_chan",     true);
+    $orign_chan     = $agi->get_variable("orign_chan",     true);
     $id   	        = $agi->get_variable("pt1c_UNIQUEID",  true);
     $IS_ORGNT   	= $agi->get_variable("IS_ORGNT",       true);
     if($id == '' || !empty($QUEUE_SRC_CHAN)){
@@ -31,13 +31,13 @@ 
         // Если это новый вызов $id == ''.
         $id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
     }
-	// Канал, AGI скрипта.
-	$channel 		= $agi->request['agi_channel'];
+    // Канал, AGI скрипта.
+    $channel 		= $agi->request['agi_channel'];
     $is_local       = !(stripos($channel, 'local/') === false);
-	if($QUEUE_SRC_CHAN != '' && $is_local){
-		// Это LOCAL, Переопределим на исходный. 
-		$channel = $QUEUE_SRC_CHAN;
-	}else if($is_local && (stripos($orign_chan, 'local/') === false)){
+    if($QUEUE_SRC_CHAN != '' && $is_local){
+        // Это LOCAL, Переопределим на исходный. 
+        $channel = $QUEUE_SRC_CHAN;
+    }else if($is_local && (stripos($orign_chan, 'local/') === false)){
         $channel = $orign_chan;
     }
 
@@ -68,20 +68,20 @@ 
         $dst_num  	 = $agi->request['agi_extension'];
     }
 
-	$data['src_chan'] 	 = $channel;
-	$data['src_num']  	 = $src_num;
-	$data['dst_num']  	 = $dst_num;
-	$data['start']  	 = $now;
-	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
-	$data['UNIQUEID']  	 = $id;
-	$data['transfer']  	 = '0';
-	$data['agi_channel'] = $agi->request['agi_channel'];;
-	$data['did']		 = $agi->get_variable("FROM_DID",  true);
-	$data['from_account']= $from_account;
-	$data['IS_ORGNT']    = !empty($IS_ORGNT);
-
- 	$agi->set_variable("__pt1c_UNIQUEID", "$id");		
-	return $data;
+    $data['src_chan'] 	 = $channel;
+    $data['src_num']  	 = $src_num;
+    $data['dst_num']  	 = $dst_num;
+    $data['start']  	 = $now;
+    $data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
+    $data['UNIQUEID']  	 = $id;
+    $data['transfer']  	 = '0';
+    $data['agi_channel'] = $agi->request['agi_channel'];;
+    $data['did']		 = $agi->get_variable("FROM_DID",  true);
+    $data['from_account']= $from_account;
+    $data['IS_ORGNT']    = !empty($IS_ORGNT);
+
+        $agi->set_variable("__pt1c_UNIQUEID", "$id");		
+    return $data;
 }
 
 /**
@@ -92,17 +92,17 @@ 
  */
 function Event_dial_create_chan($agi, $action){
     $now = Util::get_now_date();
-	$data 	    = [];
-	$id   	    = $agi->get_variable("pt1c_UNIQUEID", true);
-	$data['action']  	 = "$action";
-	$data['dst_chan']	 = $agi->request['agi_channel'];
-	$data['UNIQUEID']	 = $id;
-	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
+    $data 	    = [];
+    $id   	    = $agi->get_variable("pt1c_UNIQUEID", true);
+    $data['action']  	 = "$action";
+    $data['dst_chan']	 = $agi->request['agi_channel'];
+    $data['UNIQUEID']	 = $id;
+    $data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
     $data['event_time']  = $now;
 
-	if( stripos($data['dst_chan'], 'local/') === false ){
+    if( stripos($data['dst_chan'], 'local/') === false ){
         $data['to_account']  	= $agi->get_variable('CUT(CUT(CHANNEL(name),,1),/,2)', true);
-	}
+    }
 
     $IS_ORGNT   = $agi->get_variable("IS_ORGNT",       true);
     if(!empty($IS_ORGNT)){
@@ -128,16 +128,16 @@ 
 function Event_dial_answer($agi, $action){
     $now = Util::get_now_date();
 
-	$id   = $agi->get_variable("pt1c_UNIQUEID", true);
-	$data = [];
-	$data['action']  	= "$action";
-	$data['answer']  	= $now;
-	$data['id'] 		= $id;
+    $id   = $agi->get_variable("pt1c_UNIQUEID", true);
+    $data = [];
+    $data['action']  	= "$action";
+    $data['answer']  	= $now;
+    $data['id'] 		= $id;
     $data['dst_num']	= $agi->request['agi_callerid'];
-	$data['agi_channel']= $agi->request['agi_channel'];
-	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
+    $data['agi_channel']= $agi->request['agi_channel'];
+    $data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
 
-	$data['ENDCALLONANSWER']= $agi->get_variable("ENDCALLONANSWER", true);
+    $data['ENDCALLONANSWER']= $agi->get_variable("ENDCALLONANSWER", true);
     $data['BRIDGEPEER']     = $agi->get_variable("FROM_CHAN", true);
 
     $IS_ORGNT   = $agi->get_variable("IS_ORGNT",       true);
@@ -174,7 +174,7 @@ 
     }
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -186,17 +186,17 @@ 
 function Event_dial_hangup_DEPRECATED($agi, $action){
     // TODO Удалить эту функцию в будущем.
     $now    = Util::get_now_date();
-	$data 	= array();
-	$data['action']  	 = "$action";
-	$data['end']  		 = $now;
-	$data['id'] 		 = $agi->get_variable("pt1c_UNIQUEID", true);
-	$data['agi_channel'] = $agi->request['agi_channel'];
-	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
-	$data['did']		 = $agi->get_variable("FROM_DID", true);
+    $data 	= array();
+    $data['action']  	 = "$action";
+    $data['end']  		 = $now;
+    $data['id'] 		 = $agi->get_variable("pt1c_UNIQUEID", true);
+    $data['agi_channel'] = $agi->request['agi_channel'];
+    $data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
+    $data['did']		 = $agi->get_variable("FROM_DID", true);
 
-	$data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -207,12 +207,12 @@ 
  */
 function Event_transfer_dial($agi, $action){
     $now = Util::get_now_date();
-	$id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    $id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
 
-	// Пытаемся определить канал.
+    // Пытаемся определить канал.
     $TRANSFERERNAME = $agi->get_variable("TRANSFERERNAME", true);
-	$QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
-	$is_local       = !(stripos($TRANSFERERNAME, 'local/') === false);
+    $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
+    $is_local       = !(stripos($TRANSFERERNAME, 'local/') === false);
     if( $QUEUE_SRC_CHAN != '' && $is_local ){
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
@@ -225,21 +225,21 @@ 
         $channel = $TRANSFERERNAME;
     }
 
-	$data   = array();
-	$data['action']  	= "$action";
-	$data['agi_channel']= $channel;// $agi->request['agi_channel'];
-	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
-	$data['src_chan'] 	= $channel;
-	$data['did']		= $agi->get_variable("FROM_DID", true);;
-	$data['start']  	= $now;
-	$data['UNIQUEID']  	= $id;	
-	$data['transfer']  	= ($TRANSFERERNAME == '')?'0':'1';
-	$data['src_num']  	= $agi->request['agi_callerid'];
-	$data['dst_num']  	= $agi->request['agi_extension'];
+    $data   = array();
+    $data['action']  	= "$action";
+    $data['agi_channel']= $channel;// $agi->request['agi_channel'];
+    $data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
+    $data['src_chan'] 	= $channel;
+    $data['did']		= $agi->get_variable("FROM_DID", true);;
+    $data['start']  	= $now;
+    $data['UNIQUEID']  	= $id;	
+    $data['transfer']  	= ($TRANSFERERNAME == '')?'0':'1';
+    $data['src_num']  	= $agi->request['agi_callerid'];
+    $data['dst_num']  	= $agi->request['agi_extension'];
 
     $agi->set_variable("__transfer_UNIQUEID", $id);
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -249,14 +249,14 @@ 
  * @return array
  */
 function Event_transfer_dial_create_chan($agi, $action){
-	$id  	= $agi->get_variable("transfer_UNIQUEID", true);
-	$data   = array();
-	$data['dst_chan'] 			= $agi->request['agi_channel'];
-	$data['transfer_UNIQUEID'] 	= "$id";
-	$data['action']  			= "$action";
-	$data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
-
-	return $data;
+    $id  	= $agi->get_variable("transfer_UNIQUEID", true);
+    $data   = array();
+    $data['dst_chan'] 			= $agi->request['agi_channel'];
+    $data['transfer_UNIQUEID'] 	= "$id";
+    $data['action']  			= "$action";
+    $data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
+
+    return $data;
 }
 
 /**
@@ -266,16 +266,16 @@ 
  * @return array
  */
 function Event_transfer_dial_answer($agi, $action){
-	$data 	= array();
+    $data 	= array();
     $now    = Util::get_now_date();
-	$id   	= $agi->get_variable("transfer_UNIQUEID", true);
-	$data['answer'] 			= $now;
-	$data['transfer_UNIQUEID'] 	= "$id";
-	$data['action']  			= "$action";
-	$data['agi_channel']		= $agi->request['agi_channel'];
-	$data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
-
-	return $data;
+    $id   	= $agi->get_variable("transfer_UNIQUEID", true);
+    $data['answer'] 			= $now;
+    $data['transfer_UNIQUEID'] 	= "$id";
+    $data['action']  			= "$action";
+    $data['agi_channel']		= $agi->request['agi_channel'];
+    $data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
+
+    return $data;
 }
 
 /**
@@ -286,25 +286,25 @@ 
  */
 function Event_transfer_dial_hangup($agi, $action){
     $now    = Util::get_now_date();
-	$data 	= array();
-	$data['end']  		  = $now;
-	$data['linkedid']  	  = $agi->get_variable("CDR(linkedid)", true);
-	$data['did']		  = $agi->get_variable("FROM_DID", true);;
-	$data['action']  	  = "$action";
-	$data['agi_channel']  = $agi->request['agi_channel'];
-	$data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
-
-	$pos = stripos( $data['agi_channel'], 'local/');
-	if($pos === false){
-		// Если это завершение переадресации (консультативной). Создадим новую строку CDR.
-	}else{
-		// Если пришел локальный канал:
-		$data['TRANSFERERNAME'] = $agi->get_variable("TRANSFERERNAME", 	true);
-		$data['ANSWEREDTIME'] 	= $agi->get_variable("ANSWEREDTIME", 	true);
-		$data['dst_chan'] 		= $agi->get_variable("CDR(dstchannel)", true);
-	}
-
-	return $data;
+    $data 	= array();
+    $data['end']  		  = $now;
+    $data['linkedid']  	  = $agi->get_variable("CDR(linkedid)", true);
+    $data['did']		  = $agi->get_variable("FROM_DID", true);;
+    $data['action']  	  = "$action";
+    $data['agi_channel']  = $agi->request['agi_channel'];
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+
+    $pos = stripos( $data['agi_channel'], 'local/');
+    if($pos === false){
+        // Если это завершение переадресации (консультативной). Создадим новую строку CDR.
+    }else{
+        // Если пришел локальный канал:
+        $data['TRANSFERERNAME'] = $agi->get_variable("TRANSFERERNAME", 	true);
+        $data['ANSWEREDTIME'] 	= $agi->get_variable("ANSWEREDTIME", 	true);
+        $data['dst_chan'] 		= $agi->get_variable("CDR(dstchannel)", true);
+    }
+
+    return $data;
 }
 
 /**
@@ -315,23 +315,23 @@ 
  */
 function Event_hangup_chan($agi, $action){
     $now    = Util::get_now_date();
-	$data 	= [];
+    $data 	= [];
     $data['action']  	    = "$action";
     $data['did']		    = $agi->get_variable("FROM_DID", true);;
     $data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
 
-	$data['linkedid']  	    = $agi->get_variable("CDR(linkedid)", true);
-	$data['dialstatus']     = $agi->get_variable("DIALSTATUS", true);
-	if('ANSWER' == $data['dialstatus']){
+    $data['linkedid']  	    = $agi->get_variable("CDR(linkedid)", true);
+    $data['dialstatus']     = $agi->get_variable("DIALSTATUS", true);
+    if('ANSWER' == $data['dialstatus']){
         $data['dialstatus'] = "ANSWERED";
     }
-	$data['agi_channel']    = $agi->request['agi_channel'];
-	$data['end']  		    = $now;
+    $data['agi_channel']    = $agi->request['agi_channel'];
+    $data['end']  		    = $now;
 
     $data['OLD_LINKEDID']   = $agi->get_variable("OLD_LINKEDID", true);
     $data['UNIQUEID']  	    = $agi->get_variable("pt1c_UNIQUEID", true);
 
-	return $data;
+    return $data;
 }
 
 /**
@@ -342,64 +342,64 @@ 
  */
 function Event_unpark_call($agi, $action){
     $now    = Util::get_now_date();
-	// Обработка данных парковки. 
-	$exten	= $agi->get_variable("EXTEN", 	true);
-	$park_row = p_Park::get_parkslot_data($exten);
+    // Обработка данных парковки. 
+    $exten	= $agi->get_variable("EXTEN", 	true);
+    $park_row = p_Park::get_parkslot_data($exten);
 	
-	$agi->set_variable("__pt1c_IS_PARK", "1");		
-	$agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']);
+    $agi->set_variable("__pt1c_IS_PARK", "1");		
+    $agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']);
 	
-	// Сбор данных для генерации CDR.
-	$id   	= $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
-	$channel= $agi->request['agi_channel'];
- 	$agi->set_variable("__pt1c_UNIQUEID", "$id");		
-	$data 	= array();
-	$data['action']  	 = "$action";
-	$data['UNIQUEID']  	 = $id;
-	$data['linkedid_old']= $agi->get_variable("CDR(linkedid)", true);
-	$data['agi_channel'] = $channel;
-	$data['linkedid']  	 = $park_row['ParkeeLinkedid'];
-	$data['start']  	 = $now;
-	$data['transfer']  	 = '0';
-	$data['did']		 = $agi->get_variable("FROM_DID", true);
-	$data['answer']  	 = $data['start'];
+    // Сбор данных для генерации CDR.
+    $id   	= $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    $channel= $agi->request['agi_channel'];
+        $agi->set_variable("__pt1c_UNIQUEID", "$id");		
+    $data 	= array();
+    $data['action']  	 = "$action";
+    $data['UNIQUEID']  	 = $id;
+    $data['linkedid_old']= $agi->get_variable("CDR(linkedid)", true);
+    $data['agi_channel'] = $channel;
+    $data['linkedid']  	 = $park_row['ParkeeLinkedid'];
+    $data['start']  	 = $now;
+    $data['transfer']  	 = '0';
+    $data['did']		 = $agi->get_variable("FROM_DID", true);
+    $data['answer']  	 = $data['start'];
 	
-	if(null == $park_row){
-		$data['src_chan'] 	= $channel;
-		$data['src_num']  	= $agi->request['agi_callerid'];
-		$data['dst_num']  	= $agi->request['agi_extension'];
-		$data['dst_chan'] 	= 'Park:'.$agi->request['agi_extension'];
-	}else if(true == $park_row['pt1c_is_dst']){
-		$data['src_chan'] 	= $channel;
-		$data['dst_chan'] 	= $park_row['ParkeeChannel'];
-		$data['src_num']  	= $agi->request['agi_callerid'];
-		$data['dst_num']  	= $park_row['ParkeeCallerIDNum'];
-	}else{
-		$data['src_chan'] 	= $park_row['ParkeeChannel'];
-		$data['dst_chan'] 	= $channel;
-		$data['src_num']  	= $park_row['ParkeeCallerIDNum'];
-		$data['dst_num']  	= $agi->request['agi_callerid'];
-	}
+    if(null == $park_row){
+        $data['src_chan'] 	= $channel;
+        $data['src_num']  	= $agi->request['agi_callerid'];
+        $data['dst_num']  	= $agi->request['agi_extension'];
+        $data['dst_chan'] 	= 'Park:'.$agi->request['agi_extension'];
+    }else if(true == $park_row['pt1c_is_dst']){
+        $data['src_chan'] 	= $channel;
+        $data['dst_chan'] 	= $park_row['ParkeeChannel'];
+        $data['src_num']  	= $agi->request['agi_callerid'];
+        $data['dst_num']  	= $park_row['ParkeeCallerIDNum'];
+    }else{
+        $data['src_chan'] 	= $park_row['ParkeeChannel'];
+        $data['dst_chan'] 	= $channel;
+        $data['src_num']  	= $park_row['ParkeeCallerIDNum'];
+        $data['dst_num']  	= $agi->request['agi_callerid'];
+    }
 	
-	if(trim($park_row['ParkingDuration'])!=''){
-		$time_start = date("Y-m-d H:i:s", time() - 1*($park_row['ParkingDuration']) );
-		$data_parking = array(
-		    'UNIQUEID' => $id .'_'. Util::generateRandomString(3),
-			'src_chan' => $park_row['ParkeeChannel'],
-			'src_num'  => $park_row['ParkeeCallerIDNum'],
-			'dst_num'  => $park_row['ParkingSpace'],
-			'dst_chan' => 'Park:'.$park_row['ParkingSpace'],
-			'start'    => $time_start,
-			'answer'   => $time_start,
-			'endtime'  => $now,
-			'did'	   => $data['did'],
-			'transfer' => '0',
-			'linkedid' => $data['linkedid']
-		);
-		$data['data_parking'] = $data_parking;
-	}
-
-	return $data;	
+    if(trim($park_row['ParkingDuration'])!=''){
+        $time_start = date("Y-m-d H:i:s", time() - 1*($park_row['ParkingDuration']) );
+        $data_parking = array(
+            'UNIQUEID' => $id .'_'. Util::generateRandomString(3),
+            'src_chan' => $park_row['ParkeeChannel'],
+            'src_num'  => $park_row['ParkeeCallerIDNum'],
+            'dst_num'  => $park_row['ParkingSpace'],
+            'dst_chan' => 'Park:'.$park_row['ParkingSpace'],
+            'start'    => $time_start,
+            'answer'   => $time_start,
+            'endtime'  => $now,
+            'did'	   => $data['did'],
+            'transfer' => '0',
+            'linkedid' => $data['linkedid']
+        );
+        $data['data_parking'] = $data_parking;
+    }
+
+    return $data;	
 }
 
 /**
@@ -410,28 +410,28 @@ 
  */
 function Event_unpark_call_timeout($agi, $action){
     $now  = Util::get_now_date();
-	$id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
-	// PARKER=SIP/206
-	$PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true);
-	$PARKING_DURATION = ($PARKING_DURATION == '')?45:$PARKING_DURATION;
+    $id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    // PARKER=SIP/206
+    $PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true);
+    $PARKING_DURATION = ($PARKING_DURATION == '')?45:$PARKING_DURATION;
 		
-	$time_start = date("Y-m-d H:i:s", time() - 1*($PARKING_DURATION));
-	$PARKING_SPACE = $agi->get_variable("PARKING_SPACE", true);
-	$data = array(
-		'action'   => "$action",
-		'src_chan' => $agi->request['agi_channel'], // $agi->get_variable("PARKER", true), // ???
-		'src_num'  => $agi->request['agi_callerid'],
-		'dst_num'  => $PARKING_SPACE,
-		'dst_chan' => 'Park:'.$PARKING_SPACE,
-		'start'    => $time_start,
-		'answer'   => $time_start,
-		'endtime'  => $now,
-		'did'	   => $agi->get_variable("FROM_DID", true),
-		'UNIQUEID' => $id,
-		'transfer' => '0',
-		'linkedid' => $agi->get_variable("CDR(linkedid)", true),
+    $time_start = date("Y-m-d H:i:s", time() - 1*($PARKING_DURATION));
+    $PARKING_SPACE = $agi->get_variable("PARKING_SPACE", true);
+    $data = array(
+        'action'   => "$action",
+        'src_chan' => $agi->request['agi_channel'], // $agi->get_variable("PARKER", true), // ???
+        'src_num'  => $agi->request['agi_callerid'],
+        'dst_num'  => $PARKING_SPACE,
+        'dst_chan' => 'Park:'.$PARKING_SPACE,
+        'start'    => $time_start,
+        'answer'   => $time_start,
+        'endtime'  => $now,
+        'did'	   => $agi->get_variable("FROM_DID", true),
+        'UNIQUEID' => $id,
+        'transfer' => '0',
+        'linkedid' => $agi->get_variable("CDR(linkedid)", true),
         'PARKER'   => $agi->get_variable("PARKER", true),
-	);
+    );
 
 
     $id2   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
@@ -458,18 +458,18 @@ 
     }
 
     $data = array(
-		'action'   => "$action",
-		// 'src_chan' => $agi->request['agi_channel'],
-		// 'src_num'  => $agi->request['agi_callerid'],
-		'dst_num'  => $agi->request['agi_extension'],
-		'dst_chan' => 'Queue:'.$agi->request['agi_extension'],
-		// 'answer'   => $time_start,
-		// 'end'  	   => $now,
-		'did'	   => $agi->get_variable("FROM_DID", true),
-		'is_app' => '1',
-		'UNIQUEID' => $id,
-		'linkedid' => $agi->get_variable("CDR(linkedid)", true)
-	);
+        'action'   => "$action",
+        // 'src_chan' => $agi->request['agi_channel'],
+        // 'src_num'  => $agi->request['agi_callerid'],
+        'dst_num'  => $agi->request['agi_extension'],
+        'dst_chan' => 'Queue:'.$agi->request['agi_extension'],
+        // 'answer'   => $time_start,
+        // 'end'  	   => $now,
+        'did'	   => $agi->get_variable("FROM_DID", true),
+        'is_app' => '1',
+        'UNIQUEID' => $id,
+        'linkedid' => $agi->get_variable("CDR(linkedid)", true)
+    );
     if(!empty($time_start)){
         $data['src_chan'] = $agi->get_variable("QUEUE_SRC_CHAN", true);
         $data['src_num']  = $agi->request['agi_callerid'];
@@ -484,7 +484,7 @@ 
         $data['transfer']  	= '0';
     }
 
-	return $data;	
+    return $data;	
 }
 
 /**
@@ -495,15 +495,15 @@ 
  */
 function Event_queue_answer($agi, $action){
     $now  = Util::get_now_date();
-	$id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
-	$data = array();
-	$data['action']  	= "$action";
-	$data['answer']  	= $now;
-	$data['id'] 		= $id;
-	$data['agi_channel']= $agi->request['agi_channel'];
-	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
-
-	return $data;	
+    $id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
+    $data = array();
+    $data['action']  	= "$action";
+    $data['answer']  	= $now;
+    $data['id'] 		= $id;
+    $data['agi_channel']= $agi->request['agi_channel'];
+    $data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
+
+    return $data;	
 }
 
 /**
@@ -514,16 +514,16 @@ 
  */
 function Event_queue_end($agi, $action){
     $now  = Util::get_now_date();
-	$id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
-	$data = array();
-	$data['action']  	= "$action";
-	$data['end']  		= $now;
-	$data['id'] 		= $id;
-	$data['dialstatus'] = $agi->get_variable("QUEUESTATUS", true);
-	$data['agi_channel']= $agi->request['agi_channel'];
-	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
-
-	return $data;	
+    $id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
+    $data = array();
+    $data['action']  	= "$action";
+    $data['end']  		= $now;
+    $data['id'] 		= $id;
+    $data['dialstatus'] = $agi->get_variable("QUEUESTATUS", true);
+    $data['agi_channel']= $agi->request['agi_channel'];
+    $data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
+
+    return $data;	
 }
 
 /**
@@ -672,7 +672,7 @@ 
 if( function_exists($func_name) ){
     $agi = new AGI();
     // Сбор сведений по каналу.
-	$result = $func_name($agi, $action);
+    $result = $func_name($agi, $action);
     // Оповещение без задержек.
     $data = base64_encode(json_encode($result));
     $agi->exec("UserEvent", "CdrConnector,AgiData:".base64_encode(json_encode($result)));

Spacing +174 added lines, -174 removed lines

@@ -17,53 +17,53 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial($agi, $action){
+function Event_dial($agi, $action) {
 	$now = Util::get_now_date();
     $data = array();
 	
 	// Уточним канал, на случай очереди.
     $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
-	$orign_chan     = $agi->get_variable("orign_chan",     true);
-    $id   	        = $agi->get_variable("pt1c_UNIQUEID",  true);
-    $IS_ORGNT   	= $agi->get_variable("IS_ORGNT",       true);
-    if($id == '' || !empty($QUEUE_SRC_CHAN)){
+	$orign_chan     = $agi->get_variable("orign_chan", true);
+    $id = $agi->get_variable("pt1c_UNIQUEID", true);
+    $IS_ORGNT   	= $agi->get_variable("IS_ORGNT", true);
+    if ($id == '' || !empty($QUEUE_SRC_CHAN)) {
         // Если это вызов на агента очереди !empty($QUEUE_SRC_CHAN).
         // Если это новый вызов $id == ''.
-        $id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
 	// Канал, AGI скрипта.
-	$channel 		= $agi->request['agi_channel'];
-    $is_local       = !(stripos($channel, 'local/') === false);
-	if($QUEUE_SRC_CHAN != '' && $is_local){
+	$channel = $agi->request['agi_channel'];
+    $is_local = !(stripos($channel, 'local/') === false);
+	if ($QUEUE_SRC_CHAN != '' && $is_local) {
 		// Это LOCAL, Переопределим на исходный. 
 		$channel = $QUEUE_SRC_CHAN;
-	}else if($is_local && (stripos($orign_chan, 'local/') === false)){
+	} else if ($is_local && (stripos($orign_chan, 'local/') === false)) {
         $channel = $orign_chan;
     }
 
     // Получим ID исходного канала.
     $from_account = $agi->get_variable("FROM_PEER", true);
-    if( $from_account == '' && stripos($agi->request['agi_channel'], 'local/') === false ){
-        $from_account  	= $agi->get_variable('CUT(CUT(CHANNEL(name),,1),/,2)', true);
+    if ($from_account == '' && stripos($agi->request['agi_channel'], 'local/') === false) {
+        $from_account = $agi->get_variable('CUT(CUT(CHANNEL(name),,1),/,2)', true);
     }
 
-    $data['action']  	 = "$action";
-    if(!empty($IS_ORGNT)){
+    $data['action'] = "$action";
+    if (!empty($IS_ORGNT)) {
         $dst_num  	        = $agi->request['agi_callerid'];
         $src_num  	        = $agi->request['agi_extension'];
         $data['dialstatus'] = 'ORIGINATE';
-        $from_account='';
+        $from_account = '';
 
-        $p_start = strpos($agi->request['agi_channel'],'/')+1;
-        $p_end   = strpos($agi->request['agi_channel'],'@') - $p_start;
+        $p_start = strpos($agi->request['agi_channel'], '/') + 1;
+        $p_end   = strpos($agi->request['agi_channel'], '@') - $p_start;
         $num     = substr($agi->request['agi_channel'], $p_start, $p_end);
 
-        $p_start = strpos($agi->request['agi_channel'],';');
-        $dst_chan= substr($agi->request['agi_channel'], 0, $p_start).';1';
+        $p_start = strpos($agi->request['agi_channel'], ';');
+        $dst_chan = substr($agi->request['agi_channel'], 0, $p_start).';1';
 
-        $id   = substr($agi->request['agi_uniqueid'],0, 16) .'_'.$num.'_'. $IS_ORGNT;
-        $data['dst_chan'] 	 = $dst_chan;
-    }else{
+        $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$num.'_'.$IS_ORGNT;
+        $data['dst_chan'] = $dst_chan;
+    } else {
         $src_num  	 = $agi->request['agi_callerid'];
         $dst_num  	 = $agi->request['agi_extension'];
     }
@@ -71,13 +71,13 @@ 
 	$data['src_chan'] 	 = $channel;
 	$data['src_num']  	 = $src_num;
 	$data['dst_num']  	 = $dst_num;
-	$data['start']  	 = $now;
+	$data['start'] = $now;
 	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
 	$data['UNIQUEID']  	 = $id;
 	$data['transfer']  	 = '0';
-	$data['agi_channel'] = $agi->request['agi_channel'];;
-	$data['did']		 = $agi->get_variable("FROM_DID",  true);
-	$data['from_account']= $from_account;
+	$data['agi_channel'] = $agi->request['agi_channel']; ;
+	$data['did'] = $agi->get_variable("FROM_DID", true);
+	$data['from_account'] = $from_account;
 	$data['IS_ORGNT']    = !empty($IS_ORGNT);
 
  	$agi->set_variable("__pt1c_UNIQUEID", "$id");		
@@ -90,28 +90,28 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial_create_chan($agi, $action){
+function Event_dial_create_chan($agi, $action) {
     $now = Util::get_now_date();
 	$data 	    = [];
 	$id   	    = $agi->get_variable("pt1c_UNIQUEID", true);
 	$data['action']  	 = "$action";
 	$data['dst_chan']	 = $agi->request['agi_channel'];
 	$data['UNIQUEID']	 = $id;
-	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
-    $data['event_time']  = $now;
+	$data['linkedid'] = $agi->get_variable("CDR(linkedid)", true);
+    $data['event_time'] = $now;
 
-	if( stripos($data['dst_chan'], 'local/') === false ){
-        $data['to_account']  	= $agi->get_variable('CUT(CUT(CHANNEL(name),,1),/,2)', true);
+	if (stripos($data['dst_chan'], 'local/') === false) {
+        $data['to_account'] = $agi->get_variable('CUT(CUT(CHANNEL(name),,1),/,2)', true);
 	}
 
-    $IS_ORGNT   = $agi->get_variable("IS_ORGNT",       true);
-    if(!empty($IS_ORGNT)){
+    $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить искать по двум ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
-        $peer_mobile= $agi->get_variable("peer_mobile", true);
-        if( !empty($peer_mobile) && stripos($id, $peer_mobile) === false ) {
-            $id   = substr($agi->request['agi_uniqueid'],0, 16) .'_'.$peer_mobile.'_'. $IS_ORGNT;
+        $peer_mobile = $agi->get_variable("peer_mobile", true);
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
@@ -125,52 +125,52 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial_answer($agi, $action){
+function Event_dial_answer($agi, $action) {
     $now = Util::get_now_date();
 
 	$id   = $agi->get_variable("pt1c_UNIQUEID", true);
 	$data = [];
 	$data['action']  	= "$action";
 	$data['answer']  	= $now;
-	$data['id'] 		= $id;
+	$data['id'] = $id;
     $data['dst_num']	= $agi->request['agi_callerid'];
-	$data['agi_channel']= $agi->request['agi_channel'];
+	$data['agi_channel'] = $agi->request['agi_channel'];
 	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
 
-	$data['ENDCALLONANSWER']= $agi->get_variable("ENDCALLONANSWER", true);
-    $data['BRIDGEPEER']     = $agi->get_variable("FROM_CHAN", true);
+	$data['ENDCALLONANSWER'] = $agi->get_variable("ENDCALLONANSWER", true);
+    $data['BRIDGEPEER'] = $agi->get_variable("FROM_CHAN", true);
 
-    $IS_ORGNT   = $agi->get_variable("IS_ORGNT",       true);
-    if(!empty($IS_ORGNT)){
+    $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
-        $peer_mobile= $agi->get_variable("peer_mobile", true);
-        if( !empty($peer_mobile) && stripos($id, $peer_mobile) === false ) {
-            $id   = substr($agi->request['agi_uniqueid'],0, 16) .'_'.$peer_mobile.'_'. $IS_ORGNT;
+        $peer_mobile = $agi->get_variable("peer_mobile", true);
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
 
-    if(!empty($data['ENDCALLONANSWER'])){
+    if (!empty($data['ENDCALLONANSWER'])) {
         $agi->set_variable("__ENDCALLONANSWER", "");
     }
 
     $PICKUPEER      = trim(''.$agi->get_variable("PICKUPEER", true));
     $data['dnid']   = $agi->request['agi_dnid'];
     $pickupexten = Config::get_pickupexten();
-    if('unknown' == $data['dnid'] && $PICKUPEER != ''){
+    if ('unknown' == $data['dnid'] && $PICKUPEER != '') {
         // Скорее всего ответ на вызов из 1С.
         $data['dnid']   = $pickupexten;
-    }elseif ($pickupexten == substr($data['dnid'], 0, 2) && $PICKUPEER != ''){
+    }elseif ($pickupexten == substr($data['dnid'], 0, 2) && $PICKUPEER != '') {
         // Это перехват при наборе номера *8XXX.
         $data['dnid']   = $pickupexten;
     }
-    if(trim($data['dnid']) == $pickupexten ) {
+    if (trim($data['dnid']) == $pickupexten) {
         // Очищаем переменную канала. Больше не требуется.
         $agi->set_variable("PICKUPEER", "");
         $data['old_id'] = $id;
-        $data['id'] 	= $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+        $data['id'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
@@ -183,18 +183,18 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial_hangup_DEPRECATED($agi, $action){
+function Event_dial_hangup_DEPRECATED($agi, $action) {
     // TODO Удалить эту функцию в будущем.
-    $now    = Util::get_now_date();
-	$data 	= array();
-	$data['action']  	 = "$action";
-	$data['end']  		 = $now;
+    $now = Util::get_now_date();
+	$data = array();
+	$data['action'] = "$action";
+	$data['end'] = $now;
 	$data['id'] 		 = $agi->get_variable("pt1c_UNIQUEID", true);
 	$data['agi_channel'] = $agi->request['agi_channel'];
 	$data['linkedid']  	 = $agi->get_variable("CDR(linkedid)", true);
 	$data['did']		 = $agi->get_variable("FROM_DID", true);
 
-	$data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+	$data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
 	return $data;
 }
@@ -205,35 +205,35 @@ 
  * @param string $action
  * @return array
  */
-function Event_transfer_dial($agi, $action){
+function Event_transfer_dial($agi, $action) {
     $now = Util::get_now_date();
-	$id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+	$id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
 	// Пытаемся определить канал.
     $TRANSFERERNAME = $agi->get_variable("TRANSFERERNAME", true);
 	$QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
 	$is_local       = !(stripos($TRANSFERERNAME, 'local/') === false);
-    if( $QUEUE_SRC_CHAN != '' && $is_local ){
+    if ($QUEUE_SRC_CHAN != '' && $is_local) {
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
-    }else if( $QUEUE_SRC_CHAN != '' && $TRANSFERERNAME == '' ){
+    } else if ($QUEUE_SRC_CHAN != '' && $TRANSFERERNAME == '') {
         // Это редирект на очередь.
         $channel = $QUEUE_SRC_CHAN;
-    }else if($TRANSFERERNAME == ''){
+    } else if ($TRANSFERERNAME == '') {
         $channel = $agi->request['agi_channel'];
-    }else{
+    } else {
         $channel = $TRANSFERERNAME;
     }
 
-	$data   = array();
-	$data['action']  	= "$action";
-	$data['agi_channel']= $channel;// $agi->request['agi_channel'];
+	$data = array();
+	$data['action'] = "$action";
+	$data['agi_channel'] = $channel; // $agi->request['agi_channel'];
 	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
-	$data['src_chan'] 	= $channel;
-	$data['did']		= $agi->get_variable("FROM_DID", true);;
-	$data['start']  	= $now;
+	$data['src_chan'] = $channel;
+	$data['did'] = $agi->get_variable("FROM_DID", true); ;
+	$data['start'] = $now;
 	$data['UNIQUEID']  	= $id;	
-	$data['transfer']  	= ($TRANSFERERNAME == '')?'0':'1';
+	$data['transfer']  	= ($TRANSFERERNAME == '') ? '0' : '1';
 	$data['src_num']  	= $agi->request['agi_callerid'];
 	$data['dst_num']  	= $agi->request['agi_extension'];
 
@@ -248,13 +248,13 @@ 
  * @param string $action
  * @return array
  */
-function Event_transfer_dial_create_chan($agi, $action){
-	$id  	= $agi->get_variable("transfer_UNIQUEID", true);
-	$data   = array();
-	$data['dst_chan'] 			= $agi->request['agi_channel'];
-	$data['transfer_UNIQUEID'] 	= "$id";
-	$data['action']  			= "$action";
-	$data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
+function Event_transfer_dial_create_chan($agi, $action) {
+	$id = $agi->get_variable("transfer_UNIQUEID", true);
+	$data = array();
+	$data['dst_chan'] = $agi->request['agi_channel'];
+	$data['transfer_UNIQUEID'] = "$id";
+	$data['action'] = "$action";
+	$data['linkedid'] = $agi->get_variable("CDR(linkedid)", true);
 
 	return $data;
 }
@@ -265,13 +265,13 @@ 
  * @param string $action
  * @return array
  */
-function Event_transfer_dial_answer($agi, $action){
+function Event_transfer_dial_answer($agi, $action) {
 	$data 	= array();
-    $now    = Util::get_now_date();
+    $now = Util::get_now_date();
 	$id   	= $agi->get_variable("transfer_UNIQUEID", true);
-	$data['answer'] 			= $now;
-	$data['transfer_UNIQUEID'] 	= "$id";
-	$data['action']  			= "$action";
+	$data['answer'] = $now;
+	$data['transfer_UNIQUEID'] = "$id";
+	$data['action'] = "$action";
 	$data['agi_channel']		= $agi->request['agi_channel'];
 	$data['linkedid']  			= $agi->get_variable("CDR(linkedid)", true);
 
@@ -284,24 +284,24 @@ 
  * @param string $action
  * @return array
  */
-function Event_transfer_dial_hangup($agi, $action){
-    $now    = Util::get_now_date();
-	$data 	= array();
-	$data['end']  		  = $now;
+function Event_transfer_dial_hangup($agi, $action) {
+    $now = Util::get_now_date();
+	$data = array();
+	$data['end'] = $now;
 	$data['linkedid']  	  = $agi->get_variable("CDR(linkedid)", true);
-	$data['did']		  = $agi->get_variable("FROM_DID", true);;
-	$data['action']  	  = "$action";
+	$data['did'] = $agi->get_variable("FROM_DID", true); ;
+	$data['action'] = "$action";
 	$data['agi_channel']  = $agi->request['agi_channel'];
-	$data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+	$data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
-	$pos = stripos( $data['agi_channel'], 'local/');
-	if($pos === false){
+	$pos = stripos($data['agi_channel'], 'local/');
+	if ($pos === false) {
 		// Если это завершение переадресации (консультативной). Создадим новую строку CDR.
-	}else{
+	} else {
 		// Если пришел локальный канал:
-		$data['TRANSFERERNAME'] = $agi->get_variable("TRANSFERERNAME", 	true);
-		$data['ANSWEREDTIME'] 	= $agi->get_variable("ANSWEREDTIME", 	true);
-		$data['dst_chan'] 		= $agi->get_variable("CDR(dstchannel)", true);
+		$data['TRANSFERERNAME'] = $agi->get_variable("TRANSFERERNAME", true);
+		$data['ANSWEREDTIME'] = $agi->get_variable("ANSWEREDTIME", true);
+		$data['dst_chan'] = $agi->get_variable("CDR(dstchannel)", true);
 	}
 
 	return $data;
@@ -313,20 +313,20 @@ 
  * @param string $action
  * @return array
  */
-function Event_hangup_chan($agi, $action){
-    $now    = Util::get_now_date();
-	$data 	= [];
+function Event_hangup_chan($agi, $action) {
+    $now = Util::get_now_date();
+	$data = [];
     $data['action']  	    = "$action";
-    $data['did']		    = $agi->get_variable("FROM_DID", true);;
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    $data['did'] = $agi->get_variable("FROM_DID", true); ;
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
 	$data['linkedid']  	    = $agi->get_variable("CDR(linkedid)", true);
 	$data['dialstatus']     = $agi->get_variable("DIALSTATUS", true);
-	if('ANSWER' == $data['dialstatus']){
+	if ('ANSWER' == $data['dialstatus']) {
         $data['dialstatus'] = "ANSWERED";
     }
-	$data['agi_channel']    = $agi->request['agi_channel'];
-	$data['end']  		    = $now;
+	$data['agi_channel'] = $agi->request['agi_channel'];
+	$data['end'] = $now;
 
     $data['OLD_LINKEDID']   = $agi->get_variable("OLD_LINKEDID", true);
     $data['UNIQUEID']  	    = $agi->get_variable("pt1c_UNIQUEID", true);
@@ -340,51 +340,51 @@ 
  * @param string $action
  * @return array
  */
-function Event_unpark_call($agi, $action){
-    $now    = Util::get_now_date();
+function Event_unpark_call($agi, $action) {
+    $now = Util::get_now_date();
 	// Обработка данных парковки. 
-	$exten	= $agi->get_variable("EXTEN", 	true);
+	$exten = $agi->get_variable("EXTEN", true);
 	$park_row = p_Park::get_parkslot_data($exten);
 	
 	$agi->set_variable("__pt1c_IS_PARK", "1");		
 	$agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']);
 	
 	// Сбор данных для генерации CDR.
-	$id   	= $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
-	$channel= $agi->request['agi_channel'];
+	$id   	= $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
+	$channel = $agi->request['agi_channel'];
  	$agi->set_variable("__pt1c_UNIQUEID", "$id");		
 	$data 	= array();
-	$data['action']  	 = "$action";
+	$data['action'] = "$action";
 	$data['UNIQUEID']  	 = $id;
-	$data['linkedid_old']= $agi->get_variable("CDR(linkedid)", true);
+	$data['linkedid_old'] = $agi->get_variable("CDR(linkedid)", true);
 	$data['agi_channel'] = $channel;
 	$data['linkedid']  	 = $park_row['ParkeeLinkedid'];
-	$data['start']  	 = $now;
+	$data['start'] = $now;
 	$data['transfer']  	 = '0';
-	$data['did']		 = $agi->get_variable("FROM_DID", true);
-	$data['answer']  	 = $data['start'];
+	$data['did'] = $agi->get_variable("FROM_DID", true);
+	$data['answer'] = $data['start'];
 	
-	if(null == $park_row){
+	if (null == $park_row) {
 		$data['src_chan'] 	= $channel;
 		$data['src_num']  	= $agi->request['agi_callerid'];
 		$data['dst_num']  	= $agi->request['agi_extension'];
 		$data['dst_chan'] 	= 'Park:'.$agi->request['agi_extension'];
-	}else if(true == $park_row['pt1c_is_dst']){
+	} else if (true == $park_row['pt1c_is_dst']) {
 		$data['src_chan'] 	= $channel;
 		$data['dst_chan'] 	= $park_row['ParkeeChannel'];
 		$data['src_num']  	= $agi->request['agi_callerid'];
 		$data['dst_num']  	= $park_row['ParkeeCallerIDNum'];
-	}else{
+	} else {
 		$data['src_chan'] 	= $park_row['ParkeeChannel'];
 		$data['dst_chan'] 	= $channel;
 		$data['src_num']  	= $park_row['ParkeeCallerIDNum'];
 		$data['dst_num']  	= $agi->request['agi_callerid'];
 	}
 	
-	if(trim($park_row['ParkingDuration'])!=''){
-		$time_start = date("Y-m-d H:i:s", time() - 1*($park_row['ParkingDuration']) );
+	if (trim($park_row['ParkingDuration']) != '') {
+		$time_start = date("Y-m-d H:i:s", time() - 1 * ($park_row['ParkingDuration']));
 		$data_parking = array(
-		    'UNIQUEID' => $id .'_'. Util::generateRandomString(3),
+		    'UNIQUEID' => $id.'_'.Util::generateRandomString(3),
 			'src_chan' => $park_row['ParkeeChannel'],
 			'src_num'  => $park_row['ParkeeCallerIDNum'],
 			'dst_num'  => $park_row['ParkingSpace'],
@@ -408,14 +408,14 @@ 
  * @param string $action
  * @return array
  */
-function Event_unpark_call_timeout($agi, $action){
-    $now  = Util::get_now_date();
-	$id   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+function Event_unpark_call_timeout($agi, $action) {
+    $now = Util::get_now_date();
+	$id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 	// PARKER=SIP/206
 	$PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true);
-	$PARKING_DURATION = ($PARKING_DURATION == '')?45:$PARKING_DURATION;
+	$PARKING_DURATION = ($PARKING_DURATION == '') ? 45 : $PARKING_DURATION;
 		
-	$time_start = date("Y-m-d H:i:s", time() - 1*($PARKING_DURATION));
+	$time_start = date("Y-m-d H:i:s", time() - 1 * ($PARKING_DURATION));
 	$PARKING_SPACE = $agi->get_variable("PARKING_SPACE", true);
 	$data = array(
 		'action'   => "$action",
@@ -434,7 +434,7 @@ 
 	);
 
 
-    $id2   = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    $id2 = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $agi->set_variable("__pt1c_UNIQUEID", "$id2");
 
     return $data;
@@ -446,13 +446,13 @@ 
  * @param string $action
  * @return array
  */
-function Event_queue_start($agi, $action){
-    $now  = Util::get_now_date();
+function Event_queue_start($agi, $action) {
+    $now = Util::get_now_date();
     $time_start = null;
-    $id = $agi->get_variable("pt1c_UNIQUEID",  true);
-    $ISTRANSFER = $agi->get_variable("ISTRANSFER",  true);
+    $id = $agi->get_variable("pt1c_UNIQUEID", true);
+    $ISTRANSFER = $agi->get_variable("ISTRANSFER", true);
 
-    if(empty($id) || !empty($ISTRANSFER)) {
+    if (empty($id) || !empty($ISTRANSFER)) {
         $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
         $time_start = $now;
     }
@@ -470,7 +470,7 @@ 
 		'UNIQUEID' => $id,
 		'linkedid' => $agi->get_variable("CDR(linkedid)", true)
 	);
-    if(!empty($time_start)){
+    if (!empty($time_start)) {
         $data['src_chan'] = $agi->get_variable("QUEUE_SRC_CHAN", true);
         $data['src_num']  = $agi->request['agi_callerid'];
         $data['start']    = $time_start;
@@ -478,9 +478,9 @@ 
         $data['transfer'] = '0';
         $agi->set_variable("__pt1c_q_UNIQUEID", "$id");
     }
-    if(!empty($ISTRANSFER)){
+    if (!empty($ISTRANSFER)) {
         $data['transfer']  	= '1';
-    }else{
+    } else {
         $data['transfer']  	= '0';
     }
 
@@ -493,14 +493,14 @@ 
  * @param string $action
  * @return array
  */
-function Event_queue_answer($agi, $action){
-    $now  = Util::get_now_date();
+function Event_queue_answer($agi, $action) {
+    $now = Util::get_now_date();
 	$id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
 	$data = array();
 	$data['action']  	= "$action";
 	$data['answer']  	= $now;
-	$data['id'] 		= $id;
-	$data['agi_channel']= $agi->request['agi_channel'];
+	$data['id'] = $id;
+	$data['agi_channel'] = $agi->request['agi_channel'];
 	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
 
 	return $data;	
@@ -512,15 +512,15 @@ 
  * @param string $action
  * @return array
  */
-function Event_queue_end($agi, $action){
-    $now  = Util::get_now_date();
+function Event_queue_end($agi, $action) {
+    $now = Util::get_now_date();
 	$id   = $agi->get_variable("pt1c_q_UNIQUEID", true);
 	$data = array();
-	$data['action']  	= "$action";
-	$data['end']  		= $now;
-	$data['id'] 		= $id;
+	$data['action'] = "$action";
+	$data['end'] = $now;
+	$data['id'] = $id;
 	$data['dialstatus'] = $agi->get_variable("QUEUESTATUS", true);
-	$data['agi_channel']= $agi->request['agi_channel'];
+	$data['agi_channel'] = $agi->request['agi_channel'];
 	$data['linkedid']  	= $agi->get_variable("CDR(linkedid)", true);
 
 	return $data;	
@@ -532,52 +532,52 @@ 
  * @param string $action
  * @return array
  */
-function Event_meetme_dial($agi, $action){
+function Event_meetme_dial($agi, $action) {
     $now        = Util::get_now_date();
     $id         = '';
     $time_start = $now;
     $exten      = $agi->request['agi_extension'];
 
-    $not_local       = (stripos($agi->request['agi_channel'], 'local/') === false);
-    if($not_local){
+    $not_local = (stripos($agi->request['agi_channel'], 'local/') === false);
+    if ($not_local) {
         $am     = Util::get_am();
         $res    = $am->meetMeCollectInfo($exten, ['conf_1c']);
         $callid = $agi->request['agi_callerid'];
-        $users_nums   = [ [$callid] ];
-        foreach ($res as $row){
+        $users_nums = [[$callid]];
+        foreach ($res as $row) {
             $users_nums[] = explode('_', $row['conf_1c']);
         }
         $users = implode('_', array_unique(array_merge(... $users_nums)));
         $agi->set_variable('conf_1c', $users);
-        $agi->set_variable('CALLERID(num)','Conference_Room');
+        $agi->set_variable('CALLERID(num)', 'Conference_Room');
         $agi->set_variable('CALLERID(name)', $callid);
-        $agi->set_variable('mikoconfcid',    $exten);
-        $agi->set_variable('mikoidconf',     $exten);
+        $agi->set_variable('mikoconfcid', $exten);
+        $agi->set_variable('mikoidconf', $exten);
 
         $mikoidconf = $exten;
-        $BLINDTRANSFER  = $agi->get_variable("BLINDTRANSFER", true);
-        if(empty($BLINDTRANSFER)){
+        $BLINDTRANSFER = $agi->get_variable("BLINDTRANSFER", true);
+        if (empty($BLINDTRANSFER)) {
             $id     = $agi->get_variable('pt1c_UNIQUEID', true);
         }
-        $src_num= $callid;
-        $dst_num= $exten;
-    }else{
+        $src_num = $callid;
+        $dst_num = $exten;
+    } else {
         $mikoidconf     = $agi->get_variable('mikoidconf', true);
-        if(empty($mikoidconf)){
+        if (empty($mikoidconf)) {
             $mikoidconf = $exten;
         }
-        $src_num    = $agi->get_variable('mikoconfcid', true);
+        $src_num = $agi->get_variable('mikoconfcid', true);
         // Отсечем все до "/".
         $tmp_arr = explode('/', $mikoidconf);
-        if(count($tmp_arr)>1){
+        if (count($tmp_arr) > 1) {
             unset($tmp_arr[0]);
             $mikoidconf = implode('/', $tmp_arr);
         }
-        $dst_num    = substr($mikoidconf, 4);
+        $dst_num = substr($mikoidconf, 4);
     }
 
-    if(empty($id)){
-        $id         = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+    if (empty($id)) {
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
 
     $recordingfile = Cdr::MeetMeSetRecFilename($id);
@@ -595,8 +595,8 @@ 
         'UNIQUEID'      => $id,
         'linkedid'      => $agi->get_variable('CDR(linkedid)', true)
     ];
-    $agi->set_variable('MEETME_RECORDINGFILE',  $recordingfile);
-    $agi->set_variable('__pt1c_q_UNIQUEID',     $id);
+    $agi->set_variable('MEETME_RECORDINGFILE', $recordingfile);
+    $agi->set_variable('__pt1c_q_UNIQUEID', $id);
 
     return $data;
 }
@@ -610,11 +610,11 @@ 
 function Event_hangup_chan_meetme($agi, $action):array {
     $now  = Util::get_now_date();
     $data = [];
-    $data['action']  	= $action;
+    $data['action'] = $action;
     $data['linkedid']  	= $agi->get_variable('CDR(linkedid)', true);
     $data['src_chan']   = $agi->request['agi_channel'];
-    $data['agi_channel']= $agi->request['agi_channel'];
-    $data['end']  		= $now;
+    $data['agi_channel'] = $agi->request['agi_channel'];
+    $data['end'] = $now;
     $data['meetme_id'] 	= $agi->get_variable('MEETMEUNIQUEID', true);
     $data['conference'] = $agi->get_variable('mikoidconf', true);
     $data['UNIQUEID']   = $agi->get_variable('pt1c_q_UNIQUEID', true);
@@ -632,10 +632,10 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial_app($agi, $action){
-    $id         = $agi->request['agi_uniqueid'] .'_'. Util::generateRandomString();
+function Event_dial_app($agi, $action) {
+    $id         = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $extension 	= $agi->get_variable("APPEXTEN", true);
-    if(empty($extension)){
+    if (empty($extension)) {
         $extension = $agi->request['agi_extension'];
     }
 
@@ -655,21 +655,21 @@ 
  * @param string $action
  * @return array
  */
-function Event_dial_outworktimes($agi, $action){
+function Event_dial_outworktimes($agi, $action) {
     $data = Event_dial($agi, $action);
     $data['dst_chan']   = 'App:outworktimes';
-    $data['dst_num']  	= 'outworktimes';
+    $data['dst_num'] = 'outworktimes';
     $data['is_app']     = 1;
     return $data;
 }
 
 // Должны быть переданы параметры.
-if(count($argv)==1) exit;
+if (count($argv) == 1) exit;
 
 $action	    = trim($argv[1]);
 $func_name 	= "Event_$action";
 
-if( function_exists($func_name) ){
+if (function_exists($func_name)) {
     $agi = new AGI();
     // Сбор сведений по каналу.
 	$result = $func_name($agi, $action);

Braces +14 added lines, -12 removed lines

@@ -37,7 +37,7 @@ 
 	if($QUEUE_SRC_CHAN != '' && $is_local){
 		// Это LOCAL, Переопределим на исходный. 
 		$channel = $QUEUE_SRC_CHAN;
-	}else if($is_local && (stripos($orign_chan, 'local/') === false)){
+	} else if($is_local && (stripos($orign_chan, 'local/') === false)){
         $channel = $orign_chan;
     }
 
@@ -63,7 +63,7 @@ 
 
         $id   = substr($agi->request['agi_uniqueid'],0, 16) .'_'.$num.'_'. $IS_ORGNT;
         $data['dst_chan'] 	 = $dst_chan;
-    }else{
+    } else{
         $src_num  	 = $agi->request['agi_callerid'];
         $dst_num  	 = $agi->request['agi_extension'];
     }
@@ -162,7 +162,7 @@ 
     if('unknown' == $data['dnid'] && $PICKUPEER != ''){
         // Скорее всего ответ на вызов из 1С.
         $data['dnid']   = $pickupexten;
-    }elseif ($pickupexten == substr($data['dnid'], 0, 2) && $PICKUPEER != ''){
+    } elseif ($pickupexten == substr($data['dnid'], 0, 2) && $PICKUPEER != ''){
         // Это перехват при наборе номера *8XXX.
         $data['dnid']   = $pickupexten;
     }
@@ -216,12 +216,12 @@ 
     if( $QUEUE_SRC_CHAN != '' && $is_local ){
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
-    }else if( $QUEUE_SRC_CHAN != '' && $TRANSFERERNAME == '' ){
+    } else if( $QUEUE_SRC_CHAN != '' && $TRANSFERERNAME == '' ){
         // Это редирект на очередь.
         $channel = $QUEUE_SRC_CHAN;
-    }else if($TRANSFERERNAME == ''){
+    } else if($TRANSFERERNAME == ''){
         $channel = $agi->request['agi_channel'];
-    }else{
+    } else{
         $channel = $TRANSFERERNAME;
     }
 
@@ -297,7 +297,7 @@ 
 	$pos = stripos( $data['agi_channel'], 'local/');
 	if($pos === false){
 		// Если это завершение переадресации (консультативной). Создадим новую строку CDR.
-	}else{
+	} else{
 		// Если пришел локальный канал:
 		$data['TRANSFERERNAME'] = $agi->get_variable("TRANSFERERNAME", 	true);
 		$data['ANSWEREDTIME'] 	= $agi->get_variable("ANSWEREDTIME", 	true);
@@ -369,12 +369,12 @@ 
 		$data['src_num']  	= $agi->request['agi_callerid'];
 		$data['dst_num']  	= $agi->request['agi_extension'];
 		$data['dst_chan'] 	= 'Park:'.$agi->request['agi_extension'];
-	}else if(true == $park_row['pt1c_is_dst']){
+	} else if(true == $park_row['pt1c_is_dst']){
 		$data['src_chan'] 	= $channel;
 		$data['dst_chan'] 	= $park_row['ParkeeChannel'];
 		$data['src_num']  	= $agi->request['agi_callerid'];
 		$data['dst_num']  	= $park_row['ParkeeCallerIDNum'];
-	}else{
+	} else{
 		$data['src_chan'] 	= $park_row['ParkeeChannel'];
 		$data['dst_chan'] 	= $channel;
 		$data['src_num']  	= $park_row['ParkeeCallerIDNum'];
@@ -480,7 +480,7 @@ 
     }
     if(!empty($ISTRANSFER)){
         $data['transfer']  	= '1';
-    }else{
+    } else{
         $data['transfer']  	= '0';
     }
 
@@ -561,7 +561,7 @@ 
         }
         $src_num= $callid;
         $dst_num= $exten;
-    }else{
+    } else{
         $mikoidconf     = $agi->get_variable('mikoidconf', true);
         if(empty($mikoidconf)){
             $mikoidconf = $exten;
@@ -664,7 +664,9 @@ 
 }
 
 // Должны быть переданы параметры.
-if(count($argv)==1) exit;
+if(count($argv)==1) {
+    exit;
+}
 
 $action	    = trim($argv[1]);
 $func_name 	= "Event_$action";

etc/asterisk/agi-bin/phpagi-asmanager.php

Spacing +109 added lines, -109 removed lines

@@ -88,7 +88,7 @@ 
      * @param string $config is the name of the config file to parse or a parent agi from which to read the config
      * @param array  $optconfig is an array of configuration vars and vals, stuffed into $this->config['asmanager']
      */
-    function __construct($config = NULL, $optconfig = array()){
+    function __construct($config = NULL, $optconfig = array()) {
         // load config
         if (!is_null($config) && file_exists($config)) $this->config = parse_ini_file($config, true); elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
 
@@ -109,11 +109,11 @@ 
      * @param array  $parameters
      * @return array of parameters
      */
-    function send_request($action, $parameters = array()){
+    function send_request($action, $parameters = array()) {
         $req = "Action: $action\r\n";
         foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
         $req .= "\r\n";
-        if(!is_resource($this->socket)){
+        if (!is_resource($this->socket)) {
             return array();
         }
         @fwrite($this->socket, $req);
@@ -127,11 +127,11 @@ 
      * @param array  $parameters
      * @return array of parameters
      */
-    function send_request_timeout($action, $parameters = array()){
+    function send_request_timeout($action, $parameters = array()) {
         $req = "Action: $action\r\n";
         foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
         $req .= "\r\n";
-        if(!is_resource($this->socket)){
+        if (!is_resource($this->socket)) {
             return array();
         }
         @fwrite($this->socket, $req);
@@ -143,9 +143,9 @@ 
      * @param string $pingname
      * @return array|bool
      */
-    function ping_ami_listner($pingname = 'CdrConnector'){
+    function ping_ami_listner($pingname = 'CdrConnector') {
         // Установим фильтр на события.
-        $params   = ['Operation'=>'Add', 'Filter' => 'Event: UserEvent'];
+        $params = ['Operation'=>'Add', 'Filter' => 'Event: UserEvent'];
         $this->send_request_timeout('Filter', $params);
         // Отправим пинг.
         $req = '';
@@ -155,7 +155,7 @@ 
         );
         foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
         $req .= "\r\n";
-        if(!is_resource($this->socket)){
+        if (!is_resource($this->socket)) {
             return array();
         }
         @fwrite($this->socket, $req);
@@ -169,14 +169,14 @@ 
         do {
             $type       = '';
             $parameters = [];
-            if(!is_resource($this->socket)){
+            if (!is_resource($this->socket)) {
                 return false;
             }
             $buffer = trim(@fgets($this->socket, 4096));
             while ($buffer != '') {
                 $a = strpos($buffer, ':');
                 if ($a) {
-                    if (!count($parameters)){
+                    if (!count($parameters)) {
                         $type = strtolower(substr($buffer, 0, $a));
                     }
                     $parameters[substr($buffer, 0, $a)] = substr($buffer, $a + 2);
@@ -184,16 +184,16 @@ 
                 $buffer = trim(fgets($this->socket, 4096));
             }
 
-            if($type == '' && count($this->Ping())==0){
+            if ($type == '' && count($this->Ping()) == 0) {
                 $timeout = true;
             }
-            else if('event' == $type && $parameters['Event'] == 'UserEvent' && "{$pingname}Pong" == $parameters['UserEvent']){
+            else if ('event' == $type && $parameters['Event'] == 'UserEvent' && "{$pingname}Pong" == $parameters['UserEvent']) {
                 // Ответ получен.
                 $result = true;
                 break;
             }
             $time = $this->microtime_float() - $time_start;
-            if($time > 2){
+            if ($time > 2) {
                 // Таймаут ожидания.
                 break;
             }
@@ -203,11 +203,11 @@ 
         return $result;
     }
 
-    private function wait_response_get_sub_data(&$parameters, $end_string = '', $event_as_array=true):void {
-        if(!is_array($parameters)){
+    private function wait_response_get_sub_data(&$parameters, $end_string = '', $event_as_array = true):void {
+        if (!is_array($parameters)) {
             $parameters = [];
         }
-        if(empty($end_string)){
+        if (empty($end_string)) {
             return;
         }
         $parameters['data'] = array();
@@ -218,10 +218,10 @@ 
             $buff   = fgets($this->socket, 4096);
             $a_pos  = strpos($buff, ':');
             if (!$a_pos) {
-                if (count($m)>0) {
-                    if($event_as_array){
+                if (count($m) > 0) {
+                    if ($event_as_array) {
                         $parameters['data'][$m['Event']][] = $m;
-                    }else{
+                    } else {
                         $parameters['data'][$m['Event']] = $m;
                     }
                 }
@@ -251,7 +251,7 @@ 
         do {
             $type = NULL;
             $parameters = array();
-            if(!is_resource($this->socket)){
+            if (!is_resource($this->socket)) {
                 return $parameters;
             }
             $buffer = trim(@fgets($this->socket, 4096));
@@ -260,7 +260,7 @@ 
                 if ($a) {
                     $key = ''; $value = '';
                     $event_text = substr($buffer, $a + 2);
-                    if (!count($parameters)){
+                    if (!count($parameters)) {
                         $type = strtolower(substr($buffer, 0, $a));
                         if ($event_text === 'Follows') {
                             // A follows response means there is a miltiline field that follows.
@@ -308,7 +308,7 @@ 
                         // MeetmeList
                         $this->wait_response_get_sub_data($parameters, 'MeetmeListRoomsComplete');
                     }
-                    unset($key,$value);
+                    unset($key, $value);
                     // store parameter in $parameters
                     $parameters[substr($buffer, 0, $a)] = $event_text;
                 }
@@ -327,7 +327,7 @@ 
                 case 'response':
                     break;
                 default:
-                    $this->log('Unhandled response packet from Manager: ' . print_r($parameters, true));
+                    $this->log('Unhandled response packet from Manager: '.print_r($parameters, true));
                     break;
             }
         } while ($type !== 'response' && !$timeout);
@@ -339,30 +339,30 @@ 
      * @param $allow_timeout bool
      * @return array of parameters, empty on timeout
      */
-    function wait_user_event($allow_timeout = false){
+    function wait_user_event($allow_timeout = false) {
         $timeout = false;
         do {
             $type       = '';
             $parameters = [];
-            try{
+            try {
                 $buffer = trim(@fgets($this->socket, 4096));
-            }catch (Exception $e){
+            } catch (Exception $e) {
                 return false;
             }
             while ($buffer != '') {
                 $a = strpos($buffer, ':');
                 if ($a) {
-                    if (!count($parameters)){
+                    if (!count($parameters)) {
                         $type = strtolower(substr($buffer, 0, $a));
                     }
                     $parameters[substr($buffer, 0, $a)] = substr($buffer, $a + 2);
                 }
                 $buffer = trim(fgets($this->socket, 4096));
             }
-            if($type == '' && count($this->Ping())==0){
+            if ($type == '' && count($this->Ping()) == 0) {
                 $timeout = $allow_timeout;
             }
-            else if('event' == $type){
+            else if ('event' == $type) {
                 $this->process_event($parameters);
             }
         } while (!$timeout);
@@ -380,7 +380,7 @@ 
      * @param string $events
      * @return boolean true on success
      */
-    function connect($server = NULL, $username = NULL, $secret = NULL, $events = 'on'){
+    function connect($server = NULL, $username = NULL, $secret = NULL, $events = 'on') {
         // use config if not specified
         if (is_null($server)) $server = $this->config['asmanager']['server'];
         if (is_null($username)) $username = $this->config['asmanager']['username'];
@@ -428,7 +428,7 @@ 
         return true;
     }
 
-    public function logged_in(){
+    public function logged_in() {
         return $this->_logged_in;
     }
 
@@ -437,9 +437,9 @@ 
      *
      * @example examples/sip_show_peer.php Get information about a sip peer
      */
-    function disconnect(){
+    function disconnect() {
         if ($this->_logged_in == TRUE) $this->logoff();
-        if(is_resource($this->socket)){
+        if (is_resource($this->socket)) {
             fclose($this->socket);
         }
     }
@@ -458,7 +458,7 @@ 
      * @param integer $timeout Maximum duration of the call (sec)
      * @return array
      */
-    function AbsoluteTimeout($channel, $timeout){
+    function AbsoluteTimeout($channel, $timeout) {
         return $this->send_request('AbsoluteTimeout', array('Channel' => $channel, 'Timeout' => $timeout));
     }
 
@@ -470,7 +470,7 @@ 
      * @param string $file the new name of the file created in the monitor spool directory.
      * @return array
      */
-    function ChangeMonitor($channel, $file){
+    function ChangeMonitor($channel, $file) {
         return $this->send_request('ChangeMontior', array('Channel' => $channel, 'File' => $file));
     }
 
@@ -484,7 +484,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function Command($command, $actionid = NULL){
+    function Command($command, $actionid = NULL) {
         $parameters = array('Command' => $command);
         if ($actionid) $parameters['ActionID'] = $actionid;
         return $this->send_request('Command', $parameters);
@@ -497,7 +497,7 @@ 
      * @param string $eventmask is either 'on', 'off', or 'system,call,log'
      * @return array
      */
-    function Events($eventmask){
+    function Events($eventmask) {
         return $this->send_request('Events', array('EventMask' => $eventmask));
     }
 
@@ -510,7 +510,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function ExtensionState($exten, $context, $actionid = NULL){
+    function ExtensionState($exten, $context, $actionid = NULL) {
         $parameters = array('Exten' => $exten, 'Context' => $context);
         if ($actionid) $parameters['ActionID'] = $actionid;
         return $this->send_request('ExtensionState', $parameters);
@@ -527,15 +527,15 @@ 
      * @param boolean $ret_array
      * @return string | array
      */
-    function GetVar($channel, $variable, $actionid = NULL, $ret_array = true){
+    function GetVar($channel, $variable, $actionid = NULL, $ret_array = true) {
         $parameters = array('Channel' => $channel, 'Variable' => $variable);
-        if ($actionid){
+        if ($actionid) {
             $parameters['ActionID'] = $actionid;
         }
 
         $data = $this->send_request('GetVar', $parameters);
-        if($ret_array != true){
-            $data = (isset($data['Value']) && $data['Value'] )?$data['Value']:'';
+        if ($ret_array != true) {
+            $data = (isset($data['Value']) && $data['Value']) ? $data['Value'] : '';
         }
         return $data;
     }
@@ -545,21 +545,21 @@ 
      * @param boolean $group
      * @return array
      */
-    public function GetChannels($group = true){
-        $res 	  = $this->send_request_timeout('CoreShowChannels');
+    public function GetChannels($group = true) {
+        $res = $this->send_request_timeout('CoreShowChannels');
         $channels = null;
-        if(isset($res['data']['CoreShowChannel'])){
+        if (isset($res['data']['CoreShowChannel'])) {
             $channels = $res['data']['CoreShowChannel'];
         }
         $channels_id = array();
-        if(null != $channels){
-            foreach($channels as $chan){
-                if($group == true){
-                    if(! isset($chan['Linkedid']) ){
+        if (null != $channels) {
+            foreach ($channels as $chan) {
+                if ($group == true) {
+                    if (!isset($chan['Linkedid'])) {
                         continue;
                     }
                     $channels_id[$chan['Linkedid']][] = $chan['Channel'];
-                }else{
+                } else {
                     $channels_id[] = $chan['Channel'];
                 }
             }
@@ -575,7 +575,7 @@ 
      * @param string $channel The channel name to be hungup
      * @return array
      */
-    function Hangup($channel){
+    function Hangup($channel) {
         return $this->send_request('Hangup', array('Channel' => $channel));
     }
 
@@ -585,10 +585,10 @@ 
      * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+IAXpeers
      * @return array
      */
-    function IAXpeerlist(){
+    function IAXpeerlist() {
         $result = $this->send_request('IAXpeerlist');
-        $data = (isset($result['data']) && is_array($result['data']))?$result['data']:[];
-        $arr_peer = (isset($data['PeerEntry']) && is_array($data['PeerEntry']))?$data['PeerEntry']:[];
+        $data = (isset($result['data']) && is_array($result['data'])) ? $result['data'] : [];
+        $arr_peer = (isset($data['PeerEntry']) && is_array($data['PeerEntry'])) ? $data['PeerEntry'] : [];
         return $arr_peer;
     }
 
@@ -596,10 +596,10 @@ 
      * Возвращает регистрации пиров.
      * @return array
      */
-    function IAXregistry(){
+    function IAXregistry() {
         $result = $this->send_request('IAXregistry');
-        $data = (isset($result['data']) && is_array($result['data']))?$result['data']:[];
-        $arr_peer = (isset($data['RegistryEntry']) && is_array($data['RegistryEntry']))?$data['RegistryEntry']:[];
+        $data = (isset($result['data']) && is_array($result['data'])) ? $result['data'] : [];
+        $arr_peer = (isset($data['RegistryEntry']) && is_array($data['RegistryEntry'])) ? $data['RegistryEntry'] : [];
         return $arr_peer;
     }
 
@@ -610,7 +610,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function ListCommands($actionid = NULL){
+    function ListCommands($actionid = NULL) {
         if ($actionid) return $this->send_request('ListCommands', array('ActionID' => $actionid)); else
             return $this->send_request('ListCommands');
     }
@@ -621,7 +621,7 @@ 
      * @param  array  $headers
      * @return array
      */
-    function UserEvent($name, $headers){
+    function UserEvent($name, $headers) {
         $headers['UserEvent'] = $name;
         return $this->send_request_timeout('UserEvent', $headers);
     }
@@ -631,7 +631,7 @@ 
      *
      * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Logoff
      */
-    function Logoff(){
+    function Logoff() {
         return $this->send_request_timeout('Logoff');
     }
 
@@ -649,7 +649,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function MailboxCount($mailbox, $actionid = NULL){
+    function MailboxCount($mailbox, $actionid = NULL) {
         $parameters = array('Mailbox' => $mailbox);
         if ($actionid) $parameters['ActionID'] = $actionid;
         return $this->send_request('MailboxCount', $parameters);
@@ -668,7 +668,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function MailboxStatus($mailbox, $actionid = NULL){
+    function MailboxStatus($mailbox, $actionid = NULL) {
         $parameters = array('Mailbox' => $mailbox);
         if ($actionid) $parameters['ActionID'] = $actionid;
         return $this->send_request('MailboxStatus', $parameters);
@@ -684,7 +684,7 @@ 
      * @param boolean $mix
      * @return array
      */
-    function Monitor($channel, $file = NULL, $format = NULL, $mix = NULL){
+    function Monitor($channel, $file = NULL, $format = NULL, $mix = NULL) {
         $parameters = array('Channel' => $channel);
         if ($file) $parameters['File'] = $file;
         if ($format) $parameters['Format'] = $format;
@@ -702,7 +702,7 @@ 
      * @param string $command
      * @return array
      */
-    function MixMonitor($channel, $file, $options, $command){
+    function MixMonitor($channel, $file, $options, $command) {
         $parameters = array('Channel' => $channel);
         $parameters['File'] = $file;
         $parameters['options'] = $options;
@@ -717,7 +717,7 @@ 
      * @param string $channel
      * @return array
      */
-    function StopMixMonitor($channel){
+    function StopMixMonitor($channel) {
         $parameters = array('Channel' => $channel);
         return $this->send_request_timeout('StopMixMonitor', $parameters);
     }
@@ -730,7 +730,7 @@ 
      * @param string $Val
      * @return array
      */
-    function DBPut($Family, $Key, $Val = ''){
+    function DBPut($Family, $Key, $Val = '') {
         $parameters = array('Family' => $Family, 'Key' => $Key, 'Val' => $Val);
         $res_data = $this->send_request_timeout('DBPut', $parameters);
         return $res_data;
@@ -742,8 +742,8 @@ 
      * @param $ActionID
      * @return array
      */
-    public function MeetmeList($Conference, $ActionID=''):array {
-        if(empty($ActionID)){
+    public function MeetmeList($Conference, $ActionID = ''):array {
+        if (empty($ActionID)) {
             $ActionID = Util::generateRandomString(5);
         }
         $parameters = [
@@ -758,8 +758,8 @@ 
      * @param $ActionID
      * @return array
      */
-    public function MeetmeListRooms($ActionID=''):array {
-        if(empty($ActionID)){
+    public function MeetmeListRooms($ActionID = ''):array {
+        if (empty($ActionID)) {
             $ActionID = Util::generateRandomString(5);
         }
         $parameters = [
@@ -775,7 +775,7 @@ 
      * @param string $Key
      * @return array
      */
-    function DBGet($Family, $Key){
+    function DBGet($Family, $Key) {
         $parameters = array('Family' => $Family, 'Key' => $Key);
         return $this->send_request_timeout('DBGet', $parameters);
     }
@@ -798,7 +798,7 @@ 
      * @param string  $actionid message matching variable
      * @return array
      */
-    function Originate($channel, $exten = NULL, $context = NULL, $priority = NULL, $application = NULL, $data = NULL, $timeout = NULL, $callerid = NULL, $variable = NULL, $account = NULL, $async = NULL, $actionid = NULL){
+    function Originate($channel, $exten = NULL, $context = NULL, $priority = NULL, $application = NULL, $data = NULL, $timeout = NULL, $callerid = NULL, $variable = NULL, $account = NULL, $async = NULL, $actionid = NULL) {
         $parameters = array('Channel' => $channel);
 
         if ($exten) $parameters['Exten'] = $exten;
@@ -826,12 +826,12 @@ 
      * @param string $parkinglot message matching variable
      * @return array
      */
-    function ParkedCalls($parkinglot = NULL, $actionid = NULL){
+    function ParkedCalls($parkinglot = NULL, $actionid = NULL) {
         $parameters = [];
-        if ($actionid){
+        if ($actionid) {
             $parameters['ActionID'] = $actionid;
         }
-        if ($parkinglot){
+        if ($parkinglot) {
             $parameters['ParkingLot'] = $parkinglot;
         }
         $result = $this->send_request_timeout('ParkedCalls', $parameters);
@@ -844,7 +844,7 @@ 
      *
      * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Ping
      */
-    function Ping(){
+    function Ping() {
         return $this->send_request_timeout('Ping');
     }
 
@@ -857,7 +857,7 @@ 
      * @param integer $penalty
      * @return array
      */
-    function QueueAdd($queue, $interface, $penalty = 0){
+    function QueueAdd($queue, $interface, $penalty = 0) {
         $parameters = array('Queue' => $queue, 'Interface' => $interface);
         if ($penalty) $parameters['Penalty'] = $penalty;
         return $this->send_request('QueueAdd', $parameters);
@@ -871,7 +871,7 @@ 
      * @param string $interface
      * @return array
      */
-    function QueueRemove($queue, $interface){
+    function QueueRemove($queue, $interface) {
         return $this->send_request('QueueRemove', array('Queue' => $queue, 'Interface' => $interface));
     }
 
@@ -880,7 +880,7 @@ 
      *
      * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Queues
      */
-    function Queues(){
+    function Queues() {
         return $this->send_request('Queues');
     }
 
@@ -891,7 +891,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function QueueStatus($actionid = NULL){
+    function QueueStatus($actionid = NULL) {
         if ($actionid) return $this->send_request('QueueStatus', array('ActionID' => $actionid)); else
             return $this->send_request('QueueStatus');
     }
@@ -907,7 +907,7 @@ 
      * @param string $priority
      * @return array
      */
-    function Redirect($channel, $extrachannel, $exten, $context, $priority){
+    function Redirect($channel, $extrachannel, $exten, $context, $priority) {
         return $this->send_request('Redirect', array('Channel' => $channel, 'ExtraChannel' => $extrachannel, 'Exten' => $exten, 'Context' => $context, 'Priority' => $priority));
     }
 
@@ -920,7 +920,7 @@ 
      * @param string $append
      * @return array
      */
-    function SetCDRUserField($userfield, $channel, $append = NULL){
+    function SetCDRUserField($userfield, $channel, $append = NULL) {
         $parameters = array('UserField' => $userfield, 'Channel' => $channel);
         if ($append) $parameters['Append'] = $append;
         return $this->send_request('SetCDRUserField', $parameters);
@@ -935,7 +935,7 @@ 
      * @param string $value
      * @return array
      */
-    function SetVar($channel, $variable, $value){
+    function SetVar($channel, $variable, $value) {
         return $this->send_request('SetVar', array('Channel' => $channel, 'Variable' => $variable, 'Value' => $value));
     }
 
@@ -947,7 +947,7 @@ 
      * @param string $actionid message matching variable
      * @return array
      */
-    function Status($channel, $actionid = NULL){
+    function Status($channel, $actionid = NULL) {
         $parameters = array('Channel' => $channel);
         if ($actionid) $parameters['ActionID'] = $actionid;
         return $this->send_request('Status', $parameters);
@@ -960,7 +960,7 @@ 
      * @param string $channel
      * @return array
      */
-    function StopMonitor($channel){
+    function StopMonitor($channel) {
         return $this->send_request('StopMonitor', array('Channel' => $channel));
     }
 
@@ -972,7 +972,7 @@ 
      * Полученире текущих регистраций.
      * @return array
      */
-    public function get_sip_registry(){
+    public function get_sip_registry() {
         $peers = array();
         $result = $this->send_request_timeout('SIPshowregistry');
         if ($result['data'] !== null && $result['data']['RegistryEntry'] !== null) {
@@ -995,7 +995,7 @@ 
     public function get_pj_sip_registry():array {
         $peers  = [];
         $result = $this->send_request_timeout('PJSIPShowRegistrationsOutbound');
-        if ( isset($result['data']['OutboundRegistrationDetail']) ) {
+        if (isset($result['data']['OutboundRegistrationDetail'])) {
             foreach ($result['data']['OutboundRegistrationDetail'] as $peer) {
                 [$sip, $host, $port] = explode(':', $peer['ServerUri']);
                 $peers[] = array(
@@ -1017,9 +1017,9 @@ 
     public function get_pj_sip_peers():array {
         $peers = [];
         $result = $this->send_request_timeout('PJSIPShowEndpoints');
-        if ( isset($result['data']['EndpointList']) ) {
+        if (isset($result['data']['EndpointList'])) {
             foreach ($result['data']['EndpointList'] as $peer) {
-                if($peer['ObjectName'] === 'anonymous'){
+                if ($peer['ObjectName'] === 'anonymous') {
                     continue;
                 }
 
@@ -1042,7 +1042,7 @@ 
      * Получение статусов пиров.
      * @return array
      */
-    function get_sip_peers(){
+    function get_sip_peers() {
         $peers = array();
         $res = $this->send_request_timeout('SIPpeers');
         if (isset($res['data']) && $res['data'] != null && $res['data']['PeerEntry'] != null) {
@@ -1061,12 +1061,12 @@ 
      * @param $peer
      * @return array
      */
-    function get_sip_peer($peer){
+    function get_sip_peer($peer) {
         $parameters = ['Peer' => trim($peer)];
         $res = $this->send_request_timeout('SIPshowpeer', $parameters);
         $arr_status          = explode(' ', $res['Status']);
         $res['state']        = strtoupper($arr_status[0]);
-        $res['time-response']= strtoupper(str_replace(['(', ')'],'',$arr_status[1]));
+        $res['time-response'] = strtoupper(str_replace(['(', ')'], '', $arr_status[1]));
         return $res;
     }
 
@@ -1075,15 +1075,15 @@ 
      * @param $peer
      * @return array
      */
-    function get_pj_sip_peer($peer){
+    function get_pj_sip_peer($peer) {
         $result = [];
         $parameters = ['Endpoint' => trim($peer)];
         $res = $this->send_request_timeout('PJSIPShowEndpoint', $parameters);
 
-        if(isset($res['data']['ContactStatusDetail'])){
+        if (isset($res['data']['ContactStatusDetail'])) {
             $result = $res['data']['ContactStatusDetail'];
         }
-        $result['state']  = isset($result['URI']) && !empty($result['URI']) ? 'OK' : 'UNKNOWN';
+        $result['state'] = isset($result['URI']) && !empty($result['URI']) ? 'OK' : 'UNKNOWN';
         return $result;
     }
 
@@ -1092,17 +1092,17 @@ 
      * @param array $vars
      * @return array
      */
-    public function meetMeCollectInfo($conference, $vars=[]):array {
+    public function meetMeCollectInfo($conference, $vars = []):array {
         $result = [];
         $conf_data = $this->MeetmeList($conference);
-        if(!isset($conf_data['data']['MeetmeList'])){
+        if (!isset($conf_data['data']['MeetmeList'])) {
             return $result;
         }
-        foreach ($conf_data['data']['MeetmeList'] as $user_data){
-            $user_data['linkedid']  = $this->GetVar($user_data['Channel'], 'CDR(linkedid)',  null, false);
+        foreach ($conf_data['data']['MeetmeList'] as $user_data) {
+            $user_data['linkedid']  = $this->GetVar($user_data['Channel'], 'CDR(linkedid)', null, false);
             $user_data['meetme_id'] = $this->GetVar($user_data['Channel'], 'MEETMEUNIQUEID', null, false);
 
-            foreach ($vars as $var){
+            foreach ($vars as $var) {
                 $user_data[$var] = $this->GetVar($user_data['Channel'], $var, null, false);
             }
 
@@ -1127,14 +1127,14 @@ 
      * @param string $message
      * @param integer $level from 1 to 4
      */
-    function log($message, $level = 1){
+    function log($message, $level = 1) {
         if ($this->pagi != false) $this->pagi->conlog($message, $level);
 
     }
 
-    function microtime_float(){
+    function microtime_float() {
         list($usec, $sec) = explode(" ", microtime());
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -1177,7 +1177,7 @@ 
      * @param string | array $callback function
      * @return boolean sucess
      */
-    function add_event_handler($event, $callback){
+    function add_event_handler($event, $callback) {
         $event = strtolower($event);
         if (isset($this->event_handlers[$event])) {
             $this->log("$event handler is already defined, not over-writing.");
@@ -1194,21 +1194,21 @@ 
      * @param array $parameters
      * @return mixed result of event handler or false if no handler was found
      */
-    function process_event($parameters){
+    function process_event($parameters) {
         $ret = false;
         $e = strtolower($parameters['Event']);
         $this->log("Got event.. $e");
 
         $handler = '';
-        if (isset($this->event_handlers[$e])){
+        if (isset($this->event_handlers[$e])) {
             $handler = $this->event_handlers[$e];
         }
-        elseif (isset($this->event_handlers['*'])){
+        elseif (isset($this->event_handlers['*'])) {
             $handler = $this->event_handlers['*'];
         }
-        if(is_array($handler)){
+        if (is_array($handler)) {
             call_user_func($handler, $parameters);
-        }else if (function_exists($handler)) {
+        } else if (function_exists($handler)) {
             $this->log("Execute handler $handler");
             $ret = $handler($e, $parameters, $this->server, $this->port);
         } else

Braces +130 added lines, -52 removed lines

@@ -90,16 +90,30 @@ 
      */
     function __construct($config = NULL, $optconfig = array()){
         // load config
-        if (!is_null($config) && file_exists($config)) $this->config = parse_ini_file($config, true); elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+        if (!is_null($config) && file_exists($config)) {
+            $this->config = parse_ini_file($config, true);
+        } elseif (file_exists(DEFAULT_PHPAGI_CONFIG)) {
+            $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+        }
 
         // If optconfig is specified, stuff vals and vars into 'asmanager' config array.
-        foreach ($optconfig as $var => $val) $this->config['asmanager'][$var] = $val;
+        foreach ($optconfig as $var => $val) {
+            $this->config['asmanager'][$var] = $val;
+        }
 
         // add default values to config for uninitialized values
-        if (!isset($this->config['asmanager']['server'])) $this->config['asmanager']['server'] = 'localhost';
-        if (!isset($this->config['asmanager']['port'])) $this->config['asmanager']['port'] = 5038;
-        if (!isset($this->config['asmanager']['username'])) $this->config['asmanager']['username'] = 'phpagi';
-        if (!isset($this->config['asmanager']['secret'])) $this->config['asmanager']['secret'] = 'phpagi';
+        if (!isset($this->config['asmanager']['server'])) {
+            $this->config['asmanager']['server'] = 'localhost';
+        }
+        if (!isset($this->config['asmanager']['port'])) {
+            $this->config['asmanager']['port'] = 5038;
+        }
+        if (!isset($this->config['asmanager']['username'])) {
+            $this->config['asmanager']['username'] = 'phpagi';
+        }
+        if (!isset($this->config['asmanager']['secret'])) {
+            $this->config['asmanager']['secret'] = 'phpagi';
+        }
     }
 
     /**
@@ -111,7 +125,9 @@ 
      */
     function send_request($action, $parameters = array()){
         $req = "Action: $action\r\n";
-        foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
+        foreach ($parameters as $var => $val) {
+            $req .= "$var: $val\r\n";
+        }
         $req .= "\r\n";
         if(!is_resource($this->socket)){
             return array();
@@ -129,7 +145,9 @@ 
      */
     function send_request_timeout($action, $parameters = array()){
         $req = "Action: $action\r\n";
-        foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
+        foreach ($parameters as $var => $val) {
+            $req .= "$var: $val\r\n";
+        }
         $req .= "\r\n";
         if(!is_resource($this->socket)){
             return array();
@@ -153,7 +171,9 @@ 
             'Action'    => 'UserEvent',
             'UserEvent' => "{$pingname}Ping"
         );
-        foreach ($parameters as $var => $val) $req .= "$var: $val\r\n";
+        foreach ($parameters as $var => $val) {
+            $req .= "$var: $val\r\n";
+        }
         $req .= "\r\n";
         if(!is_resource($this->socket)){
             return array();
@@ -186,8 +206,7 @@ 
 
             if($type == '' && count($this->Ping())==0){
                 $timeout = true;
-            }
-            else if('event' == $type && $parameters['Event'] == 'UserEvent' && "{$pingname}Pong" == $parameters['UserEvent']){
+            } else if('event' == $type && $parameters['Event'] == 'UserEvent' && "{$pingname}Pong" == $parameters['UserEvent']){
                 // Ответ получен.
                 $result = true;
                 break;
@@ -221,7 +240,7 @@ 
                 if (count($m)>0) {
                     if($event_as_array){
                         $parameters['data'][$m['Event']][] = $m;
-                    }else{
+                    } else{
                         $parameters['data'][$m['Event']] = $m;
                     }
                 }
@@ -346,7 +365,7 @@ 
             $parameters = [];
             try{
                 $buffer = trim(@fgets($this->socket, 4096));
-            }catch (Exception $e){
+            } catch (Exception $e){
                 return false;
             }
             while ($buffer != '') {
@@ -361,8 +380,7 @@ 
             }
             if($type == '' && count($this->Ping())==0){
                 $timeout = $allow_timeout;
-            }
-            else if('event' == $type){
+            } else if('event' == $type){
                 $this->process_event($parameters);
             }
         } while (!$timeout);
@@ -382,9 +400,15 @@ 
      */
     function connect($server = NULL, $username = NULL, $secret = NULL, $events = 'on'){
         // use config if not specified
-        if (is_null($server)) $server = $this->config['asmanager']['server'];
-        if (is_null($username)) $username = $this->config['asmanager']['username'];
-        if (is_null($secret)) $secret = $this->config['asmanager']['secret'];
+        if (is_null($server)) {
+            $server = $this->config['asmanager']['server'];
+        }
+        if (is_null($username)) {
+            $username = $this->config['asmanager']['username'];
+        }
+        if (is_null($secret)) {
+            $secret = $this->config['asmanager']['secret'];
+        }
 
         // get port from server if specified
         if (strpos($server, ':') !== false) {
@@ -438,7 +462,9 @@ 
      * @example examples/sip_show_peer.php Get information about a sip peer
      */
     function disconnect(){
-        if ($this->_logged_in == TRUE) $this->logoff();
+        if ($this->_logged_in == TRUE) {
+            $this->logoff();
+        }
         if(is_resource($this->socket)){
             fclose($this->socket);
         }
@@ -486,7 +512,9 @@ 
      */
     function Command($command, $actionid = NULL){
         $parameters = array('Command' => $command);
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
         return $this->send_request('Command', $parameters);
     }
 
@@ -512,7 +540,9 @@ 
      */
     function ExtensionState($exten, $context, $actionid = NULL){
         $parameters = array('Exten' => $exten, 'Context' => $context);
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
         return $this->send_request('ExtensionState', $parameters);
     }
 
@@ -559,7 +589,7 @@ 
                         continue;
                     }
                     $channels_id[$chan['Linkedid']][] = $chan['Channel'];
-                }else{
+                } else{
                     $channels_id[] = $chan['Channel'];
                 }
             }
@@ -611,8 +641,11 @@ 
      * @return array
      */
     function ListCommands($actionid = NULL){
-        if ($actionid) return $this->send_request('ListCommands', array('ActionID' => $actionid)); else
-            return $this->send_request('ListCommands');
+        if ($actionid) {
+            return $this->send_request('ListCommands', array('ActionID' => $actionid));
+        } else {
+                    return $this->send_request('ListCommands');
+        }
     }
 
     /**
@@ -651,7 +684,9 @@ 
      */
     function MailboxCount($mailbox, $actionid = NULL){
         $parameters = array('Mailbox' => $mailbox);
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
         return $this->send_request('MailboxCount', $parameters);
     }
 
@@ -670,7 +705,9 @@ 
      */
     function MailboxStatus($mailbox, $actionid = NULL){
         $parameters = array('Mailbox' => $mailbox);
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
         return $this->send_request('MailboxStatus', $parameters);
     }
 
@@ -686,9 +723,15 @@ 
      */
     function Monitor($channel, $file = NULL, $format = NULL, $mix = NULL){
         $parameters = array('Channel' => $channel);
-        if ($file) $parameters['File'] = $file;
-        if ($format) $parameters['Format'] = $format;
-        if (!is_null($file)) $parameters['Mix'] = ($mix) ? 'true' : 'false';
+        if ($file) {
+            $parameters['File'] = $file;
+        }
+        if ($format) {
+            $parameters['Format'] = $format;
+        }
+        if (!is_null($file)) {
+            $parameters['Mix'] = ($mix) ? 'true' : 'false';
+        }
         return $this->send_request('Monitor', $parameters);
     }
 
@@ -801,19 +844,41 @@ 
     function Originate($channel, $exten = NULL, $context = NULL, $priority = NULL, $application = NULL, $data = NULL, $timeout = NULL, $callerid = NULL, $variable = NULL, $account = NULL, $async = NULL, $actionid = NULL){
         $parameters = array('Channel' => $channel);
 
-        if ($exten) $parameters['Exten'] = $exten;
-        if ($context) $parameters['Context'] = $context;
-        if ($priority) $parameters['Priority'] = $priority;
+        if ($exten) {
+            $parameters['Exten'] = $exten;
+        }
+        if ($context) {
+            $parameters['Context'] = $context;
+        }
+        if ($priority) {
+            $parameters['Priority'] = $priority;
+        }
 
-        if ($application) $parameters['Application'] = $application;
-        if ($data) $parameters['Data'] = $data;
+        if ($application) {
+            $parameters['Application'] = $application;
+        }
+        if ($data) {
+            $parameters['Data'] = $data;
+        }
 
-        if ($timeout) $parameters['Timeout'] = $timeout;
-        if ($callerid) $parameters['CallerID'] = $callerid;
-        if ($variable) $parameters['Variable'] = $variable;
-        if ($account) $parameters['Account'] = $account;
-        if (!is_null($async)) $parameters['Async'] = ($async) ? 'true' : 'false';
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($timeout) {
+            $parameters['Timeout'] = $timeout;
+        }
+        if ($callerid) {
+            $parameters['CallerID'] = $callerid;
+        }
+        if ($variable) {
+            $parameters['Variable'] = $variable;
+        }
+        if ($account) {
+            $parameters['Account'] = $account;
+        }
+        if (!is_null($async)) {
+            $parameters['Async'] = ($async) ? 'true' : 'false';
+        }
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
 
         return $this->send_request('Originate', $parameters);
     }
@@ -859,7 +924,9 @@ 
      */
     function QueueAdd($queue, $interface, $penalty = 0){
         $parameters = array('Queue' => $queue, 'Interface' => $interface);
-        if ($penalty) $parameters['Penalty'] = $penalty;
+        if ($penalty) {
+            $parameters['Penalty'] = $penalty;
+        }
         return $this->send_request('QueueAdd', $parameters);
     }
 
@@ -892,8 +959,11 @@ 
      * @return array
      */
     function QueueStatus($actionid = NULL){
-        if ($actionid) return $this->send_request('QueueStatus', array('ActionID' => $actionid)); else
-            return $this->send_request('QueueStatus');
+        if ($actionid) {
+            return $this->send_request('QueueStatus', array('ActionID' => $actionid));
+        } else {
+                    return $this->send_request('QueueStatus');
+        }
     }
 
     /**
@@ -922,7 +992,9 @@ 
      */
     function SetCDRUserField($userfield, $channel, $append = NULL){
         $parameters = array('UserField' => $userfield, 'Channel' => $channel);
-        if ($append) $parameters['Append'] = $append;
+        if ($append) {
+            $parameters['Append'] = $append;
+        }
         return $this->send_request('SetCDRUserField', $parameters);
     }
 
@@ -949,7 +1021,9 @@ 
      */
     function Status($channel, $actionid = NULL){
         $parameters = array('Channel' => $channel);
-        if ($actionid) $parameters['ActionID'] = $actionid;
+        if ($actionid) {
+            $parameters['ActionID'] = $actionid;
+        }
         return $this->send_request('Status', $parameters);
     }
 
@@ -1047,7 +1121,9 @@ 
         $res = $this->send_request_timeout('SIPpeers');
         if (isset($res['data']) && $res['data'] != null && $res['data']['PeerEntry'] != null) {
             foreach ($res['data']['PeerEntry'] as $peer) {
-                if (!is_numeric($peer['ObjectName'])) continue;
+                if (!is_numeric($peer['ObjectName'])) {
+                    continue;
+                }
                 // if ('Unmonitored' == $peer['Status']) continue;
                 $arr_status = explode(' ', $peer['Status']);
                 $peers[] = array('id' => $peer['ObjectName'], 'state' => strtoupper($arr_status[0]),);
@@ -1128,7 +1204,9 @@ 
      * @param integer $level from 1 to 4
      */
     function log($message, $level = 1){
-        if ($this->pagi != false) $this->pagi->conlog($message, $level);
+        if ($this->pagi != false) {
+            $this->pagi->conlog($message, $level);
+        }
 
     }
 
@@ -1202,17 +1280,17 @@ 
         $handler = '';
         if (isset($this->event_handlers[$e])){
             $handler = $this->event_handlers[$e];
-        }
-        elseif (isset($this->event_handlers['*'])){
+        } elseif (isset($this->event_handlers['*'])){
             $handler = $this->event_handlers['*'];
         }
         if(is_array($handler)){
             call_user_func($handler, $parameters);
-        }else if (function_exists($handler)) {
+        } else if (function_exists($handler)) {
             $this->log("Execute handler $handler");
             $ret = $handler($e, $parameters, $this->server, $this->port);
-        } else
-            $this->log("No event handler for event '$e'");
+        } else {
+                    $this->log("No event handler for event '$e'");
+        }
         return $ret;
     }
 }

etc/asterisk/agi-bin/check_redirect.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 $DIALSTATUS = $agi->get_variable('DIALSTATUS', true);
 $linkedid   = $agi->get_variable('CDR(linkedid)', true);
 if($chan === '' && 'ANSWER' === $DIALSTATUS) {
-	exit;
+    exit;
 }
 // Обнуляем значение переменной.
 $agi->set_variable('BLINDTRANSFER', '');

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@ 
 $agi 		= new AGI();
 $DIALSTATUS = $agi->get_variable('DIALSTATUS', true);
 $linkedid   = $agi->get_variable('CDR(linkedid)', true);
-if($chan === '' && 'ANSWER' === $DIALSTATUS) {
+if ($chan === '' && 'ANSWER' === $DIALSTATUS) {
 	exit;
 }
 // Обнуляем значение переменной.
 $agi->set_variable('BLINDTRANSFER', '');
 
-try{
+try {
     $filter = [
         '(dst_chan=:chan: OR src_chan=:chan:) AND linkedid=:linkedid:',
         'bind'  => ['chan' => $chan, 'linkedid' => $linkedid],
@@ -28,18 +28,18 @@ 
     ];
     $client  = new BeanstalkClient('select_cdr');
     $message = $client->request(json_encode($filter), 2);
-    if($message !== false){
+    if ($message !== false) {
         $res = json_decode($client->getBody(), true);
-        if(count($res) === 1){
-            $exten = ($res[0]['src_chan'] === $chan)?$res[0]['src_num']:$res[0]['dst_num'];
+        if (count($res) === 1) {
+            $exten = ($res[0]['src_chan'] === $chan) ? $res[0]['src_num'] : $res[0]['dst_num'];
             sleep(2);
             $agi->set_variable('pt1c_UNIQUEID', '');
             $agi->exec_goto('internal', $exten, '1');
         }
-    }else{
+    } else {
         Util::sys_log_msg('CheckRedirect', "Error get data from queue 'select_cdr'. ");
     }
 
-}catch (Exception $e){
+} catch (Exception $e) {
     Util::sys_log_msg('CheckRedirect', $e->getMessage());
 }

Braces +2 added lines, -2 removed lines

@@ -36,10 +36,10 @@
             $agi->set_variable('pt1c_UNIQUEID', '');
             $agi->exec_goto('internal', $exten, '1');
         }
-    }else{
+    } else{
         Util::sys_log_msg('CheckRedirect', "Error get data from queue 'select_cdr'. ");
     }
 
-}catch (Exception $e){
+} catch (Exception $e){
     Util::sys_log_msg('CheckRedirect', $e->getMessage());
 }

etc/asterisk/agi-bin/phpagi-fastagi.php

Indentation +52 added lines, -52 removed lines

@@ -1,79 +1,79 @@
 #!/usr/local/bin/php -q
 <?php
- /**
-  * phpagi-fastagi.php : PHP FastAGI bootstrap
-  * Website: http://phpagi.sourceforge.net
-  *
-  * $Id: phpagi-fastagi.php,v 1.2 2005/05/25 18:43:48 pinhole Exp $
-  *
-  * Copyright (c) 2004, 2005 Matthew Asham <matthewa@bcwireless.net>, David Eder <david@eder.us>
-  * All Rights Reserved.
-  *
-  * This software is released under the terms of the GNU Lesser General Public License v2.1
-  * A copy of which is available from http://www.gnu.org/copyleft/lesser.html
-  *
-  * We would be happy to list your phpagi based application on the phpagi
-  * website.  Drop me an Email if you'd like us to list your program.
-  *
-  * @package phpAGI
-  * @version 2.0
-  * @example docs/fastagi.xinetd Example xinetd config file
-  */
+    /**
+     * phpagi-fastagi.php : PHP FastAGI bootstrap
+     * Website: http://phpagi.sourceforge.net
+     *
+     * $Id: phpagi-fastagi.php,v 1.2 2005/05/25 18:43:48 pinhole Exp $
+     *
+     * Copyright (c) 2004, 2005 Matthew Asham <matthewa@bcwireless.net>, David Eder <david@eder.us>
+     * All Rights Reserved.
+     *
+     * This software is released under the terms of the GNU Lesser General Public License v2.1
+     * A copy of which is available from http://www.gnu.org/copyleft/lesser.html
+     *
+     * We would be happy to list your phpagi based application on the phpagi
+     * website.  Drop me an Email if you'd like us to list your program.
+     *
+     * @package phpAGI
+     * @version 2.0
+     * @example docs/fastagi.xinetd Example xinetd config file
+     */
 
- /**
-  * Written for PHP 4.3.4, should work with older PHP 4.x versions.
-  * Please submit bug reports, patches, etc to http://sourceforge.net/projects/phpagi/
-  * Gracias. :)
-  *
-  */
+    /**
+     * Written for PHP 4.3.4, should work with older PHP 4.x versions.
+     * Please submit bug reports, patches, etc to http://sourceforge.net/projects/phpagi/
+     * Gracias. :)
+     *
+     */
 
-  require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi.php');
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi.php');
 
-  $fastagi = new AGI();
+    $fastagi = new AGI();
 
-  $fastagi->verbose(print_r($fastagi, true));
+    $fastagi->verbose(print_r($fastagi, true));
 
-  if(!isset($fastagi->config['fastagi']['basedir']))
+    if(!isset($fastagi->config['fastagi']['basedir']))
     $fastagi->config['fastagi']['basedir'] = dirname(__FILE__);
 
-  // perform some security checks
+    // perform some security checks
 
-  $script = $fastagi->config['fastagi']['basedir'] . DIRECTORY_SEPARATOR . $fastagi->request['agi_network_script'];
+    $script = $fastagi->config['fastagi']['basedir'] . DIRECTORY_SEPARATOR . $fastagi->request['agi_network_script'];
 
-  // in the same directory (or subdirectory)
-  $mydir = dirname($fastagi->config['fastagi']['basedir']) . DIRECTORY_SEPARATOR;
-  $dir = dirname($script) . DIRECTORY_SEPARATOR;
-  if(substr($dir, 0, strlen($mydir)) != $mydir)
-  {
+    // in the same directory (or subdirectory)
+    $mydir = dirname($fastagi->config['fastagi']['basedir']) . DIRECTORY_SEPARATOR;
+    $dir = dirname($script) . DIRECTORY_SEPARATOR;
+    if(substr($dir, 0, strlen($mydir)) != $mydir)
+    {
     $fastagi->conlog("$script is not allowed to execute.");
     exit;
-  }
+    }
 
-  // make sure it exists
-  if(!file_exists($script))
-  {
+    // make sure it exists
+    if(!file_exists($script))
+    {
     $fastagi->conlog("$script does not exist.");
     exit;
-  }
+    }
 
-  // drop privileges
-  if(isset($fastagi->config['fastagi']['setuid']) && $fastagi->config['fastagi']['setuid'])
-  {
+    // drop privileges
+    if(isset($fastagi->config['fastagi']['setuid']) && $fastagi->config['fastagi']['setuid'])
+    {
     $owner = fileowner($script);
     $group = filegroup($script);
     if(!posix_setgid($group) || !posix_setegid($group) || !posix_setuid($owner) || !posix_seteuid($owner))
     {
-      $fastagi->conlog("failed to lower privileges.");
-      exit;      
+        $fastagi->conlog("failed to lower privileges.");
+        exit;      
+    }
     }
-  }
 
-  // make sure script is still readable
-  if(!is_readable($script))
-  {
+    // make sure script is still readable
+    if(!is_readable($script))
+    {
     $fastagi->conlog("$script is not readable.");
     exit;
-  }
+    }
 
-  require_once($script);
+    require_once($script);
 ?>

Spacing +10 added lines, -10 removed lines

@@ -27,41 +27,41 @@ 
   *
   */
 
-  require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi.php');
+  require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'phpagi.php');
 
   $fastagi = new AGI();
 
   $fastagi->verbose(print_r($fastagi, true));
 
-  if(!isset($fastagi->config['fastagi']['basedir']))
+  if (!isset($fastagi->config['fastagi']['basedir']))
     $fastagi->config['fastagi']['basedir'] = dirname(__FILE__);
 
   // perform some security checks
 
-  $script = $fastagi->config['fastagi']['basedir'] . DIRECTORY_SEPARATOR . $fastagi->request['agi_network_script'];
+  $script = $fastagi->config['fastagi']['basedir'].DIRECTORY_SEPARATOR.$fastagi->request['agi_network_script'];
 
   // in the same directory (or subdirectory)
-  $mydir = dirname($fastagi->config['fastagi']['basedir']) . DIRECTORY_SEPARATOR;
-  $dir = dirname($script) . DIRECTORY_SEPARATOR;
-  if(substr($dir, 0, strlen($mydir)) != $mydir)
+  $mydir = dirname($fastagi->config['fastagi']['basedir']).DIRECTORY_SEPARATOR;
+  $dir = dirname($script).DIRECTORY_SEPARATOR;
+  if (substr($dir, 0, strlen($mydir)) != $mydir)
   {
     $fastagi->conlog("$script is not allowed to execute.");
     exit;
   }
 
   // make sure it exists
-  if(!file_exists($script))
+  if (!file_exists($script))
   {
     $fastagi->conlog("$script does not exist.");
     exit;
   }
 
   // drop privileges
-  if(isset($fastagi->config['fastagi']['setuid']) && $fastagi->config['fastagi']['setuid'])
+  if (isset($fastagi->config['fastagi']['setuid']) && $fastagi->config['fastagi']['setuid'])
   {
     $owner = fileowner($script);
     $group = filegroup($script);
-    if(!posix_setgid($group) || !posix_setegid($group) || !posix_setuid($owner) || !posix_seteuid($owner))
+    if (!posix_setgid($group) || !posix_setegid($group) || !posix_setuid($owner) || !posix_seteuid($owner))
     {
       $fastagi->conlog("failed to lower privileges.");
       exit;      
@@ -69,7 +69,7 @@ 
   }
 
   // make sure script is still readable
-  if(!is_readable($script))
+  if (!is_readable($script))
   {
     $fastagi->conlog("$script is not readable.");
     exit;

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 
   $fastagi->verbose(print_r($fastagi, true));
 
-  if(!isset($fastagi->config['fastagi']['basedir']))
-    $fastagi->config['fastagi']['basedir'] = dirname(__FILE__);
+  if(!isset($fastagi->config['fastagi']['basedir'])) {
+      $fastagi->config['fastagi']['basedir'] = dirname(__FILE__);
+  }
 
   // perform some security checks
 

etc/asterisk/agi-bin/clean_timeout.php

Spacing +3 added lines, -3 removed lines

@@ -10,12 +10,12 @@
 require_once 'phpagi.php';
 
 $agi = new AGI();
-$channel	= $agi->get_variable('MASTER_CHANNEL(M_TIMEOUT_CHANNEL)', 	true);
-$FROM_CHAN	= $agi->get_variable('FROM_CHAN', 	true);
+$channel = $agi->get_variable('MASTER_CHANNEL(M_TIMEOUT_CHANNEL)', true);
+$FROM_CHAN = $agi->get_variable('FROM_CHAN', true);
 
 /** @var AGI_AsteriskManager $am */
 $am = Util::get_am('off');
-$am->SetVar($channel,   'TIMEOUT(absolute)', '0');
+$am->SetVar($channel, 'TIMEOUT(absolute)', '0');
 $am->SetVar($FROM_CHAN, "MASTER_CHANNEL(M_DIALSTATUS)", 'ANSWER');
 
 // Перестрахова на случай с перехватом звонка через *8.

etc/asterisk/agi-bin/phpagi-debug.php

Indentation +77 added lines, -77 removed lines

@@ -10,83 +10,83 @@
 *  Заглушка для отладки скрипта. 
 */
 class _AGI {
-	public function exec($v1, $v2){
-		echo "exec($v1, $v2)\n";	
-	}
-	public function answer(){
-		echo "answer()\n";	
-	}
-	public function get_variable($_varName){
+    public function exec($v1, $v2){
+        echo "exec($v1, $v2)\n";	
+    }
+    public function answer(){
+        echo "answer()\n";	
+    }
+    public function get_variable($_varName){
 		
-		$value = array();
-		$value['result']=1;
+        $value = array();
+        $value['result']=1;
 		
-		if('10000666' == PT1C_SKRIPTNAME){
-			switch ($_varName) {
-			    case 'v1':
-					$value['data']='SIP/204';
-			        break;
-			    case 'v2':
-					$value['data']='mikopbx-1558444069.34';
-			        break;
-			    case 'v3':
-					$value['data']='';
-			        break;
-			    case 'v6':
-					$value['data']='Records';
-			        break;
-			    case 'ASTSPOOLDIR':
-					$value['data']='/var/spool/asterisk';
-			        break;
-			    default:
-					$value['data']='';
-			}	
-		}else if('10000555' == PT1C_SKRIPTNAME){
-			switch ($_varName) {
-			    case 'v1':
-					$value['data']='SIP/201';
-			        break;
-			    case 'v2':
-					$value['data']='2017-01-01';
-			        break;
-			    case 'v3':
-					$value['data']='2019-01-01';
-			        break;
-			    case 'v4':
-					$value['data']='201-89257184254';
-			        break;
-			    default:
-					$value['data']='';
-			}	
-		}else if('1C_HistoryFax.php' == PT1C_SKRIPTNAME){
-			switch ($_varName) {
-			    case 'v1':
-					$value['data']='SIP/1000';
-			        break;
-			    case 'v2':
-					$value['data']='2017-01-01';
-			        break;
-			    case 'v3':
-					$value['data']='2019-01-01';
-			        break;
-			    default:
-					$value['data']='';
-			}	
-		}else if('10000777' == PT1C_SKRIPTNAME){
-			switch ($_varName) {
-			    case 'chan':
-					$value['data']='SIP/204';
-			        break;
-			    case 'uniqueid1c':
-					$value['data']='mikopbx-1519992881.0';
-			        break;
-			    case 'ASTSPOOLDIR':
-					$value['data']='/var/spool/asterisk';
-			        break;
-			    default:
-					$value['data']='';
-			}	
-		}
-		return $value['data'];
-	}
+        if('10000666' == PT1C_SKRIPTNAME){
+            switch ($_varName) {
+                case 'v1':
+                    $value['data']='SIP/204';
+                    break;
+                case 'v2':
+                    $value['data']='mikopbx-1558444069.34';
+                    break;
+                case 'v3':
+                    $value['data']='';
+                    break;
+                case 'v6':
+                    $value['data']='Records';
+                    break;
+                case 'ASTSPOOLDIR':
+                    $value['data']='/var/spool/asterisk';
+                    break;
+                default:
+                    $value['data']='';
+            }	
+        }else if('10000555' == PT1C_SKRIPTNAME){
+            switch ($_varName) {
+                case 'v1':
+                    $value['data']='SIP/201';
+                    break;
+                case 'v2':
+                    $value['data']='2017-01-01';
+                    break;
+                case 'v3':
+                    $value['data']='2019-01-01';
+                    break;
+                case 'v4':
+                    $value['data']='201-89257184254';
+                    break;
+                default:
+                    $value['data']='';
+            }	
+        }else if('1C_HistoryFax.php' == PT1C_SKRIPTNAME){
+            switch ($_varName) {
+                case 'v1':
+                    $value['data']='SIP/1000';
+                    break;
+                case 'v2':
+                    $value['data']='2017-01-01';
+                    break;
+                case 'v3':
+                    $value['data']='2019-01-01';
+                    break;
+                default:
+                    $value['data']='';
+            }	
+        }else if('10000777' == PT1C_SKRIPTNAME){
+            switch ($_varName) {
+                case 'chan':
+                    $value['data']='SIP/204';
+                    break;
+                case 'uniqueid1c':
+                    $value['data']='mikopbx-1519992881.0';
+                    break;
+                case 'ASTSPOOLDIR':
+                    $value['data']='/var/spool/asterisk';
+                    break;
+                default:
+                    $value['data']='';
+            }	
+        }
+        return $value['data'];
+    }
 }

Spacing +27 added lines, -27 removed lines

@@ -10,81 +10,81 @@
 *  Заглушка для отладки скрипта. 
 */
 class _AGI {
-	public function exec($v1, $v2){
+	public function exec($v1, $v2) {
 		echo "exec($v1, $v2)\n";	
 	}
-	public function answer(){
+	public function answer() {
 		echo "answer()\n";	
 	}
-	public function get_variable($_varName){
+	public function get_variable($_varName) {
 		
 		$value = array();
-		$value['result']=1;
+		$value['result'] = 1;
 		
-		if('10000666' == PT1C_SKRIPTNAME){
+		if ('10000666' == PT1C_SKRIPTNAME) {
 			switch ($_varName) {
 			    case 'v1':
-					$value['data']='SIP/204';
+					$value['data'] = 'SIP/204';
 			        break;
 			    case 'v2':
-					$value['data']='mikopbx-1558444069.34';
+					$value['data'] = 'mikopbx-1558444069.34';
 			        break;
 			    case 'v3':
-					$value['data']='';
+					$value['data'] = '';
 			        break;
 			    case 'v6':
-					$value['data']='Records';
+					$value['data'] = 'Records';
 			        break;
 			    case 'ASTSPOOLDIR':
-					$value['data']='/var/spool/asterisk';
+					$value['data'] = '/var/spool/asterisk';
 			        break;
 			    default:
-					$value['data']='';
+					$value['data'] = '';
 			}	
-		}else if('10000555' == PT1C_SKRIPTNAME){
+		} else if ('10000555' == PT1C_SKRIPTNAME) {
 			switch ($_varName) {
 			    case 'v1':
-					$value['data']='SIP/201';
+					$value['data'] = 'SIP/201';
 			        break;
 			    case 'v2':
-					$value['data']='2017-01-01';
+					$value['data'] = '2017-01-01';
 			        break;
 			    case 'v3':
-					$value['data']='2019-01-01';
+					$value['data'] = '2019-01-01';
 			        break;
 			    case 'v4':
-					$value['data']='201-89257184254';
+					$value['data'] = '201-89257184254';
 			        break;
 			    default:
-					$value['data']='';
+					$value['data'] = '';
 			}	
-		}else if('1C_HistoryFax.php' == PT1C_SKRIPTNAME){
+		} else if ('1C_HistoryFax.php' == PT1C_SKRIPTNAME) {
 			switch ($_varName) {
 			    case 'v1':
-					$value['data']='SIP/1000';
+					$value['data'] = 'SIP/1000';
 			        break;
 			    case 'v2':
-					$value['data']='2017-01-01';
+					$value['data'] = '2017-01-01';
 			        break;
 			    case 'v3':
-					$value['data']='2019-01-01';
+					$value['data'] = '2019-01-01';
 			        break;
 			    default:
-					$value['data']='';
+					$value['data'] = '';
 			}	
-		}else if('10000777' == PT1C_SKRIPTNAME){
+		} else if ('10000777' == PT1C_SKRIPTNAME) {
 			switch ($_varName) {
 			    case 'chan':
-					$value['data']='SIP/204';
+					$value['data'] = 'SIP/204';
 			        break;
 			    case 'uniqueid1c':
-					$value['data']='mikopbx-1519992881.0';
+					$value['data'] = 'mikopbx-1519992881.0';
 			        break;
 			    case 'ASTSPOOLDIR':
-					$value['data']='/var/spool/asterisk';
+					$value['data'] = '/var/spool/asterisk';
 			        break;
 			    default:
-					$value['data']='';
+					$value['data'] = '';
 			}	
 		}
 		return $value['data'];

Braces +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 			    default:
 					$value['data']='';
 			}	
-		}else if('10000555' == PT1C_SKRIPTNAME){
+		} else if('10000555' == PT1C_SKRIPTNAME){
 			switch ($_varName) {
 			    case 'v1':
 					$value['data']='SIP/201';
@@ -58,7 +58,7 @@ 
 			    default:
 					$value['data']='';
 			}	
-		}else if('1C_HistoryFax.php' == PT1C_SKRIPTNAME){
+		} else if('1C_HistoryFax.php' == PT1C_SKRIPTNAME){
 			switch ($_varName) {
 			    case 'v1':
 					$value['data']='SIP/1000';
@@ -72,7 +72,7 @@ 
 			    default:
 					$value['data']='';
 			}	
-		}else if('10000777' == PT1C_SKRIPTNAME){
+		} else if('10000777' == PT1C_SKRIPTNAME){
 			switch ($_varName) {
 			    case 'chan':
 					$value['data']='SIP/204';

etc/rc/vendor/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInit6670dab4b71421eb4b91561314912df5::getLoader();