mikopbx / Core

src/Core/System/Configs/NginxConf.php

Spacing +16 added lines, -16 removed lines

@@ -63,17 +63,17 @@ 
             echo $killPath.' -QUIT '.$pid."\n";
         }
         $timeStart = time();
-        while (true){
-            if(time() - $timeStart > 20){
+        while (true) {
+            if (time() - $timeStart > 20) {
                 break;
             }
             usleep(50000);
             $pid = Util::getPidOfProcess('nginx: master process');
-            if($pid !== ''){
+            if ($pid !== '') {
                 continue;
             }
             $result = Util::mwExec($NginxPath);
-            if($result === 0){
+            if ($result === 0) {
                 break;
             }
             echo "RESULT -- $result\n";
@@ -111,9 +111,9 @@ 
 
         $RedirectToHttps = $this->mikoPBXConfig->getGeneralSettings('RedirectToHttps');
         if ($RedirectToHttps === '1' && $not_ssl === false) {
-            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {' . PHP_EOL
-                . '        ' . 'return 301 https://$host:' . $WEBHTTPSPort . '$request_uri;' . PHP_EOL
-                . '       }' . PHP_EOL;
+            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {'.PHP_EOL
+                . '        '.'return 301 https://$host:'.$WEBHTTPSPort.'$request_uri;'.PHP_EOL
+                . '       }'.PHP_EOL;
             $config    = str_replace('include mikopbx/locations/*.conf;', $conf_data, $config);
         }
         file_put_contents($httpConfigFile, $config);
@@ -123,8 +123,8 @@ 
         $WEBHTTPSPrivateKey = $this->mikoPBXConfig->getGeneralSettings('WEBHTTPSPrivateKey');
         if (
             $not_ssl === false
-            && ! empty($WEBHTTPSPublicKey)
-            && ! empty($WEBHTTPSPrivateKey)
+            && !empty($WEBHTTPSPublicKey)
+            && !empty($WEBHTTPSPrivateKey)
         ) {
             $public_filename  = '/etc/ssl/certs/nginx.crt';
             $private_filename = '/etc/ssl/private/nginx.key';
@@ -139,7 +139,7 @@ 
 
         // Test work
         $currentConfigIsGood = $this->testCurrentNginxConfig();
-        if ($level < 1 && ! $currentConfigIsGood) {
+        if ($level < 1 && !$currentConfigIsGood) {
             ++$level;
             Util::sysLogMsg('nginx', 'Failed test config file. SSL will be disable...');
             $this->generateConf(true, $level);
@@ -168,9 +168,9 @@ 
      */
     public function generateModulesConf(): void
     {
-        $locationsPath     = self::MODULES_LOCATIONS_PATH;
-        if (!is_dir($locationsPath)){
-            Util::mwMkdir($locationsPath,true);
+        $locationsPath = self::MODULES_LOCATIONS_PATH;
+        if (!is_dir($locationsPath)) {
+            Util::mwMkdir($locationsPath, true);
         }
         $additionalModules = $this->di->getShared('pbxConfModules');
         $rmPath            = Util::which('rm');
@@ -178,12 +178,12 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'createNginxLocations')) {
                 $locationContent = $appClass->createNginxLocations();
-                if ( ! empty($locationContent)) {
+                if (!empty($locationContent)) {
                     $confFileName = "{$locationsPath}/{$appClass->moduleUniqueId}.conf";
                     file_put_contents($confFileName, $locationContent);
-                    if ( ! $this->testCurrentNginxConfig()) {
+                    if (!$this->testCurrentNginxConfig()) {
                         Util::mwExec("{$rmPath} {$confFileName}");
-                        Util::sysLogMsg('nginx', 'Failed test config file for module' . $appClass->moduleUniqueId);
+                        Util::sysLogMsg('nginx', 'Failed test config file for module'.$appClass->moduleUniqueId);
                     }
                 }
             }

src/Core/Asterisk/Configs/ConferenceConf.php

Spacing +10 added lines, -10 removed lines

@@ -19,7 +19,7 @@ 
     protected function generateConfigProtected(): void
     {
         $conf = "";
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/confbridge.conf', $conf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/confbridge.conf', $conf);
     }
 
     /**
@@ -32,7 +32,7 @@ 
         $conf = '';
         $data = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n";
+            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n";
         }
         $conf .= "\n";
 
@@ -47,7 +47,7 @@ 
         $conf = '';
         $data = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n";
+            $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n";
         }
         $conf .= "\n";
 
@@ -72,13 +72,13 @@ 
         $conf .= "[conference-rooms] \n";
         $data = ConferenceRooms::find(['order' => 'extension']);
         foreach ($data as $conference) {
-            $conf .= 'exten => ' . $conference->extension . ',1,NoOp(---)' . "\n\t";
-            $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())' . "\n\t";
-            $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)' . "\n\t";
-            $conf .= 'same => n,Answer()' . "\n\t";
-            $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)' . "\n\t";
-            $conf .= 'same => n,Meetme(${EXTEN},qdMT' . $rec_options . ')' . "\n\t";
-            $conf .= 'same => n,Hangup()' . "\n\n";
+            $conf .= 'exten => '.$conference->extension.',1,NoOp(---)'."\n\t";
+            $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())'."\n\t";
+            $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)'."\n\t";
+            $conf .= 'same => n,Answer()'."\n\t";
+            $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)'."\n\t";
+            $conf .= 'same => n,Meetme(${EXTEN},qdMT'.$rec_options.')'."\n\t";
+            $conf .= 'same => n,Hangup()'."\n\n";
         }
 
         return $conf;

src/Core/Asterisk/AGIDebug.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 class AGIDebug extends AGI {
     private string $scriptName;
 
-    function __construct($scriptName){
+    function __construct($scriptName) {
         $this->scriptName = $scriptName;
     }
 

Braces +4 added lines, -2 removed lines

@@ -8,10 +8,12 @@
 
 namespace MikoPBX\Core\Asterisk;
 
-class AGIDebug extends AGI {
+class AGIDebug extends AGI
+{
     private string $scriptName;
 
-    function __construct($scriptName){
+    function __construct($scriptName)
+    {
         $this->scriptName = $scriptName;
     }
 

src/Core/System/Configs/PHPConf.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
     {
         $src_log_file = '/var/log/php_error.log';
         $dst_log_file = self::getLogFile();
-        if ( ! file_exists($src_log_file)) {
+        if (!file_exists($src_log_file)) {
             file_put_contents($src_log_file, '');
         }
         $options = file_exists($dst_log_file) ? '>' : '';
@@ -41,7 +41,7 @@ 
      */
     public static function getLogFile(): string
     {
-        $logdir = System::getLogDir() . '/php';
+        $logdir = System::getLogDir().'/php';
         Util::mwMkdir($logdir);
         return "$logdir/error.log";
     }
@@ -55,7 +55,7 @@ 
 
         $max_size    = 2;
         $f_name      = self::getLogFile();
-        $text_config = $f_name . " {
+        $text_config = $f_name." {
     nocreate
     nocopytruncate
     delaycompress
@@ -69,13 +69,13 @@ 
     endscript
 }";
         // TODO::Доделать рестарт PHP-FPM после обновление лога
-        $di     = Di::getDefault();
-        if ($di !== null){
+        $di = Di::getDefault();
+        if ($di !== null) {
             $varEtcDir = $di->getConfig()->path('core.varEtcDir');
         } else {
             $varEtcDir = '/var/etc';
         }
-        $path_conf   = $varEtcDir . '/php_logrotate_' . basename($f_name) . '.conf';
+        $path_conf = $varEtcDir.'/php_logrotate_'.basename($f_name).'.conf';
         file_put_contents($path_conf, $text_config);
         $mb10 = $max_size * 1024 * 1024;
 
@@ -91,7 +91,7 @@ 
      */
     public static function phpTimeZoneConfigure(): void
     {
-        $timezone      = PbxSettings::getValueByKey('PBXTimezone');
+        $timezone = PbxSettings::getValueByKey('PBXTimezone');
         date_default_timezone_set($timezone);
         if (file_exists('/etc/TZ')) {
             $catPath = Util::which('cat');

src/Core/System/Configs/NTPConf.php

Spacing +3 added lines, -3 removed lines

@@ -22,12 +22,12 @@
         $ntp_servers = PbxSettings::getValueByKey('NTPServer');
         $ntp_servers = preg_split('/\r\n|\r|\n| /', $ntp_servers);
         $ntp_conf = '';
-        foreach ($ntp_servers as $ntp_server){
-            if ( ! empty($ntp_server)) {
+        foreach ($ntp_servers as $ntp_server) {
+            if (!empty($ntp_server)) {
                 $ntp_conf .= "server {$ntp_server}".PHP_EOL;
             }
         }
-        if ($ntp_conf==='') {
+        if ($ntp_conf === '') {
             $ntp_conf = 'server 0.pool.ntp.org
 server 1.pool.ntp.org
 server 2.pool.ntp.org';

src/Common/Models/Extensions.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
         $freeExtension = '2200100';
         for ($i = 100; ; $i++) {
             $freeExtension = "2200{$i}";
-            if ( ! in_array(['number' => $freeExtension], $result, false)) {
+            if (!in_array(['number' => $freeExtension], $result, false)) {
                 break;
             }
         }
@@ -421,8 +421,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :oldNumber:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :oldNumber:',
                         'bind'       => ['oldNumber' => $snapShotData['number']],
                     ];
                     $relatedRecords = $relatedModel::find($parameters);
@@ -476,8 +476,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :Number:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :Number:',
                         'bind'       => ['Number' => $this->number],
                     ];
                     $relatedRecords = $relatedModel::find($parameters);

src/Core/Asterisk/Configs/VoiceMailConf.php

Spacing +23 added lines, -23 removed lines

@@ -32,32 +32,32 @@ 
 
         $from = $this->generalSettings['MailSMTPSenderAddress'];
         if (empty($from)) {
-            $from =  $this->generalSettings['MailSMTPUsername'];
+            $from = $this->generalSettings['MailSMTPUsername'];
         }
 
         $timezone = $this->generalSettings['PBXTimezone'];
         $msmtpPath = Util::which('msmtp');
 
-        $conf     = "[general]\n" .
-            "format=wav49|gsm|wav\n" .
-            "attach=yes\n" .
-            "maxmsg=100\n" .
-            "maxsecs=120\n" .
-            "maxgreet=60\n" .
-            "maxsilence=10\n" .
-            "silencethreshold=128\n" .
-            "maxlogins=3\n" .
-            "moveheard=yes\n" .
-            "charset=UTF-8\n" .
-            "pbxskip=yes\n" .
-            "fromstring=VoiceMail\n" .
-            "emailsubject={$emailsubject}\n" .
-            "emailbody={$emailbody}\n\n{$emailfooter}\n" .
-            "emaildateformat=%A, %d %B %Y в %H:%M:%S\n" .
-            "pagerdateformat=%T %D\n" .
-            "mailcmd={$msmtpPath} --file=/etc/msmtp.conf -t\n" .
-            "serveremail={$from}\n\n" .
-            "[zonemessages]\n" .
+        $conf     = "[general]\n".
+            "format=wav49|gsm|wav\n".
+            "attach=yes\n".
+            "maxmsg=100\n".
+            "maxsecs=120\n".
+            "maxgreet=60\n".
+            "maxsilence=10\n".
+            "silencethreshold=128\n".
+            "maxlogins=3\n".
+            "moveheard=yes\n".
+            "charset=UTF-8\n".
+            "pbxskip=yes\n".
+            "fromstring=VoiceMail\n".
+            "emailsubject={$emailsubject}\n".
+            "emailbody={$emailbody}\n\n{$emailfooter}\n".
+            "emaildateformat=%A, %d %B %Y в %H:%M:%S\n".
+            "pagerdateformat=%T %D\n".
+            "mailcmd={$msmtpPath} --file=/etc/msmtp.conf -t\n".
+            "serveremail={$from}\n\n".
+            "[zonemessages]\n".
             "local={$timezone}|'vm-received' q 'digits/at' H 'hours' M 'minutes'\n\n";
 
         $conf .= "[voicemailcontext]\n";
@@ -66,7 +66,7 @@ 
         if (empty($mail_box)) {
             $mail_box = $this->generalSettings['SystemNotificationsEmail'];
         }
-        $conf .= "admin => admin," . Util::translate("user") . ",{$mail_box},,attach=yes|tz=local\n";
+        $conf .= "admin => admin,".Util::translate("user").",{$mail_box},,attach=yes|tz=local\n";
         /*
         $peers = Sip::find('type="peer"');
         foreach ($peers as $peer){
@@ -86,6 +86,6 @@ 
         }
         //*/
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/voicemail.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/voicemail.conf', $conf);
     }
 }
\ No newline at end of file

src/AdminCabinet/Controllers/ConferenceRoomsController.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
         $record = ConferenceRooms::findFirstByUniqid($uniqid);
         if ($record === null) {
             $record            = new ConferenceRooms();
-            $record->uniqid    = Extensions::TYPE_CONFERENCE.strtoupper('-' . md5(time()));
+            $record->uniqid    = Extensions::TYPE_CONFERENCE.strtoupper('-'.md5(time()));
             $record->extension = Extensions::getNextFreeApplicationNumber();
         }
         $this->view->form      = new ConferenceRoomEditForm($record);
@@ -51,7 +51,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $this->db->begin();
@@ -71,7 +71,7 @@ 
         }
 
         // Заполним параметры внутреннего номера
-        if ( ! $this->updateExtension($extension, $data)) {
+        if (!$this->updateExtension($extension, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -79,7 +79,7 @@ 
         }
 
         // Заполним параметры участников очереди
-        if ( ! $this->updateConferenceRoom($room, $data)) {
+        if (!$this->updateConferenceRoom($room, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -135,7 +135,7 @@ 
                     $room->$name = $data[$name];
                     break;
                 default:
-                    if ( ! array_key_exists($name, $data)) {
+                    if (!array_key_exists($name, $data)) {
                         continue 2;
                     }
                     $room->$name = $data[$name];

src/AdminCabinet/Controllers/SoundFilesController.php

Spacing +7 added lines, -7 removed lines

@@ -20,8 +20,8 @@ 
      */
     public function indexAction(): void
     {
-        $this->view->mohFiles    = SoundFiles::find('category="' . SoundFiles::CATEGORY_MOH . '"');
-        $this->view->customFiles = SoundFiles::find('category="' . SoundFiles::CATEGORY_CUSTOM . '"');
+        $this->view->mohFiles    = SoundFiles::find('category="'.SoundFiles::CATEGORY_MOH.'"');
+        $this->view->customFiles = SoundFiles::find('category="'.SoundFiles::CATEGORY_CUSTOM.'"');
     }
 
 
@@ -57,7 +57,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();
@@ -72,7 +72,7 @@ 
                 case "id":
                     break;
                 default:
-                    if ( ! array_key_exists($name, $data)) {
+                    if (!array_key_exists($name, $data)) {
                         continue 2;
                     }
                     $soundFile->$name = $data[$name];
@@ -104,11 +104,11 @@ 
             return;
         }
         $soundFile = SoundFiles::findFirstById($id);
-        if ($soundFile === null){
+        if ($soundFile === null) {
             return;
         }
-        $errors    = false;
-        if (! $soundFile->delete()) {
+        $errors = false;
+        if (!$soundFile->delete()) {
             $errors = $soundFile->getMessages();
         }
         if ($errors) {