mikopbx / Core

www/admin-cabinet/app/plugins/NotFoundPlugin.php

Indentation +8 added lines, -8 removed lines

@@ -14,14 +14,14 @@
 class NotFoundPlugin extends Plugin
 {
 
-	/**
-	 * This action is executed before execute any action in the application
-	 *
-	 * @param Event $event
-	 * @param Dispatcher $dispatcher
-	 */
-	public function beforeException(Event $event, MvcDispatcher $dispatcher, Exception $exception)
-	{
+    /**
+     * This action is executed before execute any action in the application
+     *
+     * @param Event $event
+     * @param Dispatcher $dispatcher
+     */
+    public function beforeException(Event $event, MvcDispatcher $dispatcher, Exception $exception)
+    {
     if ($exception instanceof DispatcherException) {
         switch ($exception->getCode()) {
             case Dispatcher::EXCEPTION_HANDLER_NOT_FOUND:

www/admin-cabinet/app/plugins/SecurityPlugin.php

Indentation +29 added lines, -29 removed lines

@@ -27,36 +27,36 @@
      */
     public function beforeDispatch(Event $event, Dispatcher $dispatcher)
     {
-		if($_SERVER['REMOTE_ADDR'] == '127.0.0.1'){
-			return true;
-		}
+        if($_SERVER['REMOTE_ADDR'] == '127.0.0.1'){
+            return true;
+        }
 
-	    $controller = strtoupper( $dispatcher->getControllerName() );
-		if ($this->request->isAjax()){
-			if ( $controller !== 'SESSION'){
-				if (!is_array($this->sessionRO) || !key_exists('auth', $this->sessionRO )){
-					$this->response->setStatusCode( 403, "Forbidden" )
-					               ->sendHeaders();
-					$this->response->setContent( 'The user isn\'t authenticated' );
-					$this->response->send();
-					return FALSE;
-				}
-			}
-		} else { // не AJAX запрос
-			$auth = $this->session->get( 'auth' );
-			if ( ! $auth && $controller !== 'SESSION' ) {
-				$dispatcher->forward( [
-					'controller' => 'session',
-					'action'     => 'index',
-				] );
-			} elseif ($controller == 'INDEX'){
-				// TODO: когда будет главная страница сделаем переадресацию на нее
-				$dispatcher->forward( [
-					'controller' => 'extensions',
-					'action'     => 'index',
-				] );
-			}
-		}
+        $controller = strtoupper( $dispatcher->getControllerName() );
+        if ($this->request->isAjax()){
+            if ( $controller !== 'SESSION'){
+                if (!is_array($this->sessionRO) || !key_exists('auth', $this->sessionRO )){
+                    $this->response->setStatusCode( 403, "Forbidden" )
+                                    ->sendHeaders();
+                    $this->response->setContent( 'The user isn\'t authenticated' );
+                    $this->response->send();
+                    return FALSE;
+                }
+            }
+        } else { // не AJAX запрос
+            $auth = $this->session->get( 'auth' );
+            if ( ! $auth && $controller !== 'SESSION' ) {
+                $dispatcher->forward( [
+                    'controller' => 'session',
+                    'action'     => 'index',
+                ] );
+            } elseif ($controller == 'INDEX'){
+                // TODO: когда будет главная страница сделаем переадресацию на нее
+                $dispatcher->forward( [
+                    'controller' => 'extensions',
+                    'action'     => 'index',
+                ] );
+            }
+        }
     }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -27,34 +27,34 @@
      */
     public function beforeDispatch(Event $event, Dispatcher $dispatcher)
     {
-		if($_SERVER['REMOTE_ADDR'] == '127.0.0.1'){
+		if ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') {
 			return true;
 		}
 
-	    $controller = strtoupper( $dispatcher->getControllerName() );
-		if ($this->request->isAjax()){
-			if ( $controller !== 'SESSION'){
-				if (!is_array($this->sessionRO) || !key_exists('auth', $this->sessionRO )){
-					$this->response->setStatusCode( 403, "Forbidden" )
+	    $controller = strtoupper($dispatcher->getControllerName());
+		if ($this->request->isAjax()) {
+			if ($controller !== 'SESSION') {
+				if (!is_array($this->sessionRO) || !key_exists('auth', $this->sessionRO)) {
+					$this->response->setStatusCode(403, "Forbidden")
 					               ->sendHeaders();
-					$this->response->setContent( 'The user isn\'t authenticated' );
+					$this->response->setContent('The user isn\'t authenticated');
 					$this->response->send();
 					return FALSE;
 				}
 			}
 		} else { // не AJAX запрос
-			$auth = $this->session->get( 'auth' );
-			if ( ! $auth && $controller !== 'SESSION' ) {
-				$dispatcher->forward( [
+			$auth = $this->session->get('auth');
+			if (!$auth && $controller !== 'SESSION') {
+				$dispatcher->forward([
 					'controller' => 'session',
 					'action'     => 'index',
-				] );
-			} elseif ($controller == 'INDEX'){
+				]);
+			} elseif ($controller == 'INDEX') {
 				// TODO: когда будет главная страница сделаем переадресацию на нее
-				$dispatcher->forward( [
+				$dispatcher->forward([
 					'controller' => 'extensions',
 					'action'     => 'index',
-				] );
+				]);
 			}
 		}
     }

www/admin-cabinet/app/plugins/AdditionalAssets.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
         /**
          * Сервис для работы с JS и CSS файлами
          */
-        $di->set('assets', function (){
+        $di->set('assets', function() {
             $config     = $this->get('config');
             $manager    = new Phalcon\Assets\Manager();
             $dispatcher = $this->get('dispatcher');
@@ -549,7 +549,7 @@ 
             // Сохраним перевод в файл если его еще нет
             $language   = $this->get('language');
             $langJSFile = "public/js/cache/localization-{$language}-{$version}.min.js";
-            if ( ! file_exists($langJSFile)) {
+            if (!file_exists($langJSFile)) {
                 $arrStr = [];
                 foreach ($this->get('messages') as $key => $value) {
                     $arrStr[$key] = str_replace("'", "\\'",
@@ -566,8 +566,8 @@ 
 
 
             // Название получаемого файла
-            $resultCombinedName = Text::uncamelize(ucfirst($controller) . ucfirst($action), '-');
-            $resultCombinedName = strlen($resultCombinedName) !== '' ? $resultCombinedName . '-' : '';
+            $resultCombinedName = Text::uncamelize(ucfirst($controller).ucfirst($action), '-');
+            $resultCombinedName = strlen($resultCombinedName) !== '' ? $resultCombinedName.'-' : '';
 
 
             $headerCollectionCSS->join(true);
@@ -582,16 +582,16 @@ 
             $headerCollectionJS->setPrefix('public/');
             $footerCollectionJS->setPrefix('public/');
             foreach ($headerCollectionJS as $resource) {
-                $resource->setPath($resource->getPath() . '?v=' . $version);
+                $resource->setPath($resource->getPath().'?v='.$version);
             }
             foreach ($footerCollectionJS as $resource) {
-                $resource->setPath($resource->getPath() . '?v=' . $version);
+                $resource->setPath($resource->getPath().'?v='.$version);
             }
             foreach ($semanticCollectionJS as $resource) {
-                $resource->setPath($resource->getPath() . '?v=' . $version);
+                $resource->setPath($resource->getPath().'?v='.$version);
             }
             foreach ($semanticCollectionCSS as $resource) {
-                $resource->setPath($resource->getPath() . '?v=' . $version);
+                $resource->setPath($resource->getPath().'?v='.$version);
             }
 
             $headerCollectionJSForExtensions->join(true);

www/admin-cabinet/app/plugins/NormalizeControllerNamePlugin.php

Indentation +8 added lines, -8 removed lines

@@ -20,14 +20,14 @@
 class NormalizeControllerNamePlugin extends Plugin
 {
 
-	/**
-	 * This action is executed before execute any action in the application
-	 *
-	 * @param Event $event
-	 * @param Dispatcher $dispatcher
-	 */
-	public function beforeDispatch(Event $event, Dispatcher $dispatcher) :void
-	{
+    /**
+     * This action is executed before execute any action in the application
+     *
+     * @param Event $event
+     * @param Dispatcher $dispatcher
+     */
+    public function beforeDispatch(Event $event, Dispatcher $dispatcher) :void
+    {
         $controller = $dispatcher->getControllerName();
         if ( strpos( $controller, '-' ) > 0 ) {
             $controller = str_replace('-', '_', $controller);

Spacing +7 added lines, -7 removed lines

@@ -29,15 +29,15 @@ 
 	public function beforeDispatch(Event $event, Dispatcher $dispatcher) :void
 	{
         $controller = $dispatcher->getControllerName();
-        if ( strpos( $controller, '-' ) > 0 ) {
+        if (strpos($controller, '-') > 0) {
             $controller = str_replace('-', '_', $controller);
         }
         $dispatcher->setControllerName(ucfirst($controller));
 
-        if ( stripos( $controller, 'module' ) === 0 ) {
-            $dispatcher->setModuleName( 'PBXExtension' );
+        if (stripos($controller, 'module') === 0) {
+            $dispatcher->setModuleName('PBXExtension');
         } else {
-            $dispatcher->setModuleName( 'PBXCore' );
+            $dispatcher->setModuleName('PBXCore');
         }
     }
 
@@ -51,10 +51,10 @@ 
     {
         $controller = $dispatcher->getControllerName();
 
-        if ( strpos( $controller, '_' ) > 0 ) {
-            $dispatcher->setControllerName(Text::camelize( $controller));
+        if (strpos($controller, '_') > 0) {
+            $dispatcher->setControllerName(Text::camelize($controller));
         } else {
-            $dispatcher->setControllerName(ucfirst( $controller ));
+            $dispatcher->setControllerName(ucfirst($controller));
         }
 
     }

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

Indentation +108 added lines, -108 removed lines

@@ -15,40 +15,40 @@ 
 
 
     /**
-	 * Построение списка конференц комнат
-	 */
+     * Построение списка конференц комнат
+     */
     public function indexAction()
     {
-    	$records = ConferenceRooms::find();
+        $records = ConferenceRooms::find();
         $this->view->records = $records;
     }
 
 
     /**
-	 * Карточка редактирования конференц комнаты
-	 *
-	 * @param string|NULL $uniqid
-	 */
-	public function modifyAction(string $uniqid=null){
-	    $record = ConferenceRooms::findFirstByUniqid($uniqid);
+     * Карточка редактирования конференц комнаты
+     *
+     * @param string|NULL $uniqid
+     */
+    public function modifyAction(string $uniqid=null){
+        $record = ConferenceRooms::findFirstByUniqid($uniqid);
         if (!$record){
             $record            = new ConferenceRooms();
-	        $record->uniqid    = strtoupper('CONFERENCE-'.md5(time()));
-	        $record->extension = Extensions::getNextFreeApplicationNumber();
+            $record->uniqid    = strtoupper('CONFERENCE-'.md5(time()));
+            $record->extension = Extensions::getNextFreeApplicationNumber();
         }
         $this->view->form = new ConferenceRoomEditForm($record);
-	    $this->view->represent  = $record->getRepresent();
+        $this->view->represent  = $record->getRepresent();
 
     }
 
 
-	/**
-	 * Сохранение конференц комнаты
-	 */
-	public function saveAction()
+    /**
+     * Сохранение конференц комнаты
+     */
+    public function saveAction()
     {
         if (!$this->request->isPost()) return;
-	    $this->db->begin();
+        $this->db->begin();
         $data = $this->request->getPost();
         $room = ConferenceRooms::findFirstByUniqid($data['uniqid']);
         if (!$room)  {
@@ -62,105 +62,105 @@ 
             $extension->public_access     = 1;
 
         } else {
-	        $extension = $room->Extensions;
+            $extension = $room->Extensions;
+        }
+
+        // Заполним параметры внутреннего номера
+        if (!$this->updateExtension($extension, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        // Заполним параметры участников очереди
+        if (!$this->updateConferenceRoom($room, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
         }
 
-	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    // Заполним параметры участников очереди
-	    if (!$this->updateConferenceRoom($room, $data)){
-		    $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 = "conference-rooms/modify/{$data['uniqid']}";
-	    }
+        $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
+        $this->view->success=true;
+        $this->db->commit();
+
+        // Если это было создание карточки то надо перегрузить страницу с указанием ID
+        if (empty($data['id'])){
+            $this->view->reload = "conference-rooms/modify/{$data['uniqid']}";
+        }
+    }
+
+
+    /**
+     * Удаление конференцкомнаты
+     * @param string|NULL $uniqid
+     */
+    public function deleteAction(string $uniqid=null){
+        $this->db->begin();
+        $queue = ConferenceRooms::findFirstByUniqid($uniqid);
+
+        $errors = false;
+        if($queue && !$queue->Extensions->delete())
+            $errors = $queue->Extensions->getMessages();
+
+        if ($errors){
+            $this->flash->warning(implode('<br>', $errors));
+            $this->db->rollback();
+        }
+        else
+        {
+            $this->db->commit();
+        }
+        return $this->forward('conference-rooms/index');
     }
 
 
     /**
-	 * Удаление конференцкомнаты
-	 * @param string|NULL $uniqid
-	 */
-	public function deleteAction(string $uniqid=null){
-	    $this->db->begin();
-	    $queue = ConferenceRooms::findFirstByUniqid($uniqid);
-
-	    $errors = false;
-	    if($queue && !$queue->Extensions->delete())
-		    $errors = $queue->Extensions->getMessages();
-
-	    if ($errors){
-		    $this->flash->warning(implode('<br>', $errors));
-		    $this->db->rollback();
-	    }
-	    else
-	    {
-		    $this->db->commit();
-	    }
-	    return $this->forward('conference-rooms/index');
+     * Обновление параметров внутреннего номера
+     * @param \Models\Extensions $extension
+     * @param array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateExtension(Extensions $extension, array $data){
+
+        $extension->number=$data['extension'];
+        $extension->callerid=parent::transliterate($data['name']);
+        if ($extension->save()=== false){
+            $errors = $extension->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return false;
+        }
+
+        return TRUE;
+
     }
 
 
     /**
-	 * Обновление параметров внутреннего номера
-	 * @param \Models\Extensions $extension
-	 * @param array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateExtension(Extensions $extension, array $data){
-
-		$extension->number=$data['extension'];
-		$extension->callerid=parent::transliterate($data['name']);
-		if ($extension->save()=== false){
-			$errors = $extension->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return false;
-		}
-
-		return TRUE;
-
-	}
-
-
-	/**
-	 * Обновление параметров очереди
-	 * @param \Models\ConferenceRooms $room
-	 * @param array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateConferenceRoom(ConferenceRooms $room, array $data){
-		foreach ($room as $name => $value) {
-			switch ($name){
-				case "extension":
-					$room->$name = $data[$name];
-					break;
-				case "name":
-					$room->$name = $data[$name];
-					break;
-				default:
-					if (!array_key_exists( $name, $data)) continue;
-					$room->$name = $data[$name];
-			}
-		}
-		if ($room->save()=== false){
-			$errors = $room->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return false;
-		}
-
-		return TRUE;
-	}
+     * Обновление параметров очереди
+     * @param \Models\ConferenceRooms $room
+     * @param array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateConferenceRoom(ConferenceRooms $room, array $data){
+        foreach ($room as $name => $value) {
+            switch ($name){
+                case "extension":
+                    $room->$name = $data[$name];
+                    break;
+                case "name":
+                    $room->$name = $data[$name];
+                    break;
+                default:
+                    if (!array_key_exists( $name, $data)) continue;
+                    $room->$name = $data[$name];
+            }
+        }
+        if ($room->save()=== false){
+            $errors = $room->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return false;
+        }
+
+        return TRUE;
+    }
 }
\ No newline at end of file

Spacing +22 added lines, -22 removed lines

@@ -29,15 +29,15 @@ 
 	 *
 	 * @param string|NULL $uniqid
 	 */
-	public function modifyAction(string $uniqid=null){
+	public function modifyAction(string $uniqid = null) {
 	    $record = ConferenceRooms::findFirstByUniqid($uniqid);
-        if (!$record){
-            $record            = new ConferenceRooms();
+        if (!$record) {
+            $record = new ConferenceRooms();
 	        $record->uniqid    = strtoupper('CONFERENCE-'.md5(time()));
 	        $record->extension = Extensions::getNextFreeApplicationNumber();
         }
         $this->view->form = new ConferenceRoomEditForm($record);
-	    $this->view->represent  = $record->getRepresent();
+	    $this->view->represent = $record->getRepresent();
 
     }
 
@@ -51,7 +51,7 @@ 
 	    $this->db->begin();
         $data = $this->request->getPost();
         $room = ConferenceRooms::findFirstByUniqid($data['uniqid']);
-        if (!$room)  {
+        if (!$room) {
             $room = new ConferenceRooms();
             $extension = new Extensions();
             $extension->type     = "CONFERENCE";
@@ -66,25 +66,25 @@ 
         }
 
 	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateExtension($extension, $data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
 	    // Заполним параметры участников очереди
-	    if (!$this->updateConferenceRoom($room, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateConferenceRoom($room, $data)) {
+		    $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();
 
 	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
+	    if (empty($data['id'])) {
 		    $this->view->reload = "conference-rooms/modify/{$data['uniqid']}";
 	    }
     }
@@ -94,15 +94,15 @@ 
 	 * Удаление конференцкомнаты
 	 * @param string|NULL $uniqid
 	 */
-	public function deleteAction(string $uniqid=null){
+	public function deleteAction(string $uniqid = null) {
 	    $this->db->begin();
 	    $queue = ConferenceRooms::findFirstByUniqid($uniqid);
 
 	    $errors = false;
-	    if($queue && !$queue->Extensions->delete())
+	    if ($queue && !$queue->Extensions->delete())
 		    $errors = $queue->Extensions->getMessages();
 
-	    if ($errors){
+	    if ($errors) {
 		    $this->flash->warning(implode('<br>', $errors));
 		    $this->db->rollback();
 	    }
@@ -120,11 +120,11 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateExtension(Extensions $extension, array $data){
+	private function updateExtension(Extensions $extension, array $data) {
 
-		$extension->number=$data['extension'];
-		$extension->callerid=parent::transliterate($data['name']);
-		if ($extension->save()=== false){
+		$extension->number = $data['extension'];
+		$extension->callerid = parent::transliterate($data['name']);
+		if ($extension->save() === false) {
 			$errors = $extension->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return false;
@@ -141,9 +141,9 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateConferenceRoom(ConferenceRooms $room, array $data){
+	private function updateConferenceRoom(ConferenceRooms $room, array $data) {
 		foreach ($room as $name => $value) {
-			switch ($name){
+			switch ($name) {
 				case "extension":
 					$room->$name = $data[$name];
 					break;
@@ -151,11 +151,11 @@ 
 					$room->$name = $data[$name];
 					break;
 				default:
-					if (!array_key_exists( $name, $data)) continue;
+					if (!array_key_exists($name, $data)) continue;
 					$room->$name = $data[$name];
 			}
 		}
-		if ($room->save()=== false){
+		if ($room->save() === false) {
 			$errors = $room->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return false;

Braces +10 added lines, -6 removed lines

@@ -47,7 +47,9 @@ 
 	 */
 	public function saveAction()
     {
-        if (!$this->request->isPost()) return;
+        if (!$this->request->isPost()) {
+            return;
+        }
 	    $this->db->begin();
         $data = $this->request->getPost();
         $room = ConferenceRooms::findFirstByUniqid($data['uniqid']);
@@ -99,14 +101,14 @@ 
 	    $queue = ConferenceRooms::findFirstByUniqid($uniqid);
 
 	    $errors = false;
-	    if($queue && !$queue->Extensions->delete())
-		    $errors = $queue->Extensions->getMessages();
+	    if($queue && !$queue->Extensions->delete()) {
+	    		    $errors = $queue->Extensions->getMessages();
+	    }
 
 	    if ($errors){
 		    $this->flash->warning(implode('<br>', $errors));
 		    $this->db->rollback();
-	    }
-	    else
+	    } else
 	    {
 		    $this->db->commit();
 	    }
@@ -151,7 +153,9 @@ 
 					$room->$name = $data[$name];
 					break;
 				default:
-					if (!array_key_exists( $name, $data)) continue;
+					if (!array_key_exists( $name, $data)) {
+					    continue;
+					}
 					$room->$name = $data[$name];
 			}
 		}

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

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
     {
         $licKey = PbxSettings::getValueByKey('PBXLicense');
         if (strlen($licKey) !== 28
-            || ! Text::startsWith($licKey, 'MIKO-')) {
+            || !Text::startsWith($licKey, 'MIKO-')) {
             return $this->forward('licensing/modify/pbx-extension-modules');
         }
         // Очистим кеш хранилища для получения актульной информации о свободном месте
@@ -62,7 +62,7 @@ 
         $unCamelizedControllerName  = Text::uncamelize($uniqid, '-');
         $previousMenuSettings       = PbxSettings::findFirstByKey($menuSettings);
         $this->view->showAtMainMenu = $previousMenuSettings !== false;
-        if ( ! $previousMenuSettings) {
+        if (!$previousMenuSettings) {
             $previousMenuSettings        = new PbxSettings();
             $previousMenuSettings->key   = $menuSettings;
             $value                       = [
@@ -77,7 +77,7 @@ 
         }
         $options                = json_decode($previousMenuSettings->value, true);
         $this->view->form       = new PbxExtensionModuleSettingsForm($previousMenuSettings, $options);
-        $this->view->title      = $this->translation->_('ext_SettingsForModule') . ' ' . $this->translation->_("Breadcrumb$uniqid");
+        $this->view->title      = $this->translation->_('ext_SettingsForModule').' '.$this->translation->_("Breadcrumb$uniqid");
         $this->view->submitMode = null;
         $this->view->indexUrl   = $unCamelizedControllerName;
     }
@@ -89,17 +89,17 @@ 
     public function saveModuleSettingsAction(): void
     {
 
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();
 
         $record = PbxSettings::findFirstByKey($data['key']);
-        if ( ! $record) {
+        if (!$record) {
             $record      = new PbxSettings();
             $record->key = $data['key'];
         }
-        $value         = [
+        $value = [
             'uniqid'        => $data['uniqid'],
             'href'          => $data['href'],
             'group'         => $data['menu-group'],
@@ -163,8 +163,8 @@ 
             $controller = new $controllerClass();
             if ($controller->enableAction() === false) {
                 $messages = $this->flash->getMessages();
-                if ($messages){
-                    foreach ($messages as $index=>$message){
+                if ($messages) {
+                    foreach ($messages as $index=>$message) {
                         $this->flash->$index($message[0]);
                     }
                 } else {
@@ -179,8 +179,8 @@ 
         // Проверим нет ли битых ссылок, которые мешают включить модуль
         // например удалили сотрудника, а модуль указывает на его extension
         //
-        $moduleModelsDir = $this->config->application->modulesDir . $uniqid . '/Models';
-        $results         = glob($moduleModelsDir . '/*.php', GLOB_NOSORT);
+        $moduleModelsDir = $this->config->application->modulesDir.$uniqid.'/Models';
+        $results         = glob($moduleModelsDir.'/*.php', GLOB_NOSORT);
         foreach ($results as $file) {
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$uniqid}\\Models\\{$className}";
@@ -213,18 +213,18 @@ 
                 }
             }
         }
-        if (!$error){
+        if (!$error) {
             $this->flash->clear();
         }
         $this->db->rollback('temporary'); // Откатываем временную транзакцию
 
         // Если ошибок нет, включаем Firewall и модуль
-        if ( ! $error && ! $this->enableFirewallSettings($uniqid)) {
+        if (!$error && !$this->enableFirewallSettings($uniqid)) {
             $this->flash->error('Error on enable firewall settings');
 
             return;
         }
-        if ( ! $error) {
+        if (!$error) {
             $module = PbxExtensionModules::findFirstByUniqid($uniqid);
             if ($module) {
                 $module->disabled = '0';
@@ -252,7 +252,7 @@ 
         $this->view->success = false;
 
         $controllerClass = "{$uniqid}Controller";
-        if ( ! class_exists($controllerClass)) {
+        if (!class_exists($controllerClass)) {
             $this->flash->error("Class {$controllerClass} doesn't exist");
 
             return;
@@ -268,8 +268,8 @@ 
             $controller = new $controllerClass();
             if ($controller->disableAction() === false) {
                 $messages = $this->flash->getMessages();
-                if ($messages){
-                    foreach ($messages as $index=>$message){
+                if ($messages) {
+                    foreach ($messages as $index=>$message) {
                         $this->flash->$index($message[0]);
                     }
                 } else {
@@ -285,8 +285,8 @@ 
         // Попытаемся удалить текущий модуль, если ошибок не будет, значит можно выклчать
         // Например на модуль может ссылаться запись в таблице Extensions, которую надо удалить при отключении
         // модуля
-        $moduleModelsDir = $this->config->application->modulesDir . $uniqid . '/Models';
-        $results         = glob($moduleModelsDir . '/*.php', GLOB_NOSORT);
+        $moduleModelsDir = $this->config->application->modulesDir.$uniqid.'/Models';
+        $results         = glob($moduleModelsDir.'/*.php', GLOB_NOSORT);
         foreach ($results as $file) {
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$uniqid}\\Models\\{$className}";
@@ -314,12 +314,12 @@ 
                             $parameters['bind']       = [];
                             foreach ($mappedFields as $index => $mappedField) {
                                 $parameters['conditions']             .= $index > 0 ? ' OR ' : '';
-                                $parameters['conditions']             .= $mappedField . '= :field' . $index . ':';
+                                $parameters['conditions']             .= $mappedField.'= :field'.$index.':';
                                 $bindField                            = $referencedFields[$index];
-                                $parameters['bind']['field' . $index] = $record->$bindField;
+                                $parameters['bind']['field'.$index] = $record->$bindField;
                             }
                             $relatedRecords = $relatedModel::find($parameters);
-                            if ( ! $error && ! $relatedRecords->delete()) {
+                            if (!$error && !$relatedRecords->delete()) {
                                 $error = true;
                                 $this->flash->error($relatedRecords->getMessages());
                             }
@@ -328,19 +328,19 @@ 
                 }
             }
         }
-        if (!$error){
+        if (!$error) {
             $this->flash->clear();
         }
         $this->db->rollback('temporary'); // Откатываем временную транзакцию
 
         // Если ошибок нет, выключаем Firewall и модуль
-        if ( ! $error && ! $this->disableFirewallSettings($uniqid)) {
+        if (!$error && !$this->disableFirewallSettings($uniqid)) {
             $this->flash->error('Error on disable firewall settings');
 
             return;
         }
 
-        if ( ! $error) {
+        if (!$error) {
             $module = PbxExtensionModules::findFirstByUniqid($uniqid);
             if ($module) {
                 $module->disabled = '1';
@@ -368,7 +368,7 @@ 
     protected function enableFirewallSettings($uniqid): bool
     {
         $class = "\\Modules\\{$uniqid}\\setup\\FirewallRules";
-        if ( ! class_exists($class)) {
+        if (!class_exists($class)) {
             return true;
         }
         $this->db->begin();
@@ -402,7 +402,7 @@ 
                 if (array_key_exists($network->id, $previousRules)) {
                     $newRule->action = $previousRules[$network->id];
                 }
-                if ( ! $newRule->save()) {
+                if (!$newRule->save()) {
                     $errors[] = $newRule->getMessages();
                 }
             }
@@ -430,7 +430,7 @@ 
     protected function disableFirewallSettings($uniqid): bool
     {
         $class = "\\Modules\\{$uniqid}\\setup\\FirewallRules";
-        if ( ! class_exists($class)) {
+        if (!class_exists($class)) {
             return true;
         }
         $errors       = [];
@@ -442,7 +442,7 @@ 
             $savedState[$detailRule->networkfilterid] = $detailRule->action;
         }
         $this->db->begin();
-        if ( ! $currentRules->delete()) {
+        if (!$currentRules->delete()) {
             $errors[] = $currentRules->getMessages();
         }
 
@@ -452,7 +452,7 @@ 
             $previousRuleSettings->key = "{$uniqid}FirewallSettings";
         }
         $previousRuleSettings->value = json_encode($savedState);
-        if ( ! $previousRuleSettings->save()) {
+        if (!$previousRuleSettings->save()) {
             $errors[] = $previousRuleSettings->getMessages();
         }
         if (count($errors) > 0) {

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

Indentation +135 added lines, -135 removed lines

@@ -8,143 +8,143 @@
  */
 
 use Models\AsteriskManagerUsers,
-	Models\NetworkFilters;
+    Models\NetworkFilters;
 use Phalcon\Mvc\Model\Resultset;
 
 class AsteriskManagersController extends BaseController {
 
-	private $arrCheckBoxes;
-
-	/**
-	 * Инициализация базового класса
-	 */
-	public function initialize() :void{
-		$this->arrCheckBoxes = [
-			'call',
-			'cdr',
-			'originate',
-			'reporting',
-			'agent',
-			'config',
-			'dialplan',
-			'dtmf',
-			'log',
-			'system',
-			'user',
-			'verbose',
-		];
-		parent::initialize();
-	}
-
-	/**
-	 * Построение списка пользователей Asterisk Managers
-	 */
-	public function indexAction() {
-		$amiUsers = AsteriskManagerUsers::find();
-		$amiUsers->setHydrateMode(
-			Resultset::HYDRATE_ARRAYS
-		);
-
-		$arrNetworkFilters = [];
-		$networkFilters    = NetworkFilters::find();
-		foreach ( $networkFilters as $filter ) {
-			$arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
-		}
-		$this->view->networkFilters = $arrNetworkFilters;
-		$this->view->amiUsers       = $amiUsers;
-	}
-
-
-	/**
-	 * Форма настроек пользователя Asterisk Managers
-	 *
-	 * @param string $id идентификатор редактируемого пользователя
-	 */
-	public function modifyAction( $id = NULL ) {
-
-		$manager = AsteriskManagerUsers::findFirstById( $id );
-		if ( ! $manager ) {
-			$manager = new AsteriskManagerUsers();
-		}
-
-		$arrNetworkFilters = [];
-		$networkFilters    = NetworkFilters::getAllowedFiltersForType( [
-			'AJAM',
-			'AMI',
-		] );
-		$arrNetworkFilters['none']
-		                   = $this->translation->_( 'ex_NoNetworkFilter' );
-		foreach ( $networkFilters as $filter ) {
-			$arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
-		}
-
-
-		$this->view->form = new AsteriskManagerEditForm( $manager,
-			[
-				'network_filters'     => $arrNetworkFilters,
-				'array_of_checkboxes' => $this->arrCheckBoxes,
-			] );
-
-		$this->view->arrCheckBoxes = $this->arrCheckBoxes;
-		$this->view->represent     = $manager->getRepresent();
-	}
-
-
-	/**
-	 * Сохраенение настроек Asterisk Manager
-	 */
-	public function saveAction() {
-		if ( ! $this->request->isPost()) return;
-
-		$data    = $this->request->getPost();
-		$manager = false;
-		if (isset($data['id'])){
-			$manager = AsteriskManagerUsers::findFirst( $data['id'] );
-		}
-		if (!$manager) {
-			$manager = new AsteriskManagerUsers();
-		}
-
-		foreach ( $manager as $name => $value ) {
-			if ( in_array( $name, $this->arrCheckBoxes ) ) {
-				$manager->$name = '';
-				$manager->$name .= ( $data[ $name . '_read' ] === 'on' ) ? 'read' : '';
-				$manager->$name .= ( $data[ $name . '_write' ] === 'on' ) ? 'write' : '';
-				continue;
-			}
-
-			if ( ! array_key_exists( $name, $data ) ) {
-				continue;
-			}
-			$manager->$name = $data[ $name ];
-
-		}
-		$errors = FALSE;
-		if ( ! $manager->save() ) {
-			$errors = $manager->getMessages();
-		}
-
-		if ( $errors ) {
-			$this->flash->warning( implode( '<br>', $errors ) );
-			$this->view->success = false;
-		} else {
-			$this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
-			$this->view->success = TRUE;
-			$this->view->reload = "asterisk-managers/modify/{$manager->id}";
-		}
-	}
-
-	/**
-	 * Удаление Asterisk Manager
-	 */
-	public function deleteAction( $amiId = NULL ) {
-
-		$manager = AsteriskManagerUsers::findFirstByid( $amiId );
-		if ( $manager ) {
-			$manager->delete();
-		}
-
-		return $this->forward( 'asterisk-managers/index' );
-
-	}
+    private $arrCheckBoxes;
+
+    /**
+     * Инициализация базового класса
+     */
+    public function initialize() :void{
+        $this->arrCheckBoxes = [
+            'call',
+            'cdr',
+            'originate',
+            'reporting',
+            'agent',
+            'config',
+            'dialplan',
+            'dtmf',
+            'log',
+            'system',
+            'user',
+            'verbose',
+        ];
+        parent::initialize();
+    }
+
+    /**
+     * Построение списка пользователей Asterisk Managers
+     */
+    public function indexAction() {
+        $amiUsers = AsteriskManagerUsers::find();
+        $amiUsers->setHydrateMode(
+            Resultset::HYDRATE_ARRAYS
+        );
+
+        $arrNetworkFilters = [];
+        $networkFilters    = NetworkFilters::find();
+        foreach ( $networkFilters as $filter ) {
+            $arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
+        }
+        $this->view->networkFilters = $arrNetworkFilters;
+        $this->view->amiUsers       = $amiUsers;
+    }
+
+
+    /**
+     * Форма настроек пользователя Asterisk Managers
+     *
+     * @param string $id идентификатор редактируемого пользователя
+     */
+    public function modifyAction( $id = NULL ) {
+
+        $manager = AsteriskManagerUsers::findFirstById( $id );
+        if ( ! $manager ) {
+            $manager = new AsteriskManagerUsers();
+        }
+
+        $arrNetworkFilters = [];
+        $networkFilters    = NetworkFilters::getAllowedFiltersForType( [
+            'AJAM',
+            'AMI',
+        ] );
+        $arrNetworkFilters['none']
+                            = $this->translation->_( 'ex_NoNetworkFilter' );
+        foreach ( $networkFilters as $filter ) {
+            $arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
+        }
+
+
+        $this->view->form = new AsteriskManagerEditForm( $manager,
+            [
+                'network_filters'     => $arrNetworkFilters,
+                'array_of_checkboxes' => $this->arrCheckBoxes,
+            ] );
+
+        $this->view->arrCheckBoxes = $this->arrCheckBoxes;
+        $this->view->represent     = $manager->getRepresent();
+    }
+
+
+    /**
+     * Сохраенение настроек Asterisk Manager
+     */
+    public function saveAction() {
+        if ( ! $this->request->isPost()) return;
+
+        $data    = $this->request->getPost();
+        $manager = false;
+        if (isset($data['id'])){
+            $manager = AsteriskManagerUsers::findFirst( $data['id'] );
+        }
+        if (!$manager) {
+            $manager = new AsteriskManagerUsers();
+        }
+
+        foreach ( $manager as $name => $value ) {
+            if ( in_array( $name, $this->arrCheckBoxes ) ) {
+                $manager->$name = '';
+                $manager->$name .= ( $data[ $name . '_read' ] === 'on' ) ? 'read' : '';
+                $manager->$name .= ( $data[ $name . '_write' ] === 'on' ) ? 'write' : '';
+                continue;
+            }
+
+            if ( ! array_key_exists( $name, $data ) ) {
+                continue;
+            }
+            $manager->$name = $data[ $name ];
+
+        }
+        $errors = FALSE;
+        if ( ! $manager->save() ) {
+            $errors = $manager->getMessages();
+        }
+
+        if ( $errors ) {
+            $this->flash->warning( implode( '<br>', $errors ) );
+            $this->view->success = false;
+        } else {
+            $this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
+            $this->view->success = TRUE;
+            $this->view->reload = "asterisk-managers/modify/{$manager->id}";
+        }
+    }
+
+    /**
+     * Удаление Asterisk Manager
+     */
+    public function deleteAction( $amiId = NULL ) {
+
+        $manager = AsteriskManagerUsers::findFirstByid( $amiId );
+        if ( $manager ) {
+            $manager->delete();
+        }
+
+        return $this->forward( 'asterisk-managers/index' );
+
+    }
 }
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -47,8 +47,8 @@ 
 
 		$arrNetworkFilters = [];
 		$networkFilters    = NetworkFilters::find();
-		foreach ( $networkFilters as $filter ) {
-			$arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
+		foreach ($networkFilters as $filter) {
+			$arrNetworkFilters[$filter->id] = $filter->getRepresent();
 		}
 		$this->view->networkFilters = $arrNetworkFilters;
 		$this->view->amiUsers       = $amiUsers;
@@ -60,30 +60,30 @@ 
 	 *
 	 * @param string $id идентификатор редактируемого пользователя
 	 */
-	public function modifyAction( $id = NULL ) {
+	public function modifyAction($id = NULL) {
 
-		$manager = AsteriskManagerUsers::findFirstById( $id );
-		if ( ! $manager ) {
+		$manager = AsteriskManagerUsers::findFirstById($id);
+		if (!$manager) {
 			$manager = new AsteriskManagerUsers();
 		}
 
 		$arrNetworkFilters = [];
-		$networkFilters    = NetworkFilters::getAllowedFiltersForType( [
+		$networkFilters    = NetworkFilters::getAllowedFiltersForType([
 			'AJAM',
 			'AMI',
-		] );
+		]);
 		$arrNetworkFilters['none']
-		                   = $this->translation->_( 'ex_NoNetworkFilter' );
-		foreach ( $networkFilters as $filter ) {
-			$arrNetworkFilters[ $filter->id ] = $filter->getRepresent();
+		                   = $this->translation->_('ex_NoNetworkFilter');
+		foreach ($networkFilters as $filter) {
+			$arrNetworkFilters[$filter->id] = $filter->getRepresent();
 		}
 
 
-		$this->view->form = new AsteriskManagerEditForm( $manager,
+		$this->view->form = new AsteriskManagerEditForm($manager,
 			[
 				'network_filters'     => $arrNetworkFilters,
 				'array_of_checkboxes' => $this->arrCheckBoxes,
-			] );
+			]);
 
 		$this->view->arrCheckBoxes = $this->arrCheckBoxes;
 		$this->view->represent     = $manager->getRepresent();
@@ -94,41 +94,41 @@ 
 	 * Сохраенение настроек Asterisk Manager
 	 */
 	public function saveAction() {
-		if ( ! $this->request->isPost()) return;
+		if (!$this->request->isPost()) return;
 
 		$data    = $this->request->getPost();
 		$manager = false;
-		if (isset($data['id'])){
-			$manager = AsteriskManagerUsers::findFirst( $data['id'] );
+		if (isset($data['id'])) {
+			$manager = AsteriskManagerUsers::findFirst($data['id']);
 		}
 		if (!$manager) {
 			$manager = new AsteriskManagerUsers();
 		}
 
-		foreach ( $manager as $name => $value ) {
-			if ( in_array( $name, $this->arrCheckBoxes ) ) {
+		foreach ($manager as $name => $value) {
+			if (in_array($name, $this->arrCheckBoxes)) {
 				$manager->$name = '';
-				$manager->$name .= ( $data[ $name . '_read' ] === 'on' ) ? 'read' : '';
-				$manager->$name .= ( $data[ $name . '_write' ] === 'on' ) ? 'write' : '';
+				$manager->$name .= ($data[$name.'_read'] === 'on') ? 'read' : '';
+				$manager->$name .= ($data[$name.'_write'] === 'on') ? 'write' : '';
 				continue;
 			}
 
-			if ( ! array_key_exists( $name, $data ) ) {
+			if (!array_key_exists($name, $data)) {
 				continue;
 			}
-			$manager->$name = $data[ $name ];
+			$manager->$name = $data[$name];
 
 		}
 		$errors = FALSE;
-		if ( ! $manager->save() ) {
+		if (!$manager->save()) {
 			$errors = $manager->getMessages();
 		}
 
-		if ( $errors ) {
-			$this->flash->warning( implode( '<br>', $errors ) );
+		if ($errors) {
+			$this->flash->warning(implode('<br>', $errors));
 			$this->view->success = false;
 		} else {
-			$this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
+			$this->flash->success($this->translation->_('ms_SuccessfulSaved'));
 			$this->view->success = TRUE;
 			$this->view->reload = "asterisk-managers/modify/{$manager->id}";
 		}
@@ -137,14 +137,14 @@ 
 	/**
 	 * Удаление Asterisk Manager
 	 */
-	public function deleteAction( $amiId = NULL ) {
+	public function deleteAction($amiId = NULL) {
 
-		$manager = AsteriskManagerUsers::findFirstByid( $amiId );
-		if ( $manager ) {
+		$manager = AsteriskManagerUsers::findFirstByid($amiId);
+		if ($manager) {
 			$manager->delete();
 		}
 
-		return $this->forward( 'asterisk-managers/index' );
+		return $this->forward('asterisk-managers/index');
 
 	}
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -94,7 +94,9 @@
 	 * Сохраенение настроек Asterisk Manager
 	 */
 	public function saveAction() {
-		if ( ! $this->request->isPost()) return;
+		if ( ! $this->request->isPost()) {
+		    return;
+		}
 
 		$data    = $this->request->getPost();
 		$manager = false;

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

Indentation +173 added lines, -173 removed lines

@@ -17,8 +17,8 @@ 
 
 
     /**
-	 * Построение списка IVR меню
-	 */
+     * Построение списка IVR меню
+     */
     public function indexAction()
     {
         $this->view->ivrmenu =  IvrMenu::find();
@@ -26,24 +26,24 @@ 
 
 
     /**
-	 * Карточка редактирования IVR меню
-	 *
-	 * @param null $ivrmenuid идентификатор меню
-	 */
-	public function modifyAction($ivrmenuid=null){
+     * Карточка редактирования IVR меню
+     *
+     * @param null $ivrmenuid идентификатор меню
+     */
+    public function modifyAction($ivrmenuid=null){
 
         $ivrmenu                = IvrMenu::findFirstByUniqid($ivrmenuid);
         $ivrActionsList         =[];
-		$soundfilesList[""]     = $this->translation->_( "sf_SelectAudioFile" );
-		$extensionList[""]      = $this->translation->_( "ex_SelectNumber" );
+        $soundfilesList[""]     = $this->translation->_( "sf_SelectAudioFile" );
+        $extensionList[""]      = $this->translation->_( "ex_SelectNumber" );
         $extensionListForFilter =[];
         if (!$ivrmenu) {
             $ivrmenu                   = new IvrMenu();
             $ivrmenu->uniqid           =   strtoupper('IVR-'.md5($ivrmenu->id.time()));
-	        $ivrmenu->number_of_repeat = 3;
-	        $ivrmenu->extension
-	                                   = Extensions::getNextFreeApplicationNumber();
-	        $ivrmenu->timeout		   = 7;
+            $ivrmenu->number_of_repeat = 3;
+            $ivrmenu->extension
+                                        = Extensions::getNextFreeApplicationNumber();
+            $ivrmenu->timeout		   = 7;
 
         } else {
             $extensionListForFilter[]= $ivrmenu->timeout_extension;
@@ -58,11 +58,11 @@ 
             $actions=IvrMenuActions::find($parameters);
             foreach ($actions as $action){
                 $ivrActionsList[]=[
-	                'id'                 =>$action->id,
-	                'extension'          =>$action->extension,
-	                'extensionRepresent' => str_replace( '"', '\\"',
-		                $action->Extensions->getRepresent() ),
-	                'digits'             =>$action->digits
+                    'id'                 =>$action->id,
+                    'extension'          =>$action->extension,
+                    'extensionRepresent' => str_replace( '"', '\\"',
+                        $action->Extensions->getRepresent() ),
+                    'digits'             =>$action->digits
                 ];
                 $extensionListForFilter[]= $action->extension;
             }
@@ -83,9 +83,9 @@ 
         }
 
         // Список звуковых файлов для IVR
-		$soundFiles = SoundFiles::find();
+        $soundFiles = SoundFiles::find();
         foreach ($soundFiles as $soundFile){
-	        $soundfilesList[ $soundFile->id ] = $soundFile->getRepresent();
+            $soundfilesList[ $soundFile->id ] = $soundFile->getRepresent();
         }
 
         $form = new IvrMenuEditForm($ivrmenu, [
@@ -94,14 +94,14 @@ 
         ]);
         $this->view->form = $form;
         $this->view->ivractions=$ivrActionsList;
-	    $this->view->represent  = $ivrmenu->getRepresent();
+        $this->view->represent  = $ivrmenu->getRepresent();
 
     }
 
 
     /**
-	 * Сохранение ivr меню
-	 */
+     * Сохранение ivr меню
+     */
     public function saveAction()
     {
         if (!$this->request->isPost()) return;
@@ -122,43 +122,43 @@ 
             $extension->public_access     = 1;
 
         } else {
-	        $extension = $ivrMenuRecord->Extensions;
+            $extension = $ivrMenuRecord->Extensions;
         }
 
-	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    // Заполним параметры IVR меню
-	    if (!$this->updateIVRMenu($ivrMenuRecord, $data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    // Заполним параметры участников IVR Меню
-	    if (!$this->updateIVRMenuActions($data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    $this->view->success=true;
-	    $this->db->commit();
-
-	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
-		    $this->view->reload = "ivr-menu/modify/{$data['uniqid']}";
-	    }
+        // Заполним параметры внутреннего номера
+        if (!$this->updateExtension($extension, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        // Заполним параметры IVR меню
+        if (!$this->updateIVRMenu($ivrMenuRecord, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        // Заполним параметры участников IVR Меню
+        if (!$this->updateIVRMenuActions($data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        $this->view->success=true;
+        $this->db->commit();
+
+        // Если это было создание карточки то надо перегрузить страницу с указанием ID
+        if (empty($data['id'])){
+            $this->view->reload = "ivr-menu/modify/{$data['uniqid']}";
+        }
     }
 
-	/**
-	 * Удаление ivr меню
-	 * @param null $uniqid
-	 */
+    /**
+     * Удаление ivr меню
+     * @param null $uniqid
+     */
     public function deleteAction($uniqid=null){
         $this->db->begin();
         $ivrmenu = IvrMenu::findFirstByUniqid($uniqid);
@@ -181,123 +181,123 @@ 
     }
 
 
-	/**
-	 * Обновление параметров внутреннего номера
-	 * @param \Models\Extensions $extension
-	 * @param array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateExtension(Extensions $extension, array $data){
-
-		$extension->number=$data['extension'];
-		$extension->callerid=parent::transliterate($data['name']);
-		if ($extension->save()=== false){
-			$errors = $extension->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return false;
-		}
-
-		return TRUE;
-
-	}
-
-
-	/**
-	 * Обновление параметров IVR меню
-	 *
-	 * @param \Models\IvrMenu $ivrMenu
-	 * @param array           $data массив полей из POST запроса
-	 *
-	 * @return bool update result
-	 */
-	private function updateIVRMenu(IvrMenu $ivrMenu, array $data ) {
-
-		// Заполним параметры записи Ivr Menu
-		foreach ($ivrMenu as $name => $value) {
-			switch ($name) {
-				case "extension":
-					$ivrMenu->$name = $data[$name];
-					break;
-				case "name":
-					$ivrMenu->$name = $data[$name];
-					break;
-				case "allow_enter_any_internal_extension":
-					if (array_key_exists($name, $data) && $data[$name]=="on")
-						$ivrMenu->$name = "1";
-					else
-						$ivrMenu->$name = "0";
-					break;
-				default:
-					if (!array_key_exists($name, $data)) continue;
-					$ivrMenu->$name = $data[$name];
-			}
-		}
-		if ( $ivrMenu->save()=== false){
-			$errors = $ivrMenu->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return false;
-		}
-
-		return TRUE;
-
-	}
-
-
-	/**
-	 * Обновление действий в IVR меню
-	 * @param array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateIVRMenuActions(array $data){
-
-		$existDigits = [];
-
-		// Заполним параметры IvrMenuActions
-		$arrActions=json_decode($data['actions']);
-		foreach ($arrActions as $value) {
-
-			$parameters=[
-				'conditions'=>'ivr_menu_id = :uniqid: AND digits=:digits:',
-				'bind' =>[
-					'digits'=>$value->digits,
-					'uniqid'=> $data['uniqid']
-				]
-			];
-			$newRule = IvrMenuActions::findFirst($parameters);
-			if ($newRule==false){
-				$newRule = new IvrMenuActions();
-				$newRule->digits = $value->digits;
-				$newRule->ivr_menu_id = $data['uniqid'];
-			}
-			$newRule->extension = $value->extension;
-			if ($newRule->save() === false) {
-				$errors = $newRule->getMessages();
-				$this->flash->warning(implode('<br>', $errors));
-				$this->view->success = false;
-				return FALSE;
-			}
-			$existDigits[] = $value->digits;
-		}
-
-		// Удалим лишние элементы меню
-		$parameters = [
-			'conditions'=>'digits NOT IN ({numbers:array}) AND ivr_menu_id=:uniqid:',
-			'bind' =>[
-				'numbers'=>$existDigits,
-				'uniqid'=> $data['uniqid']
-			]
-		];
-
-		$deletedActions = IvrMenuActions::find($parameters);
-		if ($deletedActions && $deletedActions->delete()=== FALSE){
-			$errors = $deletedActions->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return FALSE;
-		}
-
-		return TRUE;
-
-	}
+    /**
+     * Обновление параметров внутреннего номера
+     * @param \Models\Extensions $extension
+     * @param array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateExtension(Extensions $extension, array $data){
+
+        $extension->number=$data['extension'];
+        $extension->callerid=parent::transliterate($data['name']);
+        if ($extension->save()=== false){
+            $errors = $extension->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return false;
+        }
+
+        return TRUE;
+
+    }
+
+
+    /**
+     * Обновление параметров IVR меню
+     *
+     * @param \Models\IvrMenu $ivrMenu
+     * @param array           $data массив полей из POST запроса
+     *
+     * @return bool update result
+     */
+    private function updateIVRMenu(IvrMenu $ivrMenu, array $data ) {
+
+        // Заполним параметры записи Ivr Menu
+        foreach ($ivrMenu as $name => $value) {
+            switch ($name) {
+                case "extension":
+                    $ivrMenu->$name = $data[$name];
+                    break;
+                case "name":
+                    $ivrMenu->$name = $data[$name];
+                    break;
+                case "allow_enter_any_internal_extension":
+                    if (array_key_exists($name, $data) && $data[$name]=="on")
+                        $ivrMenu->$name = "1";
+                    else
+                        $ivrMenu->$name = "0";
+                    break;
+                default:
+                    if (!array_key_exists($name, $data)) continue;
+                    $ivrMenu->$name = $data[$name];
+            }
+        }
+        if ( $ivrMenu->save()=== false){
+            $errors = $ivrMenu->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return false;
+        }
+
+        return TRUE;
+
+    }
+
+
+    /**
+     * Обновление действий в IVR меню
+     * @param array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateIVRMenuActions(array $data){
+
+        $existDigits = [];
+
+        // Заполним параметры IvrMenuActions
+        $arrActions=json_decode($data['actions']);
+        foreach ($arrActions as $value) {
+
+            $parameters=[
+                'conditions'=>'ivr_menu_id = :uniqid: AND digits=:digits:',
+                'bind' =>[
+                    'digits'=>$value->digits,
+                    'uniqid'=> $data['uniqid']
+                ]
+            ];
+            $newRule = IvrMenuActions::findFirst($parameters);
+            if ($newRule==false){
+                $newRule = new IvrMenuActions();
+                $newRule->digits = $value->digits;
+                $newRule->ivr_menu_id = $data['uniqid'];
+            }
+            $newRule->extension = $value->extension;
+            if ($newRule->save() === false) {
+                $errors = $newRule->getMessages();
+                $this->flash->warning(implode('<br>', $errors));
+                $this->view->success = false;
+                return FALSE;
+            }
+            $existDigits[] = $value->digits;
+        }
+
+        // Удалим лишние элементы меню
+        $parameters = [
+            'conditions'=>'digits NOT IN ({numbers:array}) AND ivr_menu_id=:uniqid:',
+            'bind' =>[
+                'numbers'=>$existDigits,
+                'uniqid'=> $data['uniqid']
+            ]
+        ];
+
+        $deletedActions = IvrMenuActions::find($parameters);
+        if ($deletedActions && $deletedActions->delete()=== FALSE){
+            $errors = $deletedActions->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return FALSE;
+        }
+
+        return TRUE;
+
+    }
 
 
 }
\ No newline at end of file

Spacing +50 added lines, -50 removed lines

@@ -21,7 +21,7 @@ 
 	 */
     public function indexAction()
     {
-        $this->view->ivrmenu =  IvrMenu::find();
+        $this->view->ivrmenu = IvrMenu::find();
     }
 
 
@@ -30,62 +30,62 @@ 
 	 *
 	 * @param null $ivrmenuid идентификатор меню
 	 */
-	public function modifyAction($ivrmenuid=null){
+	public function modifyAction($ivrmenuid = null) {
 
         $ivrmenu                = IvrMenu::findFirstByUniqid($ivrmenuid);
-        $ivrActionsList         =[];
-		$soundfilesList[""]     = $this->translation->_( "sf_SelectAudioFile" );
-		$extensionList[""]      = $this->translation->_( "ex_SelectNumber" );
-        $extensionListForFilter =[];
+        $ivrActionsList         = [];
+		$soundfilesList[""]     = $this->translation->_("sf_SelectAudioFile");
+		$extensionList[""]      = $this->translation->_("ex_SelectNumber");
+        $extensionListForFilter = [];
         if (!$ivrmenu) {
             $ivrmenu                   = new IvrMenu();
-            $ivrmenu->uniqid           =   strtoupper('IVR-'.md5($ivrmenu->id.time()));
+            $ivrmenu->uniqid           = strtoupper('IVR-'.md5($ivrmenu->id.time()));
 	        $ivrmenu->number_of_repeat = 3;
 	        $ivrmenu->extension
 	                                   = Extensions::getNextFreeApplicationNumber();
-	        $ivrmenu->timeout		   = 7;
+	        $ivrmenu->timeout = 7;
 
         } else {
-            $extensionListForFilter[]= $ivrmenu->timeout_extension;
+            $extensionListForFilter[] = $ivrmenu->timeout_extension;
             // Списк экстеншенов очереди
-            $parameters =[
+            $parameters = [
                 'order'=>'digits',
                 'conditions'=>'ivr_menu_id=:menu:',
                 'bind'=>[
                     'menu'=>$ivrmenu->uniqid
                 ]
             ];
-            $actions=IvrMenuActions::find($parameters);
-            foreach ($actions as $action){
-                $ivrActionsList[]=[
+            $actions = IvrMenuActions::find($parameters);
+            foreach ($actions as $action) {
+                $ivrActionsList[] = [
 	                'id'                 =>$action->id,
 	                'extension'          =>$action->extension,
-	                'extensionRepresent' => str_replace( '"', '\\"',
-		                $action->Extensions->getRepresent() ),
+	                'extensionRepresent' => str_replace('"', '\\"',
+		                $action->Extensions->getRepresent()),
 	                'digits'             =>$action->digits
                 ];
-                $extensionListForFilter[]= $action->extension;
+                $extensionListForFilter[] = $action->extension;
             }
         }
 
         // Список всех эктеншенов выбранных ранее для правил адресации
-        if (count($extensionListForFilter)>0){
-        $parameters =[
+        if (count($extensionListForFilter) > 0) {
+        $parameters = [
             'conditions'=>'number IN ({ids:array})',
             'bind'=>[
                 'ids'=>$extensionListForFilter
             ]
         ];
         $extensions = Extensions::find($parameters);
-        foreach ($extensions as $record){
-            $extensionList[$record->number]=$record->getRepresent();
+        foreach ($extensions as $record) {
+            $extensionList[$record->number] = $record->getRepresent();
         }
         }
 
         // Список звуковых файлов для IVR
 		$soundFiles = SoundFiles::find();
-        foreach ($soundFiles as $soundFile){
-	        $soundfilesList[ $soundFile->id ] = $soundFile->getRepresent();
+        foreach ($soundFiles as $soundFile) {
+	        $soundfilesList[$soundFile->id] = $soundFile->getRepresent();
         }
 
         $form = new IvrMenuEditForm($ivrmenu, [
@@ -93,8 +93,8 @@ 
             'soundfiles'=>$soundfilesList
         ]);
         $this->view->form = $form;
-        $this->view->ivractions=$ivrActionsList;
-	    $this->view->represent  = $ivrmenu->getRepresent();
+        $this->view->ivractions = $ivrActionsList;
+	    $this->view->represent = $ivrmenu->getRepresent();
 
     }
 
@@ -110,7 +110,7 @@ 
 
         $data = $this->request->getPost();
         $ivrMenuRecord = IvrMenu::findFirstByUniqid($data['uniqid']);
-        if ($ivrMenuRecord==false) {
+        if ($ivrMenuRecord == false) {
             $ivrMenuRecord = new IvrMenu();
 
             $extension = new Extensions();
@@ -118,39 +118,39 @@ 
             $extension->number   = $data["extension"];
             $extension->callerid = parent::transliterate($data["name"]);
             $extension->userid   = null;
-            $extension->show_in_phonebook  = 1;
-            $extension->public_access     = 1;
+            $extension->show_in_phonebook = 1;
+            $extension->public_access = 1;
 
         } else {
 	        $extension = $ivrMenuRecord->Extensions;
         }
 
 	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateExtension($extension, $data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
 	    // Заполним параметры IVR меню
-	    if (!$this->updateIVRMenu($ivrMenuRecord, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateIVRMenu($ivrMenuRecord, $data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
 	    // Заполним параметры участников IVR Меню
-	    if (!$this->updateIVRMenuActions($data)){
-		    $this->view->success=false;
+	    if (!$this->updateIVRMenuActions($data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
-	    $this->view->success=true;
+	    $this->view->success = true;
 	    $this->db->commit();
 
 	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
+	    if (empty($data['id'])) {
 		    $this->view->reload = "ivr-menu/modify/{$data['uniqid']}";
 	    }
     }
@@ -159,15 +159,15 @@ 
 	 * Удаление ivr меню
 	 * @param null $uniqid
 	 */
-    public function deleteAction($uniqid=null){
+    public function deleteAction($uniqid = null) {
         $this->db->begin();
         $ivrmenu = IvrMenu::findFirstByUniqid($uniqid);
 
         $errors = false;
-        if($ivrmenu && !$ivrmenu->Extensions->delete())
+        if ($ivrmenu && !$ivrmenu->Extensions->delete())
             $errors = $ivrmenu->Extensions->getMessages();
 
-        if ($errors){
+        if ($errors) {
             $this->flash->warning(implode('<br>', $errors));
             $this->db->rollback();
         }
@@ -187,11 +187,11 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateExtension(Extensions $extension, array $data){
+	private function updateExtension(Extensions $extension, array $data) {
 
-		$extension->number=$data['extension'];
-		$extension->callerid=parent::transliterate($data['name']);
-		if ($extension->save()=== false){
+		$extension->number = $data['extension'];
+		$extension->callerid = parent::transliterate($data['name']);
+		if ($extension->save() === false) {
 			$errors = $extension->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return false;
@@ -210,7 +210,7 @@ 
 	 *
 	 * @return bool update result
 	 */
-	private function updateIVRMenu(IvrMenu $ivrMenu, array $data ) {
+	private function updateIVRMenu(IvrMenu $ivrMenu, array $data) {
 
 		// Заполним параметры записи Ivr Menu
 		foreach ($ivrMenu as $name => $value) {
@@ -222,7 +222,7 @@ 
 					$ivrMenu->$name = $data[$name];
 					break;
 				case "allow_enter_any_internal_extension":
-					if (array_key_exists($name, $data) && $data[$name]=="on")
+					if (array_key_exists($name, $data) && $data[$name] == "on")
 						$ivrMenu->$name = "1";
 					else
 						$ivrMenu->$name = "0";
@@ -232,7 +232,7 @@ 
 					$ivrMenu->$name = $data[$name];
 			}
 		}
-		if ( $ivrMenu->save()=== false){
+		if ($ivrMenu->save() === false) {
 			$errors = $ivrMenu->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return false;
@@ -248,15 +248,15 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateIVRMenuActions(array $data){
+	private function updateIVRMenuActions(array $data) {
 
 		$existDigits = [];
 
 		// Заполним параметры IvrMenuActions
-		$arrActions=json_decode($data['actions']);
+		$arrActions = json_decode($data['actions']);
 		foreach ($arrActions as $value) {
 
-			$parameters=[
+			$parameters = [
 				'conditions'=>'ivr_menu_id = :uniqid: AND digits=:digits:',
 				'bind' =>[
 					'digits'=>$value->digits,
@@ -264,7 +264,7 @@ 
 				]
 			];
 			$newRule = IvrMenuActions::findFirst($parameters);
-			if ($newRule==false){
+			if ($newRule == false) {
 				$newRule = new IvrMenuActions();
 				$newRule->digits = $value->digits;
 				$newRule->ivr_menu_id = $data['uniqid'];
@@ -289,7 +289,7 @@ 
 		];
 
 		$deletedActions = IvrMenuActions::find($parameters);
-		if ($deletedActions && $deletedActions->delete()=== FALSE){
+		if ($deletedActions && $deletedActions->delete() === FALSE) {
 			$errors = $deletedActions->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return FALSE;

Braces +15 added lines, -11 removed lines

@@ -104,7 +104,9 @@ 
 	 */
     public function saveAction()
     {
-        if (!$this->request->isPost()) return;
+        if (!$this->request->isPost()) {
+            return;
+        }
 
         $this->db->begin();
 
@@ -164,15 +166,14 @@ 
         $ivrmenu = IvrMenu::findFirstByUniqid($uniqid);
 
         $errors = false;
-        if($ivrmenu && !$ivrmenu->Extensions->delete())
-            $errors = $ivrmenu->Extensions->getMessages();
+        if($ivrmenu && !$ivrmenu->Extensions->delete()) {
+                    $errors = $ivrmenu->Extensions->getMessages();
+        }
 
         if ($errors){
             $this->flash->warning(implode('<br>', $errors));
             $this->db->rollback();
-        }
-
-        else
+        } else
         {
             $this->db->commit();
         }
@@ -222,13 +223,16 @@ 
 					$ivrMenu->$name = $data[$name];
 					break;
 				case "allow_enter_any_internal_extension":
-					if (array_key_exists($name, $data) && $data[$name]=="on")
-						$ivrMenu->$name = "1";
-					else
-						$ivrMenu->$name = "0";
+					if (array_key_exists($name, $data) && $data[$name]=="on") {
+											$ivrMenu->$name = "1";
+					} else {
+											$ivrMenu->$name = "0";
+					}
 					break;
 				default:
-					if (!array_key_exists($name, $data)) continue;
+					if (!array_key_exists($name, $data)) {
+					    continue;
+					}
 					$ivrMenu->$name = $data[$name];
 			}
 		}

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

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
         $arrEth['new'] = $template;
 
         $internetInterface = LanInterfaces::findFirstByInternet(1);
-        if ( ! $internetInterface) {
+        if (!$internetInterface) {
             $internetInterface = new LanInterfaces();
         }
         // Найдем дополнительные интерфейсы, которые можно удалить
@@ -54,7 +54,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -120,9 +120,9 @@ 
                 case 'extipaddr':
                     if ($itIsInternetInterfce) {
                         if (array_key_exists($name, $data)) {
-                            $eth->$name = ($data['usenat'] == 'on') ? $data[$name] : $data['ipaddr_' . $eth->id];
+                            $eth->$name = ($data['usenat'] == 'on') ? $data[$name] : $data['ipaddr_'.$eth->id];
                         } else {
-                            $eth->$name = $data['ipaddr_' . $eth->id];
+                            $eth->$name = $data['ipaddr_'.$eth->id];
                         }
                     } else {
                         $eth->$name = '';
@@ -141,8 +141,8 @@ 
                     }
                     break;
                 case 'dhcp':
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) == 'on' ? "1" : "0";
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) == 'on' ? "1" : "0";
                     }
                     break;
                 case 'internet':
@@ -151,13 +151,13 @@ 
                 case 'ipaddr':
                 case 'subnet':
                     $eth->$name = '';
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) == 'on' ? '' : $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) == 'on' ? '' : $data[$name.'_'.$eth->id];
                     }
                     break;
                 case 'interface':
                     if ($eth->id == 'new') {
-                        $eth->$name = LanInterfaces::findFirstById($data[$name . '_' . $eth->id])->interface;
+                        $eth->$name = LanInterfaces::findFirstById($data[$name.'_'.$eth->id])->interface;
                     }
                     break;
                 case 'domain':
@@ -172,8 +172,8 @@ 
                     }
                     break;
                 default:
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = $data[$name.'_'.$eth->id];
                     }
 
             }
@@ -188,7 +188,7 @@ 
     public function deleteAction($ethId = '')
     {
         $eth = LanInterfaces::findFirstById($ethId);
-        if ( ! $eth || $eth->delete() === false) {
+        if (!$eth || $eth->delete() === false) {
             $errors = $eth->getMessages();
             $this->flash->warning(implode('<br>', $errors));
             $this->view->success = false;