mikopbx / Core

src/PBXCoreREST/Lib/FirewallManagementProcessor.php

Indentation +15 added lines, -15 removed lines

@@ -79,22 +79,22 @@
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
-             return null;
-         }
-         try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
-             return null;
-         }
-         $db->busyTimeout(5000);
-         $fail2ban = new Fail2BanConf();
-         if (false === $fail2ban->tableBanExists($db)) {
-             return null;
-         }
+        public static function getDbConnection(){
+            if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+                return null;
+            }
+            try {
+                $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+            }catch (\Exception $e){
+                return null;
+            }
+            $db->busyTimeout(5000);
+            $fail2ban = new Fail2BanConf();
+            if (false === $fail2ban->tableBanExists($db)) {
+                return null;
+            }
 
-         return $db;
+            return $db;
     }
 
     /**

Spacing +14 added lines, -14 removed lines

@@ -28,18 +28,18 @@ 
      */
     public static function fail2banUnbanAll(string $ip): PBXApiResult
     {
-        $ip     = trim($ip);
+        $ip = trim($ip);
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        if ( ! Verify::isIpAddress($ip)) {
+        if (!Verify::isIpAddress($ip)) {
             $res->success = false;
-            $res->messages[]="Not valid ip '{$ip}'.";
+            $res->messages[] = "Not valid ip '{$ip}'.";
         }
-        $fail2ban        = new Fail2BanConf();
+        $fail2ban = new Fail2BanConf();
         if ($fail2ban->fail2ban_enable) {
             $fail2ban = Util::which('fail2ban-client');
-            $res->success  = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
+            $res->success = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
         } else {
             $res = self::fail2banUnbanDb($ip);
         }
@@ -60,7 +60,7 @@ 
         $res->processor = __METHOD__;
 
         $db = self::getDbConnection();
-        if(!$db){
+        if (!$db) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = 'DB '.Fail2BanConf::FAIL2BAN_DB_PATH.' not found';
@@ -79,13 +79,13 @@ 
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+     public static function getDbConnection() {
+         if (!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)) {
              return null;
          }
          try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+             $db = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+         } catch (\Exception $e) {
              return null;
          }
          $db->busyTimeout(5000);
@@ -110,7 +110,7 @@ 
             $ban_time = '43800';
         }
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
-        $q = 'SELECT' . ' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+' . $ban_time . ') AS timeunban FROM bans where (timeofban+' . $ban_time . ')>' . time();
+        $q = 'SELECT'.' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+'.$ban_time.') AS timeunban FROM bans where (timeofban+'.$ban_time.')>'.time();
         if ($ip !== null) {
             $q .= " AND ip='{$ip}'";
         }
@@ -133,13 +133,13 @@ 
 
         $jail_q  = ($jail === '') ? '' : "AND jail = '{$jail}'";
         $path_db = Fail2BanConf::FAIL2BAN_DB_PATH;
-        if(!file_exists($path_db)){
+        if (!file_exists($path_db)) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = "DB {$path_db} not found";
             return $res;
         }
-        $db      = new SQLite3($path_db);
+        $db = new SQLite3($path_db);
         $db->busyTimeout(3000);
         $fail2ban = new Fail2BanConf();
         if (false === $fail2ban->tableBanExists($db)) {
@@ -147,7 +147,7 @@ 
             $res->success = true;
             return $res;
         }
-        $q = 'DELETE' . " FROM bans WHERE ip = '{$ip}' {$jail_q}";
+        $q = 'DELETE'." FROM bans WHERE ip = '{$ip}' {$jail_q}";
         $db->query($q);
 
         $err = $db->lastErrorMsg();

Braces +3 added lines, -2 removed lines

@@ -79,13 +79,14 @@
         return $res;
     }
 
