fix DID destination type multiple IPs

Author: callcenter-magnus

build/MagnusBilling-current.tar.gz

@@ -83,6 +83,9 @@ Ext.define('MBilling.view.diddestination.Controller', {
             case 10:
                 method = t('Context');
                 break;
+            case 11:
+                method = t('Multiples IPs');
+                break;
         }
         showFields = me.formPanel.down('didtypecombo').store.findRecord('name', method).getData().showFields;
         me.showFieldsRelated(showFields);

classic/src/view/diddestination/Controller.js

@@ -21,6 +21,8 @@ class BackupCommand extends ConsoleCommand
 {
     public function run($args)
     {
+
+        LinuxAccess::exec("rm -f /var/wwww/html/mbilling/assets/*");
         $dbString = explode('dbname=', Yii::app()->db->connectionString);
         $dataBase = end($dbString);
 

protected/commands/BackupCommand.php

@@ -35,8 +35,8 @@ public function run($args)
             foreach ($audios as $key => $audio) {
 
                 echo 'Convert ' . $audio . " to GSM\n";
-                exec('sox ' . $this->diretory . $audio . ' ' . $this->diretory . substr($audio, 0, -4) . '.gsm');
-                exec('rm -rf ' . $this->diretory . $audio);
+                LinuxAccess::exec('sox ' . $this->diretory . $audio . ' ' . $this->diretory . substr($audio, 0, -4) . '.gsm');
+                LinuxAccess::exec('rm -rf ' . $this->diretory . $audio);
             }
         }
 
@@ -45,7 +45,7 @@ public function run($args)
     public function scan_dir($dir)
     {
 
-        $files = array();
+        $files = [];
         foreach (scandir($dir) as $file) {
             if (substr($file, -4) != '.wav') {
                 continue;

protected/commands/ConvertAudiotoGSMCommand.php

@@ -31,11 +31,11 @@ public function run($args)
         foreach ($modelDid as $key => $did) {
 
             $order_id = explode('=', $did->description);
-            if (!isset($order_id[1])) {
+            if ( ! isset($order_id[1])) {
                 continue;
             }
 
-            $result = exec("
+            $result = LinuxAccess::exec("
                 curl -H 'Content-Type: application/vnd.api+json' \
                 -H 'Accept: application/vnd.api+json' \
                 -H  'Api-Key: " . $api_key . "' \
@@ -49,7 +49,7 @@ public function run($args)
                 //discount credit of customer
                 $priceDid = $did->connection_charge + $did->fixrate;
 
-                $modelSip = Sip::model()->find('id_user = :key', array(':key' => $did->id_user));
+                $modelSip = Sip::model()->find('id_user = :key', [':key' => $did->id_user]);
 
                 $modelDiddestination              = new Diddestination;
                 $modelDiddestination->id_user     = $did->id_user;

protected/commands/DidwwwCommand.php

@@ -21,7 +21,7 @@ public function run($args)
             define('DEBUG', 0);
         }
 
-        if (!defined('PID')) {
+        if ( ! defined('PID')) {
             define("PID", "/var/run/magnus/SipTracepid.php");
         }
 
@@ -45,7 +45,7 @@ public function run($args)
                 continue;
             }
 
-            exec('pkill -f ngrep');
+            LinuxAccess::exec('pkill -f ngrep');
             echo $command = "ngrep -p  -W byline " . $modelTrace->filter . " -t port " . $modelTrace->port . $device . " >> " . $this->file_name;
 
             $output = $this->PsExecute($command, $modelTrace->timeout, $modelTrace->filter);
@@ -72,7 +72,7 @@ public function PsExecute($command, $timeout = 58, $filter, $sleep = 2)
 
             if ($cur % 5 == 0) {
                 $modelTrace = SipTrace::model()->find();
-                if (!isset($modelTrace)) {
+                if ( ! isset($modelTrace)) {
                     SipTrace::model()->deleteAll();
                     $this->PsKill($pid);
                     break;
@@ -91,7 +91,7 @@ public function PsExec($commandJob)
 
         $command = $commandJob . ' 2>&1 & echo $!';
 
-        exec($command, $op);
+        $op = LinuxAccess::exec($command);
 
         $pid = (int) $op[0];
 
@@ -105,7 +105,7 @@ public function PsExec($commandJob)
     public function PsExists($pid)
     {
 
-        exec("ps ax | grep $pid|wc -l 2>&1", $output);
+        $output = LinuxAccess::exec("ps ax | grep $pid|wc -l 2>&1");
 
         if ($output[0] > 0) {
             return true;
@@ -117,7 +117,7 @@ public function PsExists($pid)
     public function PsKill($pid)
     {
         echo "End process $pid";
-        exec('pkill ngrep');
+        LinuxAccess::exec('pkill ngrep');
         try {
             posix_kill($pid, 2);
         } catch (Exception $e) {

protected/commands/SipTraceCommand.php

@@ -25,7 +25,7 @@ public function run($args)
         $time = time();
 
         $cache_path = '/tmp/cache_mbilling_codes.sqlite';
-        exec('rm -rf ' . $cache_path);
+        LinuxAccess::exec('rm -rf ' . $cache_path);
         $fields = "data,ip,code,msg";
         try {
             $db = new SQLite3($cache_path);
@@ -34,16 +34,16 @@ public function run($args)
 
         }
 
-        if (!file_exists('/var/log/asterisk/magnus_processed ')) {
-            exec('touch /var/log/asterisk/magnus_processed ');
+        if ( ! file_exists('/var/log/asterisk/magnus_processed ')) {
+            LinuxAccess::exec('touch /var/log/asterisk/magnus_processed ');
         }
 
-        exec('cp -rf /var/log/asterisk/magnus /var/log/asterisk/magnus_new');
+        LinuxAccess::exec('cp -rf /var/log/asterisk/magnus /var/log/asterisk/magnus_new');
 
-        exec('diff -u /var/log/asterisk/magnus_processed /var/log/asterisk/magnus_new ', $lines);
+        LinuxAccess::exec('diff -u /var/log/asterisk/magnus_processed /var/log/asterisk/magnus_new ', $lines);
 
-        exec('rm -rf /var/log/asterisk/magnus_processed');
-        exec('mv /var/log/asterisk/magnus_new /var/log/asterisk/magnus_processed');
+        LinuxAccess::exec('rm -rf /var/log/asterisk/magnus_processed');
+        LinuxAccess::exec('mv /var/log/asterisk/magnus_new /var/log/asterisk/magnus_processed');
 
         $values = '';
 
@@ -52,7 +52,7 @@ public function run($args)
 
             preg_match_all('/\[(.*)\] DEBUG.*\<sip\:.*@(.*)\>.*\|(.*)\|(.*)/', $line, $output_array);
 
-            if (count($output_array) < 4 || !isset($output_array[1][0])) {
+            if (count($output_array) < 4 || ! isset($output_array[1][0])) {
 
                 continue;
             }

protected/commands/TrunkSIPCodesCommand.php

@@ -36,6 +36,7 @@ php /var/www/html/mbilling/cron.php UpdateMysql
 ## remove unnecessary directories
 rm -rf /var/www/html/mbilling/doc
 rm -rf /var/www/html/mbilling/script
+rm -rf /var/www/html/mbilling/assets/*
 ## set default permissions 
 touch /etc/asterisk/extensions_magnus_did.conf
 chown -R asterisk:asterisk /var/lib/php/session*

protected/commands/update.sh

@@ -870,6 +870,10 @@ public function actionCsv()
 
         $columns = json_decode($_GET['columns'], true);
 
+        if (json_last_error() !== 0) {
+            exit;
+        }
+
         $columns = $this->repaceColumns($columns);
 
         $columns = $this->removeColumns($columns);

protected/components/BaseController.php

@@ -11,12 +11,8 @@ class LinuxAccess
 
     public static function exec($command)
     {
-        return exec($command);
-    }
-
-    public static function system($command)
-    {
-        return exec($command);
+        Yii::log($command, 'error');
+        return exec($command, $output);
     }
 
     public static function getDirectoryDiskSpaceUsed($filter = '*', $directory = '/var/spool/asterisk/monitor/')