nchizhov / inok-phpagi

src/phpagi.php

Indentation +35 added lines, -35 removed lines

@@ -1433,39 +1433,39 @@ 
               'k9999' => 'Z',
               'k99999' => '9'];
     $symbol = ['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'];
+                '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 = '';
     do {
       $command = false;
@@ -1656,8 +1656,8 @@ 
    */
   function evaluate($command) {
     $broken = ['code' => 500,
-               'result' => -1,
-               'data' => ''];
+                'result' => -1,
+                'data' => ''];
 
     // write command
     if (!@fwrite($this->out, trim($command) . "\n")) return $broken;

Spacing +1 added lines, -1 removed lines

@@ -1637,7 +1637,7 @@
   function &new_AsteriskManager() {
     $this->asm = new AGI_AsteriskManager(null, $this->config['asmanager']);
     $this->asm->setPagi($this);
-    $this->config['asmanager'] =& $this->asm->config['asmanager'];
+    $this->config['asmanager'] = & $this->asm->config['asmanager'];
     return $this->asm;
   }
 

Braces +222 added lines, -134 removed lines

@@ -143,26 +143,40 @@ 
    */
   function __construct($config = null, $optconfig = []) {
     // 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);
 
@@ -190,15 +204,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:');
@@ -297,7 +314,9 @@ 
    */
   function database_deltree($family, $keytree = '') {
     $cmd = "DATABASE DELTREE \"$family\"";
-    if ($keytree != '') $cmd .= " \"$keytree\"";
+    if ($keytree != '') {
+      $cmd .= " \"$keytree\"";
+    }
     return $this->evaluate($cmd);
   }
 
@@ -337,10 +356,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);");
+    }
   }
 
 
@@ -354,10 +374,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}\");");
+    }
   }
 
 
@@ -371,7 +392,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");
   }
 
@@ -430,8 +453,9 @@ 
   function get_variable($variable, $getvalue = false) {
     $res = $this->evaluate("GET VARIABLE $variable");
 
-    if ($getvalue == false)
-      return ($res);
+    if ($getvalue == false) {
+          return ($res);
+    }
 
     return ($res['data']);
   }
@@ -457,8 +481,9 @@ 
 
     $res = $this->evaluate('GET FULL VARIABLE ' . $req);
 
-    if ($getvalue == false)
-      return ($res);
+    if ($getvalue == false) {
+          return ($res);
+    }
 
     return ($res['data']);
 
@@ -523,8 +548,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);
   }
 
@@ -590,7 +619,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\"");
   }
 
@@ -905,13 +936,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 ['code' => AGIRES_OK,
@@ -932,13 +965,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 ['code' => AGIRES_OK,
@@ -959,13 +994,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 ['code' => AGIRES_OK,
@@ -986,13 +1023,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 ['code' => AGIRES_OK,
@@ -1016,13 +1055,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 ['code' => AGIRES_OK,
@@ -1044,13 +1085,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 ['code' => AGIRES_OK,
@@ -1072,13 +1115,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 ['code' => AGIRES_OK,
@@ -1099,13 +1144,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 ['code' => AGIRES_OK,
@@ -1153,14 +1200,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']);
         }
       }
@@ -1189,10 +1241,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;
@@ -1207,10 +1260,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;
@@ -1241,8 +1295,9 @@ 
    *
    */
   function parse_callerid($callerid = null) {
-    if (is_null($callerid))
-      $callerid = $this->request['agi_callerid'];
+    if (is_null($callerid)) {
+          $callerid = $this->request['agi_callerid'];
+    }
 
     $ret = ['name' => '',
             'protocol' => '',
@@ -1260,18 +1315,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);
     }
@@ -1294,7 +1349,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;
@@ -1320,9 +1377,10 @@ 
 
     // clean up old files
     $delete = time() - 2592000; // 1 month
-    foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file)
-      if (filemtime($file) < $delete)
+    foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file) {
+          if (filemtime($file) < $delete)
         unlink($file);
+    }
 
     return $ret;
   }
@@ -1337,13 +1395,16 @@ 
    * @return array, 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;
@@ -1366,9 +1427,10 @@ 
 
     // clean up old files
     $delete = time() - 2592000; // 1 month
-    foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file)
-      if (filemtime($file) < $delete)
+    foreach (glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file) {
+          if (filemtime($file) < $delete)
         unlink($file);
+    }
 
     return $ret;
   }
@@ -1497,16 +1559,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) == '**');
@@ -1660,7 +1723,9 @@ 
                '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.
@@ -1682,9 +1747,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) {
@@ -1700,34 +1767,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;
   }
@@ -1744,9 +1821,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;
       }
@@ -1772,9 +1851,10 @@ 
       $chpath = $checkpath;
     }
 
-    foreach (explode(':', $chpath) as $path)
-      if (is_executable("$path/$cmd"))
+    foreach (explode(':', $chpath) as $path) {
+          if (is_executable("$path/$cmd"))
         return "$path/$cmd";
+    }
 
     return false;
   }
