mikopbx / Core

src/PBXCoreREST/Http/Response.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
     {
         $content   = $this->getContent();
         $timestamp = date('c');
-        $hash      = sha1($timestamp . $content);
+        $hash      = sha1($timestamp.$content);
         $eTag      = sha1($content);
 
         /** @var array $content */
@@ -101,7 +101,7 @@ 
                 'version' => '1.0',
             ],
         ];
-        $meta    = [
+        $meta = [
             'meta' => [
                 'timestamp' => $timestamp,
                 'hash'      => $hash,

src/Core/System/Upgrade/UpdateSystemConfig.php

Spacing +32 added lines, -32 removed lines

@@ -109,7 +109,7 @@ 
         /** @var \MikoPBX\Common\Models\PbxExtensionModules $modules */
         $modules = PbxExtensionModules::find();
         foreach ($modules as $module) {
-            if ( ! is_dir("{$this->config->path('core.modulesDir')}/{$module->uniqid}")) {
+            if (!is_dir("{$this->config->path('core.modulesDir')}/{$module->uniqid}")) {
                 $module->delete();
             }
         }
@@ -125,7 +125,7 @@ 
         /** @var \MikoPBX\Common\Models\Sip $peer */
         $peers = Sip::find('type="peer"');
         foreach ($peers as $peer) {
-            $peer->secret = md5('' . time() . 'sip' . $peer->id);
+            $peer->secret = md5(''.time().'sip'.$peer->id);
             $peer->save();
         }
 
@@ -133,7 +133,7 @@ 
         /** @var \MikoPBX\Common\Models\AsteriskManagerUsers $manager */
         $managers = AsteriskManagerUsers::find();
         foreach ($managers as $manager) {
-            $manager->secret = md5('' . time() . 'manager' . $manager->id);
+            $manager->secret = md5(''.time().'manager'.$manager->id);
             $manager->save();
         }
     }
@@ -186,7 +186,7 @@ 
         /** @var \MikoPBX\Common\Models\DialplanApplications $res */
         $app_number = '10000100';
         $app_logic  = base64_encode('1,Goto(voice_mail_peer,voicemail,1)');
-        $d_app      = DialplanApplications::findFirst('extension="' . $app_number . '"');
+        $d_app      = DialplanApplications::findFirst('extension="'.$app_number.'"');
         if ($d_app === null) {
             $d_app                   = new DialplanApplications();
             $d_app->applicationlogic = $app_logic;
@@ -194,7 +194,7 @@ 
             $d_app->description      = 'Voice Mail';
             $d_app->name             = 'VOICEMAIL';
             $d_app->type             = 'plaintext';
-            $d_app->uniqid           = 'DIALPLAN-APPLICATION-' . md5(time());
+            $d_app->uniqid           = 'DIALPLAN-APPLICATION-'.md5(time());
 
             if ($d_app->save()) {
                 $extension = ExtensionsModel::findFirst("number = '{$app_number}'");
@@ -249,19 +249,19 @@ 
 
 
         $app_number = '10003246';
-        $d_app      = DialplanApplications::findFirst('extension="' . $app_number . '"');
+        $d_app      = DialplanApplications::findFirst('extension="'.$app_number.'"');
         if ($d_app === null) {
-            $app_text                = '1,Answer()' . "\n" .
-                'n,AGI(cdr_connector.php,${ISTRANSFER}dial_answer)' . "\n" .
-                'n,Echo()' . "\n" .
-                'n,Hangup()' . "\n";
+            $app_text = '1,Answer()'."\n".
+                'n,AGI(cdr_connector.php,${ISTRANSFER}dial_answer)'."\n".
+                'n,Echo()'."\n".
+                'n,Hangup()'."\n";
             $d_app                   = new DialplanApplications();
             $d_app->applicationlogic = base64_encode($app_text);
             $d_app->extension        = $app_number;
             $d_app->description      = 'Echos audio and video back to the caller as soon as it is received. Used to test connection delay.';
             $d_app->name             = 'Echo test';
             $d_app->type             = 'plaintext';
-            $d_app->uniqid           = 'DIALPLAN-APPLICATION-' . md5(time());
+            $d_app->uniqid           = 'DIALPLAN-APPLICATION-'.md5(time());
 
             if ($d_app->save()) {
                 $extension = ExtensionsModel::findFirst("number = '{$app_number}'");
@@ -311,34 +311,34 @@ 
         $savedCodecs = [];
         // Удалим лишние кодеки
         /** @var \MikoPBX\Common\Models\Codecs $codec */
-        foreach ($codecs as $codec){
-            if(array_key_exists($codec->name, $availCodecs)){
+        foreach ($codecs as $codec) {
+            if (array_key_exists($codec->name, $availCodecs)) {
                 $savedCodecs[] = $codec->name;
                 continue;
             }
-            if(!$codec->delete()){
-                Util::sysLogMsg(__CLASS__, 'Can not delete codec '.$codec->name. ' from MikoPBX\Common\Models\Codecs');
+            if (!$codec->delete()) {
+                Util::sysLogMsg(__CLASS__, 'Can not delete codec '.$codec->name.' from MikoPBX\Common\Models\Codecs');
             }
         }
 
-        foreach ($availCodecs as $availCodec => $desc){
+        foreach ($availCodecs as $availCodec => $desc) {
             $codecData = Codecs::findFirst('name="'.$availCodec.'"');
             if ($codecData === null) {
-                $codecData              = new Codecs();
-            }elseif($codecData->description === $desc){
+                $codecData = new Codecs();
+            }elseif ($codecData->description === $desc) {
                 unset($codecData);
                 continue;
             }
-            $codecData->name        = $availCodec;
-            if(substr($availCodec,0,3) === 'h26'){
+            $codecData->name = $availCodec;
+            if (substr($availCodec, 0, 3) === 'h26') {
                 $type = 'video';
-            }else{
+            } else {
                 $type = 'audio';
             }
             $codecData->type        = $type;
             $codecData->description = $desc;
-            if(!$codecData->save()){
-                Util::sysLogMsg(__CLASS__, 'Can not update codec info '.$codec->name. ' from \MikoPBX\Common\Models\Codecs');
+            if (!$codecData->save()) {
+                Util::sysLogMsg(__CLASS__, 'Can not update codec info '.$codec->name.' from \MikoPBX\Common\Models\Codecs');
             }
         }
         unset($codecs);
@@ -352,7 +352,7 @@ 
 
         // Clean AstDB
         $astDbPath = $this->config->path('astDatabase.dbfile');
-        if(file_exists($astDbPath)){
+        if (file_exists($astDbPath)) {
             $table = 'astdb';
             $sql = 'DELETE FROM '.$table.' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
             $db = new \SQLite3($astDbPath);
@@ -367,13 +367,13 @@ 
         }
 
         // Add moh files to db and copy them to storage
-        $oldMohDir     = $this->config->path('asterisk.astvarlibdir') . '/sounds/moh';
+        $oldMohDir     = $this->config->path('asterisk.astvarlibdir').'/sounds/moh';
         $currentMohDir = $this->config->path('asterisk.mohdir');
-        if ( ! Util::mwMkdir($currentMohDir)) {
+        if (!Util::mwMkdir($currentMohDir)) {
             return;
         }
-        if(!file_exists($oldMohDir)){
-            if(!file_exists('/offload/livecd')){
+        if (!file_exists($oldMohDir)) {
+            if (!file_exists('/offload/livecd')) {
                 Util::sysLogMsg("UpdateConfigsUpToVer20202314", 'Directory sounds/moh not found', LOG_ERR);
             }
             return;
@@ -383,9 +383,9 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (copy($oldMohDir . '/' . $file, $currentMohDir . '/' . $file)) {
+            if (copy($oldMohDir.'/'.$file, $currentMohDir.'/'.$file)) {
                 $sound_file           = new SoundFiles();
-                $sound_file->path     = $currentMohDir . '/' . $file;
+                $sound_file->path     = $currentMohDir.'/'.$file;
                 $sound_file->category = SoundFiles::CATEGORY_MOH;
                 $sound_file->name     = $file;
                 $sound_file->save();
@@ -411,8 +411,8 @@ 
             'conditions' => 'not show_in_phonebook="1" AND is_general_user_number="1"',
         ];
         $wrongRecords = Extensions::find($parameters);
-        foreach ($wrongRecords as $extension){
-            $extension->show_in_phonebook='1';
+        foreach ($wrongRecords as $extension) {
+            $extension->show_in_phonebook = '1';
             $extension->update();
         }
     }

src/PBXCoreREST/Lib/PBXApiResult.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
      * Request result
      * @var bool
      */
-    public bool $success=false;
+    public bool $success = false;
 
     /**
      * Array of result fields
@@ -48,10 +48,10 @@ 
 
     public function __construct()
     {
-        $this->success= false;
+        $this->success = false;
         $this->data = [];
         $this->messages = [];
-        $this->function ='';
+        $this->function = '';
         $this->processor = '';
     }
 

src/AdminCabinet/Controllers/AdvicesController.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
                 }
             }
             $newResult = $this->$currentAdvice();
-            if ( ! empty($newResult)) {
+            if (!empty($newResult)) {
                 $arrMessages[] = $newResult;
             }
             $this->session->set(
@@ -66,7 +66,7 @@ 
         $result              = [];
         foreach ($arrMessages as $message) {
             foreach ($message as $key => $value) {
-                if ( ! empty($value)) {
+                if (!empty($value)) {
                     $result[$key][] = $value;
                 }
             }
@@ -132,7 +132,7 @@ 
      */
     private function checkStorage(): array
     {
-        if ( ! is_array($_COOKIE) || ! array_key_exists(session_name(), $_COOKIE)) {
+        if (!is_array($_COOKIE) || !array_key_exists(session_name(), $_COOKIE)) {
             return [];
         }
 
@@ -147,7 +147,7 @@ 
         if ($storageList !== null && property_exists($storageList, 'data')) {
             $storageDiskMounted = false;
             $disks              = $storageList->data;
-            if ( ! is_array($disks)) {
+            if (!is_array($disks)) {
                 $disks = [$disks];
             }
             foreach ($disks as $disk) {
@@ -217,7 +217,7 @@ 
     private function checkRegistration(): array
     {
         $licKey = PbxSettings::getValueByKey('PBXLicense');
-        if ( ! empty($licKey)) {
+        if (!empty($licKey)) {
             $checkBaseFeature = $this->license->featureAvailable(33);
             if ($checkBaseFeature['success'] === false) {
                 if ($this->language === 'ru') {

src/Modules/Setup/PbxExtensionSetupInterface.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
      *
      * @return bool результат удаления
      */
-    public function unInstallFiles(bool $keepSettings = false);//: bool Пока мешает удалять и обновлять старые модули, раскоменитровать после релиза 2020.5;
+    public function unInstallFiles(bool $keepSettings = false); //: bool Пока мешает удалять и обновлять старые модули, раскоменитровать после релиза 2020.5;
 
     /**
      * Returns error messages