mikopbx / Core

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

Spacing +13 added lines, -13 removed lines

@@ -48,7 +48,7 @@ 
             return;
         }
         // Посчитаем количество уникальных звонков с учетом фильтров
-        if ( ! empty($searchPhrase['value'])) {
+        if (!empty($searchPhrase['value'])) {
             $this->prepareConditionsForSearchPhrases($searchPhrase['value'], $parameters);
             // Если мы не смогли расшифровать строку запроса вернем пустой результата
             if (empty($parameters['conditions'])) {
@@ -102,7 +102,7 @@ 
 
         $arrCdr = [];
 
-        $objectLinkedCallRecord = (object)[
+        $objectLinkedCallRecord = (object) [
             'linkedid'    => '',
             'disposition' => '',
             'start'       => '',
@@ -114,7 +114,7 @@ 
         ];
 
         foreach ($selectedRecords as $record) {
-            if ( ! array_key_exists($record->linkedid, $arrCdr)) {
+            if (!array_key_exists($record->linkedid, $arrCdr)) {
                 $arrCdr[$record->linkedid] = clone $objectLinkedCallRecord;
             }
             if ($record->is_app !== '1'
@@ -129,12 +129,12 @@ 
             $linkedRecord->disposition = $linkedRecord->disposition !== 'ANSWERED' ? $disposition : 'ANSWERED';
             $linkedRecord->start       = $linkedRecord->start === '' ? $record->start : $linkedRecord->start;
             $linkedRecord->src_num     = $linkedRecord->src_num === '' ? $record->src_num : $linkedRecord->src_num;
-            if ( ! empty($record->did)) {
+            if (!empty($record->did)) {
                 $linkedRecord->dst_num = $record->did;
             } else {
                 $linkedRecord->dst_num = $linkedRecord->dst_num === '' ? $record->dst_num : $linkedRecord->dst_num;
             }
-            $linkedRecord->billsec += (int)$record->billsec;
+            $linkedRecord->billsec += (int) $record->billsec;
             if ($disposition === 'ANSWERED') {
                 $linkedRecord->answered[] = [
                     'id'            => $record->id,
@@ -147,7 +147,7 @@ 
         }
         $output = [];
         foreach ($arrCdr as $cdr) {
-            $timing   = gmdate($cdr->billsec<3600?'i:s':'G:i:s', $cdr->billsec);
+            $timing   = gmdate($cdr->billsec < 3600 ? 'i:s' : 'G:i:s', $cdr->billsec);
             $output[] = [
                 date('d-m-Y H:i:s', strtotime($cdr->start)),
                 $cdr->src_num,
@@ -187,19 +187,19 @@ 
                 $date                                  = DateTime::createFromFormat('d/m/Y', $matches[0][0]);
                 $requestedDate                         = $date->format('Y-m-d');
                 $tomorrowDate                          = $date->modify('+1 day')->format('Y-m-d');
-                $parameters['conditions']              .= 'start BETWEEN :dateFromPhrase1: AND :dateFromPhrase2:';
+                $parameters['conditions'] .= 'start BETWEEN :dateFromPhrase1: AND :dateFromPhrase2:';
                 $parameters['bind']['dateFromPhrase1'] = $requestedDate;
                 $parameters['bind']['dateFromPhrase2'] = $tomorrowDate;
                 $searchPhrase                          = str_replace($matches[0][0], "", $searchPhrase);
             } elseif (count($matches[0]) === 2) {
-                $parameters['conditions']              .= 'start BETWEEN :dateFromPhrase1: AND :dateFromPhrase2:';
+                $parameters['conditions'] .= 'start BETWEEN :dateFromPhrase1: AND :dateFromPhrase2:';
                 $date                                  = DateTime::createFromFormat('d/m/Y', $matches[0][0]);
                 $requestedDate                         = $date->format('Y-m-d');
                 $parameters['bind']['dateFromPhrase1'] = $requestedDate;
                 $date                                  = DateTime::createFromFormat('d/m/Y', $matches[0][1]);
                 $tomorrowDate                          = $date->modify('+1 day')->format('Y-m-d');
                 $parameters['bind']['dateFromPhrase2'] = $tomorrowDate;
-                $searchPhrase                          = str_replace([$matches[0][0],$matches[0][1]], '', $searchPhrase);
+                $searchPhrase                          = str_replace([$matches[0][0], $matches[0][1]], '', $searchPhrase);
             }
         }
 
@@ -211,17 +211,17 @@ 
             $extensionsLength = PbxSettings::getValueByKey('PBXInternalExtensionLength');
             if ($parameters['conditions'] !== '') {
                 $parameters['conditions'] .= ' AND (';
-                $needCloseAnd             = true;
+                $needCloseAnd = true;
             }
             if (count($matches[0]) === 1) {
                 if ($extensionsLength === strlen($matches[0][0])) {
-                    $parameters['conditions']            .= 'src_num = :SearchPhrase1: OR dst_num = :SearchPhrase2:';
+                    $parameters['conditions'] .= 'src_num = :SearchPhrase1: OR dst_num = :SearchPhrase2:';
                     $parameters['bind']['SearchPhrase1'] = $matches[0][0];
                     $parameters['bind']['SearchPhrase2'] = $matches[0][0];
                 } else {
 
                     $seekNumber                          = substr($matches[0][0], -9);
-                    $parameters['conditions']            .= 'src_num LIKE :SearchPhrase1: OR dst_num LIKE :SearchPhrase2: OR did LIKE :SearchPhrase3:';
+                    $parameters['conditions'] .= 'src_num LIKE :SearchPhrase1: OR dst_num LIKE :SearchPhrase2: OR did LIKE :SearchPhrase3:';
                     $parameters['bind']['SearchPhrase1'] = "%{$seekNumber}%";
                     $parameters['bind']['SearchPhrase2'] = "%{$seekNumber}%";
                     $parameters['bind']['SearchPhrase3'] = "%{$seekNumber}%";
@@ -287,7 +287,7 @@ 
                     $parameters['bind']['SearchPhrase7'] = "%{$seekNumber1}%";
                     $parameters['bind']['SearchPhrase8'] = "%{$seekNumber0}%";
                 }
-                $searchPhrase = str_replace([$matches[0][0],$matches[0][1]], '', $searchPhrase);
+                $searchPhrase = str_replace([$matches[0][0], $matches[0][1]], '', $searchPhrase);
             }
             if ($needCloseAnd) {
                 $parameters['conditions'] .= ')';

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

Spacing +17 added lines, -17 removed lines

@@ -30,15 +30,15 @@ 
      */
     public function modifyAction($backurl = null): void
     {
-        if ($this->language === 'ru'){
-            $this->view->modulesExampleImgPath = $this->url->get( 'public/img/modules-example-ru.png' );
+        if ($this->language === 'ru') {
+            $this->view->modulesExampleImgPath = $this->url->get('public/img/modules-example-ru.png');
         } else {
-            $this->view->modulesExampleImgPath = $this->url->get( 'public/img/modules-example-en.png' );;
+            $this->view->modulesExampleImgPath = $this->url->get('public/img/modules-example-en.png'); ;
         }
 
         // Форма лицензионного ключа
         $licKey                           = PbxSettings::getValueByKey('PBXLicense');
-        $changeLicenseKeyForm  = new LicensingChangeLicenseKeyForm(null, ['licKey' => $licKey]);
+        $changeLicenseKeyForm = new LicensingChangeLicenseKeyForm(null, ['licKey' => $licKey]);
         $this->view->changeLicenseKeyForm = $changeLicenseKeyForm;
 
         // Форма активации купона
@@ -58,11 +58,11 @@ 
      */
     public function updateLicenseAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();
-        if ( ! empty($data['licKey'])) {
+        if (!empty($data['licKey'])) {
             $oldLicKey = PbxSettings::getValueByKey('PBXLicense');
             if ($oldLicKey !== $data['licKey']) {
 
@@ -72,10 +72,10 @@ 
                     $this->licenseWorker->changeLicenseKey($data['licKey']);
                     $this->licenseWorker->addTrial('11'); // Askozia PBX
                     $this->view->success = true;
-                } elseif ( ! empty($licenseInfo) && strpos($licenseInfo, '2026') !== false) {
+                } elseif (!empty($licenseInfo) && strpos($licenseInfo, '2026') !== false) {
                     $this->flash->error($this->translation->_('lic_FailedCheckLicense2026'));
                     $this->view->success = false;
-                } elseif  (! empty($licenseInfo)) {
+                } elseif (!empty($licenseInfo)) {
                     $this->flash->error($licenseInfo);
                     $this->view->success = false;
                 } else {
@@ -84,7 +84,7 @@ 
                 }
 
             }
-            if ( ! empty($data['coupon'])) {
+            if (!empty($data['coupon'])) {
                 $result
                     = $this->licenseWorker->activateCoupon($data['coupon']);
                 if ($result === true) {
@@ -111,7 +111,7 @@ 
         }
 
         if ($this->view->success === true) {
-            if ( ! empty($data['backurl'])) {
+            if (!empty($data['backurl'])) {
                 $this->view->reload = $data['backurl'].'/index/';
             } else {
                 $this->view->reload = 'licensing/modify/';
@@ -129,7 +129,7 @@ 
     {
         $this->db->begin();
         $record = PbxSettings::findFirstByKey('PBXLicense');
-        if ( ! $record) {
+        if (!$record) {
             $record      = new PbxSettings();
             $record->key = 'PBXLicense';
         }
@@ -189,7 +189,7 @@ 
     public function getBaseFeatureStatusAction() :void
     {
         $checkBaseFeature = $this->licenseWorker->featureAvailable(33);
-        if ($checkBaseFeature['success']===false) {
+        if ($checkBaseFeature['success'] === false) {
             $this->view->success = false;
             $this->view->message = $this->licenseWorker->translateLicenseErrorMessage($checkBaseFeature['error']);
         } else {
@@ -203,21 +203,21 @@ 
     public function captureFeatureForProductIdAction() :void
     {
         $this->view->success = true;
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();
-        if (!isset( $data['licFeatureId'], $data['licProductId'])){
+        if (!isset($data['licFeatureId'], $data['licProductId'])) {
             return;
         }
-        if ($data['licFeatureId']> 0){
+        if ($data['licFeatureId'] > 0) {
             // Пробуем захватить фичу
             $result = $this->licenseWorker->captureFeature($data['licFeatureId']);
-            if ($result['success']===false) {
+            if ($result['success'] === false) {
                 // Добавим тириал и захватим фичу еще раз
                 $this->licenseWorker->addTrial($data['licProductId']);
                 $result = $this->licenseWorker->captureFeature($data['licFeatureId']);
-                if ($result['success']===false) {
+                if ($result['success'] === false) {
                     $this->view->message = $this->licenseWorker->translateLicenseErrorMessage($result['error']);
                     $this->view->success = false;
                 }

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

Indentation +104 added lines, -104 removed lines

@@ -13,109 +13,109 @@
 class SoundFilesController extends BaseController {
 
 
-	/**
-	 * Построение списка файлов
-	 */
-	public function indexAction() {
-
-		$files = SoundFiles::find();
-
-		$this->view->files = $files;
-
-	}
-
-
-	/**
-	 * Открытие карточки редактирования Файла записи
-	 *
-	 * @param string $id редактируемой записи
-	 */
-	public function modifyAction( string $id = NULL ) {
-		$file = SoundFiles::findFirstById( $id );
-		if (!$file) {
-			$file = new SoundFiles();
-		}
-
-		$form                  = new SoundFilesEditForm( $file );
-		$this->view->form      = $form;
-		$this->view->audioPath = empty($file->path)?'':"/pbxcore/api/cdr/playback?view={$file->path}";
-
-	}
-
-
-	/**
-	 * Сохранение параметров переопределения системного файла
-	 * @return void
-	 */
-	public function saveAction(){
-		if (!$this->request->isPost()) {
-			return;
-		}
-		$data = $this->request->getPost();
-
-		$soundFile = SoundFiles::findFirstById( $data['id'] );
-		if ( $soundFile === FALSE ) {
-			$soundFile = new SoundFiles();
-		}
-
-		foreach ( $soundFile as $name => $value ) {
-			switch ($name ) {
-				case "id":
-					break;
-				default:
-					if (!array_key_exists($name, $data)) {
-						continue;
-					}
-					$soundFile->$name = $data[ $name];
-			}
-		}
-
-		if ( $soundFile->save() === FALSE ) {
-			$errors = $soundFile->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			$this->view->success = false;
-		} else {
-			$this->flash->success($this->translation->_('ms_SuccessfulSaved'));
-			$this->view->success = true;
-			// Если это было создание карточки то надо перегрузить страницу с указанием ID
-			if ( empty( $data['id'] ) ) {
-				$this->view->reload = "sound-files/modify/{$soundFile->id}";
-			}
-		}
-	}
-
-	/**
-	 * Удаление файла по его ID
-	 *
-	 * @param string $id
-	 */
-	public function deleteAction( string $id = NULL ) {
-		$soundFile = SoundFiles::findFirstById( $id );
-		$errors   = FALSE;
-		if ( $soundFile && ! $soundFile->delete() ) {
-			$errors = $soundFile->getMessages();
-		}
-		if ( $errors ) {
-			$this->flash->error( implode( '<br>', $errors ) );
-			$this->view->success = FALSE;
-		} else {
-			$this->view->success = TRUE;
-		}
-	}
-
-	/**
-	 * Получение полного пути к файлу по его ID
-	 *
-	 * @param string $id
-	 */
-	public function getPathByIdAction( string $id = NULL ) {
-		$soundFile = SoundFiles::findFirstById( $id );
-		if ( $soundFile ) {
-			$this->view->message = $soundFile->path;
-			$this->view->success = TRUE;
-		} else {
-			$this->view->success = FALSE;
-		}
-	}
+    /**
+     * Построение списка файлов
+     */
+    public function indexAction() {
+
+        $files = SoundFiles::find();
+
+        $this->view->files = $files;
+
+    }
+
+
+    /**
+     * Открытие карточки редактирования Файла записи
+     *
+     * @param string $id редактируемой записи
+     */
+    public function modifyAction( string $id = NULL ) {
+        $file = SoundFiles::findFirstById( $id );
+        if (!$file) {
+            $file = new SoundFiles();
+        }
+
+        $form                  = new SoundFilesEditForm( $file );
+        $this->view->form      = $form;
+        $this->view->audioPath = empty($file->path)?'':"/pbxcore/api/cdr/playback?view={$file->path}";
+
+    }
+
+
+    /**
+     * Сохранение параметров переопределения системного файла
+     * @return void
+     */
+    public function saveAction(){
+        if (!$this->request->isPost()) {
+            return;
+        }
+        $data = $this->request->getPost();
+
+        $soundFile = SoundFiles::findFirstById( $data['id'] );
+        if ( $soundFile === FALSE ) {
+            $soundFile = new SoundFiles();
+        }
+
+        foreach ( $soundFile as $name => $value ) {
+            switch ($name ) {
+                case "id":
+                    break;
+                default:
+                    if (!array_key_exists($name, $data)) {
+                        continue;
+                    }
+                    $soundFile->$name = $data[ $name];
+            }
+        }
+
+        if ( $soundFile->save() === FALSE ) {
+            $errors = $soundFile->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            $this->view->success = false;
+        } else {
+            $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
+            $this->view->success = true;
+            // Если это было создание карточки то надо перегрузить страницу с указанием ID
+            if ( empty( $data['id'] ) ) {
+                $this->view->reload = "sound-files/modify/{$soundFile->id}";
+            }
+        }
+    }
+
+    /**
+     * Удаление файла по его ID
+     *
+     * @param string $id
+     */
+    public function deleteAction( string $id = NULL ) {
+        $soundFile = SoundFiles::findFirstById( $id );
+        $errors   = FALSE;
+        if ( $soundFile && ! $soundFile->delete() ) {
+            $errors = $soundFile->getMessages();
+        }
+        if ( $errors ) {
+            $this->flash->error( implode( '<br>', $errors ) );
+            $this->view->success = FALSE;
+        } else {
+            $this->view->success = TRUE;
+        }
+    }
+
+    /**
+     * Получение полного пути к файлу по его ID
+     *
+     * @param string $id
+     */
+    public function getPathByIdAction( string $id = NULL ) {
+        $soundFile = SoundFiles::findFirstById( $id );
+        if ( $soundFile ) {
+            $this->view->message = $soundFile->path;
+            $this->view->success = TRUE;
+        } else {
+            $this->view->success = FALSE;
+        }
+    }
 
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -30,15 +30,15 @@ 
 	 *
 	 * @param string $id редактируемой записи
 	 */
-	public function modifyAction( string $id = NULL ) {
-		$file = SoundFiles::findFirstById( $id );
+	public function modifyAction(string $id = NULL) {
+		$file = SoundFiles::findFirstById($id);
 		if (!$file) {
 			$file = new SoundFiles();
 		}
 
-		$form                  = new SoundFilesEditForm( $file );
+		$form                  = new SoundFilesEditForm($file);
 		$this->view->form      = $form;
-		$this->view->audioPath = empty($file->path)?'':"/pbxcore/api/cdr/playback?view={$file->path}";
+		$this->view->audioPath = empty($file->path) ? '' : "/pbxcore/api/cdr/playback?view={$file->path}";
 
 	}
 
@@ -47,30 +47,30 @@ 
 	 * Сохранение параметров переопределения системного файла
 	 * @return void
 	 */
-	public function saveAction(){
+	public function saveAction() {
 		if (!$this->request->isPost()) {
 			return;
 		}
 		$data = $this->request->getPost();
 
-		$soundFile = SoundFiles::findFirstById( $data['id'] );
-		if ( $soundFile === FALSE ) {
+		$soundFile = SoundFiles::findFirstById($data['id']);
+		if ($soundFile === FALSE) {
 			$soundFile = new SoundFiles();
 		}
 
-		foreach ( $soundFile as $name => $value ) {
-			switch ($name ) {
+		foreach ($soundFile as $name => $value) {
+			switch ($name) {
 				case "id":
 					break;
 				default:
 					if (!array_key_exists($name, $data)) {
 						continue;
 					}
-					$soundFile->$name = $data[ $name];
+					$soundFile->$name = $data[$name];
 			}
 		}
 
-		if ( $soundFile->save() === FALSE ) {
+		if ($soundFile->save() === FALSE) {
 			$errors = $soundFile->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			$this->view->success = false;
@@ -78,7 +78,7 @@ 
 			$this->flash->success($this->translation->_('ms_SuccessfulSaved'));
 			$this->view->success = true;
 			// Если это было создание карточки то надо перегрузить страницу с указанием ID
-			if ( empty( $data['id'] ) ) {
+			if (empty($data['id'])) {
 				$this->view->reload = "sound-files/modify/{$soundFile->id}";
 			}
 		}
@@ -89,14 +89,14 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function deleteAction( string $id = NULL ) {
-		$soundFile = SoundFiles::findFirstById( $id );
-		$errors   = FALSE;
-		if ( $soundFile && ! $soundFile->delete() ) {
+	public function deleteAction(string $id = NULL) {
+		$soundFile = SoundFiles::findFirstById($id);
+		$errors = FALSE;
+		if ($soundFile && !$soundFile->delete()) {
 			$errors = $soundFile->getMessages();
 		}
-		if ( $errors ) {
-			$this->flash->error( implode( '<br>', $errors ) );
+		if ($errors) {
+			$this->flash->error(implode('<br>', $errors));
 			$this->view->success = FALSE;
 		} else {
 			$this->view->success = TRUE;
@@ -108,9 +108,9 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function getPathByIdAction( string $id = NULL ) {
-		$soundFile = SoundFiles::findFirstById( $id );
-		if ( $soundFile ) {
+	public function getPathByIdAction(string $id = NULL) {
+		$soundFile = SoundFiles::findFirstById($id);
+		if ($soundFile) {
 			$this->view->message = $soundFile->path;
 			$this->view->success = TRUE;
 		} else {

Braces +12 added lines, -6 removed lines

@@ -10,13 +10,15 @@ 
 use Models\SoundFiles;
 use Phalcon\Text;
 
-class SoundFilesController extends BaseController {
+class SoundFilesController extends BaseController
+{
 
 
 	/**
 	 * Построение списка файлов
 	 */
-	public function indexAction() {
+	public function indexAction()
+	{
 
 		$files = SoundFiles::find();
 
@@ -30,7 +32,8 @@ 
 	 *
 	 * @param string $id редактируемой записи
 	 */
-	public function modifyAction( string $id = NULL ) {
+	public function modifyAction( string $id = NULL )
+	{
 		$file = SoundFiles::findFirstById( $id );
 		if (!$file) {
 			$file = new SoundFiles();
@@ -47,7 +50,8 @@ 
 	 * Сохранение параметров переопределения системного файла
 	 * @return void
 	 */
-	public function saveAction(){
+	public function saveAction()
+	{
 		if (!$this->request->isPost()) {
 			return;
 		}
@@ -89,7 +93,8 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function deleteAction( string $id = NULL ) {
+	public function deleteAction( string $id = NULL )
+	{
 		$soundFile = SoundFiles::findFirstById( $id );
 		$errors   = FALSE;
 		if ( $soundFile && ! $soundFile->delete() ) {
@@ -108,7 +113,8 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function getPathByIdAction( string $id = NULL ) {
+	public function getPathByIdAction( string $id = NULL )
+	{
 		$soundFile = SoundFiles::findFirstById( $id );
 		if ( $soundFile ) {
 			$this->view->message = $soundFile->path;

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

@@ -30,7 +30,7 @@ 
 	 *
 	 * @param string $id редактируемой записи
 	 */
-	public function modifyAction( string $id = NULL ) {
+	public function modifyAction( string $id = null ) {
 		$file = SoundFiles::findFirstById( $id );
 		if (!$file) {
 			$file = new SoundFiles();
@@ -54,7 +54,7 @@ 
 		$data = $this->request->getPost();
 
 		$soundFile = SoundFiles::findFirstById( $data['id'] );
-		if ( $soundFile === FALSE ) {
+		if ( $soundFile === false ) {
 			$soundFile = new SoundFiles();
 		}
 
@@ -70,7 +70,7 @@ 
 			}
 		}
 
-		if ( $soundFile->save() === FALSE ) {
+		if ( $soundFile->save() === false ) {
 			$errors = $soundFile->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			$this->view->success = false;
@@ -89,17 +89,17 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function deleteAction( string $id = NULL ) {
+	public function deleteAction( string $id = null ) {
 		$soundFile = SoundFiles::findFirstById( $id );
-		$errors   = FALSE;
+		$errors   = false;
 		if ( $soundFile && ! $soundFile->delete() ) {
 			$errors = $soundFile->getMessages();
 		}
 		if ( $errors ) {
 			$this->flash->error( implode( '<br>', $errors ) );
-			$this->view->success = FALSE;
+			$this->view->success = false;
 		} else {
-			$this->view->success = TRUE;
+			$this->view->success = true;
 		}
 	}
 
@@ -108,13 +108,13 @@ 
 	 *
 	 * @param string $id
 	 */
-	public function getPathByIdAction( string $id = NULL ) {
+	public function getPathByIdAction( string $id = null ) {
 		$soundFile = SoundFiles::findFirstById( $id );
 		if ( $soundFile ) {
 			$this->view->message = $soundFile->path;
-			$this->view->success = TRUE;
+			$this->view->success = true;
 		} else {
-			$this->view->success = FALSE;
+			$this->view->success = false;
 		}
 	}
 

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

Indentation +57 added lines, -57 removed lines

@@ -14,42 +14,42 @@ 
 class OutOffWorkTimeController extends BaseController {
 
 
-	/**
-	 * Построение списка правила маршрутизации в нерабочее время
-	 */
+    /**
+     * Построение списка правила маршрутизации в нерабочее время
+     */
     public function indexAction()
     {
         $paremeters = array(
-	        'order' => 'date_from, weekday_from, time_from',
+            'order' => 'date_from, weekday_from, time_from',
         );
-	    $timeframesTable=[];
+        $timeframesTable=[];
         $timeFrames= OutWorkTimes::find($paremeters);
         foreach ($timeFrames as $timeFrame){
-               $timeframesTable[]=[
-	               'id'               =>$timeFrame->id,
-	               'date_from'        => ( ! empty( $timeFrame->date_from ) )
-	                                     > 0 ? date( "d/m/Y",
-		               $timeFrame->date_from ) : '',
-	               'date_to'          => ( ! empty( $timeFrame->date_to ) ) > 0
-		               ? date( "d/m/Y", $timeFrame->date_to ) : '',
-	               'weekday_from'     =>(!empty($timeFrame->weekday_from))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_from} days"))):'',
-	               'weekday_to'       =>(!empty($timeFrame->weekday_to))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_to} days"))):'',
-	               'time_from'        => $timeFrame->time_from,
-	               'time_to'          =>$timeFrame->time_to,
-	               'action'           =>$timeFrame->action,
-	               'audio_message_id' =>($timeFrame->SoundFiles)?$timeFrame->SoundFiles->name:'',
-	               'extension'        =>($timeFrame->Extensions)?$timeFrame->Extensions->getRepresent():'',
-	               'description'      =>$timeFrame->description,
+                $timeframesTable[]=[
+                    'id'               =>$timeFrame->id,
+                    'date_from'        => ( ! empty( $timeFrame->date_from ) )
+                                            > 0 ? date( "d/m/Y",
+                        $timeFrame->date_from ) : '',
+                    'date_to'          => ( ! empty( $timeFrame->date_to ) ) > 0
+                       ? date( "d/m/Y", $timeFrame->date_to ) : '',
+                    'weekday_from'     =>(!empty($timeFrame->weekday_from))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_from} days"))):'',
+                    'weekday_to'       =>(!empty($timeFrame->weekday_to))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_to} days"))):'',
+                    'time_from'        => $timeFrame->time_from,
+                    'time_to'          =>$timeFrame->time_to,
+                    'action'           =>$timeFrame->action,
+                    'audio_message_id' =>($timeFrame->SoundFiles)?$timeFrame->SoundFiles->name:'',
+                    'extension'        =>($timeFrame->Extensions)?$timeFrame->Extensions->getRepresent():'',
+                    'description'      =>$timeFrame->description,
                 ];
         }
 
         $this->view->indexTable = $timeframesTable;
     }
 
-	/**
-	 * Карточка редактирования записи нерабочего времени
-	 * @param null $id
-	 */
+    /**
+     * Карточка редактирования записи нерабочего времени
+     * @param null $id
+     */
     public function modifyAction($id=null)
     {
         $timeFrame = OutWorkTimes::findFirstById($id);
@@ -57,7 +57,7 @@ 
             $timeFrame = new OutWorkTimes();
         }
 
-	    $forwardingExtensions[""] = $this->translation->_( "ex_SelectNumber" );
+        $forwardingExtensions[""] = $this->translation->_( "ex_SelectNumber" );
         $parameters               =[
             'conditions'=>'number = :extension:',
             'bind'=>[
@@ -66,10 +66,10 @@ 
         ];
         $extensions               = Extensions::find($parameters);
         foreach ($extensions as $record){
-              $forwardingExtensions[$record->number]=$record->getRepresent();
+                $forwardingExtensions[$record->number]=$record->getRepresent();
         }
 
-	    $audioMessages[""] = $this->translation->_( "sf_SelectAudioFile" );
+        $audioMessages[""] = $this->translation->_( "sf_SelectAudioFile" );
         $soundFiles        = SoundFiles::find();
         foreach ($soundFiles as $record){
             $audioMessages[$record->id]=$record->name;
@@ -92,18 +92,18 @@ 
             'week-days'=>$weekDays
         ]);
         $this->view->form = $form;
-	    $this->view->represent  = $timeFrame->getRepresent();
+        $this->view->represent  = $timeFrame->getRepresent();
     }
 
-	/**
-	 * Сохранение записи нерабочего времени
-	 */
+    /**
+     * Сохранение записи нерабочего времени
+     */
     public function saveAction()
     {
         if (!$this->request->isPost()) return;
         $data = $this->request->getPost();
 
-	    $this->db->begin();
+        $this->db->begin();
         $timeFrame = OutWorkTimes::findFirstByid($data['id']);
         if ($timeFrame==false) {
             $timeFrame= new OutWorkTimes();
@@ -114,21 +114,21 @@ 
             switch ($name) {
                 case 'weekday_from':
                 case 'weekday_to':
-	                if ( ! array_key_exists( $name, $data ) ) {
-		                $timeFrame->$name = '';
-	                }
-	                $timeFrame->$name = ( $data[ $name ] < 1 ) ? NULL
-		                : $data[ $name ];
+                    if ( ! array_key_exists( $name, $data ) ) {
+                        $timeFrame->$name = '';
+                    }
+                    $timeFrame->$name = ( $data[ $name ] < 1 ) ? NULL
+                        : $data[ $name ];
                     break;
                 case 'date_from':
                 case 'date_to':
-	            case 'time_from':
-	            case 'time_to':
-		            if ( ! array_key_exists( $name, $data ) ) {
-			            $timeFrame->$name = '';
-		            }
-		            $timeFrame->$name = $data[ $name ];
-		            break;
+                case 'time_from':
+                case 'time_to':
+                    if ( ! array_key_exists( $name, $data ) ) {
+                        $timeFrame->$name = '';
+                    }
+                    $timeFrame->$name = $data[ $name ];
+                    break;
                 default:
                     if (!array_key_exists( $name, $data)) continue;
                     $timeFrame->$name = $data[ $name];
@@ -139,27 +139,27 @@ 
             $errors = $timeFrame->getMessages();
             $this->flash->warning(implode('<br>', $errors));
             $this->view->success=false;
-	        $this->db->rollback();
+            $this->db->rollback();
             return;
         }
 
-	    $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
-	    $this->view->success=true;
-	    $this->db->commit();
+        $this->flash->success($this->translation->_('ms_SuccessfulSaved'));
+        $this->view->success=true;
+        $this->db->commit();
 
-	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
-		    $this->view->reload = "out-off-work-time/modify/{$timeFrame->id}";
-	    }
+        // Если это было создание карточки то надо перегрузить страницу с указанием ID
+        if (empty($data['id'])){
+            $this->view->reload = "out-off-work-time/modify/{$timeFrame->id}";
+        }
 
     }
 
-	/**
-	 * Удаление запси с данными о нерабочем времени
-	 * @param null $id
-	 */
+    /**
+     * Удаление запси с данными о нерабочем времени
+     * @param null $id
+     */
     public function deleteAction($id=null){
-    	$timeFrame = OutWorkTimes::findFirstByid($id);
+        $timeFrame = OutWorkTimes::findFirstByid($id);
         if ($timeFrame) $timeFrame->delete();
         return $this->forward('OutOffWorkTime/index');
 

Spacing +42 added lines, -42 removed lines

@@ -22,23 +22,23 @@ 
         $paremeters = array(
 	        'order' => 'date_from, weekday_from, time_from',
         );
-	    $timeframesTable=[];
-        $timeFrames= OutWorkTimes::find($paremeters);
-        foreach ($timeFrames as $timeFrame){
-               $timeframesTable[]=[
+	    $timeframesTable = [];
+        $timeFrames = OutWorkTimes::find($paremeters);
+        foreach ($timeFrames as $timeFrame) {
+               $timeframesTable[] = [
 	               'id'               =>$timeFrame->id,
-	               'date_from'        => ( ! empty( $timeFrame->date_from ) )
-	                                     > 0 ? date( "d/m/Y",
-		               $timeFrame->date_from ) : '',
-	               'date_to'          => ( ! empty( $timeFrame->date_to ) ) > 0
-		               ? date( "d/m/Y", $timeFrame->date_to ) : '',
-	               'weekday_from'     =>(!empty($timeFrame->weekday_from))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_from} days"))):'',
-	               'weekday_to'       =>(!empty($timeFrame->weekday_to))?$this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_to} days"))):'',
+	               'date_from'        => (!empty($timeFrame->date_from))
+	                                     > 0 ? date("d/m/Y",
+		               $timeFrame->date_from) : '',
+	               'date_to'          => (!empty($timeFrame->date_to)) > 0
+		               ? date("d/m/Y", $timeFrame->date_to) : '',
+	               'weekday_from'     =>(!empty($timeFrame->weekday_from)) ? $this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_from} days"))) : '',
+	               'weekday_to'       =>(!empty($timeFrame->weekday_to)) ? $this->translation->_(date('D', strtotime("Sunday +{$timeFrame->weekday_to} days"))) : '',
 	               'time_from'        => $timeFrame->time_from,
 	               'time_to'          =>$timeFrame->time_to,
 	               'action'           =>$timeFrame->action,
-	               'audio_message_id' =>($timeFrame->SoundFiles)?$timeFrame->SoundFiles->name:'',
-	               'extension'        =>($timeFrame->Extensions)?$timeFrame->Extensions->getRepresent():'',
+	               'audio_message_id' =>($timeFrame->SoundFiles) ? $timeFrame->SoundFiles->name : '',
+	               'extension'        =>($timeFrame->Extensions) ? $timeFrame->Extensions->getRepresent() : '',
 	               'description'      =>$timeFrame->description,
                 ];
         }
@@ -50,29 +50,29 @@ 
 	 * Карточка редактирования записи нерабочего времени
 	 * @param null $id
 	 */
-    public function modifyAction($id=null)
+    public function modifyAction($id = null)
     {
         $timeFrame = OutWorkTimes::findFirstById($id);
-        if (!$timeFrame){
+        if (!$timeFrame) {
             $timeFrame = new OutWorkTimes();
         }
 
-	    $forwardingExtensions[""] = $this->translation->_( "ex_SelectNumber" );
-        $parameters               =[
+	    $forwardingExtensions[""] = $this->translation->_("ex_SelectNumber");
+        $parameters = [
             'conditions'=>'number = :extension:',
             'bind'=>[
                 'extension'=>$timeFrame->extension
             ]
         ];
-        $extensions               = Extensions::find($parameters);
-        foreach ($extensions as $record){
-              $forwardingExtensions[$record->number]=$record->getRepresent();
+        $extensions = Extensions::find($parameters);
+        foreach ($extensions as $record) {
+              $forwardingExtensions[$record->number] = $record->getRepresent();
         }
 
-	    $audioMessages[""] = $this->translation->_( "sf_SelectAudioFile" );
-        $soundFiles        = SoundFiles::find();
-        foreach ($soundFiles as $record){
-            $audioMessages[$record->id]=$record->name;
+	    $audioMessages[""] = $this->translation->_("sf_SelectAudioFile");
+        $soundFiles = SoundFiles::find();
+        foreach ($soundFiles as $record) {
+            $audioMessages[$record->id] = $record->name;
         }
 
         $availableActions = [
@@ -81,18 +81,18 @@ 
         ];
 
         $weekDays = ['-1'=>'-'];
-        for ($i="1"; $i<=7; $i++){
-            $weekDays[$i]=$this->translation->_(date('D', strtotime("Sunday +{$i} days")));
+        for ($i = "1"; $i <= 7; $i++) {
+            $weekDays[$i] = $this->translation->_(date('D', strtotime("Sunday +{$i} days")));
         }
 
-        $form = new TimeFrameEditForm($timeFrame,[
+        $form = new TimeFrameEditForm($timeFrame, [
             'extensions'=>$forwardingExtensions,
             'audio-message'=>$audioMessages,
             'available-actions'=>$availableActions,
             'week-days'=>$weekDays
         ]);
         $this->view->form = $form;
-	    $this->view->represent  = $timeFrame->getRepresent();
+	    $this->view->represent = $timeFrame->getRepresent();
     }
 
 	/**
@@ -105,8 +105,8 @@ 
 
 	    $this->db->begin();
         $timeFrame = OutWorkTimes::findFirstByid($data['id']);
-        if ($timeFrame==false) {
-            $timeFrame= new OutWorkTimes();
+        if ($timeFrame == false) {
+            $timeFrame = new OutWorkTimes();
         }
 
         // Заполним параметры пользователя
@@ -114,41 +114,41 @@ 
             switch ($name) {
                 case 'weekday_from':
                 case 'weekday_to':
-	                if ( ! array_key_exists( $name, $data ) ) {
+	                if (!array_key_exists($name, $data)) {
 		                $timeFrame->$name = '';
 	                }
-	                $timeFrame->$name = ( $data[ $name ] < 1 ) ? NULL
-		                : $data[ $name ];
+	                $timeFrame->$name = ($data[$name] < 1) ? NULL
+		                : $data[$name];
                     break;
                 case 'date_from':
                 case 'date_to':
 	            case 'time_from':
 	            case 'time_to':
-		            if ( ! array_key_exists( $name, $data ) ) {
+		            if (!array_key_exists($name, $data)) {
 			            $timeFrame->$name = '';
 		            }
-		            $timeFrame->$name = $data[ $name ];
+		            $timeFrame->$name = $data[$name];
 		            break;
                 default:
-                    if (!array_key_exists( $name, $data)) continue;
-                    $timeFrame->$name = $data[ $name];
+                    if (!array_key_exists($name, $data)) continue;
+                    $timeFrame->$name = $data[$name];
             }
         }
 
-        if ($timeFrame->save()=== false){
+        if ($timeFrame->save() === false) {
             $errors = $timeFrame->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();
 
 	    // Если это было создание карточки то надо перегрузить страницу с указанием ID
-	    if (empty($data['id'])){
+	    if (empty($data['id'])) {
 		    $this->view->reload = "out-off-work-time/modify/{$timeFrame->id}";
 	    }
 
@@ -158,7 +158,7 @@ 
 	 * Удаление запси с данными о нерабочем времени
 	 * @param null $id
 	 */
-    public function deleteAction($id=null){
+    public function deleteAction($id = null) {
     	$timeFrame = OutWorkTimes::findFirstByid($id);
         if ($timeFrame) $timeFrame->delete();
         return $this->forward('OutOffWorkTime/index');

Braces +13 added lines, -5 removed lines

@@ -11,7 +11,8 @@ 
     Models\SoundFiles,
     Models\Extensions;
 
-class OutOffWorkTimeController extends BaseController {
+class OutOffWorkTimeController extends BaseController
+{
 
 
 	/**
@@ -100,7 +101,9 @@ 
 	 */
     public function saveAction()
     {
-        if (!$this->request->isPost()) return;
+        if (!$this->request->isPost()) {
+            return;
+        }
         $data = $this->request->getPost();
 
 	    $this->db->begin();
@@ -130,7 +133,9 @@ 
 		            $timeFrame->$name = $data[ $name ];
 		            break;
                 default:
-                    if (!array_key_exists( $name, $data)) continue;
+                    if (!array_key_exists( $name, $data)) {
+                        continue;
+                    }
                     $timeFrame->$name = $data[ $name];
             }
         }
@@ -158,9 +163,12 @@ 
 	 * Удаление запси с данными о нерабочем времени
 	 * @param null $id
 	 */
-    public function deleteAction($id=null){
+    public function deleteAction($id=null)
+    {
     	$timeFrame = OutWorkTimes::findFirstByid($id);
-        if ($timeFrame) $timeFrame->delete();
+        if ($timeFrame) {
+            $timeFrame->delete();
+        }
         return $this->forward('OutOffWorkTime/index');
 
     }

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

@@ -117,7 +117,7 @@
 	                if ( ! array_key_exists( $name, $data ) ) {
 		                $timeFrame->$name = '';
 	                }
-	                $timeFrame->$name = ( $data[ $name ] < 1 ) ? NULL
+	                $timeFrame->$name = ( $data[ $name ] < 1 ) ? null
 		                : $data[ $name ];
                     break;
                 case 'date_from':

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

Indentation +250 added lines, -250 removed lines

@@ -15,10 +15,10 @@ 
 
 class CallQueuesController extends BaseController {
 
-	/**
-	 * Получение списка очередей вызовово
-	 */
-	public function indexAction()
+    /**
+     * Получение списка очередей вызовово
+     */
+    public function indexAction()
     {
         $queues = CallQueues::find();
         $this->view->queues = $queues;
@@ -26,12 +26,12 @@ 
 
 
     /**
-	 * Карточка редактирования очереди
-	 *
-	 * @param string $uniqid - идентификатор редактируемой очереди
-	 */
-	public function modifyAction(string $uniqid=null){
-		$queue = CallQueues::findFirstByUniqid($uniqid);
+     * Карточка редактирования очереди
+     *
+     * @param string $uniqid - идентификатор редактируемой очереди
+     */
+    public function modifyAction(string $uniqid=null){
+        $queue = CallQueues::findFirstByUniqid($uniqid);
         $queueMembersList=[];
         $soundfilesList=[];
         $extensionList = [];
@@ -44,8 +44,8 @@ 
             $queue->announce_position           =   1;
             $queue->announce_hold_time          =   1;
             $queue->periodic_announce_frequency =45;
-	        $queue->extension
-	                                            = Extensions::getNextFreeApplicationNumber();
+            $queue->extension
+                                                = Extensions::getNextFreeApplicationNumber();
 
         } else {
             // Списк экстеншенов очереди
@@ -66,7 +66,7 @@ 
             }
         }
 
-		$extensionList[""] = $this->translation->_( "ex_SelectNumber" );
+        $extensionList[""] = $this->translation->_( "ex_SelectNumber" );
         // Список всех используемых эктеншенов
         $parameters =[
             'conditions'=>'number IN ({ids:array})',
@@ -84,9 +84,9 @@ 
         }
 
         // Список звуковых файлов для очередей
-		$soundfilesList[""]    = $this->translation->_( "sf_SelectAudioFile" );
-		$soundfilesList[ - 1 ] = '-';
-		$soundFiles            = SoundFiles::find();
+        $soundfilesList[""]    = $this->translation->_( "sf_SelectAudioFile" );
+        $soundfilesList[ - 1 ] = '-';
+        $soundFiles            = SoundFiles::find();
         foreach ($soundFiles as $soundFile){
             $soundfilesList[$soundFile->id]=$soundFile->name;
         }
@@ -97,70 +97,70 @@ 
         ]);
         $this->view->form = $form;
         $this->view->extensionsTable=$queueMembersList;
-	    $this->view->represent  = $queue->getRepresent();
+        $this->view->represent  = $queue->getRepresent();
     }
 
 
-	/**
-	 * Сохранение очереди через AJAX запрос из формы
-	 */
-	public function saveAction()
+    /**
+     * Сохранение очереди через AJAX запрос из формы
+     */
+    public function saveAction()
     {
-	    if (!$this->request->isPost()) return;
-	    $this->db->begin();
-
-	    $data = $this->request->getPost();
-	    $queue = CallQueues::findFirstByUniqid($data['uniqid']);
-	    if (!$queue)  {
-		    $queue = new CallQueues();
-		    $extension = new Extensions();
-		    $extension->type     = "QUEUE";
-		    $extension->number   = $data["extension"];
-		    $extension->callerid = parent::transliterate($data["name"]);
-		    $extension->userid   = null;
-		    $extension->show_in_phonebook  = 1;
-		    $extension->public_access     = 1;
-	    } else {
-		    $extension = $queue->Extensions;
-	    }
-
-	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    // Заполним параметры пользователя
-	    if (!$this->updateQueue($queue, $data)){
-		    $this->view->success=false;
-		    $this->db->rollback();
-		    return;
-	    }
-
-	    // Заполним параметры участников очереди
-	    if (!$this->updateQueueMembers($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 = "call-queues/modify/{$data['uniqid']}";
-	    }
+        if (!$this->request->isPost()) return;
+        $this->db->begin();
+
+        $data = $this->request->getPost();
+        $queue = CallQueues::findFirstByUniqid($data['uniqid']);
+        if (!$queue)  {
+            $queue = new CallQueues();
+            $extension = new Extensions();
+            $extension->type     = "QUEUE";
+            $extension->number   = $data["extension"];
+            $extension->callerid = parent::transliterate($data["name"]);
+            $extension->userid   = null;
+            $extension->show_in_phonebook  = 1;
+            $extension->public_access     = 1;
+        } else {
+            $extension = $queue->Extensions;
+        }
+
+        // Заполним параметры внутреннего номера
+        if (!$this->updateExtension($extension, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        // Заполним параметры пользователя
+        if (!$this->updateQueue($queue, $data)){
+            $this->view->success=false;
+            $this->db->rollback();
+            return;
+        }
+
+        // Заполним параметры участников очереди
+        if (!$this->updateQueueMembers($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 = "call-queues/modify/{$data['uniqid']}";
+        }
     }
 
 
     /**
-	 * Удаление очереди по ее ID
-	 * @param string $uniqid
-	 */
-	public function deleteAction(string $uniqid=null){
+     * Удаление очереди по ее ID
+     * @param string $uniqid
+     */
+    public function deleteAction(string $uniqid=null){
         $this->db->begin();
         $queue = CallQueues::findFirstByUniqid($uniqid);
 
@@ -180,182 +180,182 @@ 
     }
 
 
-	/**
-	 * Обновление параметров очереди
-	 * @param \Models\CallQueues $queue
-	 * @param array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateQueue(CallQueues $queue, array $data){
-		foreach ($queue as $name => $value) {
-			switch($name) {
-				case "extension":
-					$queue->$name = $data[$name];
-					break;
-				case "name":
-					$queue->$name = $data[$name];
-					break;
-				case "recive_calls_while_on_a_call":
-				case "announce_position":
-				case "announce_hold_time":
-					if (array_key_exists($name, $data))
-						$queue->$name = ($data[$name]=='on') ? "1" : "0";
-					else
-						$queue->$name = "0";
-					break;
-
-				case "periodic_announce_sound_id":
-				case "redirect_to_extension_if_repeat_exceeded":
-					if (!array_key_exists($name, $data) || empty($data[$name])) {
-						$queue->$name = null;
-						continue;
-					}
-					$queue->$name = $data[$name];
-					break;
-				case "redirect_to_extension_if_empty":
-					if (!array_key_exists($name, $data) || empty($data[$name])) {
-						$queue->$name = null;
-						continue;
-					}
-					$queue->$name = $data[$name];
-
-					break;
-				case "timeout_to_redirect_to_extension":
-					if (!array_key_exists($name, $data)) continue;
-					if (empty($data[$name])) {
-						$queue->$name = null;
-					} else {
-						$queue->$name = $data[$name];
-					}
-					break;
-				case "timeout_extension":
-					if (!array_key_exists($name, $data)
-					    || empty($data[$name])
-					             || (array_key_exists('timeout_to_redirect_to_extension', $data)
-					                 && intval($data['timeout_to_redirect_to_extension'])===0)) {
-						$queue->$name = null;
-						continue;
-					}
-					$queue->$name = $data[$name];
-
-					break;
-				case "number_unanswered_calls_to_redirect":
-					if (!array_key_exists($name, $data)) continue;
-					if (empty($data[$name])) {
-						$queue->$name = null;
-					} else {
-						$queue->$name = $data[$name];
-					}
-					break;
-				case "redirect_to_extension_if_unanswered":
-					if (!array_key_exists($name, $data)
-					    || empty($data[$name])
-					             || (array_key_exists('number_unanswered_calls_to_redirect', $data)
-					                 && intval($data['number_unanswered_calls_to_redirect'])===0)) {
-						$queue->$name = null;
-						continue;
-					}
-					$queue->$name = $data[$name];
-
-					break;
-				default:
-					if (!array_key_exists($name, $data)) continue;
-					$queue->$name = $data[$name];
-			}
-		}
-
-		if ($queue->save()=== false){
-			$errors = $queue->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 array $data массив полей из POST запроса
-	 * @return bool update result
-	 */
-	private function updateQueueMembers(array $data){
-
-		$realMembers=[];
-		// Обновим настройки у существующих членов очереди
-		$membersTable=json_decode($data['members']);
-		foreach ($membersTable as $member) {
-			$parameters = [
-				'conditions'=>'extension = :number: AND queue=:uniqid:',
-				'bind'=>[
-					'number'=>$member->number,
-					'uniqid'=> $data['uniqid']
-				]
-			];
-			$queueMembers = CallQueueMembers::find($parameters);
-			if ($queueMembers->count()>1){
-				// откуда то взались лишние. Надо их всех удалить и создать нового
-				if ($queueMembers->delete()=== FALSE){
-					$errors = $queueMembers->getMessages();
-					$this->flash->error(implode('<br>', $errors));
-					return FALSE;
-				}
-				$queueMember = new CallQueueMembers();
-			} elseif ($queueMembers->count()==1){
-				$queueMember = $queueMembers->getFirst();
-			} else {
-				$queueMember = new CallQueueMembers();
-			}
-
-			$queueMember->priority    = $member->priority;
-			$queueMember->extension   = $member->number;
-			$queueMember->queue       = $data['uniqid'];
-			$realMembers[]= $member->number;
-			if ($queueMember->save()=== FALSE){
-				$errors = $queueMember->getMessages();
-				$this->flash->error(implode('<br>', $errors));
-				return FALSE;
-			}
-		}
-
-		// Удалим членов очереди которх нет в списке
-		$parameters = [
-			'conditions'=>'extension NOT IN  ({numbers:array}) AND queue=:uniqid:',
-			'bind' =>[
-				'numbers'=>$realMembers,
-				'uniqid'=> $data['uniqid']
-			]
-		];
-
-		$deletedMembers = CallQueueMembers::find($parameters);
-		if ($deletedMembers && $deletedMembers->delete()=== FALSE){
-			$errors = $deletedMembers->getMessages();
-			$this->flash->error(implode('<br>', $errors));
-			return FALSE;
-		}
-
-		return TRUE;
-	}
+    /**
+     * Обновление параметров очереди
+     * @param \Models\CallQueues $queue
+     * @param array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateQueue(CallQueues $queue, array $data){
+        foreach ($queue as $name => $value) {
+            switch($name) {
+                case "extension":
+                    $queue->$name = $data[$name];
+                    break;
+                case "name":
+                    $queue->$name = $data[$name];
+                    break;
+                case "recive_calls_while_on_a_call":
+                case "announce_position":
+                case "announce_hold_time":
+                    if (array_key_exists($name, $data))
+                        $queue->$name = ($data[$name]=='on') ? "1" : "0";
+                    else
+                        $queue->$name = "0";
+                    break;
+
+                case "periodic_announce_sound_id":
+                case "redirect_to_extension_if_repeat_exceeded":
+                    if (!array_key_exists($name, $data) || empty($data[$name])) {
+                        $queue->$name = null;
+                        continue;
+                    }
+                    $queue->$name = $data[$name];
+                    break;
+                case "redirect_to_extension_if_empty":
+                    if (!array_key_exists($name, $data) || empty($data[$name])) {
+                        $queue->$name = null;
+                        continue;
+                    }
+                    $queue->$name = $data[$name];
+
+                    break;
+                case "timeout_to_redirect_to_extension":
+                    if (!array_key_exists($name, $data)) continue;
+                    if (empty($data[$name])) {
+                        $queue->$name = null;
+                    } else {
+                        $queue->$name = $data[$name];
+                    }
+                    break;
+                case "timeout_extension":
+                    if (!array_key_exists($name, $data)
+                        || empty($data[$name])
+                                 || (array_key_exists('timeout_to_redirect_to_extension', $data)
+                                     && intval($data['timeout_to_redirect_to_extension'])===0)) {
+                        $queue->$name = null;
+                        continue;
+                    }
+                    $queue->$name = $data[$name];
+
+                    break;
+                case "number_unanswered_calls_to_redirect":
+                    if (!array_key_exists($name, $data)) continue;
+                    if (empty($data[$name])) {
+                        $queue->$name = null;
+                    } else {
+                        $queue->$name = $data[$name];
+                    }
+                    break;
+                case "redirect_to_extension_if_unanswered":
+                    if (!array_key_exists($name, $data)
+                        || empty($data[$name])
+                                 || (array_key_exists('number_unanswered_calls_to_redirect', $data)
+                                     && intval($data['number_unanswered_calls_to_redirect'])===0)) {
+                        $queue->$name = null;
+                        continue;
+                    }
+                    $queue->$name = $data[$name];
+
+                    break;
+                default:
+                    if (!array_key_exists($name, $data)) continue;
+                    $queue->$name = $data[$name];
+            }
+        }
+
+        if ($queue->save()=== false){
+            $errors = $queue->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 array $data массив полей из POST запроса
+     * @return bool update result
+     */
+    private function updateQueueMembers(array $data){
+
+        $realMembers=[];
+        // Обновим настройки у существующих членов очереди
+        $membersTable=json_decode($data['members']);
+        foreach ($membersTable as $member) {
+            $parameters = [
+                'conditions'=>'extension = :number: AND queue=:uniqid:',
+                'bind'=>[
+                    'number'=>$member->number,
+                    'uniqid'=> $data['uniqid']
+                ]
+            ];
+            $queueMembers = CallQueueMembers::find($parameters);
+            if ($queueMembers->count()>1){
+                // откуда то взались лишние. Надо их всех удалить и создать нового
+                if ($queueMembers->delete()=== FALSE){
+                    $errors = $queueMembers->getMessages();
+                    $this->flash->error(implode('<br>', $errors));
+                    return FALSE;
+                }
+                $queueMember = new CallQueueMembers();
+            } elseif ($queueMembers->count()==1){
+                $queueMember = $queueMembers->getFirst();
+            } else {
+                $queueMember = new CallQueueMembers();
+            }
+
+            $queueMember->priority    = $member->priority;
+            $queueMember->extension   = $member->number;
+            $queueMember->queue       = $data['uniqid'];
+            $realMembers[]= $member->number;
+            if ($queueMember->save()=== FALSE){
+                $errors = $queueMember->getMessages();
+                $this->flash->error(implode('<br>', $errors));
+                return FALSE;
+            }
+        }
+
+        // Удалим членов очереди которх нет в списке
+        $parameters = [
+            'conditions'=>'extension NOT IN  ({numbers:array}) AND queue=:uniqid:',
+            'bind' =>[
+                'numbers'=>$realMembers,
+                'uniqid'=> $data['uniqid']
+            ]
+        ];
+
+        $deletedMembers = CallQueueMembers::find($parameters);
+        if ($deletedMembers && $deletedMembers->delete()=== FALSE){
+            $errors = $deletedMembers->getMessages();
+            $this->flash->error(implode('<br>', $errors));
+            return FALSE;
+        }
+
+        return TRUE;
+    }
 }
\ No newline at end of file

Spacing +56 added lines, -56 removed lines

@@ -30,35 +30,35 @@ 
 	 *
 	 * @param string $uniqid - идентификатор редактируемой очереди
 	 */
-	public function modifyAction(string $uniqid=null){
+	public function modifyAction(string $uniqid = null) {
 		$queue = CallQueues::findFirstByUniqid($uniqid);
-        $queueMembersList=[];
-        $soundfilesList=[];
+        $queueMembersList = [];
+        $soundfilesList = [];
         $extensionList = [];
         if (!$queue) {
             $queue                              = new CallQueues();
-            $queue->uniqid                      =   strtoupper('QUEUE-'.md5($queue->id.time()));
-            $queue->caller_hear                 =   'moh';
+            $queue->uniqid                      = strtoupper('QUEUE-'.md5($queue->id.time()));
+            $queue->caller_hear                 = 'moh';
             $queue->seconds_to_ring_each_member = 20;
-            $queue->seconds_for_wrapup          =   15;
-            $queue->announce_position           =   1;
-            $queue->announce_hold_time          =   1;
-            $queue->periodic_announce_frequency =45;
+            $queue->seconds_for_wrapup          = 15;
+            $queue->announce_position           = 1;
+            $queue->announce_hold_time          = 1;
+            $queue->periodic_announce_frequency = 45;
 	        $queue->extension
 	                                            = Extensions::getNextFreeApplicationNumber();
 
         } else {
             // Списк экстеншенов очереди
-            $parameters =[
+            $parameters = [
                 'order'=>'priority',
                 'conditions'=>'queue=:queue:',
                 'bind'=>[
                     'queue'=>$queue->uniqid
                 ]
             ];
-            $members=CallQueueMembers::find($parameters);
-            foreach ($members as $member){
-                $queueMembersList[]=[
+            $members = CallQueueMembers::find($parameters);
+            foreach ($members as $member) {
+                $queueMembersList[] = [
                     'id'=>$member->id,
                     'number'=>$member->extension,
                     'callerid'=>$member->Extensions->getRepresent()
@@ -66,9 +66,9 @@ 
             }
         }
 
-		$extensionList[""] = $this->translation->_( "ex_SelectNumber" );
+		$extensionList[""] = $this->translation->_("ex_SelectNumber");
         // Список всех используемых эктеншенов
-        $parameters =[
+        $parameters = [
             'conditions'=>'number IN ({ids:array})',
             'bind'=>[
                 'ids'=>[
@@ -79,16 +79,16 @@ 
                 ]]
         ];
         $extensions = Extensions::find($parameters);
-        foreach ($extensions as $record){
-            $extensionList[$record->number]=$record->getRepresent();
+        foreach ($extensions as $record) {
+            $extensionList[$record->number] = $record->getRepresent();
         }
 
         // Список звуковых файлов для очередей
-		$soundfilesList[""]    = $this->translation->_( "sf_SelectAudioFile" );
-		$soundfilesList[ - 1 ] = '-';
+		$soundfilesList[""]    = $this->translation->_("sf_SelectAudioFile");
+		$soundfilesList[ -1] = '-';
 		$soundFiles            = SoundFiles::find();
-        foreach ($soundFiles as $soundFile){
-            $soundfilesList[$soundFile->id]=$soundFile->name;
+        foreach ($soundFiles as $soundFile) {
+            $soundfilesList[$soundFile->id] = $soundFile->name;
         }
 
         $form = new CallQueueEditForm($queue, [
@@ -96,8 +96,8 @@ 
             'soundfiles'=>$soundfilesList
         ]);
         $this->view->form = $form;
-        $this->view->extensionsTable=$queueMembersList;
-	    $this->view->represent  = $queue->getRepresent();
+        $this->view->extensionsTable = $queueMembersList;
+	    $this->view->represent = $queue->getRepresent();
     }
 
 
@@ -111,46 +111,46 @@ 
 
 	    $data = $this->request->getPost();
 	    $queue = CallQueues::findFirstByUniqid($data['uniqid']);
-	    if (!$queue)  {
+	    if (!$queue) {
 		    $queue = new CallQueues();
 		    $extension = new Extensions();
 		    $extension->type     = "QUEUE";
 		    $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 = $queue->Extensions;
 	    }
 
 	    // Заполним параметры внутреннего номера
-	    if (!$this->updateExtension($extension, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateExtension($extension, $data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
 	    // Заполним параметры пользователя
-	    if (!$this->updateQueue($queue, $data)){
-		    $this->view->success=false;
+	    if (!$this->updateQueue($queue, $data)) {
+		    $this->view->success = false;
 		    $this->db->rollback();
 		    return;
 	    }
 
 	    // Заполним параметры участников очереди
-	    if (!$this->updateQueueMembers($data)){
-		    $this->view->success=false;
+	    if (!$this->updateQueueMembers($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 = "call-queues/modify/{$data['uniqid']}";
 	    }
     }
@@ -160,15 +160,15 @@ 
 	 * Удаление очереди по ее ID
 	 * @param string $uniqid
 	 */
-	public function deleteAction(string $uniqid=null){
+	public function deleteAction(string $uniqid = null) {
         $this->db->begin();
         $queue = CallQueues::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();
         }
@@ -186,9 +186,9 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateQueue(CallQueues $queue, array $data){
+	private function updateQueue(CallQueues $queue, array $data) {
 		foreach ($queue as $name => $value) {
-			switch($name) {
+			switch ($name) {
 				case "extension":
 					$queue->$name = $data[$name];
 					break;
@@ -199,7 +199,7 @@ 
 				case "announce_position":
 				case "announce_hold_time":
 					if (array_key_exists($name, $data))
-						$queue->$name = ($data[$name]=='on') ? "1" : "0";
+						$queue->$name = ($data[$name] == 'on') ? "1" : "0";
 					else
 						$queue->$name = "0";
 					break;
@@ -232,7 +232,7 @@ 
 					if (!array_key_exists($name, $data)
 					    || empty($data[$name])
 					             || (array_key_exists('timeout_to_redirect_to_extension', $data)
-					                 && intval($data['timeout_to_redirect_to_extension'])===0)) {
+					                 && intval($data['timeout_to_redirect_to_extension']) === 0)) {
 						$queue->$name = null;
 						continue;
 					}
@@ -251,7 +251,7 @@ 
 					if (!array_key_exists($name, $data)
 					    || empty($data[$name])
 					             || (array_key_exists('number_unanswered_calls_to_redirect', $data)
-					                 && intval($data['number_unanswered_calls_to_redirect'])===0)) {
+					                 && intval($data['number_unanswered_calls_to_redirect']) === 0)) {
 						$queue->$name = null;
 						continue;
 					}
@@ -264,7 +264,7 @@ 
 			}
 		}
 
-		if ($queue->save()=== false){
+		if ($queue->save() === false) {
 			$errors = $queue->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return false;
@@ -280,11 +280,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;
@@ -301,11 +301,11 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateQueueMembers(array $data){
+	private function updateQueueMembers(array $data) {
 
-		$realMembers=[];
+		$realMembers = [];
 		// Обновим настройки у существующих членов очереди
-		$membersTable=json_decode($data['members']);
+		$membersTable = json_decode($data['members']);
 		foreach ($membersTable as $member) {
 			$parameters = [
 				'conditions'=>'extension = :number: AND queue=:uniqid:',
@@ -315,15 +315,15 @@ 
 				]
 			];
 			$queueMembers = CallQueueMembers::find($parameters);
-			if ($queueMembers->count()>1){
+			if ($queueMembers->count() > 1) {
 				// откуда то взались лишние. Надо их всех удалить и создать нового
-				if ($queueMembers->delete()=== FALSE){
+				if ($queueMembers->delete() === FALSE) {
 					$errors = $queueMembers->getMessages();
 					$this->flash->error(implode('<br>', $errors));
 					return FALSE;
 				}
 				$queueMember = new CallQueueMembers();
-			} elseif ($queueMembers->count()==1){
+			} elseif ($queueMembers->count() == 1) {
 				$queueMember = $queueMembers->getFirst();
 			} else {
 				$queueMember = new CallQueueMembers();
@@ -332,8 +332,8 @@ 
 			$queueMember->priority    = $member->priority;
 			$queueMember->extension   = $member->number;
 			$queueMember->queue       = $data['uniqid'];
-			$realMembers[]= $member->number;
-			if ($queueMember->save()=== FALSE){
+			$realMembers[] = $member->number;
+			if ($queueMember->save() === FALSE) {
 				$errors = $queueMember->getMessages();
 				$this->flash->error(implode('<br>', $errors));
 				return FALSE;
@@ -350,7 +350,7 @@ 
 		];
 
 		$deletedMembers = CallQueueMembers::find($parameters);
-		if ($deletedMembers && $deletedMembers->delete()=== FALSE){
+		if ($deletedMembers && $deletedMembers->delete() === FALSE) {
 			$errors = $deletedMembers->getMessages();
 			$this->flash->error(implode('<br>', $errors));
 			return FALSE;

Braces +35 added lines, -20 removed lines

@@ -13,13 +13,14 @@ 
     Models\CallQueueMembers;
 
 
-class CallQueuesController extends BaseController {
+class CallQueuesController extends BaseController
+{
 
 	/**
 	 * Получение списка очередей вызовово
 	 */
 	public function indexAction()
-    {
+	{
         $queues = CallQueues::find();
         $this->view->queues = $queues;
     }
@@ -30,7 +31,8 @@ 
 	 *
 	 * @param string $uniqid - идентификатор редактируемой очереди
 	 */
-	public function modifyAction(string $uniqid=null){
+	public function modifyAction(string $uniqid=null)
+	{
 		$queue = CallQueues::findFirstByUniqid($uniqid);
         $queueMembersList=[];
         $soundfilesList=[];
@@ -105,8 +107,10 @@ 
 	 * Сохранение очереди через AJAX запрос из формы
 	 */
 	public function saveAction()
-    {
-	    if (!$this->request->isPost()) return;
+	{
+	    if (!$this->request->isPost()) {
+	        return;
+	    }
 	    $this->db->begin();
 
 	    $data = $this->request->getPost();
@@ -160,19 +164,20 @@ 
 	 * Удаление очереди по ее ID
 	 * @param string $uniqid
 	 */
-	public function deleteAction(string $uniqid=null){
+	public function deleteAction(string $uniqid=null)
+	{
         $this->db->begin();
         $queue = CallQueues::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();
         }
@@ -186,7 +191,8 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateQueue(CallQueues $queue, array $data){
+	private function updateQueue(CallQueues $queue, array $data)
+	{
 		foreach ($queue as $name => $value) {
 			switch($name) {
 				case "extension":
@@ -198,10 +204,11 @@ 
 				case "recive_calls_while_on_a_call":
 				case "announce_position":
 				case "announce_hold_time":
-					if (array_key_exists($name, $data))
-						$queue->$name = ($data[$name]=='on') ? "1" : "0";
-					else
-						$queue->$name = "0";
+					if (array_key_exists($name, $data)) {
+											$queue->$name = ($data[$name]=='on') ? "1" : "0";
+					} else {
+											$queue->$name = "0";
+					}
 					break;
 
 				case "periodic_announce_sound_id":
@@ -221,7 +228,9 @@ 
 
 					break;
 				case "timeout_to_redirect_to_extension":
-					if (!array_key_exists($name, $data)) continue;
+					if (!array_key_exists($name, $data)) {
+					    continue;
+					}
 					if (empty($data[$name])) {
 						$queue->$name = null;
 					} else {
@@ -240,7 +249,9 @@ 
 
 					break;
 				case "number_unanswered_calls_to_redirect":
-					if (!array_key_exists($name, $data)) continue;
+					if (!array_key_exists($name, $data)) {
+					    continue;
+					}
 					if (empty($data[$name])) {
 						$queue->$name = null;
 					} else {
@@ -259,7 +270,9 @@ 
 
 					break;
 				default:
-					if (!array_key_exists($name, $data)) continue;
+					if (!array_key_exists($name, $data)) {
+					    continue;
+					}
 					$queue->$name = $data[$name];
 			}
 		}
@@ -280,7 +293,8 @@ 
 	 * @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']);
@@ -301,7 +315,8 @@ 
 	 * @param array $data массив полей из POST запроса
 	 * @return bool update result
 	 */
-	private function updateQueueMembers(array $data){
+	private function updateQueueMembers(array $data)
+	{
 
 		$realMembers=[];
 		// Обновим настройки у существующих членов очереди

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

@@ -270,7 +270,7 @@ 
 			return false;
 		}
 
-		return TRUE;
+		return true;
 	}
 
 
@@ -290,7 +290,7 @@ 
 			return false;
 		}
 
-		return TRUE;
+		return true;
 
 	}
 
@@ -317,10 +317,10 @@ 
 			$queueMembers = CallQueueMembers::find($parameters);
 			if ($queueMembers->count()>1){
 				// откуда то взались лишние. Надо их всех удалить и создать нового
-				if ($queueMembers->delete()=== FALSE){
+				if ($queueMembers->delete()=== false){
 					$errors = $queueMembers->getMessages();
 					$this->flash->error(implode('<br>', $errors));
-					return FALSE;
+					return false;
 				}
 				$queueMember = new CallQueueMembers();
 			} elseif ($queueMembers->count()==1){
@@ -333,10 +333,10 @@ 
 			$queueMember->extension   = $member->number;
 			$queueMember->queue       = $data['uniqid'];
 			$realMembers[]= $member->number;
-			if ($queueMember->save()=== FALSE){
+			if ($queueMember->save()=== false){
 				$errors = $queueMember->getMessages();
 				$this->flash->error(implode('<br>', $errors));
-				return FALSE;
+				return false;
 			}
 		}
 
@@ -350,12 +350,12 @@ 
 		];
 
 		$deletedMembers = CallQueueMembers::find($parameters);
-		if ($deletedMembers && $deletedMembers->delete()=== FALSE){
+		if ($deletedMembers && $deletedMembers->delete()=== false){
 			$errors = $deletedMembers->getMessages();
 			$this->flash->error(implode('<br>', $errors));
-			return FALSE;
+			return false;
 		}
 
-		return TRUE;
+		return true;
 	}
 }
\ No newline at end of file

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

Indentation +7 added lines, -7 removed lines

@@ -13,11 +13,11 @@
 class UpdateController extends BaseController {
 
 
-	/**
-	 * Обновление станции до нового релиза
-	 *
-	 */
-	public function indexAction() {
-		$this->view->submitMode = NULL;
-	}
+    /**
+     * Обновление станции до нового релиза
+     *
+     */
+    public function indexAction() {
+        $this->view->submitMode = NULL;
+    }
 }
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -10,14 +10,16 @@
 use Models\PbxSettings;
 use Phalcon\Text;
 
-class UpdateController extends BaseController {
+class UpdateController extends BaseController
+{
 
 
 	/**
 	 * Обновление станции до нового релиза
 	 *
 	 */
-	public function indexAction() {
+	public function indexAction()
+	{
 		$this->view->submitMode = NULL;
 	}
 }
\ No newline at end of file

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

@@ -18,6 +18,6 @@
 	 *
 	 */
 	public function indexAction() {
-		$this->view->submitMode = NULL;
+		$this->view->submitMode = null;
 	}
 }
\ No newline at end of file

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

Spacing +12 added lines, -12 removed lines

@@ -54,7 +54,7 @@ 
         }
         //Маршрут по умолчанию
         $defaultRule = IncomingRoutingTable::findFirstById(1);
-        if ( ! $defaultRule) {
+        if (!$defaultRule) {
             $defaultRule           = new IncomingRoutingTable();
             $defaultRule->id       = 1;
             $defaultRule->action   = 'busy';
@@ -72,7 +72,7 @@ 
                 ],
             ],
         ];
-        $extensions               = Extensions::find($parameters);
+        $extensions = Extensions::find($parameters);
         foreach ($extensions as $record) {
             $forwardingExtensions[$record->number] = $record ? $record->getRepresent() : '';
         }
@@ -91,12 +91,12 @@ 
      */
     public function modifyAction($ruleId = null)
     {
-        if ((int)$ruleId === 1) {
+        if ((int) $ruleId === 1) {
             return $this->forward('incoming-routes/index');
         } // Первая строка маршрут по умолчанию, ее не трогаем.
 
         $rule = IncomingRoutingTable::findFirstByid($ruleId);
-        if ( ! $rule) {
+        if (!$rule) {
             $rule = new IncomingRoutingTable();
         }
 
@@ -120,7 +120,7 @@ 
                 ],
             ],
         ];
-        $extensions               = Extensions::find($parameters);
+        $extensions = Extensions::find($parameters);
         foreach ($extensions as $record) {
             $forwardingExtensions[$record->number] = $record ? $record->getRepresent() : '';
         }
@@ -137,13 +137,13 @@ 
      */
     public function saveAction()
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $this->db->begin();
         $data = $this->request->getPost();
         $rule = IncomingRoutingTable::findFirstByid($data['id']);
-        if ( ! $rule) {
+        if (!$rule) {
             $rule = new IncomingRoutingTable();
         }
 
@@ -159,7 +159,7 @@ 
                 case 'priority':
                     if (empty($data[$name])) {
                         // Найдем строчку с самым высоким приоиртетом, кроме 9999
-                        $params      = [
+                        $params = [
                             'column'     => 'priority',
                             'conditions' => 'priority != 9999',
                         ];
@@ -205,7 +205,7 @@ 
      */
     public function deleteAction(string $ruleId)
     {
-        if ((int)$ruleId === 1) {
+        if ((int) $ruleId === 1) {
             return $this->forward('incoming-routes/index'); // Первая строка маршрут по умолчанию, ее не трогаем.
         }
 
@@ -225,20 +225,20 @@ 
      */
     public function changePriorityAction(string $ruleId = null)
     {
-        if ((int)$ruleId === 1) {
+        if ((int) $ruleId === 1) {
             return;
         } // Первая строка маршрут по умолчанию, ее не трогаем.
 
         $this->view->disable();
         $result = false;
 
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();
         $rule = IncomingRoutingTable::findFirstById($ruleId);
         if ($rule) {
-            $rule->priority = (int)$data['newPriority'];
+            $rule->priority = (int) $data['newPriority'];
             $result         = $rule->update();
         }
         echo json_encode($result);

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

Spacing +2 added lines, -2 removed lines

@@ -14,13 +14,13 @@
     /**
      * Проверка на доступность емейл адреса
      */
-    public function availableAction($email){
+    public function availableAction($email) {
         $result = true;
         $extension = Users::findFirstByEmail($email);
         if ($extension) {
             $result = false;
         }
-        $this->view->emailAvailable=$result;
+        $this->view->emailAvailable = $result;
     }
 
 }
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -9,12 +9,14 @@
 
 use \Models\Users;
 
-class UsersController extends BaseController {
+class UsersController extends BaseController
+{
 
     /**
      * Проверка на доступность емейл адреса
      */
-    public function availableAction($email){
+    public function availableAction($email)
+    {
         $result = true;
         $extension = Users::findFirstByEmail($email);
         if ($extension) {

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

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
                 }
             }
             $newResult = $this->$currentAdvice();
-            if ( ! empty($newResult)) {
+            if (!empty($newResult)) {
                 $arrMessages[] = $newResult;
             }
             $this->session->set($currentAdvice, json_encode(['LastMessage' => $newResult, 'LastTimeStamp' => time()]));
@@ -49,7 +49,7 @@ 
         $result              = [];
         foreach ($arrMessages as $message) {
             foreach ($message as $key => $value) {
-                if ( ! empty($value)) {
+                if (!empty($value)) {
                     $result[$key][] = $value;
                 }
             }
@@ -105,7 +105,7 @@ 
      */
     private function checkStorage()
     {
-        if ( ! is_array($_COOKIE) || ! array_key_exists(session_name(), $_COOKIE)) {
+        if (!is_array($_COOKIE) || !array_key_exists(session_name(), $_COOKIE)) {
             return [];
         }
 
@@ -115,7 +115,7 @@ 
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_TIMEOUT, 3);
-        curl_setopt($ch, CURLOPT_COOKIE, session_name() . '=' . $_COOKIE[session_name()]);
+        curl_setopt($ch, CURLOPT_COOKIE, session_name().'='.$_COOKIE[session_name()]);
         $output = curl_exec($ch);
         curl_close($ch);
         $storageList = json_decode($output, false);
@@ -181,7 +181,7 @@ 
     private function checkRegistration()
     {
         $licKey = Models\PbxSettings::getValueByKey('PBXLicense');
-        if ( ! empty($licKey)) {
+        if (!empty($licKey)) {
 
             $checkBaseFeature = $this->licenseWorker->featureAvailable(33);
             if ($checkBaseFeature['success'] === false) {