-     public static function getDbConnection(){
+     public static function getDbConnection()
+     {
          if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
              return null;
          }
          try {
              $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (\Exception $e){
+         } catch (\Exception $e){
              return null;
          }
          $db->busyTimeout(5000);

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

@@ -136,7 +136,7 @@
         if(!file_exists($path_db)){
             // Таблица не существует. Бана нет.
             $res->success    = false;
-            $res->messages[] = "DB {$path_db} not found";
+            $res->messages[] = "db {$path_db} not found";
             return $res;
         }
         $db      = new SQLite3($path_db);

src/PBXCoreREST/Lib/SystemManagementProcessor.php

Spacing +19 added lines, -19 removed lines

@@ -162,14 +162,14 @@ 
         $res->data['message'] = 'In progress...';
 
 
-        if ( ! file_exists($tempFilename)) {
+        if (!file_exists($tempFilename)) {
             $res->success    = false;
             $res->messages[] = "Update file '{$tempFilename}' not found.";
 
             return $res;
         }
 
-        if ( ! file_exists('/var/etc/cfdevice')) {
+        if (!file_exists('/var/etc/cfdevice')) {
             $res->success    = false;
             $res->messages[] = "The system is not installed";
 
@@ -198,7 +198,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -237,7 +237,7 @@ 
         if (class_exists($pbxExtensionSetupClass)
             && method_exists($pbxExtensionSetupClass, 'installModule')) {
             $setup = new $pbxExtensionSetupClass($moduleUniqueID);
-            if ( ! $setup->installModule()) {
+            if (!$setup->installModule()) {
                 $res->success    = false;
                 $res->messages[] = $setup->getMessages();
             }
@@ -384,15 +384,15 @@ 
             [IncomingRoutingTable::class => ''],
             [OutWorkTimes::class => ''],
             [AsteriskManagerUsers::class => ''],
-            [Extensions::class => 'type="' . Extensions::TYPE_IVR_MENU . '"'],  // IVR Menu
-            [Extensions::class => 'type="' . Extensions::TYPE_CONFERENCE . '"'],  // CONFERENCE
-            [Extensions::class => 'type="' . Extensions::TYPE_QUEUE . '"'],  // QUEUE
+            [Extensions::class => 'type="'.Extensions::TYPE_IVR_MENU.'"'], // IVR Menu
+            [Extensions::class => 'type="'.Extensions::TYPE_CONFERENCE.'"'], // CONFERENCE
+            [Extensions::class => 'type="'.Extensions::TYPE_QUEUE.'"'], // QUEUE
         ];
 
         foreach ($clearThisModels as $modelParams) {
             foreach ($modelParams as $key => $value) {
                 $records = call_user_func([$key, 'find'], $value);
-                if ( ! $records->delete()) {
+                if (!$records->delete()) {
                     $res->messages[] = $records->getMessages();
                     $res->success    = false;
                 }
@@ -400,13 +400,13 @@ 
         }
 
         // Other extensions
-        $parameters     = [
+        $parameters = [
             'conditions' => 'not number IN ({ids:array})',
             'bind'       => [
                 'ids' => [
                     '000063', // Reads back the extension
                     '000064', // 0000MILLI
-                    '10003246',// Echo test
+                    '10003246', // Echo test
                     '10000100' // Voicemail
                 ],
             ],
@@ -420,7 +420,7 @@ 
                 $stopDeleting = true;
                 continue;
             }
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $deleteAttempts += 1;
             }
             if ($deleteAttempts > $countRecords * 10) {
@@ -436,12 +436,12 @@ 
                 'custom' => SoundFiles::CATEGORY_CUSTOM,
             ],
         ];
-        $records    = SoundFiles::find($parameters);
+        $records = SoundFiles::find($parameters);
 
         foreach ($records as $record) {
             if (stripos($record->path, '/storage/usbdisk1/mikopbx') !== false) {
                 Util::mwExec("{$rm} -rf {$record->path}");
-                if ( ! $record->delete()) {
+                if (!$record->delete()) {
                     $res->messages[] = $record->getMessages();
                     $res->success    = false;
                 }
@@ -453,7 +453,7 @@ 
         foreach ($records as $record) {
             $moduleDir = PbxExtensionUtils::getModuleDir($record->uniqid);
             Util::mwExec("{$rm} -rf {$moduleDir}");
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $res->messages[] = $record->getMessages();
                 $res->success    = false;
             }
@@ -461,7 +461,7 @@ 
 
         // Delete CallRecords
         $records = CallDetailRecords::find();
-        if ( ! $records->delete()) {
+        if (!$records->delete()) {
             $res->messages[] = $records->getMessages();
             $res->success    = false;
         }
@@ -486,14 +486,14 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        if ( ! file_exists($filename)) {
+        if (!file_exists($filename)) {
             $res->success    = false;
             $res->messages[] = "File '{$filename}' not found.";
 
             return $res;
         }
         $out          = [];
-        $tmp_filename = '/tmp/' . time() . "_" . basename($filename);
+        $tmp_filename = '/tmp/'.time()."_".basename($filename);
         if (false === copy($filename, $tmp_filename)) {
             $res->success    = false;
             $res->messages[] = "Unable to create temporary file '{$tmp_filename}'.";
@@ -502,8 +502,8 @@ 
         }
 
         // Принудительно устанавливаем расширение файла в wav.
-        $n_filename     = Util::trimExtensionForFile($filename) . ".wav";
-        $n_filename_mp3 = Util::trimExtensionForFile($filename) . ".mp3";
+        $n_filename     = Util::trimExtensionForFile($filename).".wav";
+        $n_filename_mp3 = Util::trimExtensionForFile($filename).".mp3";
         // Конвертируем файл.
         $tmp_filename = escapeshellcmd($tmp_filename);
         $n_filename   = escapeshellcmd($n_filename);

src/Common/Providers/LicenseProvider.php

Spacing +2 added lines, -2 removed lines

@@ -49,10 +49,10 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 try {
                     return new License('http://127.0.0.1:8223');
-                } catch (Error $exception){
+                } catch (Error $exception) {
                     Util::sysLogMsg(__CLASS__, $exception);
                 }
                 return null;

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 try {
                     return new License('http://127.0.0.1:8223');
                 } catch (Error $exception){