change from iptables to firewalld

magnussolution · Jul 22, 2024 · 6d0e380 · 6d0e380
1 parent 3702f68
commit 6d0e380
Show file tree

Hide file tree

Showing 6 changed files with 1,961 additions and 854 deletions.
diff --git a/build/MagnusBilling-current.tar.gz b/build/MagnusBilling-current.tar.gz
diff --git a/protected/commands/CallChartCommand.php b/protected/commands/CallChartCommand.php
@@ -43,6 +43,8 @@ public function run($args)
                 sleep(4);
                 continue;
             }
+
+            print_r($calls);
             echo "\n\n\n\nSTART ------" . $calls . "\n\n";
 
             if ($calls == 'old_version') {
@@ -510,7 +512,7 @@ public function use_concise()
                             $tech   = substr($ndiscado, 0, $config['global']['ip_tech_length']);
 
                             $modelSip = Sip::model()->find('techprefix = :key AND host != "dynamic" ', [':key' => $tech]);
-                            if ( ! count($modelSip)) {
+                            if ( ! isset($modelSip->id)) {
                                 if (preg_match('/^SIP\/sipproxy\-/', $channel)) {
                                     $modelSip = Sip::model()->find('name = :key',
                                         [
@@ -522,23 +524,23 @@ public function use_concise()
                                             ':key' => $originate,
                                         ]);
                                 }
-                                if ( ! count($modelSip)) {
+                                if ( ! isset($modelSip->id)) {
                                     //check if is via IP from proxy
                                     $callProxy = AsteriskAccess::getCoreShowChannel($channel, null, $call['server']);
                                     $modelSip  = Sip::model()->find('host = :key', [':key' => $callProxy['X-AUTH-IP']]);
                                 }
                             }
 
-                            if (count($modelSip)) {
+                            if (isset($modelSip->id)) {
                                 $userType = 'User';
                             } else {
                                 $resultTrunk = Trunk::model()->find('trunkcode = :key', [':key' => $originate]);
-                                if (count($resultTrunk)) {
+                                if (isset($resultTrunk->id)) {
                                     $userType = 'Trunk';
                                 }
                             }
 
-                            if ( ! count($userType)) {
+                            if ( ! isset($userType)) {
                                 //not fount the type call
                                 continue;
                             } elseif ($userType == 'User') {

diff --git a/protected/models/Plan.php b/protected/models/Plan.php
@@ -53,13 +53,14 @@ public function primaryKey()
 
     public function rules()
     {
-        $rules = array(
-            array('name', 'required'),
-            array('id_user, tariff_limit, play_audio,techprefix, lcrtype, signup, portabilidadeMobile, portabilidadeFixed', 'numerical', 'integerOnly' => true),
-            array('name, ini_credit', 'length', 'max' => 50),
-            array('techprefix', 'length', 'max' => 5),
-            array('name', 'unique', 'caseSensitive' => 'false'),
-        );
+        $rules = [
+            ['name', 'required'],
+            ['id_user, tariff_limit, play_audio,techprefix, lcrtype, signup, portabilidadeMobile, portabilidadeFixed', 'numerical', 'integerOnly' => true],
+            ['name, ini_credit', 'length', 'max' => 50],
+            ['techprefix', 'length', 'max' => 5],
+            ['name', 'unique', 'caseSensitive' => 'false'],
+            ['creationdate', 'safe'],
+        ];
         return $this->getExtraField($rules);
     }
 
@@ -68,9 +69,9 @@ public function rules()
      */
     public function relations()
     {
-        return array(
-            'idUser' => array(self::BELONGS_TO, 'User', 'id_user'),
-        );
+        return [
+            'idUser' => [self::BELONGS_TO, 'User', 'id_user'],
+        ];
     }
 
     public function searchTariff($id_plan, $destination)
@@ -92,6 +93,6 @@ public function searchTariff($id_plan, $destination)
                 LEFT JOIN pkg_trunk_group ON pkg_trunk_group.id = pkg_rate.id_trunk_group
                 WHERE pkg_plan.id=$id_plan AND pkg_rate.status = 1 AND $prefixclause
                 ORDER BY LENGTH( prefix ) DESC  LIMIT 1";
-        return array($sql, Yii::app()->db->createCommand($sql)->queryAll(), $prefixclause);
+        return [$sql, Yii::app()->db->createCommand($sql)->queryAll(), $prefixclause];
     }
 }