@@ -1815,18 +1895,23 @@ 
  * @param array $context variables in the current scope
  */
 function phpagi_error_handler(int $level, string $message, string $file, int $line, array $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:
@@ -1871,29 +1956,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
-        $ret .= $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 {
+              $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++;
   }
 }

src/phpagi-fastagi.php

Braces +2 added lines, -1 removed lines

@@ -33,8 +33,9 @@
 
 $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
 

src/phpagi-asmanager.php

Indentation +12 added lines, -12 removed lines

@@ -327,7 +327,7 @@ 
 
     // login
     $res = $this->send_request('login', ['Username' => $username,
-                                         'Secret' => $secret]);
+                                          'Secret' => $secret]);
     if ($res['Response'] != 'Success') {
       $this->_logged_in = false;
       $this->log("Failed to login.");
@@ -366,7 +366,7 @@ 
    */
   function AbsoluteTimeout(string $channel, int $timeout): array {
     return $this->send_request('AbsoluteTimeout', ['Channel' => $channel,
-                                                   'Timeout' => $timeout]);
+                                                    'Timeout' => $timeout]);
   }
 
   /**
@@ -380,7 +380,7 @@ 
    */
   function ChangeMonitor(string $channel, string $file): array {
     return $this->send_request('ChangeMonitor', ['Channel' => $channel,
-                                                 'File' => $file]);
+                                                  'File' => $file]);
   }
 
   /**
@@ -432,7 +432,7 @@ 
    */
   function DBGet(string $family, string $key, $actionid = null): string {
     $parameters = ['Family' => $family,
-                   'Key' => $key];
+                    'Key' => $key];
     if ($actionid == null)
       $actionid = $this->ActionID();
     $parameters['ActionID'] = $actionid;
@@ -456,7 +456,7 @@ 
    */
   function ExtensionState(string $exten, string $context, $actionid = null): array {
     $parameters = ['Exten' => $exten,
-                   'Context' => $context];
+                    'Context' => $context];
     if ($actionid) $parameters['ActionID'] = $actionid;
     return $this->send_request('ExtensionState', $parameters);
   }
@@ -474,7 +474,7 @@ 
    */
   function GetVar(string $channel, string $variable, $actionid = null): array {
     $parameters = ['Channel' => $channel,
-                   'Variable' => $variable];
+                    'Variable' => $variable];
     if ($actionid) $parameters['ActionID'] = $actionid;
     return $this->send_request('GetVar', $parameters);
   }
@@ -603,9 +603,9 @@ 
    * @throws Exception
    */
   function Originate(string $channel,
-                     $exten = null, $context = null, $priority = null,
-                     $application = null, $data = null,
-                     $timeout = null, $callerid = null, $variable = null, $account = null, $async = null, $actionid = null): array {
+                      $exten = null, $context = null, $priority = null,
+                      $application = null, $data = null,
+                      $timeout = null, $callerid = null, $variable = null, $account = null, $async = null, $actionid = null): array {
     $parameters = ['Channel' => $channel];
 
     if ($exten) $parameters['Exten'] = $exten;
@@ -660,7 +660,7 @@ 
    */
   function QueueAdd(string $queue, string $interface, int $penalty = 0, $memberName = false): array {
     $parameters = ['Queue' => $queue,
-                   'Interface' => $interface];
+                    'Interface' => $interface];
     if ($penalty) $parameters['Penalty'] = $penalty;
     if ($memberName) $parameters["MemberName"] = $memberName;
     return $this->send_request('QueueAdd', $parameters);
@@ -677,7 +677,7 @@ 
    */
   function QueueRemove(string $queue, string $interface): array {
     return $this->send_request('QueueRemove', ['Queue' => $queue,
-                                               'Interface' => $interface]);
+                                                'Interface' => $interface]);
   }
 
   /**
@@ -757,7 +757,7 @@ 
    */
   function SetCDRUserField(string $userfield, string $channel, $append = null): array {
     $parameters = ['UserField' => $userfield,
-                   'Channel' => $channel];
+                    'Channel' => $channel];
     if ($append) $parameters['Append'] = $append;
     return $this->send_request('SetCDRUserField', $parameters);
   }

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     }
 
     $haveData = array_key_exists("data", $parameters);
