mikopbx / Core

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

Indentation +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
 class SystemDiagnosticController extends BaseController {
 
-	public function indexAction() {
+    public function indexAction() {
        
-	}
+    }
 
 }
\ No newline at end of file

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

Indentation +16 added lines, -16 removed lines

@@ -12,9 +12,9 @@ 
 
 class CustomFilesController extends BaseController {
 
-	/**
-	 * Построение списка файлов
-	 */
+    /**
+     * Построение списка файлов
+     */
     public function indexAction() {
 
         $files = CustomFiles::find();
@@ -24,11 +24,11 @@ 
 
 
     /**
-	 * Открытие карточки редактирования Файла записи
-	 *
-	 * @param string $id редактируемой записи
-	 */
-	public function modifyAction(string $id) {
+     * Открытие карточки редактирования Файла записи
+     *
+     * @param string $id редактируемой записи
+     */
+    public function modifyAction(string $id) {
         $file = CustomFiles::findFirstById($id);
         if (!$file) {
             return $this->forward('custom-files/index');
@@ -37,17 +37,17 @@ 
         $form = new CustomFilesEditForm($file);
         $this->view->content = $file->getContent();
         $this->view->form = $form;
-	    $this->view->represent  = $file->getRepresent();
-		$this->view->submitMode = NULL;
+        $this->view->represent  = $file->getRepresent();
+        $this->view->submitMode = NULL;
     }
 
 
-	/**
-	 * Сохранение параметров переопределения системного файла
-	 *
-	 * @return void
-	 */
-	public function saveAction(){
+    /**
+     * Сохранение параметров переопределения системного файла
+     *
+     * @return void
+     */
+    public function saveAction(){
         if (!$this->request->isPost()) return;
 
         $data = $this->request->getPost();

Spacing +3 added lines, -3 removed lines

@@ -47,12 +47,12 @@ 
 	 *
 	 * @return void
 	 */
-	public function saveAction(){
+	public function saveAction() {
         if (!$this->request->isPost()) return;
 
         $data = $this->request->getPost();
         $customFile = CustomFiles::findFirstById($data['id']);
-        if ($customFile==false) return;
+        if ($customFile == false) return;
 
         // Заполним параметры записи
         foreach ($customFile as $name => $value) {
@@ -68,7 +68,7 @@ 
                     $customFile->$name = $data[$name];
             }
         }
-        if ($customFile->save()=== false){
+        if ($customFile->save() === false) {
             $errors = $customFile->getMessages();
             $this->flash->error(implode('<br>', $errors));
             $this->view->success = false;

Braces +9 added lines, -3 removed lines

@@ -48,11 +48,15 @@ 
 	 * @return void
 	 */
 	public function saveAction(){
-        if (!$this->request->isPost()) return;
+        if (!$this->request->isPost()) {
+            return;
+        }
 
         $data = $this->request->getPost();
         $customFile = CustomFiles::findFirstById($data['id']);
-        if ($customFile==false) return;
+        if ($customFile==false) {
+            return;
+        }
 
         // Заполним параметры записи
         foreach ($customFile as $name => $value) {
@@ -64,7 +68,9 @@ 
                     $customFile->setContent($data[$name]);
                     break;
                 default:
-                    if (!array_key_exists($name, $data)) continue;
+                    if (!array_key_exists($name, $data)) {
+                        continue;
+                    }
                     $customFile->$name = $data[$name];
             }
         }

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

Indentation +64 added lines, -64 removed lines

@@ -12,74 +12,74 @@
 
 class Fail2BanController extends BaseController {
 
-	/**
-	 * Построение списка внутренних номеров и сотрудников
-	 */
-	public function indexAction() {
-		$rules = Fail2BanRules::findFirst();
-		if ( ! $rules ) {
-			$rules = new Fail2BanRules();
-		}
-		$fail2BanEnabled = PbxSettings::getValueByKey( 'PBXFail2BanEnabled' );
+    /**
+     * Построение списка внутренних номеров и сотрудников
+     */
+    public function indexAction() {
+        $rules = Fail2BanRules::findFirst();
+        if ( ! $rules ) {
+            $rules = new Fail2BanRules();
+        }
+        $fail2BanEnabled = PbxSettings::getValueByKey( 'PBXFail2BanEnabled' );
 
-		$this->view->form = new Fail2BanEditForm( $rules,
-			[ 'PBXFail2BanEnabled' => $fail2BanEnabled ] );
-		$this->view->submitMode = NULL;
-	}
+        $this->view->form = new Fail2BanEditForm( $rules,
+            [ 'PBXFail2BanEnabled' => $fail2BanEnabled ] );
+        $this->view->submitMode = NULL;
+    }
 
-	/**
-	 * Сохранение настроек системы
-	 */
-	public function saveAction() {
-		if ( ! $this->request->isPost() ) {
-			return;
-		}
-		$data   = $this->request->getPost();
-		$record = Fail2BanRules::findFirst();
+    /**
+     * Сохранение настроек системы
+     */
+    public function saveAction() {
+        if ( ! $this->request->isPost() ) {
+            return;
+        }
+        $data   = $this->request->getPost();
+        $record = Fail2BanRules::findFirst();
 
-		if ( ! $record ) {
-			$record = new Fail2BanRules();
-		}
-		$this->db->begin();
-		foreach ( $record as $key => $value ) {
-			switch ( $key ) {
-				case "id":
-					break;
-				default:
-					if ( ! array_key_exists( $key, $data ) ) {
-						$record->$key = '';
-						continue;
-					}
-					$record->$key = $data[ $key ];
-			}
-			if ( $record->save() === FALSE ) {
-				$errors = $record->getMessages();
-				$this->flash->warning( implode( '<br>', $errors ) );
-				$this->view->success = FALSE;
-				$this->db->rollback();
+        if ( ! $record ) {
+            $record = new Fail2BanRules();
+        }
+        $this->db->begin();
+        foreach ( $record as $key => $value ) {
+            switch ( $key ) {
+                case "id":
+                    break;
+                default:
+                    if ( ! array_key_exists( $key, $data ) ) {
+                        $record->$key = '';
+                        continue;
+                    }
+                    $record->$key = $data[ $key ];
+            }
+            if ( $record->save() === FALSE ) {
+                $errors = $record->getMessages();
+                $this->flash->warning( implode( '<br>', $errors ) );
+                $this->view->success = FALSE;
+                $this->db->rollback();
 
-				return;
-			}
-		}
-		// $fail2BanEnabled = PbxSettings::findFirstByKey( 'PBXFail2BanEnabled' );
-		// if ( ! $fail2BanEnabled ) {
-		// 	$fail2BanEnabled      = new PbxSettings();
-		// 	$fail2BanEnabled->key = 'PBXFail2BanEnabled';
-		// }
-		// $fail2BanEnabled->value = ( $data['PBXFail2BanEnabled'] == 'on' ) ? "1"
-		// 	: "0";
-		// if ( $fail2BanEnabled->save() === FALSE ) {
-		// 	$errors = $fail2BanEnabled->getMessages();
-		// 	$this->flash->warning( implode( '<br>', $errors ) );
-		// 	$this->view->success = FALSE;
-		// 	$this->db->rollback();
-		//
-		// 	return;
-		// }
+                return;
+            }
+        }
+        // $fail2BanEnabled = PbxSettings::findFirstByKey( 'PBXFail2BanEnabled' );
+        // if ( ! $fail2BanEnabled ) {
+        // 	$fail2BanEnabled      = new PbxSettings();
+        // 	$fail2BanEnabled->key = 'PBXFail2BanEnabled';
+        // }
+        // $fail2BanEnabled->value = ( $data['PBXFail2BanEnabled'] == 'on' ) ? "1"
+        // 	: "0";
+        // if ( $fail2BanEnabled->save() === FALSE ) {
+        // 	$errors = $fail2BanEnabled->getMessages();
+        // 	$this->flash->warning( implode( '<br>', $errors ) );
+        // 	$this->view->success = FALSE;
+        // 	$this->db->rollback();
+        //
+        // 	return;
+        // }
 
-		$this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
-		$this->view->success = FALSE;
-		$this->db->commit();
-	}
+        $this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
+        $this->view->success = FALSE;
+        $this->db->commit();
+    }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -17,13 +17,13 @@ 
 	 */
 	public function indexAction() {
 		$rules = Fail2BanRules::findFirst();
-		if ( ! $rules ) {
+		if (!$rules) {
 			$rules = new Fail2BanRules();
 		}
-		$fail2BanEnabled = PbxSettings::getValueByKey( 'PBXFail2BanEnabled' );
+		$fail2BanEnabled = PbxSettings::getValueByKey('PBXFail2BanEnabled');
 
-		$this->view->form = new Fail2BanEditForm( $rules,
-			[ 'PBXFail2BanEnabled' => $fail2BanEnabled ] );
+		$this->view->form = new Fail2BanEditForm($rules,
+			['PBXFail2BanEnabled' => $fail2BanEnabled]);
 		$this->view->submitMode = NULL;
 	}
 
@@ -31,30 +31,30 @@ 
 	 * Сохранение настроек системы
 	 */
 	public function saveAction() {
-		if ( ! $this->request->isPost() ) {
+		if (!$this->request->isPost()) {
 			return;
 		}
 		$data   = $this->request->getPost();
 		$record = Fail2BanRules::findFirst();
 
-		if ( ! $record ) {
+		if (!$record) {
 			$record = new Fail2BanRules();
 		}
 		$this->db->begin();
-		foreach ( $record as $key => $value ) {
-			switch ( $key ) {
+		foreach ($record as $key => $value) {
+			switch ($key) {
 				case "id":
 					break;
 				default:
-					if ( ! array_key_exists( $key, $data ) ) {
+					if (!array_key_exists($key, $data)) {
 						$record->$key = '';
 						continue;
 					}
-					$record->$key = $data[ $key ];
+					$record->$key = $data[$key];
 			}
-			if ( $record->save() === FALSE ) {
+			if ($record->save() === FALSE) {
 				$errors = $record->getMessages();
-				$this->flash->warning( implode( '<br>', $errors ) );
+				$this->flash->warning(implode('<br>', $errors));
 				$this->view->success = FALSE;
 				$this->db->rollback();
 
@@ -77,7 +77,7 @@ 
 		// 	return;
 		// }
 
-		$this->flash->success( $this->translation->_( 'ms_SuccessfulSaved' ) );
+		$this->flash->success($this->translation->_('ms_SuccessfulSaved'));
 		$this->view->success = FALSE;
 		$this->db->commit();
 	}

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

Spacing +22 added lines, -22 removed lines

@@ -32,10 +32,10 @@ 
 
             if (strpos($interface->subnet, '.') === false) {
                 $localAddresses[] = $calculator->cidr2network($interface->ipaddr,
-                        $interface->subnet) . '/' . $interface->subnet;
+                        $interface->subnet).'/'.$interface->subnet;
             } else {
                 $cidr             = $calculator->netmask2cidr($interface->subnet);
-                $localAddresses[] = $calculator->cidr2network($interface->ipaddr, $cidr) . '/' . $cidr;
+                $localAddresses[] = $calculator->cidr2network($interface->ipaddr, $cidr).'/'.$cidr;
             }
         }
 
@@ -51,11 +51,11 @@ 
 
             if (strpos($permitParts[1], '.') === false) {
                 $networksTable[$filter->id]['network'] = $calculator->cidr2network($permitParts[0],
-                        $permitParts[1]) . '/' . $permitParts[1];
+                        $permitParts[1]).'/'.$permitParts[1];
             } else {
                 $cidr                                  = $calculator->netmask2cidr($permitParts[1]);
                 $networksTable[$filter->id]['network'] = $calculator->cidr2network($permitParts[0],
-                        $cidr) . '/' . $cidr;
+                        $cidr).'/'.$cidr;
             }
             $networksTable[$filter->id]['permanent'] = false;
 
@@ -63,7 +63,7 @@ 
             // Заполним значениями по умолчанию
             foreach ($defaultRules as $key => $value) {
                 $networksTable[$filter->id]['category'][$key] = [
-                    'name' => empty($value['shortName'])?$key:$value['shortName'],
+                    'name' => empty($value['shortName']) ? $key : $value['shortName'],
                     'action' => $value['action']
                 ];
             }
@@ -72,7 +72,7 @@ 
             $firewallRules = $filter->FirewallRules;
             foreach ($firewallRules as $rule) {
                 $networksTable[$filter->id]['category'][$rule->category]['action'] = $rule->action;
-                if (!array_key_exists('name',$networksTable[$filter->id]['category'][$rule->category])){
+                if (!array_key_exists('name', $networksTable[$filter->id]['category'][$rule->category])) {
                     $networksTable[$filter->id]['category'][$rule->category]['name'] = $rule->category;
                 }
             }
@@ -88,7 +88,7 @@ 
                     break;
                 }
             }
-            if ( ! $existsPersistentRecord) {
+            if (!$existsPersistentRecord) {
                 foreach ($defaultRules as $key => $value) {
                     $networksTableNewRecord['category'][$key] = [
                         'name'   => $key,
@@ -98,7 +98,7 @@ 
                 $networksTableNewRecord['id']        = '';
                 $networksTableNewRecord['permanent'] = true;
                 $networksTableNewRecord['network']   = $localAddress;
-                if ($localAddress==='0.0.0.0/0'){
+                if ($localAddress === '0.0.0.0/0') {
                     $networksTableNewRecord['description'] = $this->translation->_('fw_AllNetworksRule');
                 } else {
                     $networksTableNewRecord['description'] = $this->translation->_('fw_LocalNetworksRule');
@@ -125,7 +125,7 @@ 
         $networkFilter = NetworkFilters::findFirstById($networkId);
         $firewallRules = FirewallRules::getDefaultRules();
         $data          = $this->request->getPost();
-        if ( ! $networkFilter) {
+        if (!$networkFilter) {
             $networkFilter         = new NetworkFilters();
             $networkFilter->permit = empty($data['permit']) ? '0.0.0.0/0' : $data['permit'];
         } else {
@@ -148,7 +148,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -162,7 +162,7 @@ 
         }
 
         // Заполним параметры записи Network Filter
-        if ( ! $this->updateNetworkFilters($filterRecord, $data)) {
+        if (!$this->updateNetworkFilters($filterRecord, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -171,7 +171,7 @@ 
 
         // Заполним параметры Firewall
         $data['id'] = $filterRecord->id;
-        if ( ! $this->updateFirewallRules($data)) {
+        if (!$this->updateFirewallRules($data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -195,7 +195,7 @@ 
         $filterRecord = NetworkFilters::findFirstById($networkId);
 
         $errors = false;
-        if ($filterRecord && ! $filterRecord->delete()) {
+        if ($filterRecord && !$filterRecord->delete()) {
             $errors = $filterRecord->getMessages();
         }
 
@@ -246,7 +246,7 @@ 
             switch ($name) {
                 case 'permit':
                     $filterRecord->$name = $calculator->cidr2network($data['network'],
-                            $data['subnet']) . '/' . $data['subnet'];
+                            $data['subnet']).'/'.$data['subnet'];
                     break;
                 case 'deny':
                     $filterRecord->$name = '0.0.0.0/0';
@@ -260,7 +260,7 @@ 
                     }
                     break;
                 default:
-                    if ( array_key_exists($name, $data)) {
+                    if (array_key_exists($name, $data)) {
                         $filterRecord->$name = $data[$name];
                     }
             }
@@ -296,7 +296,7 @@ 
 
 
         // Удалим все предыдущие правила
-        $parameters        = [
+        $parameters = [
             'conditions' => 'networkfilterid=:networkfilterid:',
             'bind'       => [
                 'networkfilterid' => $data['id'],
@@ -331,8 +331,8 @@ 
                 $newRule->portto          = $rule['portto'];
                 $newRule->category        = $key;
 
-                if (array_key_exists('rule_' . $key, $data) && $data['rule_' . $key]) {
-                    $newRule->action = $data['rule_' . $key] === 'on' ? 'allow' : 'block';
+                if (array_key_exists('rule_'.$key, $data) && $data['rule_'.$key]) {
+                    $newRule->action = $data['rule_'.$key] === 'on' ? 'allow' : 'block';
                 } else {
                     $newRule->action = 'block';
                 }
@@ -360,7 +360,7 @@ 
     public function enableAction(): void
     {
         $fail2BanEnabled = PbxSettings::findFirstByKey('PBXFail2BanEnabled');
-        if ( ! $fail2BanEnabled) {
+        if (!$fail2BanEnabled) {
             $fail2BanEnabled      = new PbxSettings();
             $fail2BanEnabled->key = 'PBXFail2BanEnabled';
         }
@@ -374,7 +374,7 @@ 
         }
 
         $firewallEnabled = PbxSettings::findFirstByKey('PBXFirewallEnabled');
-        if ( ! $firewallEnabled) {
+        if (!$firewallEnabled) {
             $firewallEnabled      = new PbxSettings();
             $firewallEnabled->key = 'PBXFail2BanEnabled';
         }
@@ -395,7 +395,7 @@ 
     public function disableAction(): void
     {
         $fail2BanEnabled = PbxSettings::findFirstByKey('PBXFail2BanEnabled');
-        if ( ! $fail2BanEnabled) {
+        if (!$fail2BanEnabled) {
             $fail2BanEnabled      = new PbxSettings();
             $fail2BanEnabled->key = 'PBXFail2BanEnabled';
         }
@@ -409,7 +409,7 @@ 
         }
 
         $firewallEnabled = PbxSettings::findFirstByKey('PBXFirewallEnabled');
-        if ( ! $firewallEnabled) {
+        if (!$firewallEnabled) {
             $firewallEnabled      = new PbxSettings();
             $firewallEnabled->key = 'PBXFail2BanEnabled';
         }

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

Indentation +5 added lines, -5 removed lines

@@ -11,10 +11,10 @@
 
 class RestartController extends BaseController {
 
-	/**
-	 * Форма с основными кнопками для перезагрузки и выключения станции
-	 */
-	public function indexAction() {
+    /**
+     * Форма с основными кнопками для перезагрузки и выключения станции
+     */
+    public function indexAction() {
 
-	}
+    }
 }

www/admin-cabinet/app/library/Elements.php

Spacing +13 added lines, -13 removed lines

@@ -339,24 +339,24 @@ 
             if (array_key_exists('submenu', $groupparams)) {
                 $resultHtml .= '<div class="item">';
                 $resultHtml .= '<div class="header">';
-                if (array_key_exists('iconclass', $groupparams) && ! empty($groupparams['iconclass'])) {
+                if (array_key_exists('iconclass', $groupparams) && !empty($groupparams['iconclass'])) {
                     $resultHtml .= "<i class='{$groupparams['iconclass']} icon'></i>";
                 }
-                $resultHtml .=  $this->translation->_($groupparams['caption']) . '</div>';
-                $resultHtml .=  "<div class='menu' data-group='{$group}'>";
+                $resultHtml .= $this->translation->_($groupparams['caption']).'</div>';
+                $resultHtml .= "<div class='menu' data-group='{$group}'>";
                 foreach ($groupparams['submenu'] as $controller => $option) {
-                    $link    = $this->url->get($controller . '/' . $option['action'] . '/' . $option['param']);
+                    $link    = $this->url->get($controller.'/'.$option['action'].'/'.$option['param']);
                     $caption = $this->translation->_($option['caption']);
-                    $resultHtml .=  "<a class='item {$option['style']}' href='{$link}'>
+                    $resultHtml .= "<a class='item {$option['style']}' href='{$link}'>
                     		<i class='{$option['iconclass']} icon'></i>{$caption}
                     	 </a>";
                 }
-                $resultHtml .=  '</div>';
-                $resultHtml .=  '</div>';
+                $resultHtml .= '</div>';
+                $resultHtml .= '</div>';
             } else {
-                $link    = $this->url->get($group . '/' . $groupparams['action'] . '/' . $groupparams['param']);
+                $link    = $this->url->get($group.'/'.$groupparams['action'].'/'.$groupparams['param']);
                 $caption = $this->translation->_($groupparams['caption']);
-                $resultHtml .=  "<a class='item {$groupparams['style']}' href='{$link}'>
+                $resultHtml .= "<a class='item {$groupparams['style']}' href='{$link}'>
                     	<i class='{$groupparams['iconclass']} icon'></i>{$caption}
                       </a>";
             }
@@ -378,7 +378,7 @@ 
         foreach ($this->_headerMenu as $index => $group) {
             if ($index === $uncamelizeControllerName
                 && array_key_exists('iconclass', $group[$uncamelizeControllerName])
-                && ! empty($group[$uncamelizeControllerName]['iconclass'])
+                && !empty($group[$uncamelizeControllerName]['iconclass'])
             ) {
                 $result = "<i class='{$group[$uncamelizeControllerName]['iconclass']} icon'></i>";
                 break;
@@ -386,7 +386,7 @@ 
             if (array_key_exists('submenu', $group)) {
                 foreach ($group['submenu'] as $index2 => $submenu) {
                     if ($index2 === $uncamelizeControllerName
-                        && ! empty($submenu['iconclass'])) {
+                        && !empty($submenu['iconclass'])) {
                         $result = "<i class='{$submenu['iconclass']} icon'></i>";
                         break;
                     }
@@ -404,8 +404,8 @@ 
     {
         $result = [];
         foreach ($this->_headerMenu as $group => $groupparams) {
-            if (array_key_exists('submenu', $groupparams)){
-                $result[(string)($group)] =$this->translation->_($groupparams['caption']);
+            if (array_key_exists('submenu', $groupparams)) {
+                $result[(string) ($group)] = $this->translation->_($groupparams['caption']);
             }
         }
         return $result;

www/admin-cabinet/app/library/LicenseWorker.php

Indentation +167 added lines, -167 removed lines

@@ -12,172 +12,172 @@
 
 class LicenseWorker extends Component {
 
-	private $serverUrl;
-
-	function __construct( $serverUrl = 'http://127.0.0.1:8222' ) {
-		$this->serverUrl = $serverUrl;
-	}
-
-	/**
-	 * Выполнение запроса к серверу NATS.
-	 *
-	 * @param $metod
-	 * @param $data
-	 *
-	 * @return mixed
-	 */
-	private function curlPostRequest( $metod, $data = NULL ) {
-		$url = $this->serverUrl . "/license.api/$metod";
-		$ch  = curl_init();
-		curl_setopt( $ch, CURLOPT_URL, $url );
-		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-		curl_setopt( $ch, CURLOPT_TIMEOUT, 25 );
-		if ( $data != NULL ) {
-			$params = http_build_query( $data );
-			curl_setopt( $ch, CURLOPT_POST, 1 );
-			curl_setopt( $ch, CURLOPT_POSTFIELDS, $params );
-			curl_setopt( $ch, CURLOPT_HTTPHEADER,
-				[ "Content-type: application/x-www-form-urlencoded" ] );
-		}
-		$output = curl_exec( $ch );
-		curl_close( $ch );
-
-		return $output;
-	}
-
-	/**
-	 * Получение инфорамции по лицензиям. Установка значения ключа в NATS.
-	 *
-	 * @param $key
-	 *
-	 * @return array
-	 */
-	public function getLicenseInfo( $key ) {
-		$response = $this->curlPostRequest( 'getlicenseinfo',
-			[ 'key' => $key ] );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
-			$result = $arResult['result'];
-		} else {
-			$result = $arResult['error'];
-			if ( openlog( "License", LOG_ODELAY, LOG_LOCAL7 ) ) {
-				syslog( LOG_EMERG, $arResult['error'] );
-				closelog();
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Получение нового регистрационного номера.
-	 *
-	 * @param $params
-	 *
-	 * @return mixed
-	 */
-	public function getTrialLicense( $params ) {
-		$data     = [
-			'companyname' => $params['companyname'],
-			'email'       => $params['email'],
-			'contact'     => $params['contact'],
-			'tel'         => $params['telefone'],
-			'inn'         => $params['inn'],
-			'description' => 'get trial from askozia pbx',
-			'product'     => 11,
-		];
-		$response = $this->curlPostRequest( 'gettrial', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
-			$result = $arResult['result'];
-		} else {
-			$result = $arResult['error'];
-		}
-		return $result;
-	}
-
-	/**
-	 * Добавление нового триала к ключу.
-	 *
-	 * @param $productid
-	 *
-	 * @return bool - результат активации триала
-	 */
-	public function addTrial( $productid = "11" ) {
-		$data     = [ 'product' => $productid ];
-		$response = $this->curlPostRequest( 'addtrial', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
-			$result = TRUE;
-		} else {
-			$result = $arResult['error'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Активация купона
-	 *
-	 * @param $coupon
-	 *
-	 * @return bool результат активации купона
-	 */
-	public function activateCoupon( $coupon ) {
-		$data     = [ 'coupon' => trim( $coupon ) ];
-		$response = $this->curlPostRequest( 'activatecoupon', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
-			$result = TRUE;
-		} else {
-			$result = $arResult['error'];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Смена лицензионного ключа
-	 *
-	 * @param $newKey - новый ключ
-	 */
-	public function changeLicenseKey( $newKey ) {
-		$this->curlPostRequest( 'changekey', [ 'key' => $newKey ] );
-	}
-
-	/**
-	 * Преобразование ответа в массив значений.
-	 *
-	 * @param $text
-	 *
-	 * @return array
-	 */
-	private function convertXMLToArray( $text ) {
-
-		$json_data = json_decode( $text, TRUE );
-		if (is_null($json_data)){
-			$text = str_replace( '\n', "\n", $text );
-			$text = str_replace( '\"', '"', $text );
-
-			$json_data = json_decode( $text, TRUE );
-		}
-		if ( ! isset( $json_data['error'] ) ) {
-			$text_xml = urldecode($json_data['result']);
-			libxml_use_internal_errors(true);
-			$doc = simplexml_load_string($text_xml);
-			if (!$doc) {
-				libxml_clear_errors();
-				$doc = $text_xml;
-			}
-
-			$result   = ['success' => TRUE, 'result' => $doc];
-		}elseif ( isset( $json_data['error'] ) ) {
-			$result = [ 'success' => FALSE, 'error' => $json_data['error'] ];
-		} else {
-			$result = [ 'success' => FALSE, 'error' => $json_data ];
-		}
-
-		return $result;
-	}
+    private $serverUrl;
+
+    function __construct( $serverUrl = 'http://127.0.0.1:8222' ) {
+        $this->serverUrl = $serverUrl;
+    }
+
+    /**
+     * Выполнение запроса к серверу NATS.
+     *
+     * @param $metod
+     * @param $data
+     *
+     * @return mixed
+     */
+    private function curlPostRequest( $metod, $data = NULL ) {
+        $url = $this->serverUrl . "/license.api/$metod";
+        $ch  = curl_init();
+        curl_setopt( $ch, CURLOPT_URL, $url );
+        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
+        curl_setopt( $ch, CURLOPT_TIMEOUT, 25 );
+        if ( $data != NULL ) {
+            $params = http_build_query( $data );
+            curl_setopt( $ch, CURLOPT_POST, 1 );
+            curl_setopt( $ch, CURLOPT_POSTFIELDS, $params );
+            curl_setopt( $ch, CURLOPT_HTTPHEADER,
+                [ "Content-type: application/x-www-form-urlencoded" ] );
+        }
+        $output = curl_exec( $ch );
+        curl_close( $ch );
+
+        return $output;
+    }
+
+    /**
+     * Получение инфорамции по лицензиям. Установка значения ключа в NATS.
+     *
+     * @param $key
+     *
+     * @return array
+     */
+    public function getLicenseInfo( $key ) {
+        $response = $this->curlPostRequest( 'getlicenseinfo',
+            [ 'key' => $key ] );
+        $arResult = $this->convertXMLToArray( $response );
+        if ( $arResult['success'] ) {
+            $result = $arResult['result'];
+        } else {
+            $result = $arResult['error'];
+            if ( openlog( "License", LOG_ODELAY, LOG_LOCAL7 ) ) {
+                syslog( LOG_EMERG, $arResult['error'] );
+                closelog();
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Получение нового регистрационного номера.
+     *
+     * @param $params
+     *
+     * @return mixed
+     */
+    public function getTrialLicense( $params ) {
+        $data     = [
+            'companyname' => $params['companyname'],
+            'email'       => $params['email'],
+            'contact'     => $params['contact'],
+            'tel'         => $params['telefone'],
+            'inn'         => $params['inn'],
+            'description' => 'get trial from askozia pbx',
+            'product'     => 11,
+        ];
+        $response = $this->curlPostRequest( 'gettrial', $data );
+        $arResult = $this->convertXMLToArray( $response );
+        if ( $arResult['success'] ) {
+            $result = $arResult['result'];
+        } else {
+            $result = $arResult['error'];
+        }
+        return $result;
+    }
+
+    /**
+     * Добавление нового триала к ключу.
+     *
+     * @param $productid
+     *
+     * @return bool - результат активации триала
+     */
+    public function addTrial( $productid = "11" ) {
+        $data     = [ 'product' => $productid ];
+        $response = $this->curlPostRequest( 'addtrial', $data );
+        $arResult = $this->convertXMLToArray( $response );
+        if ( $arResult['success'] ) {
+            $result = TRUE;
+        } else {
+            $result = $arResult['error'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Активация купона
+     *
+     * @param $coupon
+     *
+     * @return bool результат активации купона
+     */
+    public function activateCoupon( $coupon ) {
+        $data     = [ 'coupon' => trim( $coupon ) ];
+        $response = $this->curlPostRequest( 'activatecoupon', $data );
+        $arResult = $this->convertXMLToArray( $response );
+        if ( $arResult['success'] ) {
+            $result = TRUE;
+        } else {
+            $result = $arResult['error'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Смена лицензионного ключа
+     *
+     * @param $newKey - новый ключ
+     */
+    public function changeLicenseKey( $newKey ) {
+        $this->curlPostRequest( 'changekey', [ 'key' => $newKey ] );
+    }
+
+    /**
+     * Преобразование ответа в массив значений.
+     *
+     * @param $text
+     *
+     * @return array
+     */
+    private function convertXMLToArray( $text ) {
+
+        $json_data = json_decode( $text, TRUE );
+        if (is_null($json_data)){
+            $text = str_replace( '\n', "\n", $text );
+            $text = str_replace( '\"', '"', $text );
+
+            $json_data = json_decode( $text, TRUE );
+        }
+        if ( ! isset( $json_data['error'] ) ) {
+            $text_xml = urldecode($json_data['result']);
+            libxml_use_internal_errors(true);
+            $doc = simplexml_load_string($text_xml);
+            if (!$doc) {
+                libxml_clear_errors();
+                $doc = $text_xml;
+            }
+
+            $result   = ['success' => TRUE, 'result' => $doc];
+        }elseif ( isset( $json_data['error'] ) ) {
+            $result = [ 'success' => FALSE, 'error' => $json_data['error'] ];
+        } else {
+            $result = [ 'success' => FALSE, 'error' => $json_data ];
+        }
+
+        return $result;
+    }
 
 }
\ No newline at end of file

Spacing +49 added lines, -49 removed lines

@@ -14,7 +14,7 @@ 
 
 	private $serverUrl;
 
-	function __construct( $serverUrl = 'http://127.0.0.1:8222' ) {
+	function __construct($serverUrl = 'http://127.0.0.1:8222') {
 		$this->serverUrl = $serverUrl;
 	}
 
@@ -26,21 +26,21 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function curlPostRequest( $metod, $data = NULL ) {
-		$url = $this->serverUrl . "/license.api/$metod";
+	private function curlPostRequest($metod, $data = NULL) {
+		$url = $this->serverUrl."/license.api/$metod";
 		$ch  = curl_init();
-		curl_setopt( $ch, CURLOPT_URL, $url );
-		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
-		curl_setopt( $ch, CURLOPT_TIMEOUT, 25 );
-		if ( $data != NULL ) {
-			$params = http_build_query( $data );
-			curl_setopt( $ch, CURLOPT_POST, 1 );
-			curl_setopt( $ch, CURLOPT_POSTFIELDS, $params );
-			curl_setopt( $ch, CURLOPT_HTTPHEADER,
-				[ "Content-type: application/x-www-form-urlencoded" ] );
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 25);
+		if ($data != NULL) {
+			$params = http_build_query($data);
+			curl_setopt($ch, CURLOPT_POST, 1);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+			curl_setopt($ch, CURLOPT_HTTPHEADER,
+				["Content-type: application/x-www-form-urlencoded"]);
 		}
-		$output = curl_exec( $ch );
-		curl_close( $ch );
+		$output = curl_exec($ch);
+		curl_close($ch);
 
 		return $output;
 	}
@@ -52,16 +52,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function getLicenseInfo( $key ) {
-		$response = $this->curlPostRequest( 'getlicenseinfo',
-			[ 'key' => $key ] );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
+	public function getLicenseInfo($key) {
+		$response = $this->curlPostRequest('getlicenseinfo',
+			['key' => $key]);
+		$arResult = $this->convertXMLToArray($response);
+		if ($arResult['success']) {
 			$result = $arResult['result'];
 		} else {
 			$result = $arResult['error'];
-			if ( openlog( "License", LOG_ODELAY, LOG_LOCAL7 ) ) {
-				syslog( LOG_EMERG, $arResult['error'] );
+			if (openlog("License", LOG_ODELAY, LOG_LOCAL7)) {
+				syslog(LOG_EMERG, $arResult['error']);
 				closelog();
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function getTrialLicense( $params ) {
-		$data     = [
+	public function getTrialLicense($params) {
+		$data = [
 			'companyname' => $params['companyname'],
 			'email'       => $params['email'],
 			'contact'     => $params['contact'],
@@ -86,9 +86,9 @@ 
 			'description' => 'get trial from askozia pbx',
 			'product'     => 11,
 		];
-		$response = $this->curlPostRequest( 'gettrial', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
+		$response = $this->curlPostRequest('gettrial', $data);
+		$arResult = $this->convertXMLToArray($response);
+		if ($arResult['success']) {
 			$result = $arResult['result'];
 		} else {
 			$result = $arResult['error'];
@@ -103,11 +103,11 @@ 
 	 *
 	 * @return bool - результат активации триала
 	 */
-	public function addTrial( $productid = "11" ) {
-		$data     = [ 'product' => $productid ];
-		$response = $this->curlPostRequest( 'addtrial', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
+	public function addTrial($productid = "11") {
+		$data     = ['product' => $productid];
+		$response = $this->curlPostRequest('addtrial', $data);
+		$arResult = $this->convertXMLToArray($response);
+		if ($arResult['success']) {
 			$result = TRUE;
 		} else {
 			$result = $arResult['error'];
@@ -123,11 +123,11 @@ 
 	 *
 	 * @return bool результат активации купона
 	 */
-	public function activateCoupon( $coupon ) {
-		$data     = [ 'coupon' => trim( $coupon ) ];
-		$response = $this->curlPostRequest( 'activatecoupon', $data );
-		$arResult = $this->convertXMLToArray( $response );
-		if ( $arResult['success'] ) {
+	public function activateCoupon($coupon) {
+		$data     = ['coupon' => trim($coupon)];
+		$response = $this->curlPostRequest('activatecoupon', $data);
+		$arResult = $this->convertXMLToArray($response);
+		if ($arResult['success']) {
 			$result = TRUE;
 		} else {
 			$result = $arResult['error'];
@@ -141,8 +141,8 @@ 
 	 *
 	 * @param $newKey - новый ключ
 	 */
-	public function changeLicenseKey( $newKey ) {
-		$this->curlPostRequest( 'changekey', [ 'key' => $newKey ] );
+	public function changeLicenseKey($newKey) {
+		$this->curlPostRequest('changekey', ['key' => $newKey]);
 	}
 
 	/**
@@ -152,16 +152,16 @@ 
 	 *
 	 * @return array
 	 */
-	private function convertXMLToArray( $text ) {
+	private function convertXMLToArray($text) {
 
-		$json_data = json_decode( $text, TRUE );
-		if (is_null($json_data)){
-			$text = str_replace( '\n', "\n", $text );
-			$text = str_replace( '\"', '"', $text );
+		$json_data = json_decode($text, TRUE);
+		if (is_null($json_data)) {
+			$text = str_replace('\n', "\n", $text);
+			$text = str_replace('\"', '"', $text);
 
-			$json_data = json_decode( $text, TRUE );
+			$json_data = json_decode($text, TRUE);
 		}
-		if ( ! isset( $json_data['error'] ) ) {
+		if (!isset($json_data['error'])) {
 			$text_xml = urldecode($json_data['result']);
 			libxml_use_internal_errors(true);
 			$doc = simplexml_load_string($text_xml);
@@ -170,11 +170,11 @@ 
 				$doc = $text_xml;
 			}
 
-			$result   = ['success' => TRUE, 'result' => $doc];
-		}elseif ( isset( $json_data['error'] ) ) {
-			$result = [ 'success' => FALSE, 'error' => $json_data['error'] ];
+			$result = ['success' => TRUE, 'result' => $doc];
+		}elseif (isset($json_data['error'])) {
+			$result = ['success' => FALSE, 'error' => $json_data['error']];
 		} else {
-			$result = [ 'success' => FALSE, 'error' => $json_data ];
+			$result = ['success' => FALSE, 'error' => $json_data];
 		}
 
 		return $result;

Braces +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
 			}
 
 			$result   = ['success' => TRUE, 'result' => $doc];
-		}elseif ( isset( $json_data['error'] ) ) {
+		} elseif ( isset( $json_data['error'] ) ) {
 			$result = [ 'success' => FALSE, 'error' => $json_data['error'] ];
 		} else {
 			$result = [ 'success' => FALSE, 'error' => $json_data ];

www/admin-cabinet/app/library/Cidr.php

Spacing +5 added lines, -5 removed lines

@@ -15,12 +15,12 @@ 
     public function cidr2netmask($cidr)
     {
         $bin = '';
-        for( $i = 1; $i <= 32; $i++ )
+        for ($i = 1; $i <= 32; $i++)
             $bin .= $cidr >= $i ? '1' : '0';
 
         $netmask = long2ip(bindec($bin));
 
-        if ( $netmask == "0.0.0.0")
+        if ($netmask == "0.0.0.0")
             return false;
 
         return $netmask;
@@ -30,7 +30,7 @@ 
     // e.g. 10.0.2.56/21 = 10.0.0.0
     public function cidr2network($ip, $cidr)
     {
-        $network = long2ip((ip2long($ip)) & ((-1 << (32 - (int)$cidr))));
+        $network = long2ip((ip2long($ip)) & ((-1 << (32 - (int) $cidr))));
 
         return $network;
     }
@@ -42,7 +42,7 @@ 
         $bits = 0;
         $netmask = explode(".", $netmask);
 
-        foreach($netmask as $octect)
+        foreach ($netmask as $octect)
             $bits += strlen(str_replace("0", "", decbin($octect)));
 
         return $bits;
@@ -53,7 +53,7 @@ 
     //      is 192.168.50.2 in 192.168.30.0/23 == false
     public function cidr_match($ip, $network, $cidr)
     {
-        if ((ip2long($ip) & ~((1 << (32 - $cidr)) - 1) ) == ip2long($network))
+        if ((ip2long($ip) & ~((1 << (32 - $cidr)) - 1)) == ip2long($network))
         {
             return true;
         }

Braces +9 added lines, -6 removed lines

@@ -15,13 +15,15 @@ 
     public function cidr2netmask($cidr)
     {
         $bin = '';
-        for( $i = 1; $i <= 32; $i++ )
-            $bin .= $cidr >= $i ? '1' : '0';
+        for( $i = 1; $i <= 32; $i++ ) {
+                    $bin .= $cidr >= $i ? '1' : '0';
+        }
 
         $netmask = long2ip(bindec($bin));
 
-        if ( $netmask == "0.0.0.0")
-            return false;
+        if ( $netmask == "0.0.0.0") {
+                    return false;
+        }
 
         return $netmask;
     }
@@ -42,8 +44,9 @@ 
         $bits = 0;
         $netmask = explode(".", $netmask);
 
-        foreach($netmask as $octect)
-            $bits += strlen(str_replace("0", "", decbin($octect)));
+        foreach($netmask as $octect) {
+                    $bits += strlen(str_replace("0", "", decbin($octect)));
+        }
 
         return $bits;
     }

www/admin-cabinet/app/config/loader.php

Indentation +6 added lines, -6 removed lines

@@ -10,15 +10,15 @@
  */
 
 $arNameSpaces = [
-	 'Models'  => $config->application->modelsDir,
+        'Models'  => $config->application->modelsDir,
 ];
 
 $arDirs = [
-	$config->application->controllersDir,
-	$config->application->pluginsDir,
-	$config->application->libraryDir,
-	$config->application->modelsDir,
-	$config->application->formsDir,
+    $config->application->controllersDir,
+    $config->application->pluginsDir,
+    $config->application->libraryDir,
+    $config->application->modelsDir,
+    $config->application->formsDir,
 ];
 
 $arrFiles[] = $config->application->backendDir.'modules/ClassLoader.php';

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 $arrFiles[] = $config->application->backendDir.'library/vendor/autoload.php';
 $loader->registerFiles($arrFiles);
 $loader->registerNamespaces($arNameSpaces);
-$loader->registerDirs( $arDirs );
+$loader->registerDirs($arDirs);
 $loader->register();
 
 // Зарегаем классы модулей