mikopbx / Core

www/admin-cabinet/app/controllers/GeneralSettingsController.php

Indentation +36 added lines, -36 removed lines

@@ -11,20 +11,20 @@ 
 
 class GeneralSettingsController extends BaseController {
 
-	/**
-	 * Построение формы настроек
-	 */
-	public function modifyAction()
-	{
-		$pbxSettings = PbxSettings::getAllPbxSettings();
-		$this->view->form = new GeneralSettingsEditForm(null,$pbxSettings);
-		$this->view->submitMode = NULL;
-	}
+    /**
+     * Построение формы настроек
+     */
+    public function modifyAction()
+    {
+        $pbxSettings = PbxSettings::getAllPbxSettings();
+        $this->view->form = new GeneralSettingsEditForm(null,$pbxSettings);
+        $this->view->submitMode = NULL;
+    }
 
-	/**
-	 * Сохранение настроек системы
-	 */
-	public function saveAction()
+    /**
+     * Сохранение настроек системы
+     */
+    public function saveAction()
     {
         if (!$this->request->isPost()) {
             return;
@@ -35,9 +35,9 @@ 
         foreach ($pbxSettings as $key=>$value){
             $record = PbxSettings::findFirstByKey($key);
             if (!$record) {
-	            $record        = new PbxSettings();
-	            $record->key   = $key;
-	            $record->value = $value;
+                $record        = new PbxSettings();
+                $record->key   = $key;
+                $record->value = $value;
             }
 
             switch($key) {
@@ -49,32 +49,32 @@ 
                 case '***ALL CHECK BOXES ABOVE***':
                     $record->value = ($data[$key] === 'on') ? '1' : '0';
                     break;
-	            case 'SSHPassword':
-		            //Если отправили пароль по-умолчанию, то сделаем его равным паролю WEB
-		            if ( $data[ $key ] === $pbxSettings[ $key ] ) {
-			            $record->value = $data['WebAdminPassword'];
-		            } else {
-			            $record->value = $data[ $key ];
-		            }
-		            break;
-				case 'PBXLanguage':
-					$record->value = $data[$key];
-					if ($this->language !==$data[$key]){
-						$sessionParams = $this->session->get('auth');
-						$sessionParams['lang'] = substr($data[$key],0,2);
-						$this->session->set('auth', $sessionParams);
-						$this->session->set('PBXLanguage',$data[$key]);
-						$this->view->reload = 'general-settings/modify/';
-					}
-					break;
+                case 'SSHPassword':
+                    //Если отправили пароль по-умолчанию, то сделаем его равным паролю WEB
+                    if ( $data[ $key ] === $pbxSettings[ $key ] ) {
+                        $record->value = $data['WebAdminPassword'];
+                    } else {
+                        $record->value = $data[ $key ];
+                    }
+                    break;
+                case 'PBXLanguage':
+                    $record->value = $data[$key];
+                    if ($this->language !==$data[$key]){
+                        $sessionParams = $this->session->get('auth');
+                        $sessionParams['lang'] = substr($data[$key],0,2);
+                        $this->session->set('auth', $sessionParams);
+                        $this->session->set('PBXLanguage',$data[$key]);
+                        $this->view->reload = 'general-settings/modify/';
+                    }
+                    break;
                 case 'SendMetrics':
                     $record->value = ($data[$key] === 'on') ? '1' : '0';
                     $this->session->set('SendMetrics', $record->value);
                     break;
                 default:
                     if (array_key_exists($key, $data)){
-						$record->value = $data[$key];
-					}
+                        $record->value = $data[$key];
+                    }
             }
             if ($record->save()=== false){
                 $errors = $record->getMessages();

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
 	public function modifyAction()
 	{
 		$pbxSettings = PbxSettings::getAllPbxSettings();
-		$this->view->form = new GeneralSettingsEditForm(null,$pbxSettings);
+		$this->view->form = new GeneralSettingsEditForm(null, $pbxSettings);
 		$this->view->submitMode = NULL;
 	}
 
@@ -30,9 +30,9 @@ 
             return;
         }
         $data = $this->request->getPost();
-        $pbxSettings=PbxSettings::getDefaultArrayValues();
+        $pbxSettings = PbxSettings::getDefaultArrayValues();
         $this->db->begin();
-        foreach ($pbxSettings as $key=>$value){
+        foreach ($pbxSettings as $key=>$value) {
             $record = PbxSettings::findFirstByKey($key);
             if (!$record) {
 	            $record        = new PbxSettings();
@@ -40,7 +40,7 @@ 
 	            $record->value = $value;
             }
 
-            switch($key) {
+            switch ($key) {
                 case 'PBXRecordCalls':
                 case 'AJAMEnabled':
                 case 'AMIEnabled':
@@ -51,19 +51,19 @@ 
                     break;
 	            case 'SSHPassword':
 		            //Если отправили пароль по-умолчанию, то сделаем его равным паролю WEB
-		            if ( $data[ $key ] === $pbxSettings[ $key ] ) {
+		            if ($data[$key] === $pbxSettings[$key]) {
 			            $record->value = $data['WebAdminPassword'];
 		            } else {
-			            $record->value = $data[ $key ];
+			            $record->value = $data[$key];
 		            }
 		            break;
 				case 'PBXLanguage':
 					$record->value = $data[$key];
-					if ($this->language !==$data[$key]){
+					if ($this->language !== $data[$key]) {
 						$sessionParams = $this->session->get('auth');
-						$sessionParams['lang'] = substr($data[$key],0,2);
+						$sessionParams['lang'] = substr($data[$key], 0, 2);
 						$this->session->set('auth', $sessionParams);
-						$this->session->set('PBXLanguage',$data[$key]);
+						$this->session->set('PBXLanguage', $data[$key]);
 						$this->view->reload = 'general-settings/modify/';
 					}
 					break;
@@ -72,21 +72,21 @@ 
                     $this->session->set('SendMetrics', $record->value);
                     break;
                 default:
-                    if (array_key_exists($key, $data)){
+                    if (array_key_exists($key, $data)) {
 						$record->value = $data[$key];
 					}
             }
-            if ($record->save()=== false){
+            if ($record->save() === false) {
                 $errors = $record->getMessages();
                 $this->flash->warning(implode('<br>', $errors));
-                $this->view->success=false;
+                $this->view->success = false;
                 $this->db->rollback();
                 return;
             }
         }
 
         $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
-        $this->view->success=true;
+        $this->view->success = true;
         $this->db->commit();
     }
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -9,7 +9,8 @@ 
 
 use Models\PbxSettings;
 
-class GeneralSettingsController extends BaseController {
+class GeneralSettingsController extends BaseController
+{
 
 	/**
 	 * Построение формы настроек
@@ -25,7 +26,7 @@ 
 	 * Сохранение настроек системы
 	 */
 	public function saveAction()
-    {
+	{
         if (!$this->request->isPost()) {
             return;
         }

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

@@ -18,7 +18,7 @@
 	{
 		$pbxSettings = PbxSettings::getAllPbxSettings();
 		$this->view->form = new GeneralSettingsEditForm(null,$pbxSettings);
-		$this->view->submitMode = NULL;
+		$this->view->submitMode = null;
 	}
 
 	/**

www/admin-cabinet/app/controllers/SessionController.php

Indentation +2 added lines, -2 removed lines

@@ -26,9 +26,9 @@
     {
         $form = new LoginForm();
         $this->view->NameFromSettings
-              = PbxSettings::getValueByKey('Name');
+                = PbxSettings::getValueByKey('Name');
         $this->view->DescriptionFromSettings
-              = PbxSettings::getValueByKey('Description');
+                = PbxSettings::getValueByKey('Description');
 
         $this->view->form = $form;
     }

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      */
     public function startAction()
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return $this->forward('session/index');
         }
         $loginFromUser = $this->request->getPost('login');

www/admin-cabinet/app/controllers/DialplanApplicationsController.php

Spacing +6 added lines, -6 removed lines

@@ -33,9 +33,9 @@ 
     public function modifyAction(string $uniqid = null): void
     {
         $app = DialplanApplications::findFirstByUniqid($uniqid);
-        if ( ! $app) {
+        if (!$app) {
             $app            = new DialplanApplications();
-            $app->uniqid    = strtoupper('DIALPLAN-APP-' . md5($app->id . time()));
+            $app->uniqid    = strtoupper('DIALPLAN-APP-'.md5($app->id.time()));
             $app->type      = 'php';
             $app->extension = Extensions::getNextFreeApplicationNumber();
         }
@@ -53,7 +53,7 @@ 
      */
     public function saveAction()
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -77,7 +77,7 @@ 
         }
 
         // Заполним параметры внутреннего номера
-        if ( ! $this->updateExtension($extension, $data)) {
+        if (!$this->updateExtension($extension, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -85,7 +85,7 @@ 
         }
 
         // Заполним параметры пользователя
-        if ( ! $this->updateDialplanApplication($appRecord, $data)) {
+        if (!$this->updateDialplanApplication($appRecord, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -113,7 +113,7 @@ 
         $appRecord = DialplanApplications::findFirstByUniqid($uniqid);
 
         $errors = false;
-        if ($appRecord->Extensions && ! $appRecord->Extensions->delete()) {
+        if ($appRecord->Extensions && !$appRecord->Extensions->delete()) {
             $errors = $appRecord->Extensions->getMessages();
         }
 

www/admin-cabinet/app/controllers/ConsoleController.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      *
      * @param int $currentPage текущая страница пажинации
      */
-    public function indexAction( $currentPage = 0, $parameters = NULL )
+    public function indexAction($currentPage = 0, $parameters = NULL)
     {
     }
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -13,7 +13,8 @@
  *
  * SSH консоль
  */
-class ConsoleController extends BaseController {
+class ConsoleController extends BaseController
+{
 
     /**
      * Заглушка

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

@@ -20,7 +20,7 @@
      *
      * @param int $currentPage текущая страница пажинации
      */
-    public function indexAction( $currentPage = 0, $parameters = NULL )
+    public function indexAction( $currentPage = 0, $parameters = null )
     {
     }
 }
\ No newline at end of file

www/admin-cabinet/app/controllers/ExtensionsController.php

Indentation +2 added lines, -2 removed lines

@@ -145,7 +145,7 @@ 
             $this->view->avatar        = '';
         } else {
             $extension->Sip->manualattributes
-                           = $extension->Sip->getManualAttributes();
+                            = $extension->Sip->getManualAttributes();
             $enabledCodecs = $extension->Sip->Codecs;
             foreach ($enabledCodecs as $codec) {
                 $codecs[$codec->codec]['enabled'] = true;
@@ -796,7 +796,7 @@ 
         }
         $result       = (int)$query + 1;
         $extensionsLength
-                      = PbxSettings::getValueByKey('PBXInternalExtensionLength');
+                        = PbxSettings::getValueByKey('PBXInternalExtensionLength');
         $maxExtension = (10 ** $extensionsLength) - 1;
 
         return ($result <= $maxExtension) ? $result : '';

Spacing +45 added lines, -45 removed lines

@@ -77,13 +77,13 @@ 
                     $extensionTable[$extension->userid]['email']    = $extension->email;
                     $extensionTable[$extension->userid]['secret']   = $extension->secret;
 
-                    if ( ! array_key_exists('mobile', $extensionTable[$extension->userid])) {
+                    if (!array_key_exists('mobile', $extensionTable[$extension->userid])) {
                         $extensionTable[$extension->userid]['mobile'] = '';
                     }
                     if ($extension->avatar) {
                         $filename = md5($extension->avatar);
                         $imgFile  = "{$this->config->application->imgCacheDir}$filename.jpg";
-                        if ( ! file_exists($imgFile)) {
+                        if (!file_exists($imgFile)) {
                             $this->base64ToJpeg($extension->avatar, $imgFile);
                         }
 
@@ -120,7 +120,7 @@ 
 
         $extension = Extensions::findFirstById($id);
 
-        if ( ! $extension) {
+        if (!$extension) {
             $extension                         = new Extensions();
             $extension->show_in_phonebook      = '1';
             $extension->public_access          = '0';
@@ -129,7 +129,7 @@ 
             $extension->Sip                    = new Sip();
             $extension->Sip->disabled          = 0;
             $extension->Sip->type              = 'peer';
-            $extension->Sip->uniqid            = strtoupper('SIP-PHONE-' . md5(time()));
+            $extension->Sip->uniqid            = strtoupper('SIP-PHONE-'.md5(time()));
             $extension->Sip->busylevel         = 1;
             $extension->Sip->qualify           = '1';
             $extension->Sip->qualifyfreq       = 60;
@@ -160,20 +160,20 @@ 
             $arrNetworkFilters[$filter->id] = $filter->getRepresent();
         }
 
-        $parameters        = [
+        $parameters = [
             'conditions' => 'type = "EXTERNAL" AND is_general_user_number = 1 AND userid=:userid:',
             'bind'       => [
                 'userid' => $extension->userid,
             ],
         ];
         $externalExtension = Extensions::findFirst($parameters);
-        if ( ! $externalExtension) {
+        if (!$externalExtension) {
             $externalExtension                           = new Extensions();
             $externalExtension->userid                   = $extension->userid;
             $externalExtension->type                     = 'EXTERNAL';
             $externalExtension->is_general_user_number   = '1';
             $externalExtension->ExternalPhones           = new ExternalPhones();
-            $externalExtension->ExternalPhones->uniqid   = strtoupper('EXTERNAL-' . md5(time()));
+            $externalExtension->ExternalPhones->uniqid   = strtoupper('EXTERNAL-'.md5(time()));
             $externalExtension->ExternalPhones->disabled = '0';
 
         }
@@ -198,7 +198,7 @@ 
 
         // Ограничим длинну внутреннего номера согласно настройкам
         $extensionsLength      = PbxSettings::getValueByKey('PBXInternalExtensionLength');
-        $internalExtensionMask = '9{' . $extensionsLength . '}';
+        $internalExtensionMask = '9{'.$extensionsLength.'}';
 
         $form = new ExtensionEditForm($extension, [
             'network_filters'        => $arrNetworkFilters,
@@ -220,7 +220,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -243,21 +243,21 @@ 
 
         } else {
             $extension = $sipEntity->Extensions;
-            if ( ! $extension) {
+            if (!$extension) {
                 $extension = new Extensions();
             }
             $userEntity = $extension->Users;
-            if ( ! $userEntity) {
+            if (!$userEntity) {
                 $userEntity = new Users();
             }
             $fwdEntity = $extension->ExtensionForwardingRights;
-            if ( ! $fwdEntity) {
+            if (!$fwdEntity) {
                 $fwdEntity = new ExtensionForwardingRights();
             }
         }
 
         // Заполним параметры пользователя
-        if ( ! $this->saveUser($userEntity, $data)) {
+        if (!$this->saveUser($userEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -265,7 +265,7 @@ 
         }
 
         // Заполним параметры внутреннего номера
-        if ( ! $this->saveExtension($extension, $userEntity, $data, false)) {
+        if (!$this->saveExtension($extension, $userEntity, $data, false)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -273,7 +273,7 @@ 
         }
 
         // Заполним параметры SIP учетки
-        if ( ! $this->saveSip($sipEntity, $data)) {
+        if (!$this->saveSip($sipEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -281,7 +281,7 @@ 
         }
 
         // Заполним параметры Кодеков
-        if ( ! $this->saveSipCodecs($data)) {
+        if (!$this->saveSipCodecs($data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -289,7 +289,7 @@ 
         }
 
         // Заполним параметры маршрутизации
-        if ( ! $this->saveForwardingRights($fwdEntity, $data)) {
+        if (!$this->saveForwardingRights($fwdEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -297,7 +297,7 @@ 
         }
 
         // Если мобильный не указан, то не будем его добавлять в базу
-        if ( ! empty($data['mobile_number'])) {
+        if (!empty($data['mobile_number'])) {
             $externalPhone = ExternalPhones::findFirstByUniqid($data['mobile_uniqid']);
             if ($externalPhone === false) {
                 $externalPhone   = new ExternalPhones();
@@ -307,7 +307,7 @@ 
             }
 
             // Заполним параметры Extension для мобильного
-            if ( ! $this->saveExtension($mobileExtension, $userEntity, $data, true)) {
+            if (!$this->saveExtension($mobileExtension, $userEntity, $data, true)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -315,7 +315,7 @@ 
             }
 
             // Заполним параметры ExternalPhones для мобильного
-            if ( ! $this->saveExternalPhones($externalPhone, $data)) {
+            if (!$this->saveExternalPhones($externalPhone, $data)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -323,7 +323,7 @@ 
             }
         } else {
             // Удалить номер мобильного если он был привязан к пользователю
-            $parameters          = [
+            $parameters = [
                 'conditions' => 'type="EXTERNAL" AND is_general_user_number = 1 AND userid=:userid:',
                 'bind'       => [
                     'userid' => $userEntity->id,
@@ -367,12 +367,12 @@ 
 
         $errors = false;
         if ($extension && $extension->ExtensionForwardingRights
-            && ! $extension->ExtensionForwardingRights->delete()) {
+            && !$extension->ExtensionForwardingRights->delete()) {
             $errors = $extension->ExtensionForwardingRights->getMessages();
         }
 
 
-        if ( ! $errors && $extension && ! $extension->Users->delete()) {
+        if (!$errors && $extension && !$extension->Users->delete()) {
             $errors = $extension->Users->getMessages();
         }
 
@@ -502,13 +502,13 @@ 
         foreach ($userEntity as $name => $value) {
             switch ($name) {
                 case 'role':
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_' . $name]; // не повышаем роль
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_'.$name]; // не повышаем роль
                     }
                     break;
                 default:
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = $data['user_' . $name];
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = $data['user_'.$name];
                     }
             }
         }
@@ -610,20 +610,20 @@ 
                     break;
                 case 'disabled':
                 case 'disablefromuser':
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = ($data['sip_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = ($data['sip_'.$name] === 'on') ? '1' : '0';
                     } else {
                         $sipEntity->$name = "0";
                     }
                     break;
                 case 'networkfilterid':
-                    if ( ! array_key_exists('sip_' . $name, $data)) {
+                    if (!array_key_exists('sip_'.$name, $data)) {
                         continue 2;
                     }
-                    if ($data['sip_' . $name] === 'none') {
+                    if ($data['sip_'.$name] === 'none') {
                         $sipEntity->$name = null;
                     } else {
-                        $sipEntity->$name = $data['sip_' . $name];
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
                     break;
                 case 'extension':
@@ -636,8 +636,8 @@ 
                     $sipEntity->setManualAttributes($data['sip_manualattributes']);
                     break;
                 default:
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = $data['sip_' . $name];
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
 
             }
@@ -672,9 +672,9 @@ 
                     'codec'  => $key,
                 ],
             ];
-            if (array_key_exists('codec_' . $key, $data) && $data['codec_' . $key] === 'on') {
+            if (array_key_exists('codec_'.$key, $data) && $data['codec_'.$key] === 'on') {
                 $newCodec = SipCodecs::findFirst($parameters);
-                if ( ! $newCodec) {
+                if (!$newCodec) {
                     $newCodec = new SipCodecs();
                 }
                 $newCodec->sipuid   = $data['sip_uniqid'];
@@ -723,16 +723,16 @@ 
                     $externalPhone->$name = $data['user_username'];
                     break;
                 case 'disabled':
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = ($data['mobile_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = ($data['mobile_'.$name] === 'on') ? '1' : '0';
 
                     } else {
                         $externalPhone->$name = '0';
                     }
                     break;
                 default:
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = $data['mobile_' . $name];
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = $data['mobile_'.$name];
                     }
 
             }
@@ -764,8 +764,8 @@ 
                     $forwardingRight->$name = $data['number'];
                     break;
                 default:
-                    if (array_key_exists('fwd_' . $name, $data)) {
-                        $forwardingRight->$name = ($data['fwd_' . $name] === -1) ? '' : $data['fwd_' . $name];
+                    if (array_key_exists('fwd_'.$name, $data)) {
+                        $forwardingRight->$name = ($data['fwd_'.$name] === -1) ? '' : $data['fwd_'.$name];
                     }
 
             }
@@ -790,11 +790,11 @@ 
             'conditions' => 'type = "SIP"',
             'column'     => 'number',
         ];
-        $query      = Extensions::maximum($parameters);
+        $query = Extensions::maximum($parameters);
         if ($query === null) {
             $query = 200;
         }
-        $result       = (int)$query + 1;
+        $result       = (int) $query + 1;
         $extensionsLength
                       = PbxSettings::getValueByKey('PBXInternalExtensionLength');
         $maxExtension = (10 ** $extensionsLength) - 1;
@@ -878,7 +878,7 @@ 
      */
     public function GetPhonesRepresentAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $numbers = $this->request->getPost('numbers');

www/admin-cabinet/app/controllers/ProvidersController.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
                 'hostname' => $provByType->host,
                 'type'     => $provider->type,
                 'status'   => $provByType->disabled ? 'disabled' : '',
-                'existLinks'=>$provider->OutgoingRouting->count()>0?'true':'false'
+                'existLinks'=>$provider->OutgoingRouting->count() > 0 ? 'true' : 'false'
 
             ];
         }
@@ -66,7 +66,7 @@ 
             }
 
         } else {
-            $uniqid                     = strtoupper('SIP-' . time());
+            $uniqid                     = strtoupper('SIP-'.time());
             $provider                   = new Providers();
             $provider->type             = 'SIP';
             $provider->uniqid           = $uniqid;
@@ -113,7 +113,7 @@ 
             }
 
         } else {
-            $uniqid                    = strtoupper('IAX-' . time());
+            $uniqid                    = strtoupper('IAX-'.time());
             $provider                  = new Providers();
             $provider->type            = 'IAX';
             $provider->uniqid          = $uniqid;
@@ -203,14 +203,14 @@ 
      */
     public function saveAction($type)
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return $this->forward('network/index');
         }
         $this->db->begin();
         $data = $this->request->getPost();
 
         // Заполним параметры провайдера и его SIP IAX записей
-        if ( ! $this->saveProvider($data, $type)) {
+        if (!$this->saveProvider($data, $type)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -218,7 +218,7 @@ 
         }
 
         // Заполним параметры Кодеков
-        if ( ! $this->saveCodecs($data, $type)) {
+        if (!$this->saveCodecs($data, $type)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -248,7 +248,7 @@ 
 
         // Проверим это новый провайдер или старый
         $provider = Providers::findFirstByUniqid($data['uniqid']);
-        if ( ! $provider) {
+        if (!$provider) {
             $provider         = new Providers();
             $provider->uniqid = $data['uniqid'];
             switch ($type) {
@@ -346,9 +346,9 @@ 
                     'codec'  => $key,
                 ],
             ];
-            if (array_key_exists('codec_' . $key, $data) && $data['codec_' . $key] == 'on') {
+            if (array_key_exists('codec_'.$key, $data) && $data['codec_'.$key] == 'on') {
                 $newCodec = $classCodecs::findFirst($parameters);
-                if ( ! $newCodec) {
+                if (!$newCodec) {
                     $newCodec = new $classCodecs();
                 }
                 $newCodec->$fieldUid = $data['uniqid'];
@@ -390,11 +390,11 @@ 
         if ($provider) {
             $this->db->begin();
             $errors = false;
-            if ($provider->Iax && ! $provider->Iax->delete()) {
+            if ($provider->Iax && !$provider->Iax->delete()) {
                 $errors = $provider->Iax->getMessages();
             }
 
-            if ($provider->Sip && ! $provider->Sip->delete()) {
+            if ($provider->Sip && !$provider->Sip->delete()) {
                 $errors = $provider->Sip->getMessages();
             }
 

www/admin-cabinet/app/controllers/BaseController.php

Spacing +59 added lines, -59 removed lines

@@ -24,15 +24,15 @@ 
     /**
      * Инициализация базововго класса
      */
-    public function initialize(){
+    public function initialize() {
         $this->di                    = $this->getDi();
         $this->actionName            = $this->dispatcher->getActionName();
-        $this->controllerName        = Text::camelize($this->dispatcher->getControllerName(),'_');
-        $this->controllerNameUnCamelized = Text::uncamelize( $this->controllerName  ,'-');
+        $this->controllerName        = Text::camelize($this->dispatcher->getControllerName(), '_');
+        $this->controllerNameUnCamelized = Text::uncamelize($this->controllerName, '-');
 
         $this->moduleName            = $this->dispatcher->getModuleName();
 
-        if ( $this->request->isAjax() === FALSE ) {
+        if ($this->request->isAjax() === FALSE) {
             $this->prepareView( );
         }
     }
@@ -42,33 +42,33 @@ 
      * Инициализирует шаблонизатор View и устанавливает переменные системы для отображения
      */
     protected function prepareView() :void{
-        date_default_timezone_set( $this->getSessionData('PBXTimezone') );
-        $roSession  = $this->sessionRO;
+        date_default_timezone_set($this->getSessionData('PBXTimezone'));
+        $roSession = $this->sessionRO;
         $this->view->PBXVersion = $this->getSessionData('PBXVersion');
-        if ( $roSession !== null && array_key_exists('auth', $roSession)) {
+        if ($roSession !== null && array_key_exists('auth', $roSession)) {
             $this->view->SSHPort    = $this->getSessionData('SSHPort');
             $this->view->PBXLicense = $this->getSessionData('PBXLicense');
-            $this->view->PBXLanguage= $this->getSessionData('PBXLanguage');
+            $this->view->PBXLanguage = $this->getSessionData('PBXLanguage');
         } else {
             $this->view->SSHPort    = '';
             $this->view->PBXLicense = '';
-            $this->view->PBXLanguage= '';
+            $this->view->PBXLanguage = '';
         }
 
         // Кеш версий модулей и атс, для правильной работы АТС при установке модулей
         $versionHash = $this->getVersionsHash();
-        $this->session->set( 'versionHash', $versionHash);
+        $this->session->set('versionHash', $versionHash);
 
-        if ( $roSession !== null && array_key_exists('SubmitMode', $roSession)) {
-            $this->view->submitMode = $roSession[ 'SubmitMode' ];
+        if ($roSession !== null && array_key_exists('SubmitMode', $roSession)) {
+            $this->view->submitMode = $roSession['SubmitMode'];
         } else {
             $this->view->submitMode = 'SaveSettings';
         }
 
         // Добавим версию модуля, если это модуль
-        if ( $this->moduleName === 'PBXExtension' ) {
-            $module = PbxExtensionModules::findFirstByUniqid( $this->controllerName );
-            if ( !$module ) {
+        if ($this->moduleName === 'PBXExtension') {
+            $module = PbxExtensionModules::findFirstByUniqid($this->controllerName);
+            if (!$module) {
                 $module = new PbxExtensionModules();
                 $module->disabled = '1';
                 $module->name = 'Unknown module';
@@ -77,36 +77,36 @@ 
         }
 
         // Разрешим отправку анонимной информации об ошибках
-        if ($this->getSessionData('SendMetrics') === '1'){
+        if ($this->getSessionData('SendMetrics') === '1') {
             touch('/tmp/sendmetrics');
             $this->view->lastSentryEventId = Sentry\State\Hub::getCurrent()->getLastEventId();
         } else {
-            if (file_exists('/tmp/sendmetrics')){
+            if (file_exists('/tmp/sendmetrics')) {
                 unlink('/tmp/sendmetrics');
             }
             $this->view->lastSentryEventId = Null;
         }
-        switch ( $this->actionName ) {
+        switch ($this->actionName) {
             case'index':
             case'delete':
             case'save':
             case'modify':
             case'*** WITHOUT ACTION ***':
-                $this->tag->setTitle( $this->config->application->kind . ' | '
-                    . $this->translation->_( 'Breadcrumb'
-                        . $this->controllerName ) );
+                $this->tag->setTitle($this->config->application->kind.' | '
+                    . $this->translation->_('Breadcrumb'
+                        . $this->controllerName));
                 break;
             default:
-                $this->tag->setTitle( $this->config->application->kind . ' | '
-                    . $this->translation->_( 'Breadcrumb'
+                $this->tag->setTitle($this->config->application->kind.' | '
+                    . $this->translation->_('Breadcrumb'
                         . $this->controllerName
-                        . $this->actionName ) );
+                        . $this->actionName));
         }
 
         $this->view->t = $this->translation;
         $this->view->debugMode = $this->config->application->debugMode;
-        $this->view->urlToLogo = $this->url->get( 'public/img/logo-mikopbx.svg' );
-        if ($this->language === 'ru'){
+        $this->view->urlToLogo = $this->url->get('public/img/logo-mikopbx.svg');
+        if ($this->language === 'ru') {
             $this->view->urlToWiki
                 = "https://wiki.mikopbx.com/{$this->controllerNameUnCamelized}";
         } else {
@@ -114,25 +114,25 @@ 
                 = "https://wiki.mikopbx.com/{$this->language}:{$this->controllerNameUnCamelized}";
         }
 
-        $this->view->urlToController = $this->url->get( $this->controllerNameUnCamelized );
+        $this->view->urlToController = $this->url->get($this->controllerNameUnCamelized);
         $this->view->represent       = '';
         $this->view->cacheName       = "{$this->controllerName}{$this->actionName}{$this->language}{$versionHash}";
 
         // Подключим нужный View
-        if ( $this->moduleName  === 'PBXExtension' ) {
-            $this->view->setTemplateAfter( 'modules' );
+        if ($this->moduleName === 'PBXExtension') {
+            $this->view->setTemplateAfter('modules');
         } else {
-            $this->view->setTemplateAfter( 'main' );
+            $this->view->setTemplateAfter('main');
         }
 
         // Для модулей кинем в кеш все статические картинки
-        if ( $this->moduleName  === 'PBXExtension' ) {
+        if ($this->moduleName === 'PBXExtension') {
             $modulesDir = $this->getDI()->getModulesDir();
-            $moduleImageDir = $modulesDir . $this->controllerName.'/public/img';
+            $moduleImageDir = $modulesDir.$this->controllerName.'/public/img';
             $moduleImageCacheDir = $this->config->application->imgCacheDir.$this->controllerName;
             if (file_exists($moduleImageDir)
-                && !file_exists($moduleImageCacheDir)){
-                symlink ( $moduleImageDir, $moduleImageCacheDir );
+                && !file_exists($moduleImageCacheDir)) {
+                symlink($moduleImageDir, $moduleImageCacheDir);
             }
         }
     }
@@ -144,34 +144,34 @@ 
      *
      * @return \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface
      */
-    public function afterExecuteRoute( Dispatcher $dispatcher ) {
-        if ( $this->request->isAjax() === TRUE ) {
-            $this->view->disableLevel( [
+    public function afterExecuteRoute(Dispatcher $dispatcher) {
+        if ($this->request->isAjax() === TRUE) {
+            $this->view->disableLevel([
                 View::LEVEL_ACTION_VIEW     => TRUE,
                 View::LEVEL_LAYOUT          => TRUE,
                 View::LEVEL_MAIN_LAYOUT     => TRUE,
                 View::LEVEL_AFTER_TEMPLATE  => TRUE,
                 View::LEVEL_BEFORE_TEMPLATE => TRUE,
-            ] );
-            $this->response->setContentType( 'application/json', 'UTF-8' );
+            ]);
+            $this->response->setContentType('application/json', 'UTF-8');
             $data = $this->view->getParamsToView();
 
             /* Set global params if is not set in controller/action */
-            if (is_array($data) && isset($data['raw_response'])){
+            if (is_array($data) && isset($data['raw_response'])) {
                 $result = $data['raw_response'];
-            } elseif ( is_array( $data ) ) {
-                $data['success'] = array_key_exists( 'success', $data ) ? $data['success'] : TRUE;
-                $data['reload']  = array_key_exists( 'reload', $data ) ? $data['reload'] : FALSE;
+            } elseif (is_array($data)) {
+                $data['success'] = array_key_exists('success', $data) ? $data['success'] : TRUE;
+                $data['reload']  = array_key_exists('reload', $data) ? $data['reload'] : FALSE;
                 $data['message'] = $data['message'] ?? $this->flash->getMessages();
 
                 // Добавим информацию о последней ошибке для отображения диалогового окна для пользователя
                 if (file_exists('/tmp/sendmetrics')) {
                     $data['lastSentryEventId'] = Sentry\State\Hub::getCurrent()->getLastEventId();
                 }
-                $result            = json_encode( $data );
+                $result = json_encode($data);
             }
 
-            $this->response->setContent( $result );
+            $this->response->setContent($result);
         }
         return $this->response->send();
     }
@@ -180,9 +180,9 @@ 
      * Перехват события перед обработкой в контроллере
      */
     public function beforeExecuteRoute() :void{
-        if ($this->request->isPost()){
+        if ($this->request->isPost()) {
             $data = $this->request->getPost('submitMode');
-            if (!empty($data)){
+            if (!empty($data)) {
                 $this->session->set('SubmitMode', $data);
             }
         }
@@ -193,9 +193,9 @@ 
      *
      * @param string $uri
      */
-    protected function forward( $uri ) {
-        $uriParts = explode( '/', $uri );
-        $params   = array_slice( $uriParts, 2 );
+    protected function forward($uri) {
+        $uriParts = explode('/', $uri);
+        $params   = array_slice($uriParts, 2);
 
         return $this->dispatcher->forward(
             [
@@ -214,7 +214,7 @@ 
      *
      * @return string
      */
-    protected function transliterate( $string ) :string{
+    protected function transliterate($string) :string{
 
         $converter = [
             'а' => 'a',
@@ -286,7 +286,7 @@ 
             'Я' => 'Ya',
         ];
 
-        return strtr( $string, $converter );
+        return strtr($string, $converter);
 
     }
 
@@ -295,10 +295,10 @@ 
      *
      */
     private function getVersionsHash() :string{
-        $result = Models\PbxSettings::getValueByKey( 'PBXVersion' );
+        $result = Models\PbxSettings::getValueByKey('PBXVersion');
         $modulesVersions = Models\PbxExtensionModules::find(['columns'=>'id,version']);
         foreach ($modulesVersions as $module) {
-            $result.="{$module->version}{$module->version}";
+            $result .= "{$module->version}{$module->version}";
         }
         return md5($result);
     }
@@ -311,12 +311,12 @@ 
      * @return string
      */
     protected function getSessionData($key) :string{
-        $roSession  = $this->sessionRO;
-        if ( $roSession !== null && array_key_exists($key, $roSession) && !empty($roSession[ $key ])) {
-            $value = $roSession[ $key ];
+        $roSession = $this->sessionRO;
+        if ($roSession !== null && array_key_exists($key, $roSession) && !empty($roSession[$key])) {
+            $value = $roSession[$key];
         } else {
-            $value = Models\PbxSettings::getValueByKey( $key ) ;
-            $this->session->set( $key, $value);
+            $value = Models\PbxSettings::getValueByKey($key);
+            $this->session->set($key, $value);
         }
         return $value;
     }

Braces +8 added lines, -4 removed lines

@@ -13,7 +13,8 @@ 
 use Phalcon\Mvc\View;
 use Phalcon\Text;
 
-class BaseController extends Controller {
+class BaseController extends Controller
+{
 
     protected $di;
     protected $actionName;
@@ -24,7 +25,8 @@ 
     /**
      * Инициализация базововго класса
      */
-    public function initialize(){
+    public function initialize()
+    {
         $this->di                    = $this->getDi();
         $this->actionName            = $this->dispatcher->getActionName();
         $this->controllerName        = Text::camelize($this->dispatcher->getControllerName(),'_');
@@ -144,7 +146,8 @@ 
      *
      * @return \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface
      */
-    public function afterExecuteRoute( Dispatcher $dispatcher ) {
+    public function afterExecuteRoute( Dispatcher $dispatcher )
+    {
         if ( $this->request->isAjax() === TRUE ) {
             $this->view->disableLevel( [
                 View::LEVEL_ACTION_VIEW     => TRUE,
@@ -193,7 +196,8 @@ 
      *
      * @param string $uri
      */
-    protected function forward( $uri ) {
+    protected function forward( $uri )
+    {
         $uriParts = explode( '/', $uri );
         $params   = array_slice( $uriParts, 2 );
 

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

@@ -32,7 +32,7 @@ 
 
         $this->moduleName            = $this->dispatcher->getModuleName();
 
-        if ( $this->request->isAjax() === FALSE ) {
+        if ( $this->request->isAjax() === false ) {
             $this->prepareView( );
         }
     }
@@ -84,7 +84,7 @@ 
             if (file_exists('/tmp/sendmetrics')){
                 unlink('/tmp/sendmetrics');
             }
-            $this->view->lastSentryEventId = Null;
+            $this->view->lastSentryEventId = null;
         }
         switch ( $this->actionName ) {
             case'index':
@@ -145,13 +145,13 @@ 
      * @return \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface
      */
     public function afterExecuteRoute( Dispatcher $dispatcher ) {
-        if ( $this->request->isAjax() === TRUE ) {
+        if ( $this->request->isAjax() === true ) {
             $this->view->disableLevel( [
-                View::LEVEL_ACTION_VIEW     => TRUE,
-                View::LEVEL_LAYOUT          => TRUE,
-                View::LEVEL_MAIN_LAYOUT     => TRUE,
-                View::LEVEL_AFTER_TEMPLATE  => TRUE,
-                View::LEVEL_BEFORE_TEMPLATE => TRUE,
+                View::LEVEL_ACTION_VIEW     => true,
+                View::LEVEL_LAYOUT          => true,
+                View::LEVEL_MAIN_LAYOUT     => true,
+                View::LEVEL_AFTER_TEMPLATE  => true,
+                View::LEVEL_BEFORE_TEMPLATE => true,
             ] );
             $this->response->setContentType( 'application/json', 'UTF-8' );
             $data = $this->view->getParamsToView();
@@ -160,8 +160,8 @@ 
             if (is_array($data) && isset($data['raw_response'])){
                 $result = $data['raw_response'];
             } elseif ( is_array( $data ) ) {
-                $data['success'] = array_key_exists( 'success', $data ) ? $data['success'] : TRUE;
-                $data['reload']  = array_key_exists( 'reload', $data ) ? $data['reload'] : FALSE;
+                $data['success'] = array_key_exists( 'success', $data ) ? $data['success'] : true;
+                $data['reload']  = array_key_exists( 'reload', $data ) ? $data['reload'] : false;
                 $data['message'] = $data['message'] ?? $this->flash->getMessages();
 
                 // Добавим информацию о последней ошибке для отображения диалогового окна для пользователя

www/admin-cabinet/app/controllers/OutboundRoutesController.php

Indentation +125 added lines, -125 removed lines

@@ -14,9 +14,9 @@ 
 class OutboundRoutesController extends BaseController {
 
 
-	/**
-	 * Построениие списка исходящих маршрутов
-	 */
+    /**
+     * Построениие списка исходящих маршрутов
+     */
     public function indexAction()
     {
 
@@ -25,112 +25,112 @@ 
         foreach ($rules as $rule){
             $provider       = $rule->Providers;
             if ($provider){
-	        	$modelType      = ucfirst( $provider->type );
-	        	$provByType     = $provider->$modelType;
-            	$routingTable[] =[
-	            	'id'               =>  $rule->id,
-	            	'priority'         =>  $rule->priority,
-	            	'provider'         =>  $provider->getRepresent(),
-	            	'numberbeginswith' =>  $rule->numberbeginswith,
-	            	'restnumbers'      =>  $rule->restnumbers,
-	            	'trimfrombegin'    =>  $rule->trimfrombegin,
-	            	'prepend'          =>  $rule->prepend,
-	            	'note'             =>  $rule->note,
-	            	'rulename'         =>  $rule->getRepresent(),
-	            	'disabled'         =>  $provByType->disabled,
-            	];
-			} else {
-				$routingTable[] =[
-					'id'               =>  $rule->id,
-					'priority'         =>  $rule->priority,
-					'provider'         =>  null,
-					'numberbeginswith' =>  $rule->numberbeginswith,
-					'restnumbers'      =>  $rule->restnumbers,
-					'trimfrombegin'    =>  $rule->trimfrombegin,
-					'prepend'          =>  $rule->prepend,
-					'note'             =>  $rule->note,
-					'rulename'         =>  '<i class="icon attention"></i> '.$rule->getRepresent(),
-					'disabled'         =>  false,
-				];
-			}
+                $modelType      = ucfirst( $provider->type );
+                $provByType     = $provider->$modelType;
+                $routingTable[] =[
+                    'id'               =>  $rule->id,
+                    'priority'         =>  $rule->priority,
+                    'provider'         =>  $provider->getRepresent(),
+                    'numberbeginswith' =>  $rule->numberbeginswith,
+                    'restnumbers'      =>  $rule->restnumbers,
+                    'trimfrombegin'    =>  $rule->trimfrombegin,
+                    'prepend'          =>  $rule->prepend,
+                    'note'             =>  $rule->note,
+                    'rulename'         =>  $rule->getRepresent(),
+                    'disabled'         =>  $provByType->disabled,
+                ];
+            } else {
+                $routingTable[] =[
+                    'id'               =>  $rule->id,
+                    'priority'         =>  $rule->priority,
+                    'provider'         =>  null,
+                    'numberbeginswith' =>  $rule->numberbeginswith,
+                    'restnumbers'      =>  $rule->restnumbers,
+                    'trimfrombegin'    =>  $rule->trimfrombegin,
+                    'prepend'          =>  $rule->prepend,
+                    'note'             =>  $rule->note,
+                    'rulename'         =>  '<i class="icon attention"></i> '.$rule->getRepresent(),
+                    'disabled'         =>  false,
+                ];
+            }
         }
 
         $this->view->routingTable = $routingTable;
     }
 
-	/**
-	 * Карточка редактирования исходящего маршрута
-	 * @param null $id
-	 */
-	public function modifyAction($id=null){
+    /**
+     * Карточка редактирования исходящего маршрута
+     * @param null $id
+     */
+    public function modifyAction($id=null){
 
-		$rule = OutgoingRoutingTable::findFirstByid($id);
-		if (!$rule) $rule = new OutgoingRoutingTable();
+        $rule = OutgoingRoutingTable::findFirstByid($id);
+        if (!$rule) $rule = new OutgoingRoutingTable();
 
-		$providers = Providers::find();
-		$providersList = array();
-		foreach ($providers as $provider){
-			$providersList[ $provider->uniqid ] = $provider->getRepresent();
-		}
+        $providers = Providers::find();
+        $providersList = array();
+        foreach ($providers as $provider){
+            $providersList[ $provider->uniqid ] = $provider->getRepresent();
+        }
 
-		uasort($providersList, ["OutboundRoutesController", "sortArrayByNameAndState"]);
+        uasort($providersList, ["OutboundRoutesController", "sortArrayByNameAndState"]);
 
-		if ($rule->restnumbers == -1){
-			$rule->restnumbers = '';
-		}
-		$this->view->form = new OutgoingRouteEditForm($rule, $providersList);
-		$this->view->represent  = $rule->getRepresent();
+        if ($rule->restnumbers == -1){
+            $rule->restnumbers = '';
+        }
+        $this->view->form = new OutgoingRouteEditForm($rule, $providersList);
+        $this->view->represent  = $rule->getRepresent();
 
-	}
+    }
 
-	/**
-	 * Сохранение карточки исходящего маршрута
-	 */
+    /**
+     * Сохранение карточки исходящего маршрута
+     */
     public function saveAction()
     {
-	    $this->db->begin();
-
-	    $data = $this->request->getPost();
-
-	    $rule = OutgoingRoutingTable::findFirstByid($data['id']);
-	    if (!$rule)  $rule = new OutgoingRoutingTable();
-
-	    foreach ($rule as $name => $value) {
-		    switch($name) {
-				case 'restnumbers':{
-					if (!array_key_exists($name, $data)) continue;
-					$rule->$name = $data[$name]==''?-1:$data[$name];
-					break;
-				}
-			    default:
-				    if (!array_key_exists($name, $data)) continue;
-				    $rule->$name = $data[$name];
-		    }
-	    }
-
-	    if ($rule->save() === false) {
-		    $errors = $rule->getMessages();
-		    $this->flash->warning(implode('<br>', $errors));
-		    $this->view->success = false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
-	    $this->view->success=true;
-	    $this->db->commit();
-
-	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
-		    $this->view->reload = "outbound-routes/modify/{$rule->id}";
-	    }
+        $this->db->begin();
+
+        $data = $this->request->getPost();
+
+        $rule = OutgoingRoutingTable::findFirstByid($data['id']);
+        if (!$rule)  $rule = new OutgoingRoutingTable();
+
+        foreach ($rule as $name => $value) {
+            switch($name) {
+                case 'restnumbers':{
+                    if (!array_key_exists($name, $data)) continue;
+                    $rule->$name = $data[$name]==''?-1:$data[$name];
+                    break;
+                }
+                default:
+                    if (!array_key_exists($name, $data)) continue;
+                    $rule->$name = $data[$name];
+            }
+        }
+
+        if ($rule->save() === false) {
+            $errors = $rule->getMessages();
+            $this->flash->warning(implode('<br>', $errors));
+            $this->view->success = false;
+            $this->db->rollback();
+            return;
+        }
+
+        $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
+        $this->view->success=true;
+        $this->db->commit();
+
+        // Если это было создание карточки то надо перегрузить страницу с указанием ID
+        if (empty($data['id'])){
+            $this->view->reload = "outbound-routes/modify/{$rule->id}";
+        }
     }
 
 
-	/**
-	 * Удаление исходящего маршрута из базы данных
-	 * @param null $id
-	 */
+    /**
+     * Удаление исходящего маршрута из базы данных
+     * @param null $id
+     */
     public function deleteAction($id=null){
         $rule = OutgoingRoutingTable::findFirstByid($id);
         if ($rule) $rule->delete();
@@ -138,36 +138,36 @@ 
 
     }
 
-	/**
-	 * Изменение приоритета правила
-	 * @param null $ruleid
-	 */
-	public function changePriorityAction($ruleid=null){
-		$this->view->disable();
-		$result = false;
-
-		if (!$this->request->isPost()) {
-			return;
-		}
-		$data = $this->request->getPost();
-		$rule = OutgoingRoutingTable::findFirstById($ruleid);
-		if ($rule){
-			$rule->priority=intval($data['newPriority']);
-			$result=$rule->update();
-		}
-		echo json_encode($result);
-	}
-
-	private function sortArrayByNameAndState ($a, $b)
-	{
-		$sDisabled = $this->translation->_('mo_Disabled');
-			if ($a == $b) {
-				return 0;
-			} elseif (strpos ( $a , $sDisabled)!==false && strpos ( $b , $sDisabled)===false) {
-				return 1;
-			} else {
-				return ($a < $b) ? -1 : 1;
-			}
-
-	}
+    /**
+     * Изменение приоритета правила
+     * @param null $ruleid
+     */
+    public function changePriorityAction($ruleid=null){
+        $this->view->disable();
+        $result = false;
+
+        if (!$this->request->isPost()) {
+            return;
+        }
+        $data = $this->request->getPost();
+        $rule = OutgoingRoutingTable::findFirstById($ruleid);
+        if ($rule){
+            $rule->priority=intval($data['newPriority']);
+            $result=$rule->update();
+        }
+        echo json_encode($result);
+    }
+
+    private function sortArrayByNameAndState ($a, $b)
+    {
+        $sDisabled = $this->translation->_('mo_Disabled');
+            if ($a == $b) {
+                return 0;
+            } elseif (strpos ( $a , $sDisabled)!==false && strpos ( $b , $sDisabled)===false) {
+                return 1;
+            } else {
+                return ($a < $b) ? -1 : 1;
+            }
+
+    }
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -22,12 +22,12 @@ 
 
         $rules = OutgoingRoutingTable::find(array('order'=>'priority'));
         $routingTable = array();
-        foreach ($rules as $rule){
-            $provider       = $rule->Providers;
-            if ($provider){
-	        	$modelType      = ucfirst( $provider->type );
+        foreach ($rules as $rule) {
+            $provider = $rule->Providers;
+            if ($provider) {
+	        	$modelType      = ucfirst($provider->type);
 	        	$provByType     = $provider->$modelType;
-            	$routingTable[] =[
+            	$routingTable[] = [
 	            	'id'               =>  $rule->id,
 	            	'priority'         =>  $rule->priority,
 	            	'provider'         =>  $provider->getRepresent(),
@@ -40,7 +40,7 @@ 
 	            	'disabled'         =>  $provByType->disabled,
             	];
 			} else {
-				$routingTable[] =[
+				$routingTable[] = [
 					'id'               =>  $rule->id,
 					'priority'         =>  $rule->priority,
 					'provider'         =>  null,
@@ -62,24 +62,24 @@ 
 	 * Карточка редактирования исходящего маршрута
 	 * @param null $id
 	 */
-	public function modifyAction($id=null){
+	public function modifyAction($id = null) {
 
 		$rule = OutgoingRoutingTable::findFirstByid($id);
 		if (!$rule) $rule = new OutgoingRoutingTable();
 
 		$providers = Providers::find();
 		$providersList = array();
-		foreach ($providers as $provider){
-			$providersList[ $provider->uniqid ] = $provider->getRepresent();
+		foreach ($providers as $provider) {
+			$providersList[$provider->uniqid] = $provider->getRepresent();
 		}
 
 		uasort($providersList, ["OutboundRoutesController", "sortArrayByNameAndState"]);
 
-		if ($rule->restnumbers == -1){
+		if ($rule->restnumbers == -1) {
 			$rule->restnumbers = '';
 		}
 		$this->view->form = new OutgoingRouteEditForm($rule, $providersList);
-		$this->view->represent  = $rule->getRepresent();
+		$this->view->represent = $rule->getRepresent();
 
 	}
 
@@ -96,10 +96,10 @@ 
 	    if (!$rule)  $rule = new OutgoingRoutingTable();
 
 	    foreach ($rule as $name => $value) {
-		    switch($name) {
+		    switch ($name) {
 				case 'restnumbers':{
 					if (!array_key_exists($name, $data)) continue;
-					$rule->$name = $data[$name]==''?-1:$data[$name];
+					$rule->$name = $data[$name] == '' ?-1 : $data[$name];
 					break;
 				}
 			    default:
@@ -117,11 +117,11 @@ 
 	    }
 
 	    $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
-	    $this->view->success=true;
+	    $this->view->success = true;
 	    $this->db->commit();
 
 	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
+	    if (empty($data['id'])) {
 		    $this->view->reload = "outbound-routes/modify/{$rule->id}";
 	    }
     }
@@ -131,7 +131,7 @@ 
 	 * Удаление исходящего маршрута из базы данных
 	 * @param null $id
 	 */
-    public function deleteAction($id=null){
+    public function deleteAction($id = null) {
         $rule = OutgoingRoutingTable::findFirstByid($id);
         if ($rule) $rule->delete();
         return $this->forward('outbound-routes/index');
@@ -142,7 +142,7 @@ 
 	 * Изменение приоритета правила
 	 * @param null $ruleid
 	 */
-	public function changePriorityAction($ruleid=null){
+	public function changePriorityAction($ruleid = null) {
 		$this->view->disable();
 		$result = false;
 
@@ -151,19 +151,19 @@ 
 		}
 		$data = $this->request->getPost();
 		$rule = OutgoingRoutingTable::findFirstById($ruleid);
-		if ($rule){
-			$rule->priority=intval($data['newPriority']);
-			$result=$rule->update();
+		if ($rule) {
+			$rule->priority = intval($data['newPriority']);
+			$result = $rule->update();
 		}
 		echo json_encode($result);
 	}
 
-	private function sortArrayByNameAndState ($a, $b)
+	private function sortArrayByNameAndState($a, $b)
 	{
 		$sDisabled = $this->translation->_('mo_Disabled');
 			if ($a == $b) {
 				return 0;
-			} elseif (strpos ( $a , $sDisabled)!==false && strpos ( $b , $sDisabled)===false) {
+			} elseif (strpos($a, $sDisabled) !== false && strpos($b, $sDisabled) === false) {
 				return 1;
 			} else {
 				return ($a < $b) ? -1 : 1;

Braces +23 added lines, -9 removed lines

@@ -11,7 +11,8 @@ 
     Models\Providers;
 
 
-class OutboundRoutesController extends BaseController {
+class OutboundRoutesController extends BaseController
+{
 
 
 	/**
@@ -62,10 +63,13 @@ 
 	 * Карточка редактирования исходящего маршрута
 	 * @param null $id
 	 */
-	public function modifyAction($id=null){
+	public function modifyAction($id=null)
+	{
 
 		$rule = OutgoingRoutingTable::findFirstByid($id);
-		if (!$rule) $rule = new OutgoingRoutingTable();
+		if (!$rule) {
+		    $rule = new OutgoingRoutingTable();
+		}
 
 		$providers = Providers::find();
 		$providersList = array();
@@ -93,17 +97,23 @@ 
 	    $data = $this->request->getPost();
 
 	    $rule = OutgoingRoutingTable::findFirstByid($data['id']);
-	    if (!$rule)  $rule = new OutgoingRoutingTable();
+	    if (!$rule) {
+	        $rule = new OutgoingRoutingTable();
+	    }
 
 	    foreach ($rule as $name => $value) {
 		    switch($name) {
 				case 'restnumbers':{
-					if (!array_key_exists($name, $data)) continue;
+					if (!array_key_exists($name, $data)) {
+					    continue;
+					}
 					$rule->$name = $data[$name]==''?-1:$data[$name];
 					break;
 				}
 			    default:
-				    if (!array_key_exists($name, $data)) continue;
+				    if (!array_key_exists($name, $data)) {
+				        continue;
+				    }
 				    $rule->$name = $data[$name];
 		    }
 	    }
@@ -131,9 +141,12 @@ 
 	 * Удаление исходящего маршрута из базы данных
 	 * @param null $id
 	 */
-    public function deleteAction($id=null){
+    public function deleteAction($id=null)
+    {
         $rule = OutgoingRoutingTable::findFirstByid($id);
-        if ($rule) $rule->delete();
+        if ($rule) {
+            $rule->delete();
+        }
         return $this->forward('outbound-routes/index');
 
     }
@@ -142,7 +155,8 @@ 
 	 * Изменение приоритета правила
 	 * @param null $ruleid
 	 */
-	public function changePriorityAction($ruleid=null){
+	public function changePriorityAction($ruleid=null)
+	{
 		$this->view->disable();
 		$result = false;
 

www/admin-cabinet/app/controllers/MailSettingsController.php

Indentation +31 added lines, -31 removed lines

@@ -11,10 +11,10 @@ 
 
 class MailSettingsController extends BaseController {
 
-	/**
-	 * Построение формы настроек почты
-	 */
-	public function modifyAction()
+    /**
+     * Построение формы настроек почты
+     */
+    public function modifyAction()
     {
         $arrKeys = MailSettingsController::getEmailSettingsArray();
         foreach ($arrKeys as $key) {
@@ -22,14 +22,14 @@ 
         }
 
         $this->view->form = new MailSettingsEditForm(null,$MailSettingsFields);
-		$this->view->submitMode = NULL;
+        $this->view->submitMode = NULL;
     }
 
 
-	/**
-	 * Сохранение почтовых настроек
-	 */
-	public function saveAction()
+    /**
+     * Сохранение почтовых настроек
+     */
+    public function saveAction()
     {
         if (!$this->request->isPost()) return;
         $data = $this->request->getPost();
@@ -69,27 +69,27 @@ 
     }
 
     /**
-	 * Возвращает список ключей для настройки почты на станции
-	 * @return array
-	 */
-	private function getEmailSettingsArray(){
-		return array(
-			'MailSMTPHost',
-			'MailSMTPPort',
-			'MailSMTPUsername',
-			'MailSMTPPassword',
-			'MailEnableNotifications',
-			'MailSMTPFromUsername',
-			'MailSMTPSenderAddress',
-			'MailSMTPUseTLS',
-			'MailSMTPCertCheck',
-			'MailTplMissedCallSubject',
-			'MailTplMissedCallBody',
-			'MailTplMissedCallFooter',
-			'MailTplVoicemailSubject',
-			'MailTplVoicemailBody',
-			'SystemNotificationsEmail',
+     * Возвращает список ключей для настройки почты на станции
+     * @return array
+     */
+    private function getEmailSettingsArray(){
+        return array(
+            'MailSMTPHost',
+            'MailSMTPPort',
+            'MailSMTPUsername',
+            'MailSMTPPassword',
+            'MailEnableNotifications',
+            'MailSMTPFromUsername',
+            'MailSMTPSenderAddress',
+            'MailSMTPUseTLS',
+            'MailSMTPCertCheck',
+            'MailTplMissedCallSubject',
+            'MailTplMissedCallBody',
+            'MailTplMissedCallFooter',
+            'MailTplVoicemailSubject',
+            'MailTplVoicemailBody',
+            'SystemNotificationsEmail',
             'VoicemailNotificationsEmail'
-		);
-	}
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
             $MailSettingsFields[$key] = PbxSettings::getValueByKey($key);
         }
 
-        $this->view->form = new MailSettingsEditForm(null,$MailSettingsFields);
+        $this->view->form = new MailSettingsEditForm(null, $MailSettingsFields);
 		$this->view->submitMode = NULL;
     }
 
@@ -72,7 +72,7 @@ 
 	 * Возвращает список ключей для настройки почты на станции
 	 * @return array
 	 */
-	private function getEmailSettingsArray(){
+	private function getEmailSettingsArray() {
 		return array(
 			'MailSMTPHost',
 			'MailSMTPPort',

Braces +12 added lines, -6 removed lines

@@ -9,13 +9,14 @@ 
 
 use Models\PbxSettings;
 
-class MailSettingsController extends BaseController {
+class MailSettingsController extends BaseController
+{
 
 	/**
 	 * Построение формы настроек почты
 	 */
 	public function modifyAction()
-    {
+	{
         $arrKeys = MailSettingsController::getEmailSettingsArray();
         foreach ($arrKeys as $key) {
             $MailSettingsFields[$key] = PbxSettings::getValueByKey($key);
@@ -30,8 +31,10 @@ 
 	 * Сохранение почтовых настроек
 	 */
 	public function saveAction()
-    {
-        if (!$this->request->isPost()) return;
+	{
+        if (!$this->request->isPost()) {
+            return;
+        }
         $data = $this->request->getPost();
 
         $this->db->begin();
@@ -51,7 +54,9 @@ 
                     $record->value = ($data[$key] == 'on') ? "1" : "0";
                     break;
                 default:
-                    if (!array_key_exists($key, $data)) continue;
+                    if (!array_key_exists($key, $data)) {
+                        continue;
+                    }
                     $record->value = $data[$key];
             }
             if ($record->save() === false) {
@@ -72,7 +77,8 @@ 
 	 * Возвращает список ключей для настройки почты на станции
 	 * @return array
 	 */
-	private function getEmailSettingsArray(){
+	private function getEmailSettingsArray()
+	{
 		return array(
 			'MailSMTPHost',
 			'MailSMTPPort',

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

@@ -22,7 +22,7 @@
         }
 
         $this->view->form = new MailSettingsEditForm(null,$MailSettingsFields);
-		$this->view->submitMode = NULL;
+		$this->view->submitMode = null;
     }