injitools / cms-Inji

system/modules/View/objects/Template.php

Spacing +22 added lines, -22 removed lines

@@ -94,7 +94,7 @@ 
     {
         $this->setParams($params);
         if (!$this->path) {
-            $this->path = $this->app->view->templatesPath . '/' . $this->name;
+            $this->path = $this->app->view->templatesPath.'/'.$this->name;
         }
         $this->loadConfig();
         $this->setPage();
@@ -110,7 +110,7 @@ 
     public function loadConfig($configPath = '')
     {
         if (!$configPath) {
-            $configPath = $this->path . '/config.php';
+            $configPath = $this->path.'/config.php';
         }
         $this->configPath = $configPath;
         $this->config = \Config::custom($this->configPath);
@@ -140,7 +140,7 @@ 
         }
         $this->page = $page;
         if (!$this->pagePath) {
-            $this->pagePath = $this->path . '/' . $this->page . '.html';
+            $this->pagePath = $this->path.'/'.$this->page.'.html';
         }
         $this->pagePath = \Tools::pathsResolve($this->getPagePaths(), $this->pagePath);
     }
@@ -157,8 +157,8 @@ 
             $page = $this->page;
         }
         return [
-            'template' => $this->path . '/' . $page . '.html',
-            'defaultPage' => \Module::getModulePath('View') . '/templatePages/' . $page . '.html'
+            'template' => $this->path.'/'.$page.'.html',
+            'defaultPage' => \Module::getModulePath('View').'/templatePages/'.$page.'.html'
         ];
     }
 
@@ -194,7 +194,7 @@ 
                 $this->content = \Controller::$cur->method;
             }
             if ((!$this->contentPath || $content) && \Module::$cur) {
-                $this->contentPath = \Module::$cur->path . '/' . \Module::$cur->app->type . "Controllers/content/{$this->content}.php";
+                $this->contentPath = \Module::$cur->path.'/'.\Module::$cur->app->type."Controllers/content/{$this->content}.php";
             }
             $this->contentPath = \Tools::pathsResolve($this->getContentPaths(), $this->contentPath);
         }