-    $asteriskRawOutput = [];;
+    $asteriskRawOutput = []; ;
 
     foreach ($msgarr as $num => $str) {
       $kv = explode(':', $str, 2);

Braces +125 added lines, -53 removed lines

@@ -109,21 +109,33 @@ 
    */
   function __construct($config = null, array $optconfig = []) {
     // 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 values 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']['write_log'])) $this->config['asmanager']['write_log'] = false;
+    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']['write_log'])) {
+      $this->config['asmanager']['write_log'] = false;
+    }
   }
 
   /**
@@ -270,10 +282,11 @@ 
       $evlist = [];
       do {
         $res = $this->wait_response(false, $actionid);
-        if (isset($res['EventList']) && $res['EventList'] == 'Complete')
-          break;
-        else
-          $evlist[] = $res;
+        if (isset($res['EventList']) && $res['EventList'] == 'Complete') {
+                  break;
+        } else {
+                  $evlist[] = $res;
+        }
       } while (true);
       $res['events'] = $evlist;
     }
@@ -295,9 +308,15 @@ 
    */
   function connect($server = null, $username = null, $secret = null): bool {
     // 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) {
@@ -344,8 +363,9 @@ 
    * @example examples/sip_show_peer.php Get information about a sip peer
    */
   function disconnect() {
-    if ($this->_logged_in)
-      $this->logoff();
+    if ($this->_logged_in) {
+          $this->logoff();
+    }
     fclose($this->socket);
   }
 
@@ -396,7 +416,9 @@ 
    */
   function Command(string $command, $actionid = null): array {
     $parameters = ['Command' => $command];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('Command', $parameters);
   }
 
@@ -433,8 +455,9 @@ 
   function DBGet(string $family, string $key, $actionid = null): string {
     $parameters = ['Family' => $family,
                    'Key' => $key];
-    if ($actionid == null)
-      $actionid = $this->ActionID();
+    if ($actionid == null) {
+          $actionid = $this->ActionID();
+    }
     $parameters['ActionID'] = $actionid;
     $response = $this->send_request("DBGet", $parameters);
     if ($response['Response'] == "Success") {
@@ -457,7 +480,9 @@ 
   function ExtensionState(string $exten, string $context, $actionid = null): array {
     $parameters = ['Exten' => $exten,
                    'Context' => $context];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('ExtensionState', $parameters);
   }
 
@@ -475,7 +500,9 @@ 
   function GetVar(string $channel, string $variable, $actionid = null): array {
     $parameters = ['Channel' => $channel,
                    'Variable' => $variable];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('GetVar', $parameters);
   }
 
@@ -540,7 +567,9 @@ 
    */
   function MailboxCount(string $mailbox, $actionid = null): array {
     $parameters = ['Mailbox' => $mailbox];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('MailboxCount', $parameters);
   }
 
@@ -560,7 +589,9 @@ 
    */
   function MailboxStatus(string $mailbox, $actionid = null): array {
     $parameters = ['Mailbox' => $mailbox];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('MailboxStatus', $parameters);
   }
 
@@ -577,9 +608,15 @@ 
    */
   function Monitor(string $channel, $file = null, $format = null, $mix = null): array {
     $parameters = ['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);
   }
 
@@ -608,19 +645,41 @@ 
                      $timeout = null, $callerid = null, $variable = null, $account = null, $async = null, $actionid = null): array {
     $parameters = ['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);
   }
@@ -661,8 +720,12 @@ 
   function QueueAdd(string $queue, string $interface, int $penalty = 0, $memberName = false): array {
     $parameters = ['Queue' => $queue,
                    'Interface' => $interface];
-    if ($penalty) $parameters['Penalty'] = $penalty;
-    if ($memberName) $parameters["MemberName"] = $memberName;
+    if ($penalty) {
+      $parameters['Penalty'] = $penalty;
+    }
+    if ($memberName) {
+      $parameters["MemberName"] = $memberName;
+    }
     return $this->send_request('QueueAdd', $parameters);
   }
 
@@ -758,7 +821,9 @@ 
   function SetCDRUserField(string $userfield, string $channel, $append = null): array {
     $parameters = ['UserField' => $userfield,
                    'Channel' => $channel];
-    if ($append) $parameters['Append'] = $append;
+    if ($append) {
+      $parameters['Append'] = $append;
+    }
     return $this->send_request('SetCDRUserField', $parameters);
   }
 
@@ -789,7 +854,9 @@ 
    */
   function Status(string $channel, $actionid = null): array {
     $parameters = ['Channel' => $channel];
-    if ($actionid) $parameters['ActionID'] = $actionid;
+    if ($actionid) {
+      $parameters['ActionID'] = $actionid;
+    }
     return $this->send_request('Status', $parameters);
   }
 
@@ -890,10 +957,11 @@ 
    * @param integer $level from 1 to 4
    */
   function log(string $message, int $level = 1) {
-    if ($this->pagi != false)
-      $this->pagi->conlog($message, $level);
-    elseif ($this->config['asmanager']['write_log'])
-      error_log(date('r') . ' - ' . $message);
+    if ($this->pagi != false) {
+          $this->pagi->conlog($message, $level);
+    } elseif ($this->config['asmanager']['write_log']) {
+          error_log(date('r') . ' - ' . $message);
+    }
   }
 
   /**
@@ -976,16 +1044,20 @@ 
     $this->log("Got event.. $e");
 
     $handler = '';
-    if (isset($this->event_handlers[$e])) $handler = $this->event_handlers[$e];
-    elseif (isset($this->event_handlers['*'])) $handler = $this->event_handlers['*'];
+    if (isset($this->event_handlers[$e])) {
+      $handler = $this->event_handlers[$e];
+    } elseif (isset($this->event_handlers['*'])) {
+      $handler = $this->event_handlers['*'];
+    }
 
     if (function_exists($handler)) {
       $this->log("Execute handler $handler");
       $ret = $handler($e, $parameters, $this->server, $this->port);
     } elseif (is_array($handler)) {
       $ret = call_user_func($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;
   }
 }