mikopbx / Core

etc/inc/Backup.php

Indentation +1 added lines, -1 removed lines

@@ -501,7 +501,7 @@
      */
     public static function list_backups($backup_dir=''):array {
         $result = array(
-          'result'  => 'Success'
+            'result'  => 'Success'
         );
 
         $result['data'] = [];

Spacing +186 added lines, -186 removed lines

@@ -22,31 +22,31 @@ 
     private $config_file;
     private $options;
     private $options_recover_file;
-    private $progress=0;
-    private $type='img'; // img | zip
+    private $progress = 0;
+    private $type = 'img'; // img | zip
 
-    public function __construct($id, $options=null){
+    public function __construct($id, $options = null) {
         $this->dirs      = PBX::get_asterisk_dirs();
         $this->dirs_mem  = PBX::get_asterisk_dirs_mem();
         // Проверим особенность бекапа на сетевой диск.
         Util::mwexec("du /storage/*/{$id}/flist.txt -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
-        if(($out[0] ?? false) && file_exists($out[0])){
+        if (($out[0] ?? false) && file_exists($out[0])) {
             $this->dirs['backup'] = dirname($out[0], 2);
-        }elseif (is_array($options) && isset($options['backup'])){
+        }elseif (is_array($options) && isset($options['backup'])) {
             // Переопределяем каталог с бекапом.
             $this->dirs['backup'] = $options['backup'];
         }
-        $this->id        = $id;
-        $b_dir="{$this->dirs['backup']}/{$this->id}";
+        $this->id = $id;
+        $b_dir = "{$this->dirs['backup']}/{$this->id}";
 
-        if(!is_dir($b_dir) && mkdir($b_dir, 0755, true) && !is_dir($b_dir)){
+        if (!is_dir($b_dir) && mkdir($b_dir, 0755, true) && !is_dir($b_dir)) {
             Util::sys_log_msg('Backup', 'Can not create dir '.$b_dir);
         }
 
-        if(isset($options['type'])){
+        if (isset($options['type'])) {
             $this->type = $options['type'];
         }
-        if(file_exists("{$this->dirs['backup']}/{$this->id}/resultfile.zip")){
+        if (file_exists("{$this->dirs['backup']}/{$this->id}/resultfile.zip")) {
             $this->type = 'zip';
         }
 
@@ -55,16 +55,16 @@ 
         $this->result_dir     = "{$this->dirs['backup']}/{$this->id}/mnt_point";
         $this->progress_file  = "{$this->dirs['backup']}/{$this->id}/progress.txt";
         $this->config_file    = "{$this->dirs['backup']}/{$this->id}/config.json";
-        $this->options_recover_file= "{$this->dirs['backup']}/{$this->id}/options_recover.json";
+        $this->options_recover_file = "{$this->dirs['backup']}/{$this->id}/options_recover.json";
         $this->progress_file_recover = "{$this->dirs['backup']}/{$this->id}/progress_recover.txt";
 
-        if((!is_array($options) || $options === null) && file_exists($this->config_file)){
+        if ((!is_array($options) || $options === null) && file_exists($this->config_file)) {
             $this->options = json_decode(file_get_contents($this->config_file), true);
-        }else{
+        } else {
             $this->options = $options;
         }
 
-        if(!is_array($this->options) || $this->options === null){
+        if (!is_array($this->options) || $this->options === null) {
             $this->options = [
                 'backup-config'     => '1',
                 'backup-records'    => '1',
@@ -72,7 +72,7 @@ 
                 'backup-sound-files'=> '1'
             ];
         }
-        if(!file_exists($this->config_file) && FALSE === @file_put_contents($this->config_file, json_encode($this->options), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)){
+        if (!file_exists($this->config_file) && FALSE === @file_put_contents($this->config_file, json_encode($this->options), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)) {
             Util::sys_log_msg('Backup', 'Failed create file '.$this->config_file);
         }
     }
@@ -83,42 +83,42 @@ 
     private function create_file_list():bool {
         global $g;
 
-        try{
+        try {
             $result = @file_put_contents($this->file_list, '');
-        }catch (Exception $e){
+        } catch (Exception $e) {
             Util::sys_log_msg('Backup', $e->getMessage());
             $result = false;
         }
-        if($result === false || !file_exists($this->file_list)){
+        if ($result === false || !file_exists($this->file_list)) {
             Util::sys_log_msg('Backup', 'Failed to create file '.$this->file_list);
             return $result;
         }
 
         $flist = '';
-        if(($this->options['backup-config']??'') === '1'){
+        if (($this->options['backup-config'] ?? '') === '1') {
             file_put_contents($this->file_list, 'backup-config:'.$g['pt1c_db_path']."\n", FILE_APPEND);
             Util::mwexec("find {$this->dirs['custom_modules']}", $out);
-            foreach ($out as $filename){
-                $flist.= 'backup-config:'.$filename."\n";
+            foreach ($out as $filename) {
+                $flist .= 'backup-config:'.$filename."\n";
             }
         }
-        if(($this->options['backup-cdr']??'') === '1'){
+        if (($this->options['backup-cdr'] ?? '') === '1') {
             file_put_contents($this->file_list, 'backup-cdr:'.Cdr::getPathToDB()."\n", FILE_APPEND);
         }
 
-        file_put_contents($this->file_list, $this->file_list."\n",      FILE_APPEND);
-        file_put_contents($this->file_list, $this->config_file."\n",    FILE_APPEND);
+        file_put_contents($this->file_list, $this->file_list."\n", FILE_APPEND);
+        file_put_contents($this->file_list, $this->config_file."\n", FILE_APPEND);
 
-        if(($this->options['backup-sound-files']??'') === '1'){
-            Util::mwexec("find {$this->dirs['media']} -type f",$out);
-            foreach ($out as $filename){
-                $flist.= 'backup-sound-files:'.$filename."\n";
+        if (($this->options['backup-sound-files'] ?? '') === '1') {
+            Util::mwexec("find {$this->dirs['media']} -type f", $out);
+            foreach ($out as $filename) {
+                $flist .= 'backup-sound-files:'.$filename."\n";
             }
         }
-        if(($this->options['backup-records']??'') === '1'){
+        if (($this->options['backup-records'] ?? '') === '1') {
             Util::mwexec("find {$this->dirs['astspoolpath']} -type f -name *.mp3", $out);
-            foreach ($out as $filename){
-                $flist.= 'backup-records:'.$filename."\n";
+            foreach ($out as $filename) {
+                $flist .= 'backup-records:'.$filename."\n";
             }
         }
         file_put_contents($this->file_list, $flist, FILE_APPEND);
@@ -139,13 +139,13 @@ 
         $arr_size['backup-cdr']         = Util::get_size_file(Cdr::getPathToDB());
 
         $backup_config = Util::get_size_file($g['pt1c_db_path']);
-        $backup_config+= Util::get_size_file($dirs['custom_modules']);
-        $arr_size['backup-config']      = $backup_config;
+        $backup_config += Util::get_size_file($dirs['custom_modules']);
+        $arr_size['backup-config'] = $backup_config;
 
-        foreach ($arr_size as $key => $value){
+        foreach ($arr_size as $key => $value) {
             // Есть какие то аномалии с преобразование значение в json
             // Без этого костыля есть проблемы с округлением.
-            $arr_size[$key] = trim(1*$value);
+            $arr_size[$key] = trim(1 * $value);
         }
         return $arr_size;
     }
@@ -155,10 +155,10 @@ 
      */
     private function create_img_file():void {
         // Создаем директорию монтирования.
-        if(!is_dir($this->result_dir) && mkdir($this->result_dir) && !is_dir($this->result_dir)){
-            Util::sys_log_msg('Backup', 'Can not create dir '. $this->result_dir);
+        if (!is_dir($this->result_dir) && mkdir($this->result_dir) && !is_dir($this->result_dir)) {
+            Util::sys_log_msg('Backup', 'Can not create dir '.$this->result_dir);
         }
-        if( !file_exists($this->result_file) ) {
+        if (!file_exists($this->result_file)) {
             // Оценим размер бекапа.
             $result_size = 0;
             $arr_size = self::get_estimated_size();
@@ -168,7 +168,7 @@ 
                 }
             }
             // Округляем в большую сторону.
-            $result_size = $result_size < 1?1:round($result_size);
+            $result_size = $result_size < 1 ? 1 : round($result_size);
             $tmp_name    = $this->dirs['tmp'].'/'.Util::generateRandomString();
             // Создаем образ файловой системы.
             $res = Util::mwexec("/bin/dd if=/dev/zero of={$tmp_name} bs=1 count=0 seek={$result_size}M");
@@ -188,7 +188,7 @@ 
             Util::mwexec("rm -rf  '{$tmp_name}'");
         }
         // Монтируем.
-        if(! Storage::disk_is_mounted($this->result_file, '')) {
+        if (!Storage::disk_is_mounted($this->result_file, '')) {
             $res = Util::mwexec("/bin/mount -o loop {$this->result_file} {$this->result_dir}");
             if ($res > 1) {
                 Util::sys_log_msg('Backup', 'File system mount error...');
@@ -202,22 +202,22 @@ 
      * @param $filename
      */
     private function add_file_to_arhive($filename):void {
-        if(!file_exists($filename)) {
+        if (!file_exists($filename)) {
             return;
         }
-        if($this->type==='img'){
+        if ($this->type === 'img') {
             $this->create_img_file();
             $res_dir = dirname($this->result_dir.$filename);
             Util::mwexec("mkdir -p $res_dir");
-            if(in_array(basename($filename), ['mikopbx.db', 'cdr.db']) ){
+            if (in_array(basename($filename), ['mikopbx.db', 'cdr.db'])) {
                 // Выполняем копирование через dump.
                 // Наиболее безопасный вариант.
                 Util::mwexec("/usr/bin/sqlite3 '{$filename}' .dump | /usr/bin/sqlite3 '{$this->result_dir}{$filename}' ", $out);
-            }else{
+            } else {
                 // Просто копируем файл.
                 Util::mwexec("/bin/cp '{$filename}' '{$this->result_dir}{$filename}' ", $out);
             }
-        }else{
+        } else {
             Util::mwexec("7za a -tzip -spf '{$this->result_file}' '{$filename}'", $out);
         }
     }
@@ -228,21 +228,21 @@ 
      * @param null | string   $out
      * @return bool
      */
-    public function extract_file($filename='', &$out=null) :bool {
+    public function extract_file($filename = '', &$out = null) :bool {
         $arr_out = [];
 
         $result_file = $filename;
         $tmp_path    = '/var/asterisk/';
         $mem_monitor_dir = $this->dirs_mem['astspoolpath'].'/mikopbx/voicemailarchive/monitor';
         $monitor_dir     = substr(Storage::get_monitor_dir(), 0, -1);
-        if(strpos($filename, $tmp_path) === 0){
+        if (strpos($filename, $tmp_path) === 0) {
             $var_search = [
                 $mem_monitor_dir,
                 $this->dirs_mem['media'],
                 $this->dirs_mem['astlogpath'],
                 $this->dirs_mem['backup']
             ];
-            $var_replace= [
+            $var_replace = [
                 $monitor_dir,
                 $this->dirs['media'],
                 $this->dirs['astlogpath'],
@@ -252,21 +252,21 @@ 
         }
 
         $file_dir = dirname($filename);
-        if(!file_exists($file_dir)){
-            Util::mwexec('mkdir -p '.escapeshellcmd($file_dir) );
+        if (!file_exists($file_dir)) {
+            Util::mwexec('mkdir -p '.escapeshellcmd($file_dir));
         }
         $file_dir = dirname($result_file);
-        if(!file_exists($file_dir)){
-            Util::mwexec('mkdir -p '.escapeshellcmd($file_dir) );
+        if (!file_exists($file_dir)) {
+            Util::mwexec('mkdir -p '.escapeshellcmd($file_dir));
         }
 
-        if($this->type==='img') {
-            if(! Storage::disk_is_mounted($this->result_file, '')) {
+        if ($this->type === 'img') {
+            if (!Storage::disk_is_mounted($this->result_file, '')) {
                 Util::mwexec("/bin/mount -o loop {$this->result_file} {$this->result_dir}");
             }
-            if(in_array(basename($filename), ['mikopbx.db', 'cdr.db']) ){
+            if (in_array(basename($filename), ['mikopbx.db', 'cdr.db'])) {
                 $sed_command = '';
-                if($result_file !== $filename){
+                if ($result_file !== $filename) {
                     $sed_command = ' | sed \'s/'.str_replace('/', '\/', $mem_monitor_dir).'/'.str_replace('/', '\/', $monitor_dir).'/g\'';
                     $sed_command .= ' | sed \'s/'.str_replace('/', '\/', $this->dirs_mem['media']).'/'.str_replace('/', '\/', $this->dirs['media']).'/g\'';
                 }
@@ -276,16 +276,16 @@ 
                 Util::mwexec("/usr/bin/sqlite3 '{$this->result_dir}{$filename}' .dump $sed_command | /usr/bin/sqlite3 '{$result_file}' ", $arr_out);
                 Util::mwexec("chown -R www:www {$result_file}* > /dev/null 2> /dev/null");
 
-            }else{
+            } else {
                 // Просто копируем файл.
                 Util::mwexec("/bin/cp '{$this->result_dir}{$filename}' '{$result_file}'", $arr_out);
             }
-        }else {
+        } else {
             Util::mwexec("7za e -y -r -spf '{$this->result_file}' '{$filename}'", $arr_out);
-            if($filename !== $result_file && file_exists($filename)){
+            if ($filename !== $result_file && file_exists($filename)) {
                 Util::mwexec("mv '{$filename}' '{$result_file}'", $arr_out);
             }
-            if(in_array(basename($filename), ['mikopbx.db', 'cdr.db']) ){
+            if (in_array(basename($filename), ['mikopbx.db', 'cdr.db'])) {
                 Util::mwexec("chown -R www:www {$result_file}* > /dev/null 2> /dev/null");
             }
         }
@@ -302,8 +302,8 @@ 
         $result['result']     = 'Success';
         $result['id']         = $data['dir_name'];
         $result['extension']  = $data['extension'];
-        if($data['extension'] === 'img'){
-            if(!file_exists($data['res_file']??'')){
+        if ($data['extension'] === 'img') {
+            if (!file_exists($data['res_file'] ?? '')) {
                 $result['result'] = 'ERROR';
                 $result['data'] = "Backup file {$data['res_file']} not found";
                 Util::sys_log_msg('Backup_unpack_conf_img', $result['data']);
@@ -311,7 +311,7 @@ 
             }
 
             $res = Util::mwexec("/bin/mount -o loop {$data['res_file']} {$data['mnt_point']}");
-            if($res !== 0){
+            if ($res !== 0) {
                 $result['result'] = 'ERROR';
                 $result['data'] = "Fail mount {$data['res_file']}... on loop device...";
                 Util::sys_log_msg('Backup_unpack_conf_img', $result['data']);
@@ -320,23 +320,23 @@ 
 
             // Если бекап выполнялся в каталоге оперативной памяти:
             $path_b_dir = "{$data['mnt_point']}/var/asterisk/backup/{$data['dir_name']}";
-            if(!file_exists($path_b_dir)){
+            if (!file_exists($path_b_dir)) {
                 // Бекап выполнялся на диск - хранилище
                 $path_b_dir = "{$data['mnt_point']}/storage/usbdisk[1-9]/mikopbx/backup/{$data['dir_name']}";
             }
             Util::mwexec("du {$data['mnt_point']}/storage/*/{$data['dir_name']}/flist.txt -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
-            if(($out[0] ?? false) && file_exists($out[0])){
+            if (($out[0] ?? false) && file_exists($out[0])) {
                 // бекап выполнялся на сетевой диск.
                 $path_b_dir = dirname($out[0]);
             }
 
-            if(!file_exists($path_b_dir)){
+            if (!file_exists($path_b_dir)) {
                 Util::mwexec("du {$data['mnt_point']}/storage/usbdisk[1-9]/mikopbx/backup/*/flist.txt -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
-                if(($out[0] ?? false) && file_exists($out[0])){
+                if (($out[0] ?? false) && file_exists($out[0])) {
                     // бекап выполнялся на сетевой диск.
                     $path_b_dir       = dirname($out[0]);
                     $new_id           = basename($path_b_dir);
-                    if($data['dir_name'] !== $new_id){
+                    if ($data['dir_name'] !== $new_id) {
                         $result['new_id'] = $new_id;
                     }
                 }
@@ -345,25 +345,25 @@ 
             $res = Util::mwexec("/bin/cp {$path_b_dir}/* {$data['backupdir']}/{$data['dir_name']}");
 
             Util::mwexec("/bin/umount {$data['res_file']}");
-            if(isset($result['new_id'])){
+            if (isset($result['new_id'])) {
                 $res = Util::mwexec("/bin/mv {$data['backupdir']}/{$data['dir_name']} {$data['backupdir']}/{$result['new_id']}");
                 $data['dir_name'] = $result['new_id'];
             }
-            if($res !== 0){
+            if ($res !== 0) {
                 $result['result']   = 'ERROR';
                 $result['data']     = 'Fail mount cp data from loop device...';
                 Util::sys_log_msg('Backup_unpack_conf_img', $result['data']);
             }
 
-            if( ! file_exists("{$data['backupdir']}/{$data['dir_name']}/flist.txt")   ||
-                ! file_exists("{$data['backupdir']}/{$data['dir_name']}/config.json")){
+            if (!file_exists("{$data['backupdir']}/{$data['dir_name']}/flist.txt") ||
+                !file_exists("{$data['backupdir']}/{$data['dir_name']}/config.json")) {
                 $result['result'] = 'ERROR';
                 $result['data']   = 'Broken backup file';
             }
-            if($result['result'] === 'ERROR'){
+            if ($result['result'] === 'ERROR') {
                 unlink($data['res_file']);
             }
-        }elseif($data['extension'] === 'zip'){
+        }elseif ($data['extension'] === 'zip') {
             file_put_contents("{$data['backupdir']}/{$data['dir_name']}/progress.txt", '0');
 
             self::static_extract_file($data['dir_name'], $data['res_file'], "{$data['backupdir']}/{$data['dir_name']}/flist.txt");
@@ -381,33 +381,33 @@ 
      */
     public static function static_extract_file($id, $arh, $filename):void {
         $type = Util::get_extension_file($arh);
-        if($type==='img') {
+        if ($type === 'img') {
             $result_dir = basename($arh).'/mnt_point';
-            if(! Storage::disk_is_mounted($arh, '')) {
+            if (!Storage::disk_is_mounted($arh, '')) {
                 Util::mwexec("/bin/mount -o loop {$arh} {$result_dir}");
             }
             Util::mwexec("du /storage/*/{$id} -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
-            if(($out[0] ?? false) && file_exists($out[0])){
+            if (($out[0] ?? false) && file_exists($out[0])) {
                 $src_file = $out[0];
-            }else{
+            } else {
                 $src_file = "{$result_dir}{$filename}";
             }
             Util::mwexec("/bin/cp '{$src_file}' '{$filename}'", $arr_out);
             Util::mwexec("/bin/umount $arh");
-        }else {
+        } else {
             Util::mwexec("7za e -y -r -spf {$arh} {$filename}");
-            if(!file_exists($filename)){
+            if (!file_exists($filename)) {
                 $command_status = Util::mwexec("7za l {$arh} | grep '".basename($filename)."' | /bin/busybox awk '{print $6}'", $out);
-                if($command_status === 0){
+                if ($command_status === 0) {
                     $path_to_file = implode('', $out);
 
                     $file_dir = dirname($path_to_file);
-                    if(!file_exists($file_dir)){
-                        Util::mwexec('mkdir -p '.escapeshellcmd($file_dir) );
+                    if (!file_exists($file_dir)) {
+                        Util::mwexec('mkdir -p '.escapeshellcmd($file_dir));
                     }
                     $file_dir = dirname($filename);
-                    if(!file_exists($file_dir)){
-                        Util::mwexec('mkdir -p '.escapeshellcmd($file_dir) );
+                    if (!file_exists($file_dir)) {
+                        Util::mwexec('mkdir -p '.escapeshellcmd($file_dir));
                     }
                     Util::mwexec("7za e -y -r -spf {$arh} {$path_to_file}");
                     Util::mwexec("mv $path_to_file $filename");
@@ -422,41 +422,41 @@ 
      * @return array
      */
     public function create_arhive():array {
-        if(!file_exists("{$this->dirs['backup']}/{$this->id}")){
+        if (!file_exists("{$this->dirs['backup']}/{$this->id}")) {
             return ['result' => 'ERROR', 'message' => 'Unable to create directory for the backup.'];
         }
         $result = $this->create_file_list();
-        if(!$result){
+        if (!$result) {
             return ['result' => 'ERROR', 'message' => 'Unable to create file list. Failed to create file.'];
         }
 
-        if(file_exists($this->progress_file)){
+        if (file_exists($this->progress_file)) {
             $file_data  = file_get_contents($this->progress_file);
             $data       = explode('/', $file_data);
-            $this->progress = trim($data[0])*1;
+            $this->progress = trim($data[0]) * 1;
         }
-        if(!file_exists($this->file_list)){
+        if (!file_exists($this->file_list)) {
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $lines = file($this->file_list);
-        if($lines === FALSE){
+        if ($lines === FALSE) {
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $count_files = count($lines);
         file_put_contents($this->progress_file, "{$this->progress}/{$count_files}");
-        while ($this->progress < $count_files){
+        while ($this->progress < $count_files) {
             $filename_data = trim($lines[$this->progress]);
-            if(strpos($filename_data,':')===false){
+            if (strpos($filename_data, ':') === false) {
                 $filename = $filename_data;
-            }else{
+            } else {
                 $filename = (explode(':', $filename_data))[1];
             }
-            if(is_dir($filename) === FALSE){
+            if (is_dir($filename) === FALSE) {
                 $this->add_file_to_arhive($filename);
             }
 
             $this->progress++;
-            if($this->progress % 10 === 0){
+            if ($this->progress % 10 === 0) {
                 file_put_contents($this->progress_file, "{$this->progress}/{$count_files}");
             }
         }
@@ -464,7 +464,7 @@ 
         file_put_contents($this->progress_file, "{$this->progress}/{$count_files}");
         $this->add_file_to_arhive($this->progress_file);
 
-        if(Storage::disk_is_mounted($this->result_file, '')){
+        if (Storage::disk_is_mounted($this->result_file, '')) {
             Util::mwexec("/bin/umount $this->result_file");
         }
 
@@ -477,15 +477,15 @@ 
      */
     public function get_result_file():string {
 
-        if(!file_exists($this->result_file)){
+        if (!file_exists($this->result_file)) {
             $BackupRules = Models\BackupRules::find('enabled="1"');
-            foreach ($BackupRules as $res){
+            foreach ($BackupRules as $res) {
                 $backup_dir = '/storage/'.$res->ftp_host.'.'.$res->ftp_port;
                 $filename = "{$backup_dir}/{$this->id}/resultfile";
-                if(file_exists("{$filename}.zip")){
+                if (file_exists("{$filename}.zip")) {
                     $this->result_file = "{$filename}.zip";
                 }
-                if(file_exists("{$filename}.img")){
+                if (file_exists("{$filename}.img")) {
                     $this->result_file = "{$filename}.img";
                 }
             }
@@ -499,7 +499,7 @@ 
      * @param string $backup_dir
      * @return array
      */
-    public static function list_backups($backup_dir=''):array {
+    public static function list_backups($backup_dir = ''):array {
         $result = array(
           'result'  => 'Success'
         );
@@ -507,55 +507,55 @@ 
         $result['data'] = [];
 
         // Проверка каталогов FTP / SFTP бекапа:
-        if(empty($backup_dir)){
+        if (empty($backup_dir)) {
             self::list_backups_ftp($result['data']);
         }
 
         $dirs = PBX::get_asterisk_dirs();
-        if(!empty($backup_dir)){
+        if (!empty($backup_dir)) {
             $dirs['backup'] = $backup_dir;
         }
 
-        if(!is_dir($dirs['backup'])){
+        if (!is_dir($dirs['backup'])) {
             return $result;
         }
         $entries = scandir($dirs['backup']);
-        foreach($entries as $entry) {
+        foreach ($entries as $entry) {
             $base_filename = basename($entry);
-            if($base_filename === '.' || $base_filename === '..'){
+            if ($base_filename === '.' || $base_filename === '..') {
                 continue;
             }
-            $filename      = "{$dirs['backup']}/{$base_filename}/resultfile.zip";
-            if(!file_exists($filename)) {
-                $filename      = "{$dirs['backup']}/{$base_filename}/resultfile.img";
+            $filename = "{$dirs['backup']}/{$base_filename}/resultfile.zip";
+            if (!file_exists($filename)) {
+                $filename = "{$dirs['backup']}/{$base_filename}/resultfile.img";
             }
 
             $file_progress = "{$dirs['backup']}/{$base_filename}/progress.txt";
-            if(file_exists($file_progress)){
+            if (file_exists($file_progress)) {
                 $size = 0;
-                if(file_exists($filename)){
+                if (file_exists($filename)) {
                     $size = round(filesize($filename) / 1024 / 1024, 2); // размер в мегабайтах.
                 }
                 // Получим данные по прогрессу и количеству файлов.
                 $file_data  = file_get_contents($file_progress);
                 $data       = explode('/', $file_data);
-                $progress   = (count($data)>0 && is_numeric($data[0]) )?trim($data[0])*1:0;
-                $total      = (count($data)>1 && is_numeric($data[1]) )?trim($data[1])*1:0;
-                $config_file="{$dirs['backup']}/{$base_filename}/config.json";
+                $progress   = (count($data) > 0 && is_numeric($data[0])) ?trim($data[0]) * 1 : 0;
+                $total      = (count($data) > 1 && is_numeric($data[1])) ?trim($data[1]) * 1 : 0;
+                $config_file = "{$dirs['backup']}/{$base_filename}/config.json";
 
-                if(file_exists("{$dirs['backup']}/{$base_filename}/progress_recover.txt")){
+                if (file_exists("{$dirs['backup']}/{$base_filename}/progress_recover.txt")) {
                     $file_data  = file_get_contents("{$dirs['backup']}/{$base_filename}/progress_recover.txt");
                     $data       = explode('/', $file_data);
-                    $progress_recover   = (count($data)>0)?trim($data[0])*1:0;
-                    if($total === 0 ){
-                        $total          = (count($data)>1)?trim($data[1])*1:0;
+                    $progress_recover   = (count($data) > 0) ?trim($data[0]) * 1 : 0;
+                    if ($total === 0) {
+                        $total          = (count($data) > 1) ?trim($data[1]) * 1 : 0;
                     }
-                }else{
+                } else {
                     $progress_recover = '';
                 }
 
                 $config = null;
-                if(file_exists($config_file)){
+                if (file_exists($config_file)) {
                     $config = json_decode(file_get_contents($config_file), true);
                 }
                 // Вычислим timestamp.
@@ -589,26 +589,26 @@ 
         $tmp_data = [$data];
 
         $BackupRules = Models\BackupRules::find('enabled="1"');
-        foreach ($BackupRules as $res){
+        foreach ($BackupRules as $res) {
             $backup_dir = '/storage/'.$res->ftp_host.'.'.$res->ftp_port;
             $disk_mounted = Storage::is_storage_disk_mounted("$backup_dir ");
-            if(!$disk_mounted){
-                if($res->ftp_sftp_mode === '1'){
+            if (!$disk_mounted) {
+                if ($res->ftp_sftp_mode === '1') {
                     $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-                }else{
+                } else {
                     $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
                 }
             }
-            if(!$disk_mounted){
+            if (!$disk_mounted) {
                 continue;
             }
 
             // Проверим, не является ли удаленный диск локальным.
             $test_data = md5(time());
             file_put_contents("{$backup_dir}/test.tmp", $test_data);
-            if(file_exists("{$dirs['backup']}/test.tmp")){
+            if (file_exists("{$dirs['backup']}/test.tmp")) {
                 $test_data_res = file_get_contents("{$dirs['backup']}/test.tmp");
-                if($test_data_res === $test_data){
+                if ($test_data_res === $test_data) {
                     unlink("{$backup_dir}/test.tmp");
                     // Это локальный диск подключен по SFTP. Не нужно обрабатывать.
                     continue;
@@ -617,16 +617,16 @@ 
             // Чистим временный файл.
             unlink("{$backup_dir}/test.tmp");
 
-            $out  = [];
-            $command =  "/usr/bin/timeout -t 3 ls -l {$backup_dir}";
-            Util::mwexec($command,$out);
+            $out = [];
+            $command = "/usr/bin/timeout -t 3 ls -l {$backup_dir}";
+            Util::mwexec($command, $out);
             $response = trim(implode('', $out));
-            if('Terminated' === $response){
+            if ('Terminated' === $response) {
                 // Удаленный сервер не ответил / или не корректно указан пароль.
                 continue;
             }
             $result = self::list_backups($backup_dir);
-            foreach ($result['data'] as &$b){
+            foreach ($result['data'] as &$b) {
                 $b['m_BackupRules_id'] = $res->id;
                 $b['m_BackupRules_host'] = $res->ftp_host;
                 $b['m_BackupRules_port'] = $res->ftp_port;
@@ -643,12 +643,12 @@ 
      * @param  array | null $options
      * @return array
      */
-    public static function start($options=null):array {
+    public static function start($options = null):array {
         global $g;
         $result = [];
         $id = 'backup_'.time();
-        if($options !== null){
-            if(isset($options['id'])){
+        if ($options !== null) {
+            if (isset($options['id'])) {
                 $id = $options['id'];
             }
             // Инициализируем настройки резервного копирования.
@@ -670,11 +670,11 @@ 
      * @param  $options
      * @return array
      */
-    public static function start_recover($id, $options=null):array {
+    public static function start_recover($id, $options = null):array {
         global $g;
         $result = [];
 
-        if(empty($id)){
+        if (empty($id)) {
             $result['result'] = 'Error';
             $result['message'] = 'ID is empty';
             return $result;
@@ -721,7 +721,7 @@ 
      * @return array
      */
     public static function remove($id):array {
-        if(empty($id)){
+        if (empty($id)) {
             $result['result'] = 'Error';
             $result['message'] = 'ID is empty';
             return $result;
@@ -729,14 +729,14 @@ 
         $result = [];
         $b_dir  = self::get_backup_dir()."/{$id}";
         $b_dirs = [];
-        if(file_exists($b_dir)){
+        if (file_exists($b_dir)) {
             $b_dirs[] = $b_dir;
         }
-        $list   = self::list_backups();
-        foreach ($list['data'] as $backup_data){
-            if($id === $backup_data['id'] && isset($backup_data['config']['backup'])){
-                $b_dir  = $backup_data['config']['backup']."/{$id}";
-                if(file_exists($b_dir)){
+        $list = self::list_backups();
+        foreach ($list['data'] as $backup_data) {
+            if ($id === $backup_data['id'] && isset($backup_data['config']['backup'])) {
+                $b_dir = $backup_data['config']['backup']."/{$id}";
+                if (file_exists($b_dir)) {
                     $b_dirs[] = $b_dir;
                 }
             }
@@ -744,22 +744,22 @@ 
 
         $BackupRules = Models\BackupRules::find('enabled="1"');
         foreach ($BackupRules as $res) {
-            $b_dir = '/storage/' . $res->ftp_host . '.' . $res->ftp_port."/{$id}";
-            if(file_exists($b_dir)){
+            $b_dir = '/storage/'.$res->ftp_host.'.'.$res->ftp_port."/{$id}";
+            if (file_exists($b_dir)) {
                 $b_dirs[] = $b_dir;
             }
         }
 
-        if(count($b_dirs) === 0){
+        if (count($b_dirs) === 0) {
             $result['result'] = 'Error';
             $result['message'] = 'File not found';
             return $result;
         }
 
-        $ret = Util::mwexec('rm -rf '.implode(' ', $b_dirs) );
+        $ret = Util::mwexec('rm -rf '.implode(' ', $b_dirs));
         clearstatcache();
 
-        $result['result'] = $ret !== 0 ?'Error':'Success';
+        $result['result'] = $ret !== 0 ? 'Error' : 'Success';
         return $result;
     }
 
@@ -768,12 +768,12 @@ 
      * @param $options
      */
     public function save_options_recover_file($options):void {
-        if($options === null && file_exists($this->options_recover_file)){
+        if ($options === null && file_exists($this->options_recover_file)) {
             // Удаляем ненужный файл настроек.
             unlink($this->options_recover_file);
         }
 
-        if($options!==null){
+        if ($options !== null) {
             // Сохраняем настройки. Файл будет использоваться фоновым процессом.
             file_put_contents($this->options_recover_file, json_encode($options, JSON_UNESCAPED_SLASHES));
         }
@@ -784,70 +784,70 @@ 
      * @return array
      */
     public function recover_with_progress():array {
-        if(!Storage::is_storage_disk_mounted()){
+        if (!Storage::is_storage_disk_mounted()) {
             return ['result' => 'ERROR', 'message' => 'Storage is not mounted.'];
         }
         $options = null;
-        if(file_exists($this->options_recover_file)){
+        if (file_exists($this->options_recover_file)) {
             $options = json_decode(file_get_contents($this->options_recover_file), true);
         }
 
-        if(!file_exists($this->file_list)){
+        if (!file_exists($this->file_list)) {
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $lines = file($this->file_list);
-        if($lines === FALSE){
+        if ($lines === FALSE) {
             return ['result' => 'ERROR', 'message' => 'File list not read.'];
         }
 
-        if(file_exists($this->progress_file_recover)){
+        if (file_exists($this->progress_file_recover)) {
             // Получим текущий прогресс.
             $file_data  = file_get_contents($this->progress_file_recover);
             $data       = explode('/', $file_data);
-            $this->progress = trim($data[0])*1;
+            $this->progress = trim($data[0]) * 1;
         }
 
         $count_files = count($lines);
-        if($this->progress === $count_files){
+        if ($this->progress === $count_files) {
             $this->progress = 0;
         }
 
         file_put_contents($this->progress_file_recover, "{$this->progress}/{$count_files}");
-        while ($this->progress < $count_files){
+        while ($this->progress < $count_files) {
             $filename_data = trim($lines[$this->progress]);
-            if(strpos($filename_data,':')===false){
+            if (strpos($filename_data, ':') === false) {
                 $section  = ''; // Этот файл будет восстановленр в любом случае.
                 $filename = $filename_data;
-            }else{
+            } else {
                 $tmp_data = explode(':', $filename_data);
                 $section  = $tmp_data[0] ?? '';
                 $filename = $tmp_data[1] ?? '';
             }
 
             $this->progress++;
-            if(in_array(basename($filename),['flist.txt', 'config.json'])){
+            if (in_array(basename($filename), ['flist.txt', 'config.json'])) {
                 continue;
             }
 
-            if( $section!=='' && is_array($options) && !isset($options[$section]) ){
+            if ($section !== '' && is_array($options) && !isset($options[$section])) {
                 // Если секция указана, и она не определена в массиве опций,
                 // то не восстанавливаем файл.
                 unset($filename);
-            }else{
+            } else {
                 $this->extract_file($filename);
             }
-            if($this->progress % 10 === 0){
+            if ($this->progress % 10 === 0) {
                 file_put_contents($this->progress_file_recover, "{$this->progress}/{$count_files}");
             }
         }
         file_put_contents($this->progress_file_recover, "{$this->progress}/{$count_files}");
 
-        if(Storage::disk_is_mounted($this->result_file, '')){
+        if (Storage::disk_is_mounted($this->result_file, '')) {
             Util::mwexec("umount $this->result_file");
         }
         Cdr::set_permit_to_db();
 
-        if(isset($options['backup-config']) && $options['backup-config'] === '1') {
+        if (isset($options['backup-config']) && $options['backup-config'] === '1') {
             System::reboot_sync(false);
         }
         return ['result' => 'Success', 'count_files' => $count_files];
@@ -869,25 +869,25 @@ 
         global $g;
 
         $commands = Models\BackupRules::find('enabled="1"');
-        foreach ($commands as $cmd){
-            $day = ('0' === $cmd->every)?'*':$cmd->every;
+        foreach ($commands as $cmd) {
+            $day = ('0' === $cmd->every) ? '*' : $cmd->every;
             $arr_time = explode(':', $cmd->at_time);
-            if(count($arr_time)!==2){
+            if (count($arr_time) !== 2) {
                 $h = '*';
                 $m = '*';
-            }else{
+            } else {
                 $h = $arr_time[0];
-                if($h === '0'){
+                if ($h === '0') {
                     $h = '*';
                 }
                 $m = $arr_time[1];
-                $m = (strpos($m,'0')===0)?substr($m,1,1):$m;
-                if($m === '0'){
+                $m = (strpos($m, '0') === 0) ?substr($m, 1, 1) : $m;
+                if ($m === '0') {
                     $m = '0';
                 }
             }
 
-            if('*' === $h && '*' === $m && '*' === $day){
+            if ('*' === $h && '*' === $m && '*' === $day) {
                 // Не корректно описано расписание.
                 continue;
             }
@@ -902,15 +902,15 @@ 
         global $g;
         $commands = Models\BackupRules::find('enabled="1"');
         $queue_commands = [];
-        foreach ($commands as $cmd){
+        foreach ($commands as $cmd) {
             $command     = "/usr/bin/nohup /usr/bin/php -f {$g['pt1c_inc_path']}/workers/worker_backup.php ";
             $params      = "none backup {$cmd->id} > /dev/null 2>&1 &";
             $queue_commands[] = "{$command} {$params}\n";
         }
         Util::mwexec_commands($queue_commands);
-        if(count($queue_commands) === 0){
+        if (count($queue_commands) === 0) {
             $result['result'] = 'Error';
-        }else{
+        } else {
             $result['result'] = 'Success';
         }
 
@@ -926,25 +926,25 @@ 
         $result = [];
         /** @var Models\BackupRules $res */
         $res = BackupRules::findFirst("id='{$id}'");
-        if(!$res){
+        if (!$res) {
             return ['result' => 'Error', 'message' => 'Backup rule not found.'];
         }
         $backup_dir = '/storage/'.$res->ftp_host.'.'.$res->ftp_port;
         /** @var Storage::is_storage_disk_mounted $disk_mounted */
         $disk_mounted = Storage::is_storage_disk_mounted("$backup_dir ");
         $disk_mounted_start = $disk_mounted;
-        if(!$disk_mounted){
-            if($res->ftp_sftp_mode === '1'){
+        if (!$disk_mounted) {
+            if ($res->ftp_sftp_mode === '1') {
                 $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-            }else{
+            } else {
                 $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
             }
         }
-        if(!$disk_mounted){
+        if (!$disk_mounted) {
             return ['result' => 'Error', 'message' => 'Failed to mount backup disk...'];
         }
-        $result['result']   = 'Success';
-        if(!$disk_mounted_start){
+        $result['result'] = 'Success';
+        if (!$disk_mounted_start) {
             Storage::umount_disk($backup_dir);
         }
         return $result;

Braces +22 added lines, -20 removed lines

@@ -10,7 +10,8 @@ 
 
 require_once 'globals.php';
 
-class Backup {
+class Backup
+{
     private $id;
     private $dirs;
     private $dirs_mem;
@@ -25,14 +26,15 @@ 
     private $progress=0;
     private $type='img'; // img | zip
 
-    public function __construct($id, $options=null){
+    public function __construct($id, $options=null)
+    {
         $this->dirs      = PBX::get_asterisk_dirs();
         $this->dirs_mem  = PBX::get_asterisk_dirs_mem();
         // Проверим особенность бекапа на сетевой диск.
         Util::mwexec("du /storage/*/{$id}/flist.txt -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
         if(($out[0] ?? false) && file_exists($out[0])){
             $this->dirs['backup'] = dirname($out[0], 2);
-        }elseif (is_array($options) && isset($options['backup'])){
+        } elseif (is_array($options) && isset($options['backup'])){
             // Переопределяем каталог с бекапом.
             $this->dirs['backup'] = $options['backup'];
         }
@@ -60,7 +62,7 @@ 
 
         if((!is_array($options) || $options === null) && file_exists($this->config_file)){
             $this->options = json_decode(file_get_contents($this->config_file), true);
-        }else{
+        } else{
             $this->options = $options;
         }
 
@@ -85,7 +87,7 @@ 
 
         try{
             $result = @file_put_contents($this->file_list, '');
-        }catch (Exception $e){
+        } catch (Exception $e){
             Util::sys_log_msg('Backup', $e->getMessage());
             $result = false;
         }
@@ -213,11 +215,11 @@ 
                 // Выполняем копирование через dump.
                 // Наиболее безопасный вариант.
                 Util::mwexec("/usr/bin/sqlite3 '{$filename}' .dump | /usr/bin/sqlite3 '{$this->result_dir}{$filename}' ", $out);
-            }else{
+            } else{
                 // Просто копируем файл.
                 Util::mwexec("/bin/cp '{$filename}' '{$this->result_dir}{$filename}' ", $out);
             }
-        }else{
+        } else{
             Util::mwexec("7za a -tzip -spf '{$this->result_file}' '{$filename}'", $out);
         }
     }
@@ -276,11 +278,11 @@ 
                 Util::mwexec("/usr/bin/sqlite3 '{$this->result_dir}{$filename}' .dump $sed_command | /usr/bin/sqlite3 '{$result_file}' ", $arr_out);
                 Util::mwexec("chown -R www:www {$result_file}* > /dev/null 2> /dev/null");
 
-            }else{
+            } else{
                 // Просто копируем файл.
                 Util::mwexec("/bin/cp '{$this->result_dir}{$filename}' '{$result_file}'", $arr_out);
             }
-        }else {
+        } else {
             Util::mwexec("7za e -y -r -spf '{$this->result_file}' '{$filename}'", $arr_out);
             if($filename !== $result_file && file_exists($filename)){
                 Util::mwexec("mv '{$filename}' '{$result_file}'", $arr_out);
@@ -363,7 +365,7 @@ 
             if($result['result'] === 'ERROR'){
                 unlink($data['res_file']);
             }
-        }elseif($data['extension'] === 'zip'){
+        } elseif($data['extension'] === 'zip'){
             file_put_contents("{$data['backupdir']}/{$data['dir_name']}/progress.txt", '0');
 
             self::static_extract_file($data['dir_name'], $data['res_file'], "{$data['backupdir']}/{$data['dir_name']}/flist.txt");
@@ -389,12 +391,12 @@ 
             Util::mwexec("du /storage/*/{$id} -d 0 2> /dev/null | /bin/busybox awk '{print $2}'", $out);
             if(($out[0] ?? false) && file_exists($out[0])){
                 $src_file = $out[0];
-            }else{
+            } else{
                 $src_file = "{$result_dir}{$filename}";
             }
             Util::mwexec("/bin/cp '{$src_file}' '{$filename}'", $arr_out);
             Util::mwexec("/bin/umount $arh");
-        }else {
+        } else {
             Util::mwexec("7za e -y -r -spf {$arh} {$filename}");
             if(!file_exists($filename)){
                 $command_status = Util::mwexec("7za l {$arh} | grep '".basename($filename)."' | /bin/busybox awk '{print $6}'", $out);
@@ -448,7 +450,7 @@ 
             $filename_data = trim($lines[$this->progress]);
             if(strpos($filename_data,':')===false){
                 $filename = $filename_data;
-            }else{
+            } else{
                 $filename = (explode(':', $filename_data))[1];
             }
             if(is_dir($filename) === FALSE){
@@ -550,7 +552,7 @@ 
                     if($total === 0 ){
                         $total          = (count($data)>1)?trim($data[1])*1:0;
                     }
-                }else{
+                } else{
                     $progress_recover = '';
                 }
 
@@ -595,7 +597,7 @@ 
             if(!$disk_mounted){
                 if($res->ftp_sftp_mode === '1'){
                     $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-                }else{
+                } else{
                     $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
                 }
             }
@@ -818,7 +820,7 @@ 
             if(strpos($filename_data,':')===false){
                 $section  = ''; // Этот файл будет восстановленр в любом случае.
                 $filename = $filename_data;
-            }else{
+            } else{
                 $tmp_data = explode(':', $filename_data);
                 $section  = $tmp_data[0] ?? '';
                 $filename = $tmp_data[1] ?? '';
@@ -833,7 +835,7 @@ 
                 // Если секция указана, и она не определена в массиве опций,
                 // то не восстанавливаем файл.
                 unset($filename);
-            }else{
+            } else{
                 $this->extract_file($filename);
             }
             if($this->progress % 10 === 0){
@@ -875,7 +877,7 @@ 
             if(count($arr_time)!==2){
                 $h = '*';
                 $m = '*';
-            }else{
+            } else{
                 $h = $arr_time[0];
                 if($h === '0'){
                     $h = '*';
@@ -910,7 +912,7 @@ 
         Util::mwexec_commands($queue_commands);
         if(count($queue_commands) === 0){
             $result['result'] = 'Error';
-        }else{
+        } else{
             $result['result'] = 'Success';
         }
 
@@ -936,7 +938,7 @@ 
         if(!$disk_mounted){
             if($res->ftp_sftp_mode === '1'){
                 $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-            }else{
+            } else{
                 $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
             }
         }

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
                 'backup-sound-files'=> '1'
             ];
         }
-        if(!file_exists($this->config_file) && FALSE === @file_put_contents($this->config_file, json_encode($this->options), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)){
+        if(!file_exists($this->config_file) && false === @file_put_contents($this->config_file, json_encode($this->options), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)){
             Util::sys_log_msg('Backup', 'Failed create file '.$this->config_file);
         }
     }
@@ -171,7 +171,7 @@ 
             $result_size = $result_size < 1?1:round($result_size);
             $tmp_name    = $this->dirs['tmp'].'/'.Util::generateRandomString();
             // Создаем образ файловой системы.
-            $res = Util::mwexec("/bin/dd if=/dev/zero of={$tmp_name} bs=1 count=0 seek={$result_size}M");
+            $res = Util::mwexec("/bin/dd if=/dev/zero of={$tmp_name} bs=1 count=0 seek={$result_size}m");
             if ($res !== 0) {
                 Util::sys_log_msg('Backup', 'Error creating img file...');
             }
@@ -290,7 +290,7 @@ 
             }
         }
         $out = implode(' ', $arr_out);
-        return (strpos($out, 'ERROR') === FALSE);
+        return (strpos($out, 'ERROR') === false);
     }
 
     /**
@@ -439,7 +439,7 @@ 
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $lines = file($this->file_list);
-        if($lines === FALSE){
+        if($lines === false){
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $count_files = count($lines);
@@ -451,7 +451,7 @@ 
             }else{
                 $filename = (explode(':', $filename_data))[1];
             }
-            if(is_dir($filename) === FALSE){
+            if(is_dir($filename) === false){
                 $this->add_file_to_arhive($filename);
             }
 
@@ -796,7 +796,7 @@ 
             return ['result' => 'ERROR', 'message' => 'File list not found.'];
         }
         $lines = file($this->file_list);
-        if($lines === FALSE){
+        if($lines === false){
             return ['result' => 'ERROR', 'message' => 'File list not read.'];
         }
 

etc/inc/workers/worker_udhcpc_configure.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 $network = new Network();
 $action  = trim($argv[1]);
 
-if($action === 'deconfig'){
+if ($action === 'deconfig') {
     $network->udhcpc_configure_deconfig();
-}elseif( 'bound' === $action || 'renew' === $action){
+}elseif ('bound' === $action || 'renew' === $action) {
     $network->udhcpc_configure_renew_bound();
 }

Braces +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
 
 if($action === 'deconfig'){
     $network->udhcpc_configure_deconfig();
-}elseif( 'bound' === $action || 'renew' === $action){
+} elseif( 'bound' === $action || 'renew' === $action){
     $network->udhcpc_configure_renew_bound();
 }

etc/inc/workers/worker_recover.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 require_once 'globals.php';
 
-$id  = trim($argv[1]);
-if(empty($id)){
+$id = trim($argv[1]);
+if (empty($id)) {
     exit;
 }
 

etc/inc/workers/worker_backup.php

Spacing +14 added lines, -14 removed lines

@@ -8,47 +8,47 @@ 
 
 require_once 'globals.php';
 
-if(count($argv)<3) {
+if (count($argv) < 3) {
     exit;
 }
 
 $id      = trim($argv[1]);
 $command = trim($argv[2]);
-if(empty($id)){
+if (empty($id)) {
     exit;
 }
 
-if('none' !== $id ){
+if ('none' !== $id) {
     $b = new Backup($id);
     $b->create_arhive();
-}elseif(count($argv)===4){
+}elseif (count($argv) === 4) {
     $PID = Util::get_pid_process("{$argv[1]} {$argv[2]} {$argv[3]}", ''.getmypid().' ');
-    if(empty($PID)){
+    if (empty($PID)) {
         // Другого процесса с аналогичными установками не запущено.
         /** @var Models\BackupRules $res */
         $res = Models\BackupRules::findFirst("id='{$argv[3]}'");
-        if($res && Util::is_json($res->what_backup)){
+        if ($res && Util::is_json($res->what_backup)) {
             $backup_dir = '/storage/'.$res->ftp_host.'.'.$res->ftp_port;
             $disk_mounted = Storage::is_storage_disk_mounted("$backup_dir ");
-            if(!$disk_mounted){
-                if($res->ftp_sftp_mode === '1'){
+            if (!$disk_mounted) {
+                if ($res->ftp_sftp_mode === '1') {
                     $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-                }else{
+                } else {
                     $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
                 }
             }
-            if(!$disk_mounted){
+            if (!$disk_mounted) {
                 Util::sys_log_msg('Backup', 'Failed to mount backup disk...');
                 exit;
             }
 
             // Удаляем старые резервные копии, если необходимо.
-            if($res->keep_older_versions > 0){
+            if ($res->keep_older_versions > 0) {
                 $out = [];
                 Util::mwexec("find {$backup_dir} -mindepth 1 -type d  | sort", $out);
-                if(count($out)>=$res->keep_older_versions){
+                if (count($out) >= $res->keep_older_versions) {
                     $count_dir = count($out) - $res->keep_older_versions;
-                    for ($count_dir; $count_dir>=0; $count_dir--){
+                    for ($count_dir; $count_dir >= 0; $count_dir--) {
                         Util::mwexec("rm -rf {$out[$count_dir]}");
                     }
                 }
@@ -58,7 +58,7 @@ 
             $id      = 'backup_'.time();
             $options = json_decode($res->what_backup, true);
             $options['backup'] = $backup_dir;
-            if($res->ftp_sftp_mode !== '1') {
+            if ($res->ftp_sftp_mode !== '1') {
                 $options['type'] = 'zip';
             }
             $b = new Backup($id, $options);

Braces +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 if('none' !== $id ){
     $b = new Backup($id);
     $b->create_arhive();
-}elseif(count($argv)===4){
+} elseif(count($argv)===4){
     $PID = Util::get_pid_process("{$argv[1]} {$argv[2]} {$argv[3]}", ''.getmypid().' ');
     if(empty($PID)){
         // Другого процесса с аналогичными установками не запущено.
@@ -33,7 +33,7 @@ 
             if(!$disk_mounted){
                 if($res->ftp_sftp_mode === '1'){
                     $disk_mounted = Storage::mount_sftp_disk($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
-                }else{
+                } else{
                     $disk_mounted = Storage::mount_ftp($res->ftp_host, $res->ftp_port, $res->ftp_username, $res->ftp_secret, $res->ftp_path, $backup_dir);
                 }
             }

etc/inc/workers/worker_ami_listener.php

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
      * worker_ami_listener constructor.
      * @throws Exception
      */
-    function __construct(){
+    function __construct() {
         $this->client = new BeanstalkClient('call_events');
         $this->am     = Util::get_am();
         $this->set_filter();
@@ -26,27 +26,27 @@ 
      * Отправка данных на сервер очередей.
      * @param string $result - данные в ормате json для отправки.
      */
-    private function Action_SendToBeanstalk($result){
+    private function Action_SendToBeanstalk($result) {
 
-        $this->message_is_sent = false; $error ='';
+        $this->message_is_sent = false; $error = '';
         for ($i = 1; $i <= 10; $i++) {
-            try{
+            try {
                 $result_send = $this->client->publish($result);
-                if($result_send == false){
+                if ($result_send == false) {
                     $this->client->reconnect();
                 }
                 $this->message_is_sent = ($result_send !== false);
-                if($this->message_is_sent == true){
+                if ($this->message_is_sent == true) {
                     // Проверка
                     break;
                 }
-            }catch (Exception $e){
+            } catch (Exception $e) {
                 $this->client = new BeanstalkClient('call_events');
                 $error = $e->getMessage();
             }
         }
 
-        if($this->message_is_sent == false){
+        if ($this->message_is_sent == false) {
             Util::sys_log_msg('CDR_AMI_Connector', "Error send data to queue. ".$error);
         }
         // Логируем оповещение.
@@ -57,13 +57,13 @@ 
      * Функция обработки оповещений.
      * @param $parameters
      */
-    public function callback($parameters){
-        if('CdrConnectorPing' == $parameters['UserEvent']){
+    public function callback($parameters) {
+        if ('CdrConnectorPing' == $parameters['UserEvent']) {
             usleep(50000);
             $this->am->UserEvent("CdrConnectorPong", []);
             return;
         }
-        if('CdrConnector' != $parameters['UserEvent']){
+        if ('CdrConnector' != $parameters['UserEvent']) {
             return;
         }
 
@@ -74,11 +74,11 @@ 
     /**
      * Старт работы листнера.
      */
-    public function start(){
+    public function start() {
         $this->am->add_event_handler("userevent", [$this, "callback"]);
         while (true) {
             $result = $this->am->wait_user_event(true);
-            if($result == false){
+            if ($result == false) {
                 // Нужен реконнект.
                 usleep(100000);
                 $this->am = Util::get_am();
@@ -91,17 +91,17 @@ 
      * Установка фильтра
      * @return array
      */
-    private function set_filter(){
-        $params   = ['Operation'=>'Add', 'Filter' => 'Event: UserEvent'];
-        $res 	  = $this->am->send_request_timeout('Filter', $params);
+    private function set_filter() {
+        $params = ['Operation'=>'Add', 'Filter' => 'Event: UserEvent'];
+        $res = $this->am->send_request_timeout('Filter', $params);
         return $res;
     }
 }
 
-if(count($argv)>1 && $argv[1] == 'start') {
-    try{
+if (count($argv) > 1 && $argv[1] == 'start') {
+    try {
         $listener = new worker_ami_listener();
-    }catch (Exception $e) {
+    } catch (Exception $e) {
         Util::sys_log_msg("AMI_WORKER_EXCEPTION", $e->getMessage());
     }
     $listener->start();

Braces +14 added lines, -8 removed lines

@@ -7,7 +7,8 @@ 
  */
 require_once 'globals.php';
 
-class worker_ami_listener {
+class worker_ami_listener
+{
     private $client;
     private $am;
     private $message_is_sent;
@@ -16,7 +17,8 @@ 
      * worker_ami_listener constructor.
      * @throws Exception
      */
-    function __construct(){
+    function __construct()
+    {
         $this->client = new BeanstalkClient('call_events');
         $this->am     = Util::get_am();
         $this->set_filter();
@@ -26,7 +28,8 @@ 
      * Отправка данных на сервер очередей.
      * @param string $result - данные в ормате json для отправки.
      */
-    private function Action_SendToBeanstalk($result){
+    private function Action_SendToBeanstalk($result)
+    {
 
         $this->message_is_sent = false; $error ='';
         for ($i = 1; $i <= 10; $i++) {
@@ -40,7 +43,7 @@ 
                     // Проверка
                     break;
                 }
-            }catch (Exception $e){
+            } catch (Exception $e){
                 $this->client = new BeanstalkClient('call_events');
                 $error = $e->getMessage();
             }
@@ -57,7 +60,8 @@ 
      * Функция обработки оповещений.
      * @param $parameters
      */
-    public function callback($parameters){
+    public function callback($parameters)
+    {
         if('CdrConnectorPing' == $parameters['UserEvent']){
             usleep(50000);
             $this->am->UserEvent("CdrConnectorPong", []);
@@ -74,7 +78,8 @@ 
     /**
      * Старт работы листнера.
      */
-    public function start(){
+    public function start()
+    {
         $this->am->add_event_handler("userevent", [$this, "callback"]);
         while (true) {
             $result = $this->am->wait_user_event(true);
@@ -91,7 +96,8 @@ 
      * Установка фильтра
      * @return array
      */
-    private function set_filter(){
+    private function set_filter()
+    {
         $params   = ['Operation'=>'Add', 'Filter' => 'Event: UserEvent'];
         $res 	  = $this->am->send_request_timeout('Filter', $params);
         return $res;
@@ -101,7 +107,7 @@ 
 if(count($argv)>1 && $argv[1] == 'start') {
     try{
         $listener = new worker_ami_listener();
-    }catch (Exception $e) {
+    } catch (Exception $e) {
         Util::sys_log_msg("AMI_WORKER_EXCEPTION", $e->getMessage());
     }
     $listener->start();

etc/inc/workers/notify_by_email.php

Spacing +22 added lines, -22 removed lines

@@ -12,54 +12,54 @@ 
  * Обработчик пинга.
  * @param BeanstalkClient $message
  */
-$ping_worker = function ($message) {
+$ping_worker = function($message) {
     $message->reply(json_encode($message->getBody().':pong'));
 };
 
-$notify_by_email = function ($message){
+$notify_by_email = function($message) {
     $config = new \Config();
     $settings = $config->get_general_settings();
 
     /** @var BeanstalkClient $message */
     $data = json_decode($message->getBody(), true);
-    if( isset($data['NOANSWER']) ){
+    if (isset($data['NOANSWER'])) {
         // Вызов клиента отвечен одним из сотрудников. Но не все участники подняли трубку.
         return;
     }
     $template_body   = $settings['MailTplMissedCallBody'];
     $template_Footer = $settings['MailTplMissedCallFooter'];
     $emails = [];
-    foreach ($data as $call){
+    foreach ($data as $call) {
         /**
         'language'
         'is_internal'
          */
-        if(!isset($emails[$call['email']])){
+        if (!isset($emails[$call['email']])) {
             $emails[$call['email']] = '';
         }
 
-        if(empty($template_body)){
+        if (empty($template_body)) {
             $email = Util::translate("You have missing call");
-        }else{
+        } else {
             $email = str_replace("\n", "<br>", $template_body);
-            $email = str_replace("NOTIFICATION_MISSEDCAUSE",'NOANSWER', $email);
-            $email = str_replace("NOTIFICATION_CALLERID",   $call['from_number'], $email);
-            $email = str_replace("NOTIFICATION_TO",         $call['to_number'],   $email);
-            $email = str_replace("NOTIFICATION_DURATION",   $call['duration'],    $email);
-            $email = str_replace("NOTIFICATION_DATE",       $call['start'],       $email);
+            $email = str_replace("NOTIFICATION_MISSEDCAUSE", 'NOANSWER', $email);
+            $email = str_replace("NOTIFICATION_CALLERID", $call['from_number'], $email);
+            $email = str_replace("NOTIFICATION_TO", $call['to_number'], $email);
+            $email = str_replace("NOTIFICATION_DURATION", $call['duration'], $email);
+            $email = str_replace("NOTIFICATION_DATE", $call['start'], $email);
         }
-        $emails[$call['email']] .=  "$email <br> <hr> <br>";
+        $emails[$call['email']] .= "$email <br> <hr> <br>";
     }
 
-    if(isset($settings['MailSMTPSenderAddress']) && trim($settings['MailSMTPSenderAddress'])!=''){
+    if (isset($settings['MailSMTPSenderAddress']) && trim($settings['MailSMTPSenderAddress']) != '') {
         $from_address = $settings['MailSMTPSenderAddress'];
-    }else{
+    } else {
         $from_address = $settings['MailSMTPUsername'];
     }
 
-    foreach ($emails as $to => $text){
+    foreach ($emails as $to => $text) {
         $subject = str_replace("MailSMTPSenderAddress", $from_address, $settings['MailTplMissedCallSubject']);
-        if(empty($subject)){
+        if (empty($subject)) {
             $subject = Util::translate("You have missing call");
         }
 
@@ -73,13 +73,13 @@ 
  * Основной цикл демона.
  */
 while (true) {
-    try{
-        $client  = new BeanstalkClient('notify_by_email');
-        $client->subscribe('notify_by_email',           $notify_by_email );
-        $client->subscribe('ping_notify_by_email',      $ping_worker);
+    try {
+        $client = new BeanstalkClient('notify_by_email');
+        $client->subscribe('notify_by_email', $notify_by_email);
+        $client->subscribe('ping_notify_by_email', $ping_worker);
 
         $client->wait();
-    }catch (Exception $e){
+    } catch (Exception $e) {
         sleep(1);
     }
 }
\ No newline at end of file

Braces +7 added lines, -5 removed lines

@@ -12,11 +12,13 @@ 
  * Обработчик пинга.
  * @param BeanstalkClient $message
  */
-$ping_worker = function ($message) {
+$ping_worker = function ($message)
+{
     $message->reply(json_encode($message->getBody().':pong'));
 };
 
-$notify_by_email = function ($message){
+$notify_by_email = function ($message)
+{
     $config = new \Config();
     $settings = $config->get_general_settings();
 
@@ -40,7 +42,7 @@ 
 
         if(empty($template_body)){
             $email = Util::translate("You have missing call");
-        }else{
+        } else{
             $email = str_replace("\n", "<br>", $template_body);
             $email = str_replace("NOTIFICATION_MISSEDCAUSE",'NOANSWER', $email);
             $email = str_replace("NOTIFICATION_CALLERID",   $call['from_number'], $email);
@@ -53,7 +55,7 @@ 
 
     if(isset($settings['MailSMTPSenderAddress']) && trim($settings['MailSMTPSenderAddress'])!=''){
         $from_address = $settings['MailSMTPSenderAddress'];
-    }else{
+    } else{
         $from_address = $settings['MailSMTPUsername'];
     }
 
@@ -79,7 +81,7 @@ 
         $client->subscribe('ping_notify_by_email',      $ping_worker);
 
         $client->wait();
-    }catch (Exception $e){
+    } catch (Exception $e){
         sleep(1);
     }
 }
\ No newline at end of file

etc/inc/workers/worker_call_events.php

Indentation +15 added lines, -15 removed lines

@@ -15,7 +15,7 @@ 
  * @param $data
  */
 function Action_dial($data){
-	Cdr::insert_data_to_db_m($data);
+    Cdr::insert_data_to_db_m($data);
     Action_app_end($data);
 }
 
@@ -744,11 +744,11 @@ 
  * @param $data
  */
 function Action_unpark_call($data){
-	$data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $data['UNIQUEID']);
-	Cdr::insert_data_to_db_m($data);
-	if( is_array($data['data_parking']) ){
-		Cdr::insert_data_to_db_m($data['data_parking']);
-	}
+    $data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $data['UNIQUEID']);
+    Cdr::insert_data_to_db_m($data);
+    if( is_array($data['data_parking']) ){
+        Cdr::insert_data_to_db_m($data['data_parking']);
+    }
     $filter = [
         "linkedid=:linkedid: AND src_chan=:src_chan:",
         'bind'       => [
@@ -897,10 +897,10 @@ 
  */
 $call_events = function ($message) {
     $data = json_decode($message->getBody(), true);
-	$func_name 	= 'Action_'.$data['action'];
-	if( function_exists($func_name) ){
-		$func_name($data);
-	}
+    $func_name 	= 'Action_'.$data['action'];
+    if( function_exists($func_name) ){
+        $func_name($data);
+    }
     $message->reply(json_encode(true));
 };
 
@@ -909,7 +909,7 @@ 
  * @param array | BeanstalkClient $message
  */
 $ping_worker = function ($message) {
-	$message->reply(json_encode($message->getBody().':pong'));
+    $message->reply(json_encode($message->getBody().':pong'));
 
     set_global_settings();
 };
@@ -986,7 +986,7 @@ 
  */
 while (true) {
     set_global_settings();
-	try{
+    try{
         $client  = new BeanstalkClient('call_events');
         $client->subscribe('call_events',               $call_events);
         $client->subscribe('select_cdr',                $select_cdr );
@@ -996,8 +996,8 @@ 
 
         $client->wait();
     }catch (Exception $e){
-		$errorLogger = $g['error_logger'];
-		$errorLogger->captureException($e);
-	    sleep(1);
+        $errorLogger = $g['error_logger'];
+        $errorLogger->captureException($e);
+        sleep(1);
     }
 }
\ No newline at end of file

Spacing +204 added lines, -204 removed lines

@@ -14,7 +14,7 @@ 
  * Обработка события начала телефонного звонка.
  * @param $data
  */
-function Action_dial($data){
+function Action_dial($data) {
 	Cdr::insert_data_to_db_m($data);
     Action_app_end($data);
 }
@@ -23,14 +23,14 @@ 
  * Обработка события создания канала - пары, при начале телефонного звонка.
  * @param $data
  */
-function Action_dial_create_chan($data){
+function Action_dial_create_chan($data) {
 
-    if( isset($data['org_id']) ) {
+    if (isset($data['org_id'])) {
         // Вероятно необходимо переопределить искать по двум ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
-        $filter = ['(UNIQUEID=:UNIQUEID: OR UNIQUEID=:org_id:) AND endtime IS NULL', 'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'],]];
-    }else{
+        $filter = ['(UNIQUEID=:UNIQUEID: OR UNIQUEID=:org_id:) AND endtime IS NULL', 'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'], ]];
+    } else {
         $filter = [
             'UNIQUEID=:UNIQUEID: AND answer IS NULL AND endtime IS NULL',
             'bind'       => [
@@ -44,23 +44,23 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
-        if(!is_object($row)){
+    foreach ($m_data as $row) {
+        if (!is_object($row)) {
             continue;
         }
         ///
         // Проверим, если более одного канала SIP/256 при входящем.
-        $column_chan_name = ('ORIGINATE' === $row->dialstatus)?'src_chan':'dst_chan';
+        $column_chan_name = ('ORIGINATE' === $row->dialstatus) ? 'src_chan' : 'dst_chan';
 
-        if( !empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name){
-            if($row_create){
+        if (!empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name) {
+            if ($row_create) {
                 continue;
             }
             // Необходимо дублировать строку звонка.
             $new_row = new CallDetailRecordsTmp();
             $f_list = $row->toArray();
-            foreach ($f_list as $attribute => $value){
-                if($attribute === 'id'){
+            foreach ($f_list as $attribute => $value) {
+                if ($attribute === 'id') {
                     continue;
                 }
                 $new_row->writeAttribute($attribute, $value);
@@ -74,29 +74,29 @@ 
         // конец проверки
         ///
 
-        if($row->dialstatus === 'ORIGINATE'){
+        if ($row->dialstatus === 'ORIGINATE') {
             $account_col = 'from_account';
             // При оригинации меняется местами srs_chan в поле dst_chan.
-            $row->writeAttribute('src_chan',      $data['dst_chan']);
-        }else{
-            if(!$rec_start){
-                $data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $row->UNIQUEID, null, $row->recordingfile);
+            $row->writeAttribute('src_chan', $data['dst_chan']);
+        } else {
+            if (!$rec_start) {
+                $data['recordingfile'] = Cdr::MixMonitor($data['dst_chan'], $row->UNIQUEID, null, $row->recordingfile);
                 $row->writeAttribute('recordingfile', $data['recordingfile']);
                 $rec_start = true;
             }
             $account_col = 'to_account';
-            $row->writeAttribute('dst_chan',      $data['dst_chan']);
+            $row->writeAttribute('dst_chan', $data['dst_chan']);
         }
 
-        if( isset($data['to_account']) && !empty($data['to_account']) ){
+        if (isset($data['to_account']) && !empty($data['to_account'])) {
             $row->writeAttribute($account_col, $data['to_account']);
         }
-        if( isset($data['dst_call_id']) && !empty($data['dst_call_id']) ){
+        if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
             $row->writeAttribute('dst_call_id', $data['dst_call_id']);
         }
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_dial_create_chan', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_dial_create_chan', implode(' ', $row->getMessages()));
         }
     }
 }
@@ -105,18 +105,18 @@ 
  * Обработка события ответа на звонок. Соединение абонентов.
  * @param $data
  */
-function Action_dial_answer($data){
+function Action_dial_answer($data) {
     $pickupexten = Config::get_pickupexten();
-    if(trim($data['dnid']) === $pickupexten){
+    if (trim($data['dnid']) === $pickupexten) {
         // Pickup / перехват вызова.
         // Событие возникает, когда мы пытаемся перехватить вызов на соседний телефон.
         $filter = [
             'UNIQUEID=:UNIQUEID:',
-            'bind'       => ['UNIQUEID' => $data['old_id'],]
+            'bind'       => ['UNIQUEID' => $data['old_id'], ]
         ];
         /** @var CallDetailRecordsTmp $m_data */
         $m_data = CallDetailRecordsTmp::find($filter);
-        if(count($m_data->toArray()) === 1){
+        if (count($m_data->toArray()) === 1) {
             /** @var CallDetailRecordsTmp $m_row_data */
             $m_row_data = $m_data[0];
             $new_data   = $m_row_data->toArray();
@@ -135,10 +135,10 @@ 
             $new_data['action'] = 'answer_pickup_create_cdr';
             $am      = Util::get_am('off');
             $AgiData = base64_encode(json_encode($new_data));
-            $am->UserEvent('CdrConnector', [ 'AgiData' => $AgiData]);
+            $am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
         }
-    }else{
-        if(!empty($data['ENDCALLONANSWER'])){
+    } else {
+        if (!empty($data['ENDCALLONANSWER'])) {
             // Переменная ENDCALLONANSWER устанавливается при начале работы умной маршуртизации.
             // Как только произошел ответ на вызов, отметим вызов на приложение как завершенный.
             $filter = [
@@ -151,17 +151,17 @@ 
             /** @var CallDetailRecordsTmp $m_data */
             /** @var CallDetailRecordsTmp $row */
             $m_data = CallDetailRecordsTmp::find($filter);
-            foreach ($m_data as $row){
+            foreach ($m_data as $row) {
                 $row->writeAttribute('endtime', $data['answer']);
-                $row->writeAttribute('is_app',  1);
+                $row->writeAttribute('is_app', 1);
                 $res = $row->save();
-                if(!$res) {
-                    Util::sys_log_msg('ENDCALLONANSWER', implode(' ',$row->getMessages()));
+                if (!$res) {
+                    Util::sys_log_msg('ENDCALLONANSWER', implode(' ', $row->getMessages()));
                 }
             }
         }
 
-        if( isset($data['org_id']) ){
+        if (isset($data['org_id'])) {
             // Вероятно необходимо переопределить искать по двум ID.
             // Применимо только для Originate, когда в качестве звонящего используем два канала
             // мобильный и внутренний номер.
@@ -172,7 +172,7 @@ 
                     'org_id' => $data['org_id'],
                     ]
             ];
-        }else{
+        } else {
             $filter = [
                 '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer IS NULL AND endtime IS NULL',
                 'bind'       => [
@@ -183,9 +183,9 @@ 
         }
         // Отмечаем вызов как отвеченный.
         $m_data = CallDetailRecordsTmp::find($filter);
-        foreach ($m_data as $row){
-            if($row->dialstatus === 'ORIGINATE'){
-                if($row->src_chan !== $data['agi_channel']){
+        foreach ($m_data as $row) {
+            if ($row->dialstatus === 'ORIGINATE') {
+                if ($row->src_chan !== $data['agi_channel']) {
                     // Ищем совпадающий канал
                     continue;
                 }
@@ -199,8 +199,8 @@ 
                 ];
                 $m_orgn_data = CallDetailRecordsTmp::find($filter);
                 /** @var CallDetailRecordsTmp $orgn_row */
-                foreach ($m_orgn_data as $orgn_row){
-                    if(empty($orgn_row->endtime)){
+                foreach ($m_orgn_data as $orgn_row) {
+                    if (empty($orgn_row->endtime)) {
                         $orgn_row->writeAttribute('endtime', $data['answer']);
                     }
                     $orgn_row->writeAttribute('dst_chan', '');
@@ -213,12 +213,12 @@ 
                 $row->writeAttribute('UNIQUEID', $data['id']);
                 $row->save();
                 break;
-            }else{
+            } else {
                 $row->writeAttribute('answer', $data['answer']);
             }
             $res = $row->save();
-            if(!$res) {
-                Util::sys_log_msg('Action_dial_answer', implode(' ',$row->getMessages()));
+            if (!$res) {
+                Util::sys_log_msg('Action_dial_answer', implode(' ', $row->getMessages()));
             }
         }
     }
@@ -229,7 +229,7 @@ 
  * Завершение / уничтожение канала.
  * @param $data
  */
-function Action_hangup_chan($data){
+function Action_hangup_chan($data) {
     $channels       = [];
     $transfer_calls = [];
     $filter         = [
@@ -243,34 +243,34 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
-        if($row->transfer==1){
+    foreach ($m_data as $row) {
+        if ($row->transfer == 1) {
             $transfer_calls[] = $row->toArray();
         }
-        if($row->dialstatus === 'ORIGINATE'){
-            $row->writeAttribute('dialstatus',  '');
+        if ($row->dialstatus === 'ORIGINATE') {
+            $row->writeAttribute('dialstatus', '');
         }
-        $row->writeAttribute('endtime',  $data['end']);
+        $row->writeAttribute('endtime', $data['end']);
         $row->writeAttribute('transfer', 0);
-        if($data['dialstatus'] !== ''){
-            if($data['dialstatus'] === 'ORIGINATE'){
+        if ($data['dialstatus'] !== '') {
+            if ($data['dialstatus'] === 'ORIGINATE') {
                 $row->writeAttribute('dst_chan', '');
             }
             $row->writeAttribute('dialstatus', $data['dialstatus']);
         }
         $res = $row->update();
-        if(!$res) {
-            Util::sys_log_msg('Action_hangup_chan', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_hangup_chan', implode(' ', $row->getMessages()));
         }
 
-        if($row->src_chan !== $data['agi_channel']){
+        if ($row->src_chan !== $data['agi_channel']) {
             $channels[] = [
                 'chan' => $row->src_chan,
                 'did'  => $row->did,
                 'num'  => $row->src_num,
                 'out'  => true
             ];
-        }else{
+        } else {
             $channels[] = [
                 'chan' => $row->dst_chan,
                 'did'  => $row->did,
@@ -284,35 +284,35 @@ 
     Action_CreateRowTransfer('hangup_chan', $data, $transfer_calls);
 
     $not_local = (stripos($data['agi_channel'], 'local/') === false);
-    if($not_local === true && $data['OLD_LINKEDID'] === $data['linkedid']){
+    if ($not_local === true && $data['OLD_LINKEDID'] === $data['linkedid']) {
         $am = Util::get_am('off');
         $active_chans = $am->GetChannels(false);
         // TODO / Намек на SIP трансфер.
-        foreach ($channels as $data_chan){
-            if(!in_array($data_chan['chan'], $active_chans, true)){
+        foreach ($channels as $data_chan) {
+            if (!in_array($data_chan['chan'], $active_chans, true)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
             $BRIDGEPEER = $am->GetVar($data_chan['chan'], 'BRIDGEPEER', NULL, false);
-            if(!in_array($BRIDGEPEER, $active_chans, true)){
+            if (!in_array($BRIDGEPEER, $active_chans, true)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
             $linkedid   = $am->GetVar($data_chan['chan'], 'CDR(linkedid)', NULL, false);
             $CALLERID   = $am->GetVar($BRIDGEPEER, 'CALLERID(num)', NULL, false);
-            if(!empty($linkedid) && $linkedid !== $data['linkedid']){
-                $n_data['action']  	     = 'sip_transfer';
-                $n_data['src_chan'] 	 = $data_chan['out']?$data_chan['chan']:$BRIDGEPEER;
-                $n_data['src_num']  	 = $data_chan['out']?$data_chan['num']: $CALLERID;
-                $n_data['dst_chan']  	 = $data_chan['out']?$BRIDGEPEER:$data_chan['chan'];
-                $n_data['dst_num']  	 = $data_chan['out']?$CALLERID:$data_chan['num'];
-                $n_data['start']  	     = date('Y-m-d H:i:s');
-                $n_data['answer']  	     = date('Y-m-d H:i:s');
+            if (!empty($linkedid) && $linkedid !== $data['linkedid']) {
+                $n_data['action'] = 'sip_transfer';
+                $n_data['src_chan'] 	 = $data_chan['out'] ? $data_chan['chan'] : $BRIDGEPEER;
+                $n_data['src_num']  	 = $data_chan['out'] ? $data_chan['num'] : $CALLERID;
+                $n_data['dst_chan'] = $data_chan['out'] ? $BRIDGEPEER : $data_chan['chan'];
+                $n_data['dst_num']  	 = $data_chan['out'] ? $CALLERID : $data_chan['num'];
+                $n_data['start'] = date('Y-m-d H:i:s');
+                $n_data['answer'] = date('Y-m-d H:i:s');
                 $n_data['linkedid']  	 = $linkedid;
                 $n_data['UNIQUEID']  	 = $data['linkedid'].Util::generateRandomString();
                 $n_data['transfer']  	 = '0';
                 $n_data['recordingfile'] = Cdr::MixMonitor($n_data['dst_chan'], $n_data['UNIQUEID']);
-                $n_data['did']		     = $data_chan['did'];
+                $n_data['did'] = $data_chan['did'];
                 // $data['from_account'] = $from_account;
                 Util::log_msg_db('call_events', json_encode($n_data));
                 Cdr::insert_data_to_db_m($n_data);
@@ -321,7 +321,7 @@ 
                     'bind'       => ['linkedid' => $data['linkedid']]
                 ];
                 $m_data = CallDetailRecordsTmp::find($filter);
-                foreach ($m_data as $row){
+                foreach ($m_data as $row) {
                     $row->writeAttribute('linkedid', $linkedid);
                     $row->save();
                 }
@@ -331,7 +331,7 @@ 
                  */
                 $am      = Util::get_am('off');
                 $AgiData = base64_encode(json_encode($n_data));
-                $am->UserEvent('CdrConnector', [ 'AgiData' => $AgiData]);
+                $am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
             }
         } // Обход текущих каналов.
 
@@ -342,7 +342,7 @@ 
  * Завершение звонка. Завершение прееадресации.
  * @param $data
  */
-function Action_dial_hangup($data){
+function Action_dial_hangup($data) {
     // Action_CreateRowTransfer('dial_hangup', $data);
 }
 
@@ -352,9 +352,9 @@ 
  * @param $data
  * @param array $calls_data
  */
-function Action_CreateRowTransfer($action, $data, $calls_data=null){
+function Action_CreateRowTransfer($action, $data, $calls_data = null) {
 
-    if(null === $calls_data){
+    if (null === $calls_data) {
         $filter = [
             'linkedid=:linkedid: AND endtime IS NULL AND transfer=1 AND (src_chan=:chan: OR dst_chan=:chan:)',
             'bind'       => [
@@ -364,21 +364,21 @@ 
             'order' => 'is_app',
         ];
         $m_data = CallDetailRecordsTmp::find($filter);
-        $calls_data    = $m_data->toArray();
+        $calls_data = $m_data->toArray();
     }
 
-    if(count($calls_data) > 1){
+    if (count($calls_data) > 1) {
         $insert_data = array();
-        foreach ($calls_data as $row_data){
-            if($row_data['src_chan'] === $data['agi_channel'] ){
-                $fname_chan = isset($insert_data['dst_chan']) ? 'src_chan': 'dst_chan';
-                $fname_num  = isset($insert_data['dst_num'])  ? 'src_num' : 'dst_num';
+        foreach ($calls_data as $row_data) {
+            if ($row_data['src_chan'] === $data['agi_channel']) {
+                $fname_chan = isset($insert_data['dst_chan']) ? 'src_chan' : 'dst_chan';
+                $fname_num  = isset($insert_data['dst_num']) ? 'src_num' : 'dst_num';
 
                 $insert_data[$fname_chan] = $row_data['dst_chan'];
                 $insert_data[$fname_num]  = $row_data['dst_num'];
-            }else{
-                $fname_chan = !isset($insert_data['src_chan']) ? 'src_chan': 'dst_chan';
-                $fname_num  = !isset($insert_data['src_num'])  ? 'src_num' : 'dst_num';
+            } else {
+                $fname_chan = !isset($insert_data['src_chan']) ? 'src_chan' : 'dst_chan';
+                $fname_num  = !isset($insert_data['src_num']) ? 'src_num' : 'dst_num';
 
                 $insert_data[$fname_chan] = $row_data['src_chan'];
                 $insert_data[$fname_num]  = $row_data['src_num'];
@@ -387,31 +387,31 @@ 
         // Запись разговора.
         Cdr::StopMixMonitor($insert_data['src_chan']);
         Cdr::StopMixMonitor($insert_data['dst_chan']);
-        $recordingfile 	  = Cdr::MixMonitor($insert_data['dst_chan'], 'transfer_'.$insert_data['src_num'].'_'.$insert_data['dst_num'].'_'.$data['linkedid']);
+        $recordingfile = Cdr::MixMonitor($insert_data['dst_chan'], 'transfer_'.$insert_data['src_num'].'_'.$insert_data['dst_num'].'_'.$data['linkedid']);
         //
         $insert_data['action']  		= "{$action}_end_trasfer";
-        $insert_data['recordingfile'] 	= $recordingfile;
+        $insert_data['recordingfile'] = $recordingfile;
         $insert_data['start'] 	 		= $data['end'];
         $insert_data['answer'] 	 		= $data['end'];
         $insert_data['linkedid'] 		= $data['linkedid'];
         $insert_data['UNIQUEID'] 		= $data['agi_threadid'];
-        $insert_data['did'] 			= $data['did'];
-        $insert_data['transfer']  		= '0';
+        $insert_data['did'] = $data['did'];
+        $insert_data['transfer'] = '0';
 
         /**
          * Отправка UserEvent
          */
-        $insert_data['action']  		= 'transfer_dial_create_cdr';
+        $insert_data['action'] = 'transfer_dial_create_cdr';
         $am      = Util::get_am('off');
         $AgiData = base64_encode(json_encode($insert_data));
-        $am->UserEvent('CdrConnector', [ 'AgiData' => $AgiData]);
+        $am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
 
         Cdr::insert_data_to_db_m($insert_data);
         Cdr::LogEvent(json_encode($insert_data));
 
-    }elseif(empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])){
+    }elseif (empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])) {
         $row_data = $calls_data[0];
-        $chan = ($data['agi_channel'] === $row_data['src_chan'])?$row_data['dst_chan']:$row_data['src_chan'];
+        $chan = ($data['agi_channel'] === $row_data['src_chan']) ? $row_data['dst_chan'] : $row_data['src_chan'];
         $filter = [
             'linkedid=:linkedid: AND endtime IS NULL AND transfer=1 AND (src_chan=:chan: OR dst_chan=:chan:)',
             'bind'       => [
@@ -421,11 +421,11 @@ 
             'order' => 'is_app',
         ];
         /** @var CallDetailRecordsTmp $not_ended_cdr */
-        $not_ended_cdr      = CallDetailRecordsTmp::findFirst($filter);
-        if($not_ended_cdr){
+        $not_ended_cdr = CallDetailRecordsTmp::findFirst($filter);
+        if ($not_ended_cdr) {
             Cdr::StopMixMonitor($not_ended_cdr->src_chan);
             // Cdr::StopMixMonitor($not_ended_cdr->dst_chan);
-            Cdr::MixMonitor($not_ended_cdr->dst_chan, '', '',$not_ended_cdr->recordingfile);
+            Cdr::MixMonitor($not_ended_cdr->dst_chan, '', '', $not_ended_cdr->recordingfile);
         }
 
     }
@@ -435,7 +435,7 @@ 
  * Обработка начала переадресации.
  * @param $data
  */
-function Action_transfer_dial($data){
+function Action_transfer_dial($data) {
 
     Action_transfer_check($data);
     Cdr::insert_data_to_db_m($data);
@@ -447,7 +447,7 @@ 
  * Проверка на транфер
  * @param $data
  */
-function Action_transfer_check($data){
+function Action_transfer_check($data) {
     $filter = [
         "linkedid=:linkedid: AND endtime IS NULL AND transfer=0 AND (src_chan=:src_chan: OR dst_chan=:src_chan:)",
         'bind'       => [
@@ -458,7 +458,7 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
+    foreach ($m_data as $row) {
         // Пробуем остановить записть разговора.
         Cdr::StopMixMonitor($row->dst_chan);
         Cdr::StopMixMonitor($row->src_chan);
@@ -472,7 +472,7 @@ 
  * Обработка события создания канала - пары, при начале переадресации звонка.
  * @param $data
  */
-function Action_transfer_dial_create_chan($data){
+function Action_transfer_dial_create_chan($data) {
 
     $filter = [
         'UNIQUEID=:UNIQUEID: AND endtime IS NULL AND answer IS NULL',
@@ -484,18 +484,18 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
+    foreach ($m_data as $row) {
         ///
         // Проверим, если более одного канала SIP/256 при входящем.
-        if( !empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan ){
-            if($row_create){
+        if (!empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan) {
+            if ($row_create) {
                 continue;
             }
             // Необходимо дублировать строку звонка.
             $new_row = new CallDetailRecordsTmp();
             $f_list = $row->toArray();
-            foreach ($f_list as $attribute => $value){
-                if($attribute === 'id'){
+            foreach ($f_list as $attribute => $value) {
+                if ($attribute === 'id') {
                     continue;
                 }
                 $new_row->writeAttribute($attribute, $value);
@@ -508,18 +508,18 @@ 
             $row_create = true;
         }
 
-        $data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $row->UNIQUEID);
+        $data['recordingfile'] = Cdr::MixMonitor($data['dst_chan'], $row->UNIQUEID);
         // конец проверки
         ///
 
-        $row->writeAttribute('dst_chan',      $data['dst_chan']);
+        $row->writeAttribute('dst_chan', $data['dst_chan']);
         $row->writeAttribute('recordingfile', $data['recordingfile']);
-        if( isset($data['dst_call_id']) && !empty($data['dst_call_id']) ){
+        if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
             $row->writeAttribute('dst_call_id', $data['dst_call_id']);
         }
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_transfer_dial_create_chan', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_transfer_dial_create_chan', implode(' ', $row->getMessages()));
         }
     }
 }
@@ -528,7 +528,7 @@ 
  * Обработка события ответа на переадресацию. Соединение абонентов.
  * @param $data
  */
-function Action_transfer_dial_answer($data){
+function Action_transfer_dial_answer($data) {
     $filter = [
         '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer IS NULL AND endtime IS NULL',
         'bind'       => [
@@ -540,11 +540,11 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
+    foreach ($m_data as $row) {
         $row->writeAttribute('answer', $data['answer']);
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_transfer_dial_answer', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
         }
     }
 }
@@ -553,10 +553,10 @@ 
  * Завершение канала при прееадресации.
  * @param $data
  */
-function Action_transfer_dial_hangup($data){
+function Action_transfer_dial_hangup($data) {
 
-    $pos = stripos( $data['agi_channel'], 'local/');
-    if($pos === false){
+    $pos = stripos($data['agi_channel'], 'local/');
+    if ($pos === false) {
         // Это НЕ локальный канал.
         // Если это завершение переадресации (консультативной). Создадим новую строку CDR.
         // Action_CreateRowTransfer('transfer_dial_hangup', $data);
@@ -572,12 +572,12 @@ 
         /** @var CallDetailRecordsTmp $m_data */
         /** @var CallDetailRecordsTmp $row */
         $m_data = CallDetailRecordsTmp::find($filter);
-        foreach ($m_data as $row){
+        foreach ($m_data as $row) {
             // Завершим вызов в CDR.
-            $row->writeAttribute('endtime',  $data['end']);
+            $row->writeAttribute('endtime', $data['end']);
             $row->writeAttribute('transfer', 0);
-            if(!$row->save()) {
-                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ',$row->getMessages()));
+            if (!$row->save()) {
+                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             }
         }
         // Попробуем начать запись разговора.
@@ -589,13 +589,13 @@ 
         ];
         /** @var CallDetailRecordsTmp $res */
         $res = CallDetailRecordsTmp::findFirst($filter);
-        if($res){
+        if ($res) {
             $info = pathinfo($res->recordingfile);
-            $data_time = ($res->answer == null)?$res->start:$res->answer;
-            $subdir = date('Y/m/d/H/',strtotime($data_time));
+            $data_time = ($res->answer == null) ? $res->start : $res->answer;
+            $subdir = date('Y/m/d/H/', strtotime($data_time));
             Cdr::MixMonitor($res->src_chan, $info['filename'], $subdir);
         }
-    }else if('' === $data['ANSWEREDTIME'] ){
+    } else if ('' === $data['ANSWEREDTIME']) {
         $filter = [
             'linkedid=:linkedid: AND endtime IS NULL AND (src_chan=:src_chan: OR dst_chan=:dst_chan:)',
             'bind'       => [
@@ -607,12 +607,12 @@ 
         /** @var CallDetailRecordsTmp $m_data */
         /** @var CallDetailRecordsTmp $row */
         $m_data = CallDetailRecordsTmp::find($filter);
-        foreach ($m_data as $row){
+        foreach ($m_data as $row) {
             // Ответа не было. Переадресация отменена.
-            $row->writeAttribute('endtime',  $data['end']);
+            $row->writeAttribute('endtime', $data['end']);
             $row->writeAttribute('transfer', 0);
-            if(!$row->save()) {
-                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ',$row->getMessages()));
+            if (!$row->save()) {
+                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             };
         }
 
@@ -624,15 +624,15 @@ 
             ]
         ];
         $m_data = CallDetailRecordsTmp::find($filter);
-        foreach ($m_data as $row){
+        foreach ($m_data as $row) {
             $info = pathinfo($row->recordingfile);
-            $data_time = ($row->answer == null)?$row->start:$row->answer;
-            $subdir = date('Y/m/d/H/',strtotime($data_time));
+            $data_time = ($row->answer == null) ? $row->start : $row->answer;
+            $subdir = date('Y/m/d/H/', strtotime($data_time));
             Cdr::MixMonitor($row->src_chan, $info['filename'], $subdir);
             // Снимем со строк признак переадресации.
             $row->writeAttribute('transfer', 0);
-            if(!$row->save()) {
-                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ',$row->getMessages()));
+            if (!$row->save()) {
+                Util::sys_log_msg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             }
         }
 
@@ -644,7 +644,7 @@ 
  * Начало работы приложения.
  * @param $data
  */
-function Action_dial_app($data){
+function Action_dial_app($data) {
     Action_app_end($data);
     Cdr::insert_data_to_db_m($data);
 }
@@ -653,7 +653,7 @@ 
  * Завершение работы приложения.
  * @param $data
  */
-function Action_app_end($data){
+function Action_app_end($data) {
     $filter = [
         'linkedid=:linkedid: AND is_app=1 AND endtime IS NULL',
         'bind'       => [
@@ -663,11 +663,11 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
-        $row->writeAttribute('endtime',  $data['start']);
+    foreach ($m_data as $row) {
+        $row->writeAttribute('endtime', $data['start']);
         $res = $row->update();
-        if(!$res) {
-            Util::sys_log_msg('Action_app_end', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_app_end', implode(' ', $row->getMessages()));
         }
     }
 }
@@ -676,7 +676,7 @@ 
  * Вызов в нерабочее время.
  * @param $data
  */
-function Action_dial_outworktimes($data){
+function Action_dial_outworktimes($data) {
     Cdr::insert_data_to_db_m($data);
 }
 
@@ -684,16 +684,16 @@ 
  * Старт очереди.
  * @param $data
  */
-function Action_queue_start($data){
+function Action_queue_start($data) {
 
-    if($data['transfer']  	==  '1'){
+    if ($data['transfer'] == '1') {
         // Если это трансфер выполним поиск связанных данных.
         Action_transfer_check($data);
     }
-    if(isset($data['start'])){
+    if (isset($data['start'])) {
         // Это новая строка.
         Cdr::insert_data_to_db_m($data);
-    }else{
+    } else {
         // Требуется только обновление данных.
         Cdr::update_data_in_db_m($data);
     }
@@ -704,10 +704,10 @@ 
  * Событие входа в конференцкомнату.
  * @param $data
  */
-function Action_meetme_dial($data){
+function Action_meetme_dial($data) {
     Cdr::StopMixMonitor($data['src_chan']);
 
-    if(strpos($data['src_chan'], 'internal-originate') !== false){
+    if (strpos($data['src_chan'], 'internal-originate') !== false) {
         // Уточним канал и ID записи;
         $filter = [
             'linkedid=:linkedid: AND src_num=:src_num:',
@@ -719,13 +719,13 @@ 
         /** @var CallDetailRecordsTmp $m_data */
         /** @var CallDetailRecordsTmp $row */
         $m_data = CallDetailRecordsTmp::findFirst($filter);
-        if($m_data){
+        if ($m_data) {
             $data['src_chan'] = $m_data->src_chan;
             $m_data->UNIQUEID = $data['UNIQUEID'];
 
             $f_list = Cdr::get_db_fealds();
-            foreach ($data as $attribute => $value){
-                if(!array_key_exists($attribute, $f_list)){
+            foreach ($data as $attribute => $value) {
+                if (!array_key_exists($attribute, $f_list)) {
                     continue;
                 }
                 $m_data->writeAttribute($attribute, $value);
@@ -733,7 +733,7 @@ 
             // Переопределяем идентификатор, это Originate на конференцию.
             $m_data->save();
         }
-    }else{
+    } else {
         Cdr::insert_data_to_db_m($data);
         Action_app_end($data);
     }
@@ -743,10 +743,10 @@ 
  * Снятие вызова с парковки.
  * @param $data
  */
-function Action_unpark_call($data){
-	$data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $data['UNIQUEID']);
+function Action_unpark_call($data) {
+	$data['recordingfile'] = Cdr::MixMonitor($data['dst_chan'], $data['UNIQUEID']);
 	Cdr::insert_data_to_db_m($data);
-	if( is_array($data['data_parking']) ){
+	if (is_array($data['data_parking'])) {
 		Cdr::insert_data_to_db_m($data['data_parking']);
 	}
     $filter = [
@@ -759,7 +759,7 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
+    foreach ($m_data as $row) {
         $row->delete();
     }
 }
@@ -768,7 +768,7 @@ 
  * Возвращаем вызов с парковки по таймауту.
  * @param $data
  */
-function Action_unpark_call_timeout($data){
+function Action_unpark_call_timeout($data) {
     Cdr::insert_data_to_db_m($data);
 }
 
@@ -776,7 +776,7 @@ 
  * Ответ агента очереди.
  * @param $data
  */
-function Action_queue_answer($data){
+function Action_queue_answer($data) {
 
     $filter = [
         "UNIQUEID=:UNIQUEID: AND answer IS NULL",
@@ -787,12 +787,12 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
+    foreach ($m_data as $row) {
         $row->writeAttribute('answer', $data['answer']);
-        $row->writeAttribute('endtime',$data['answer']);
+        $row->writeAttribute('endtime', $data['answer']);
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_queue_answer', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_queue_answer', implode(' ', $row->getMessages()));
         };
     }
 }
@@ -801,7 +801,7 @@ 
  * Завершение работы очереди.
  * @param $data
  */
-function Action_queue_end($data){
+function Action_queue_end($data) {
     $filter = [
         "UNIQUEID=:UNIQUEID:",
         'bind'       => [
@@ -811,15 +811,15 @@ 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     $m_data = CallDetailRecordsTmp::find($filter);
-    foreach ($m_data as $row){
-        $row->writeAttribute('endtime',$data['end']);
+    foreach ($m_data as $row) {
+        $row->writeAttribute('endtime', $data['end']);
         $row->writeAttribute('is_app', 1);
-        if($data['dialstatus'] != ''){
-            $row->writeAttribute('dialstatus',$data['dialstatus']);
+        if ($data['dialstatus'] != '') {
+            $row->writeAttribute('dialstatus', $data['dialstatus']);
         }
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_queue_end', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_queue_end', implode(' ', $row->getMessages()));
         };
     }
 
@@ -829,7 +829,7 @@ 
  * Завершение / уничтожение канала.
  * @param $data
  */
-function Action_hangup_chan_meetme($data){
+function Action_hangup_chan_meetme($data) {
     clearstatcache();
     $recordingfile  = '';
     $dest_chan      = "MeetMe:{$data['conference']}";
@@ -844,47 +844,47 @@ 
     $m_data = CallDetailRecordsTmp::find($filter);
     /** @var CallDetailRecordsTmp $row */
     foreach ($m_data as $row) {
-        if($dest_chan === $row->dst_chan){
+        if ($dest_chan === $row->dst_chan) {
             $is_local        = (stripos($data['src_chan'], 'local/') !== false);
             $is_stored_local = (stripos($row->src_chan, 'local/') !== false);
-            if($row->UNIQUEID === $data['UNIQUEID'] && $is_local && !$is_stored_local){
+            if ($row->UNIQUEID === $data['UNIQUEID'] && $is_local && !$is_stored_local) {
                 $data['src_chan'] = $row->src_chan;
             }
-            if( file_exists($row->recordingfile) || file_exists(Util::trim_extension_file($row->recordingfile).'.wav') ){
+            if (file_exists($row->recordingfile) || file_exists(Util::trim_extension_file($row->recordingfile).'.wav')) {
                 // Переопределим путь к файлу записи разговора. Для конферецнии файл один.
                 $recordingfile = $row->recordingfile;
             }
 
         }
-        if($row->linkedid === $data['meetme_id']){
+        if ($row->linkedid === $data['meetme_id']) {
             continue;
         }
         // Подменим ID на идентификатор конференции.
         $row->writeAttribute('linkedid', $data['meetme_id']);
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_hangup_chan_meetme', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
         }
     }
 
     /** @var CallDetailRecordsTmp $m_data */
     /** @var CallDetailRecordsTmp $row */
     /** @var CallDetailRecordsTmp $rec_data */
-    foreach ($m_data as $row){
-        if($row->src_chan !== $data['src_chan']){
+    foreach ($m_data as $row) {
+        if ($row->src_chan !== $data['src_chan']) {
             continue;
         }
         // Заполняем данные для текущего оповещения.
-        $row->writeAttribute('endtime',       $data['end']);
+        $row->writeAttribute('endtime', $data['end']);
         $row->writeAttribute('transfer', 0);
-        $row->writeAttribute('linkedid',      $data['meetme_id']);
+        $row->writeAttribute('linkedid', $data['meetme_id']);
 
-        if(!empty($recordingfile) ){
+        if (!empty($recordingfile)) {
             $row->writeAttribute('recordingfile', $recordingfile);
         }
         $res = $row->save();
-        if(!$res) {
-            Util::sys_log_msg('Action_hangup_chan_meetme', implode(' ',$row->getMessages()));
+        if (!$res) {
+            Util::sys_log_msg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
         }
     }
 
@@ -895,10 +895,10 @@ 
  * Обработчик событий изменения состояния звонка.
  * @param array | BeanstalkClient $message
  */
-$call_events = function ($message) {
+$call_events = function($message) {
     $data = json_decode($message->getBody(), true);
 	$func_name 	= 'Action_'.$data['action'];
-	if( function_exists($func_name) ){
+	if (function_exists($func_name)) {
 		$func_name($data);
 	}
     $message->reply(json_encode(true));
@@ -908,7 +908,7 @@ 
  * Обработчик пинга.
  * @param array | BeanstalkClient $message
  */
-$ping_worker = function ($message) {
+$ping_worker = function($message) {
 	$message->reply(json_encode($message->getBody().':pong'));
 
     set_global_settings();
@@ -918,7 +918,7 @@ 
  * Получения CDR к обработке.
  * @param array | BeanstalkClient $message
  */
-$update_cdr = function ($message){
+$update_cdr = function($message) {
     $q = $message->getBody();
     $data = json_decode($q, true);
     $res = Cdr::update_data_in_db_m($data);
@@ -928,38 +928,38 @@ 
 /**
  * @param array | BeanstalkClient $message
  */
-$select_cdr = function ($message){
+$select_cdr = function($message) {
     $q      = $message->getBody();
     $filter = json_decode($q, true);
     $res    = null;
-    try{
-        if(isset($filter['miko_tmp_db'])){
+    try {
+        if (isset($filter['miko_tmp_db'])) {
             $res    = CallDetailRecordsTmp::find($filter);
-        }else{
+        } else {
             $res    = CallDetailRecords::find($filter);
         }
         $res_data = json_encode($res->toArray());
-    }catch (Exception $e){
+    } catch (Exception $e) {
         $res_data = '[]';
     }
 
-    if($res && isset($filter['add_pack_query'])) {
+    if ($res && isset($filter['add_pack_query'])) {
         $arr = [];
-        foreach ($res->toArray() as $row){
+        foreach ($res->toArray() as $row) {
             $arr[] = $row[$filter['columns']];
         }
         $filter['add_pack_query']['bind'][$filter['columns']] = $arr;
-        try{
-            $res    = CallDetailRecords::find($filter['add_pack_query']);
+        try {
+            $res = CallDetailRecords::find($filter['add_pack_query']);
             $res_data = json_encode($res->toArray());
-        }catch (Exception $e){
+        } catch (Exception $e) {
             $res_data = '[]';
         }
     }
 
-    if( isset($filter['miko_result_in_file']) ){
+    if (isset($filter['miko_result_in_file'])) {
         $ast_dirs = PBX::get_asterisk_dirs();
-        $filename = $ast_dirs['tmp'].'/'.md5( microtime(true) );
+        $filename = $ast_dirs['tmp'].'/'.md5(microtime(true));
         file_put_contents("$filename", $res_data);
         Util::mwexec("chown -R www:www {$filename} > /dev/null 2> /dev/null");
         $res_data = json_encode("$filename");
@@ -968,7 +968,7 @@ 
     $message->reply($res_data);
 };
 
-function set_global_settings(){
+function set_global_settings() {
     global $g;
     $config = new Config();
     $g['record_calls']       = $config->get_general_settings('PBXRecordCalls');
@@ -977,7 +977,7 @@ 
 }
 echo "starting...\n";
 
-$err_handler = function ($m){
+$err_handler = function($m) {
     Util::sys_log_msg("CDR_WORKER_ERROR", $m);
 };
 
@@ -986,16 +986,16 @@ 
  */
 while (true) {
     set_global_settings();
-	try{
-        $client  = new BeanstalkClient('call_events');
-        $client->subscribe('call_events',               $call_events);
-        $client->subscribe('select_cdr',                $select_cdr );
-        $client->subscribe('update_cdr',                $update_cdr );
-        $client->subscribe('ping_worker_call_events',   $ping_worker);
+	try {
+        $client = new BeanstalkClient('call_events');
+        $client->subscribe('call_events', $call_events);
+        $client->subscribe('select_cdr', $select_cdr);
+        $client->subscribe('update_cdr', $update_cdr);
+        $client->subscribe('ping_worker_call_events', $ping_worker);
         $client->setErrorHendler($err_handler);
 
         $client->wait();
-    }catch (Exception $e){
+    } catch (Exception $e) {
 		$errorLogger = $g['error_logger'];
 		$errorLogger->captureException($e);
 	    sleep(1);

Braces +69 added lines, -42 removed lines

@@ -14,7 +14,8 @@ 
  * Обработка события начала телефонного звонка.
  * @param $data
  */
-function Action_dial($data){
+function Action_dial($data)
+{
 	Cdr::insert_data_to_db_m($data);
     Action_app_end($data);
 }
@@ -23,14 +24,15 @@ 
  * Обработка события создания канала - пары, при начале телефонного звонка.
  * @param $data
  */
-function Action_dial_create_chan($data){
+function Action_dial_create_chan($data)
+{
 
     if( isset($data['org_id']) ) {
         // Вероятно необходимо переопределить искать по двум ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
         $filter = ['(UNIQUEID=:UNIQUEID: OR UNIQUEID=:org_id:) AND endtime IS NULL', 'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'],]];
-    }else{
+    } else{
         $filter = [
             'UNIQUEID=:UNIQUEID: AND answer IS NULL AND endtime IS NULL',
             'bind'       => [
@@ -78,7 +80,7 @@ 
             $account_col = 'from_account';
             // При оригинации меняется местами srs_chan в поле dst_chan.
             $row->writeAttribute('src_chan',      $data['dst_chan']);
-        }else{
+        } else{
             if(!$rec_start){
                 $data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $row->UNIQUEID, null, $row->recordingfile);
                 $row->writeAttribute('recordingfile', $data['recordingfile']);
@@ -105,7 +107,8 @@ 
  * Обработка события ответа на звонок. Соединение абонентов.
  * @param $data
  */
-function Action_dial_answer($data){
+function Action_dial_answer($data)
+{
     $pickupexten = Config::get_pickupexten();
     if(trim($data['dnid']) === $pickupexten){
         // Pickup / перехват вызова.
@@ -137,7 +140,7 @@ 
             $AgiData = base64_encode(json_encode($new_data));
             $am->UserEvent('CdrConnector', [ 'AgiData' => $AgiData]);
         }
-    }else{
+    } else{
         if(!empty($data['ENDCALLONANSWER'])){
             // Переменная ENDCALLONANSWER устанавливается при начале работы умной маршуртизации.
             // Как только произошел ответ на вызов, отметим вызов на приложение как завершенный.
@@ -172,7 +175,7 @@ 
                     'org_id' => $data['org_id'],
                     ]
             ];
-        }else{
+        } else{
             $filter = [
                 '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer IS NULL AND endtime IS NULL',
                 'bind'       => [
@@ -213,7 +216,7 @@ 
                 $row->writeAttribute('UNIQUEID', $data['id']);
                 $row->save();
                 break;
-            }else{
+            } else{
                 $row->writeAttribute('answer', $data['answer']);
             }
             $res = $row->save();
@@ -229,7 +232,8 @@ 
  * Завершение / уничтожение канала.
  * @param $data
  */
-function Action_hangup_chan($data){
+function Action_hangup_chan($data)
+{
     $channels       = [];
     $transfer_calls = [];
     $filter         = [
@@ -270,7 +274,7 @@ 
                 'num'  => $row->src_num,
                 'out'  => true
             ];
-        }else{
+        } else{
             $channels[] = [
                 'chan' => $row->dst_chan,
                 'did'  => $row->did,
@@ -342,7 +346,8 @@ 
  * Завершение звонка. Завершение прееадресации.
  * @param $data
  */
-function Action_dial_hangup($data){
+function Action_dial_hangup($data)
+{
     // Action_CreateRowTransfer('dial_hangup', $data);
 }
 
@@ -352,7 +357,8 @@ 
  * @param $data
  * @param array $calls_data
  */
-function Action_CreateRowTransfer($action, $data, $calls_data=null){
+function Action_CreateRowTransfer($action, $data, $calls_data=null)
+{
 
     if(null === $calls_data){
         $filter = [
@@ -376,7 +382,7 @@ 
 
                 $insert_data[$fname_chan] = $row_data['dst_chan'];
                 $insert_data[$fname_num]  = $row_data['dst_num'];
-            }else{
+            } else{
                 $fname_chan = !isset($insert_data['src_chan']) ? 'src_chan': 'dst_chan';
                 $fname_num  = !isset($insert_data['src_num'])  ? 'src_num' : 'dst_num';
 
@@ -409,7 +415,7 @@ 
         Cdr::insert_data_to_db_m($insert_data);
         Cdr::LogEvent(json_encode($insert_data));
 
-    }elseif(empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])){
+    } elseif(empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])){
         $row_data = $calls_data[0];
         $chan = ($data['agi_channel'] === $row_data['src_chan'])?$row_data['dst_chan']:$row_data['src_chan'];
         $filter = [
@@ -435,7 +441,8 @@ 
  * Обработка начала переадресации.
  * @param $data
  */
-function Action_transfer_dial($data){
+function Action_transfer_dial($data)
+{
 
     Action_transfer_check($data);
     Cdr::insert_data_to_db_m($data);
@@ -447,7 +454,8 @@ 
  * Проверка на транфер
  * @param $data
  */
-function Action_transfer_check($data){
+function Action_transfer_check($data)
+{
     $filter = [
         "linkedid=:linkedid: AND endtime IS NULL AND transfer=0 AND (src_chan=:src_chan: OR dst_chan=:src_chan:)",
         'bind'       => [
@@ -472,7 +480,8 @@ 
  * Обработка события создания канала - пары, при начале переадресации звонка.
  * @param $data
  */
-function Action_transfer_dial_create_chan($data){
+function Action_transfer_dial_create_chan($data)
+{
 
     $filter = [
         'UNIQUEID=:UNIQUEID: AND endtime IS NULL AND answer IS NULL',
@@ -528,7 +537,8 @@ 
  * Обработка события ответа на переадресацию. Соединение абонентов.
  * @param $data
  */
-function Action_transfer_dial_answer($data){
+function Action_transfer_dial_answer($data)
+{
     $filter = [
         '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer IS NULL AND endtime IS NULL',
         'bind'       => [
@@ -553,7 +563,8 @@ 
  * Завершение канала при прееадресации.
  * @param $data
  */
-function Action_transfer_dial_hangup($data){
+function Action_transfer_dial_hangup($data)
+{
 
     $pos = stripos( $data['agi_channel'], 'local/');
     if($pos === false){
@@ -595,7 +606,7 @@ 
             $subdir = date('Y/m/d/H/',strtotime($data_time));
             Cdr::MixMonitor($res->src_chan, $info['filename'], $subdir);
         }
-    }else if('' === $data['ANSWEREDTIME'] ){
+    } else if('' === $data['ANSWEREDTIME'] ){
         $filter = [
             'linkedid=:linkedid: AND endtime IS NULL AND (src_chan=:src_chan: OR dst_chan=:dst_chan:)',
             'bind'       => [
@@ -644,7 +655,8 @@ 
  * Начало работы приложения.
  * @param $data
  */
-function Action_dial_app($data){
+function Action_dial_app($data)
+{
     Action_app_end($data);
     Cdr::insert_data_to_db_m($data);
 }
@@ -653,7 +665,8 @@ 
  * Завершение работы приложения.
  * @param $data
  */
-function Action_app_end($data){
+function Action_app_end($data)
+{
     $filter = [
         'linkedid=:linkedid: AND is_app=1 AND endtime IS NULL',
         'bind'       => [
@@ -676,7 +689,8 @@ 
  * Вызов в нерабочее время.
  * @param $data
  */
-function Action_dial_outworktimes($data){
+function Action_dial_outworktimes($data)
+{
     Cdr::insert_data_to_db_m($data);
 }
 
@@ -684,7 +698,8 @@ 
  * Старт очереди.
  * @param $data
  */
-function Action_queue_start($data){
+function Action_queue_start($data)
+{
 
     if($data['transfer']  	==  '1'){
         // Если это трансфер выполним поиск связанных данных.
@@ -693,7 +708,7 @@ 
     if(isset($data['start'])){
         // Это новая строка.
         Cdr::insert_data_to_db_m($data);
-    }else{
+    } else{
         // Требуется только обновление данных.
         Cdr::update_data_in_db_m($data);
     }
@@ -704,7 +719,8 @@ 
  * Событие входа в конференцкомнату.
  * @param $data
  */
-function Action_meetme_dial($data){
+function Action_meetme_dial($data)
+{
     Cdr::StopMixMonitor($data['src_chan']);
 
     if(strpos($data['src_chan'], 'internal-originate') !== false){
@@ -733,7 +749,7 @@ 
             // Переопределяем идентификатор, это Originate на конференцию.
             $m_data->save();
         }
-    }else{
+    } else{
         Cdr::insert_data_to_db_m($data);
         Action_app_end($data);
     }
@@ -743,7 +759,8 @@ 
  * Снятие вызова с парковки.
  * @param $data
  */
-function Action_unpark_call($data){
+function Action_unpark_call($data)
+{
 	$data['recordingfile']	= Cdr::MixMonitor($data['dst_chan'], $data['UNIQUEID']);
 	Cdr::insert_data_to_db_m($data);
 	if( is_array($data['data_parking']) ){
@@ -768,7 +785,8 @@ 
  * Возвращаем вызов с парковки по таймауту.
  * @param $data
  */
-function Action_unpark_call_timeout($data){
+function Action_unpark_call_timeout($data)
+{
     Cdr::insert_data_to_db_m($data);
 }
 
@@ -776,7 +794,8 @@ 
  * Ответ агента очереди.
  * @param $data
  */
-function Action_queue_answer($data){
+function Action_queue_answer($data)
+{
 
     $filter = [
         "UNIQUEID=:UNIQUEID: AND answer IS NULL",
@@ -801,7 +820,8 @@ 
  * Завершение работы очереди.
  * @param $data
  */
-function Action_queue_end($data){
+function Action_queue_end($data)
+{
     $filter = [
         "UNIQUEID=:UNIQUEID:",
         'bind'       => [
@@ -829,7 +849,8 @@ 
  * Завершение / уничтожение канала.
  * @param $data
  */
-function Action_hangup_chan_meetme($data){
+function Action_hangup_chan_meetme($data)
+{
     clearstatcache();
     $recordingfile  = '';
     $dest_chan      = "MeetMe:{$data['conference']}";
@@ -895,7 +916,8 @@ 
  * Обработчик событий изменения состояния звонка.
  * @param array | BeanstalkClient $message
  */
-$call_events = function ($message) {
+$call_events = function ($message)
+{
     $data = json_decode($message->getBody(), true);
 	$func_name 	= 'Action_'.$data['action'];
 	if( function_exists($func_name) ){
@@ -908,7 +930,8 @@ 
  * Обработчик пинга.
  * @param array | BeanstalkClient $message
  */
-$ping_worker = function ($message) {
+$ping_worker = function ($message)
+{
 	$message->reply(json_encode($message->getBody().':pong'));
 
     set_global_settings();
@@ -918,7 +941,8 @@ 
  * Получения CDR к обработке.
  * @param array | BeanstalkClient $message
  */
-$update_cdr = function ($message){
+$update_cdr = function ($message)
+{
     $q = $message->getBody();
     $data = json_decode($q, true);
     $res = Cdr::update_data_in_db_m($data);
@@ -928,18 +952,19 @@ 
 /**
  * @param array | BeanstalkClient $message
  */
-$select_cdr = function ($message){
+$select_cdr = function ($message)
+{
     $q      = $message->getBody();
     $filter = json_decode($q, true);
     $res    = null;
     try{
         if(isset($filter['miko_tmp_db'])){
             $res    = CallDetailRecordsTmp::find($filter);
-        }else{
+        } else{
             $res    = CallDetailRecords::find($filter);
         }
         $res_data = json_encode($res->toArray());
-    }catch (Exception $e){
+    } catch (Exception $e){
         $res_data = '[]';
     }
 
@@ -952,7 +977,7 @@ 
         try{
             $res    = CallDetailRecords::find($filter['add_pack_query']);
             $res_data = json_encode($res->toArray());
-        }catch (Exception $e){
+        } catch (Exception $e){
             $res_data = '[]';
         }
     }
@@ -968,7 +993,8 @@ 
     $message->reply($res_data);
 };
 
-function set_global_settings(){
+function set_global_settings()
+{
     global $g;
     $config = new Config();
     $g['record_calls']       = $config->get_general_settings('PBXRecordCalls');
@@ -977,7 +1003,8 @@ 
 }
 echo "starting...\n";
 
-$err_handler = function ($m){
+$err_handler = function ($m)
+{
     Util::sys_log_msg("CDR_WORKER_ERROR", $m);
 };
 
@@ -995,7 +1022,7 @@ 
         $client->setErrorHendler($err_handler);
 
         $client->wait();
-    }catch (Exception $e){
+    } catch (Exception $e){
 		$errorLogger = $g['error_logger'];
 		$errorLogger->captureException($e);
 	    sleep(1);

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -293,13 +293,13 @@
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
-            $BRIDGEPEER = $am->GetVar($data_chan['chan'], 'BRIDGEPEER', NULL, false);
+            $BRIDGEPEER = $am->GetVar($data_chan['chan'], 'BRIDGEPEER', null, false);
             if(!in_array($BRIDGEPEER, $active_chans, true)){
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
-            $linkedid   = $am->GetVar($data_chan['chan'], 'CDR(linkedid)', NULL, false);
-            $CALLERID   = $am->GetVar($BRIDGEPEER, 'CALLERID(num)', NULL, false);
+            $linkedid   = $am->GetVar($data_chan['chan'], 'CDR(linkedid)', null, false);
+            $CALLERID   = $am->GetVar($BRIDGEPEER, 'CALLERID(num)', null, false);
             if(!empty($linkedid) && $linkedid !== $data['linkedid']){
                 $n_data['action']  	     = 'sip_transfer';
                 $n_data['src_chan'] 	 = $data_chan['out']?$data_chan['chan']:$BRIDGEPEER;

etc/inc/workers/worker_download.php

Spacing +20 added lines, -20 removed lines

@@ -40,11 +40,11 @@ 
         ini_set('memory_limit', '300M');
 
         $temp_dir = dirname($this->settings['res_file']);
-        $this->progress_file = $temp_dir . '/progress';
-        $this->installed_file = $temp_dir . '/installed';
-        $this->error_file    = $temp_dir . '/error';
+        $this->progress_file = $temp_dir.'/progress';
+        $this->installed_file = $temp_dir.'/installed';
+        $this->error_file    = $temp_dir.'/error';
 
-        if ( ! is_dir($temp_dir) && ! mkdir($temp_dir, 0777, true) && ! is_dir($temp_dir)) {
+        if (!is_dir($temp_dir) && !mkdir($temp_dir, 0777, true) && !is_dir($temp_dir)) {
             Util::sys_log_msg('FileDownloader', 'Error on create module folder');
         }
     }
@@ -106,18 +106,18 @@ 
      */
     public function get_file()
     {
-        if ( ! $this->settings) {
+        if (!$this->settings) {
             return false;
         }
-        if(strpos($this->settings['url'], 'file://') !== FALSE){
+        if (strpos($this->settings['url'], 'file://') !== FALSE) {
             // Это локальный файл.
             $src_file = str_replace('file://', '', $this->settings['url']);
             Util::mwexec("mv {$src_file} {$this->settings['res_file']}");
 
-            if(file_exists($this->settings['res_file'])){
+            if (file_exists($this->settings['res_file'])) {
                 file_put_contents($this->progress_file, 100);
                 $result = true;
-            }else{
+            } else {
                 file_put_contents($this->error_file, "Can not find module file {$src_file}", FILE_APPEND);
                 $result = false;
             }
@@ -178,15 +178,15 @@ 
      */
     public function action()
     {
-        if ( ! $this->settings || ! isset($this->settings['action'])) {
+        if (!$this->settings || !isset($this->settings['action'])) {
             return;
         }
-        if ( ! file_exists($this->settings['res_file'])) {
+        if (!file_exists($this->settings['res_file'])) {
             file_put_contents($this->error_file, 'File does not uploaded', FILE_APPEND);
 
             return;
         }
-        if ( ! file_exists($this->settings['res_file']) || md5_file($this->settings['res_file']) !== $this->settings['md5']) {
+        if (!file_exists($this->settings['res_file']) || md5_file($this->settings['res_file']) !== $this->settings['md5']) {
 
             if (file_exists($this->settings['res_file'])) {
                 unlink($this->settings['res_file']);
@@ -200,7 +200,7 @@ 
         if ('module_install' === $this->settings['action']) {
 
             $error            = false;
-            $currentModuleDir = $GLOBALS['g']['phalcon_settings']['application']['modulesDir'] . $this->settings['module'];
+            $currentModuleDir = $GLOBALS['g']['phalcon_settings']['application']['modulesDir'].$this->settings['module'];
             $needBackup       = is_dir($currentModuleDir);
             $path_class       = "\\Modules\\{$this->settings['module']}\\setup\\PbxExtensionSetup";
 
@@ -221,7 +221,7 @@ 
                         'keepSettings' => 'true'
                     ];
                     $data_string = json_encode($data);
-                    $ch      = curl_init();
+                    $ch = curl_init();
                     curl_setopt($ch, CURLOPT_URL, $url);
                     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                     curl_setopt($ch, CURLOPT_TIMEOUT, 15);
@@ -230,7 +230,7 @@ 
                     curl_exec($ch);
                     curl_close($ch);
                 }
-            } catch (Exception $error){
+            } catch (Exception $error) {
                 // Broken or very old module. Force uninstall.
                 Util::mwexec("rm -rf $currentModuleDir");
             } finally {
@@ -243,9 +243,9 @@ 
             Util::mwexec("7za e -spf -aoa -o$currentModuleDir {$this->settings['res_file']}");
             Util::mwexec("chown www:www -R $currentModuleDir");
 
-            if ( ! $error && class_exists($path_class) && method_exists($path_class, 'installModule')) {
+            if (!$error && class_exists($path_class) && method_exists($path_class, 'installModule')) {
                 $setup = new $path_class($this->settings['module']);
-                if ( ! $setup->installModule()) {
+                if (!$setup->installModule()) {
                     $error          = true;
                     $result['data'] = 'Install error:'.implode('<br>', $setup->getMessages());
                 }
@@ -256,7 +256,7 @@ 
 
             if ($error) {
                 $result['result'] = 'Error';
-                file_put_contents($this->error_file, 'Install error ' . $result['data'], FILE_APPEND);
+                file_put_contents($this->error_file, 'Install error '.$result['data'], FILE_APPEND);
             } else {
                 $result['result'] = 'Success';
                 file_put_contents($this->installed_file, '');
@@ -264,7 +264,7 @@ 
                 Util::restart_module_dependent_workers();
                 Util::restart_worker('worker_api_commands');
             }
-            Util::mwexec('rm -rf ' . $this->settings['res_file']);
+            Util::mwexec('rm -rf '.$this->settings['res_file']);
         } elseif ('upgrade_online' === $this->settings['action']) {
             sleep(3);
             unlink($this->progress_file);
@@ -276,8 +276,8 @@ 
 
 if (count($argv) > 1 && file_exists($argv[1])) {
     // php -dxdebug.remote_autostart=On -f /etc/inc/workers/worker_download.php /storage/usbdisk1/mikopbx/tmp/ModuleCTIClient/download_settings.json
-    $PID = Util::get_pid_process($argv[1], '' . getmypid() . ' ');
-    if ( ! empty($PID)) {
+    $PID = Util::get_pid_process($argv[1], ''.getmypid().' ');
+    if (!empty($PID)) {
         echo 'Error start download script... ';
         exit(4);
     }

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
             if(file_exists($this->settings['res_file'])){
                 file_put_contents($this->progress_file, 100);
                 $result = true;
-            }else{
+            } else{
                 file_put_contents($this->error_file, "Can not find module file {$src_file}", FILE_APPEND);
                 $result = false;
             }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         if ( ! $this->settings) {
             return false;
         }
-        if(strpos($this->settings['url'], 'file://') !== FALSE){
+        if(strpos($this->settings['url'], 'file://') !== false){
             // Это локальный файл.
             $src_file = str_replace('file://', '', $this->settings['url']);
             Util::mwexec("mv {$src_file} {$this->settings['res_file']}");

etc/inc/workers/worker_remove_old_records.php

Spacing +8 added lines, -8 removed lines

@@ -8,19 +8,19 @@ 
 
 require_once 'globals.php';
 $filename = "{$GLOBALS['g']['varetc_path']}/storage_device";
-if(file_exists($filename)) {
+if (file_exists($filename)) {
     $mount_point = file_get_contents($filename);
-}else{
+} else {
     exit(0);
 }
-$out=[];
+$out = [];
 Util::mwexec("/bin/mount | /bin/busybox grep {$mount_point} | /bin/busybox awk '{print $1}' | head -n 1", $out);
-$dev = implode('',$out);
+$dev = implode('', $out);
 
 $s   = new Storage();
 $MIN_SPACE  = 100; // MB
 $free_space = $s->get_free_space($dev);
-if($free_space > $MIN_SPACE){
+if ($free_space > $MIN_SPACE) {
     // Очистка диска не требуется.
     exit(0);
 }
@@ -28,13 +28,13 @@ 
 $out = [];
 $count_dir = 1;
 Util::mwexec("/bin/find {$monitor_dir}*/*/*  -maxdepth 0 -type d  -printf '%T+ %p\n' 2> /dev/null | /bin/sort | /bin/head -n 10 | /bin/busybox awk '{print $2}'", $out);
-foreach ($out as $dir_info){
-    if(!is_dir($dir_info)){
+foreach ($out as $dir_info) {
+    if (!is_dir($dir_info)) {
         echo 'error';
         continue;
     }
     $free_space = $s->get_free_space($dev);
-    if($free_space > $MIN_SPACE){
+    if ($free_space > $MIN_SPACE) {
         // Очистка диска не требуется.
         break;
     }

Braces +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $filename = "{$GLOBALS['g']['varetc_path']}/storage_device";
 if(file_exists($filename)) {
     $mount_point = file_get_contents($filename);
-}else{
+} else{
     exit(0);
 }
 $out=[];