@@ -214,33 +214,33 @@ 
         $paths = [];
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['templateModuleController'] = $this->path . "/modules/{$this->module->moduleName}/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateModuleController'] = $this->path."/modules/{$this->module->moduleName}/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateModule'] = $this->path . "/modules/{$this->module->moduleName}/{$content}.php";
+            $paths['templateModule'] = $this->path."/modules/{$this->module->moduleName}/{$content}.php";
         }
         if (\Module::$cur) {
             if (\Controller::$cur) {
-                $paths['templateCurModuleController'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateCurModuleController'] = $this->path."/modules/".\Module::$cur->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateCurModule'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/{$content}.php";
+            $paths['templateCurModule'] = $this->path."/modules/".\Module::$cur->moduleName."/{$content}.php";
         }
         if (\Controller::$cur) {
-            $paths['appControllerContentController'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['appControllerContent'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
-            $paths['controllerContentController'] = \Controller::$cur->path . "/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['controllerContent'] = \Controller::$cur->path . "/content/{$content}.php";
-            $paths['moduleControllerContentController'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['moduleControllerContent'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['appControllerContentController'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['appControllerContent'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
+            $paths['controllerContentController'] = \Controller::$cur->path."/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['controllerContent'] = \Controller::$cur->path."/content/{$content}.php";
+            $paths['moduleControllerContentController'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['moduleControllerContent'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['customModuleTemplateControllerContentController'] = $this->path . "/modules/" . $this->module->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['customModuleTemplateControllerContentController'] = $this->path."/modules/".$this->module->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['customModuleTemplateControllerContent'] = $this->path . "/modules/" . $this->module->moduleName . "/{$content}.php";
+            $paths['customModuleTemplateControllerContent'] = $this->path."/modules/".$this->module->moduleName."/{$content}.php";
         }
         if ($this->module && \Controller::$cur) {
-            $paths['customModuleControllerContentController'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['customModuleControllerContent'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['customModuleControllerContentController'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['customModuleControllerContent'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         return $paths;
     }
@@ -260,10 +260,10 @@ 
         if (!$templatesPath) {
             $templatesPath = $app->view->templatesPath;
         }
-        if (file_exists($templatesPath . '/' . $templateName)) {
+        if (file_exists($templatesPath.'/'.$templateName)) {
             return new Template([
                 'name' => $templateName,
-                'path' => $templatesPath . '/' . $templateName,
+                'path' => $templatesPath.'/'.$templateName,
                 'app' => $app
             ]);
         }

system/modules/View/objects/Adapter.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function el($name, $option = [])
     {
-        $className = get_called_class() . '\\' . $name;
+        $className = get_called_class().'\\'.$name;
         if (class_exists($className)) {
             return new $className();
         }

system/modules/Users/models/User/Info.php

Spacing +4 added lines, -4 removed lines

@@ -89,16 +89,16 @@
 
     public function name()
     {
-        if ($this->first_name . $this->last_name . $this->middle_name) {
+        if ($this->first_name.$this->last_name.$this->middle_name) {
             $name = '';
             if ($this->first_name) {
-                $name.=$this->first_name;
+                $name .= $this->first_name;
             }
             if ($this->middle_name) {
-                $name.=($name ? ' ' : '') . $this->middle_name;
+                $name .= ($name ? ' ' : '').$this->middle_name;
             }
             if ($this->last_name) {
-                $name.=($name ? ' ' : '') . $this->last_name;
+                $name .= ($name ? ' ' : '').$this->last_name;
             }
             return $name;
         } else {

system/modules/Users/appAdminControllers/UsersController.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     {
         $user = Users\User::get($userId);
         App::$cur->users->newSession($user);
-        Tools::redirect('/', 'Теперь вы на сайте под пользователем ' . $user->name());
+        Tools::redirect('/', 'Теперь вы на сайте под пользователем '.$user->name());
     }
 
 }

system/modules/Users/install_script.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [
@@ -45,7 +45,7 @@ 
     } else {
         $user = new Users\User(array(
             'user_login' => 'admin',
-            'user_mail' => 'admin@' . idn_to_utf8(INJI_DOMAIN_NAME),
+            'user_mail' => 'admin@'.idn_to_utf8(INJI_DOMAIN_NAME),
             'user_pass' => password_hash('admin', PASSWORD_DEFAULT),
             'user_group_id' => $groupObject->id,
             'user_role_id' => $roleObject->id,

system/modules/Users/appControllers/SocialController.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         if (!$social) {

             Tools::redirect('/', 'Такой соц. сети не найдено');

         }

-        $helper = 'Users\SocialHelper\\' . $social->object_name;

+        $helper = 'Users\SocialHelper\\'.$social->object_name;

         $helper::auth();

     }

 

@@ -36,10 +36,10 @@ 
         foreach (\Users\User::$cur->socials as $userSocial) {

             if ($userSocial->social_id == $social->id) {

                 $userSocial->delete();

-                Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' была удалена');

+                Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' была удалена');

             }

         }

-        Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' не найдена');

+        Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' не найдена');

     }

 

 }

system/modules/Users/widgets/cabinet/usersTree.php

Spacing +4 added lines, -4 removed lines

@@ -2,12 +2,12 @@ 
 if (!empty($_POST['partnerInvite']['email'])) {
     $title = '';
     if (!empty($_POST['partnerInvite']['name'])) {
-        $title .='Ув. ' . htmlspecialchars($_POST['partnerInvite']['name']) . '. ';
+        $title .= 'Ув. '.htmlspecialchars($_POST['partnerInvite']['name']).'. ';
     }
     if (!filter_var($_POST['partnerInvite']['email'], FILTER_VALIDATE_EMAIL)) {
         Tools::redirect(null, 'Вы ввели не корректный E-mail', 'danger');
     }
-    $title = \Users\User::$cur->name() . ' приглашает вас зарегистрироваться на сайте: ' . idn_to_utf8(INJI_DOMAIN_NAME);
+    $title = \Users\User::$cur->name().' приглашает вас зарегистрироваться на сайте: '.idn_to_utf8(INJI_DOMAIN_NAME);
     $inviteCode = Tools::randomString(60);
     $invite = new Users\User\Invite();
     $invite->code = $inviteCode;
@@ -16,8 +16,8 @@ 
     $invite->limit = 1;
     $invite->save();
     $text = "<h3>{$title}</h3>";
-    $text .= '<p>Чтобы принять приглашение, перейдите по <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/registration?invite_code=' . $inviteCode . '">этой ссылке</a> и завершите процедуру регистрации</p>';
-    Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $_POST['partnerInvite']['email'], $title, $text);
+    $text .= '<p>Чтобы принять приглашение, перейдите по <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/registration?invite_code='.$inviteCode.'">этой ссылке</a> и завершите процедуру регистрации</p>';
+    Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $_POST['partnerInvite']['email'], $title, $text);
     Tools::redirect(null, 'Приглашение было отправлено', 'success');
 }
 $partners = App::$cur->users->getUserPartners(Users\User::$cur, 8);

system/modules/Users/objects/SocialHelper/Vk.php

Spacing +6 added lines, -6 removed lines

@@ -22,20 +22,20 @@ 
                 'scope' => 'email',
                 'response_type' => 'code',
                 'display' => 'page',
-                'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
+                'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
             ];
-            \Tools::redirect("https://oauth.vk.com/authorize?" . http_build_query($query));
+            \Tools::redirect("https://oauth.vk.com/authorize?".http_build_query($query));
         }
         if (empty($_GET['code']) && !empty($_GET['error'])) {
-            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
+            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: '.$_GET['error_description']);
         }
         $query = [
             'client_id' => $config['appId'],
             'client_secret' => $config['secret'],
             'code' => $_GET['code'],
-            'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
+            'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
         ];
-        $result = @file_get_contents("https://oauth.vk.com/access_token?" . http_build_query($query));
+        $result = @file_get_contents("https://oauth.vk.com/access_token?".http_build_query($query));
         if ($result === false) {
             \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
         }
@@ -48,7 +48,7 @@ 
             'fields' => 'sex, bdate, photo_max_orig, home_town',
             'access_token' => $result['access_token']
         ];
-        $userResult = @file_get_contents("https://api.vk.com/method/users.get?" . http_build_query($userQuery));
+        $userResult = @file_get_contents("https://api.vk.com/method/users.get?".http_build_query($userQuery));
         if (!$userResult) {
             \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
         }

system/modules/Users/objects/SocialHelper/Google.php

Spacing +5 added lines, -5 removed lines

@@ -22,19 +22,19 @@ 
                 'client_id' => $config['client_id'],
                 'scope' => 'https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile',
                 'response_type' => 'code',
-                'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/google'
+                'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/google'
             ];
-            \Tools::redirect("https://accounts.google.com/o/oauth2/auth?" . http_build_query($query));
+            \Tools::redirect("https://accounts.google.com/o/oauth2/auth?".http_build_query($query));
         }
         if (empty($_GET['code']) && !empty($_GET['error'])) {
-            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
+            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: '.$_GET['error_description']);
         }
         $query = [
             'client_id' => $config['client_id'],
             'client_secret' => $config['secret'],
             'code' => $_GET['code'],
             'grant_type' => 'authorization_code',
-            'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/google'
+            'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/google'
         ];
         $result = false;
         if ($curl = curl_init()) {
@@ -55,7 +55,7 @@ 
         $userQuery = [
             'access_token' => $result['access_token']
         ];
-        $userResult = @file_get_contents("https://www.googleapis.com/oauth2/v1/userinfo?" . http_build_query($userQuery));
+        $userResult = @file_get_contents("https://www.googleapis.com/oauth2/v1/userinfo?".http_build_query($userQuery));
         if (!$userResult) {
             \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
         }