Completed
Push — master ( 135fa8...4a5eb0 )
by Alexey
09:51 queued 04:36
created
system/modules/View/View.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -37,17 +37,17 @@  discard block
 block discarded – undo
37 37
         if (!empty($this->config[$this->app->type]['current'])) {
38 38
             $templateName = $this->config[$this->app->type]['current'];
39 39
             if (!empty($this->config[$this->app->type]['installed'][$templateName]['location'])) {
40
-                $this->templatesPath = App::$primary->path . "/templates";
40
+                $this->templatesPath = App::$primary->path."/templates";
41 41
             }
42 42
         }
43 43
         if (!$this->templatesPath) {
44
-            $this->templatesPath = $this->app->path . "/templates";
44
+            $this->templatesPath = $this->app->path."/templates";
45 45
         }
46 46
         $this->template = \View\Template::get($templateName, $this->app, $this->templatesPath);
47 47
         if (!$this->template) {
48 48
             $this->template = new \View\Template([
49 49
                 'name' => 'default',
50
-                'path' => $this->templatesPath . '/default',
50
+                'path' => $this->templatesPath.'/default',
51 51
                 'app' => $this->app
52 52
             ]);
53 53
         }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
                 case 'WIDGET':
165 165
                     $source = $this->cutTag($source, $rawTag);
166 166
                     $params = array_slice($tag, 2);
167
-                    $this->widget($tag[1], ['params' => $params], ':' . implode(':', $params));
167
+                    $this->widget($tag[1], ['params' => $params], ':'.implode(':', $params));
168 168
                     break;
169 169
                 case 'HEAD':
170 170
                     $source = $this->cutTag($source, $rawTag);
@@ -187,18 +187,18 @@  discard block
 block discarded – undo
187 187
     {
188 188
         $pos = strpos($source, $rawTag) - 1;
189 189
         echo substr($source, 0, $pos);
190
-        return substr($source, ( $pos + strlen($rawTag) + 2));
190
+        return substr($source, ($pos + strlen($rawTag) + 2));
191 191
     }
192 192
 
193 193
     public function getHref($type, $params)
194 194
     {
195 195
         $href = '';
196 196
         if (is_string($params)) {
197
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params;
197
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params;
198 198
         } elseif (empty($params['template']) && !empty($params['file'])) {
199
-            $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $params['file'];
199
+            $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$params['file'];
200 200
         } elseif (!empty($params['template']) && !empty($params['file'])) {
201
-            $href = $this->app->templatesPath . "/{$this->template->name}/{$type}/{$params['file']}";
201
+            $href = $this->app->templatesPath."/{$this->template->name}/{$type}/{$params['file']}";
202 202
         }
203 203
         return $href;
204 204
     }
@@ -235,16 +235,16 @@  discard block
 block discarded – undo
235 235
 
236 236
         echo "<title>{$this->title}</title>\n";
237 237
 
238
-        if (!empty($this->template->config['favicon']) && file_exists($this->template->path . "/{$this->template->config['favicon']}")) {
238
+        if (!empty($this->template->config['favicon']) && file_exists($this->template->path."/{$this->template->config['favicon']}")) {
239 239
             echo "        <link rel='shortcut icon' href='/templates/{$this->template->name}/{$this->template->config['favicon']}' />";
240
-        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path . "/static/images/{$this->template->config['favicon']}")) {
240
+        } elseif (!empty($this->template->config['favicon']) && file_exists($this->app->path."/static/images/{$this->template->config['favicon']}")) {
241 241
             echo "        <link rel='shortcut icon' href='/static/images/{$this->template->config['favicon']}' />";
242
-        } elseif (file_exists($this->app->path . '/static/images/favicon.ico')) {
242
+        } elseif (file_exists($this->app->path.'/static/images/favicon.ico')) {
243 243
             echo "        <link rel='shortcut icon' href='/static/images/favicon.ico' />";
244 244
         }
245 245
 
246 246
         foreach ($this->getMetaTags() as $meta) {
247
-            echo "\n        " . Html::el('meta', $meta, '', null);
247
+            echo "\n        ".Html::el('meta', $meta, '', null);
248 248
         }
249 249
 
250 250
         if (!empty(Inji::$config['assets']['js'])) {
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 
256 256
         $this->checkNeedLibs();
257 257
         $this->parseCss();
258
-        echo "\n        <script src='" . Statics::file(($this->app->type != 'app' ? '/' . $this->app->name : '' ) . "/static/system/js/Inji.js") . "'></script>";
258
+        echo "\n        <script src='".Statics::file(($this->app->type != 'app' ? '/'.$this->app->name : '')."/static/system/js/Inji.js")."'></script>";
259 259
     }
260 260
 
261 261
     public function parseCss()
@@ -279,25 +279,25 @@  discard block
 block discarded – undo
279 279
             if (file_exists($path)) {
280 280
                 $this->loadedCss[$href] = $href;
281 281
                 $urls[$href] = $path;
282
-                $timeStr.=filemtime($path);
282
+                $timeStr .= filemtime($path);
283 283
             } else {
284 284
                 echo "\n        <link href='{$href}' rel='stylesheet' type='text/css' />";
285 285
             }
286 286
         }
287 287
         $timeMd5 = md5($timeStr);
288 288
         $cacheDir = Cache::getDir('static');
289
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.css')) {
289
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.css')) {
290 290
             foreach ($urls as $primaryUrl => $url) {
291 291
                 $source = file_get_contents($url);
292 292
                 $rootPath = substr($primaryUrl, 0, strrpos($primaryUrl, '/'));
293 293
                 $levelUpPath = substr($rootPath, 0, strrpos($rootPath, '/'));
294
-                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1' . $levelUpPath, $source);
295
-                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1' . $rootPath, $source);
296
-                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1' . $rootPath . '/$2', $source);
297
-                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url(' . $rootPath . '/$1$2', $source);
294
+                $source = preg_replace('!url\((\'?"?)[\.]{2}!isU', 'url($1'.$levelUpPath, $source);
295
+                $source = preg_replace('!url\((\'?"?)[\.]{1}!isU', 'url($1'.$rootPath, $source);
296
+                $source = preg_replace('#url\(([\'"]){1}(?!http|https|/|data\:)([^/])#isU', 'url($1'.$rootPath.'/$2', $source);
297
+                $source = preg_replace('#url\((?!http|https|/|data\:|\'|")([^/])#isU', 'url('.$rootPath.'/$1$2', $source);
298 298
                 $cssAll .= $source;
299 299
             }
300
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.css', $cssAll);
300
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.css', $cssAll);
301 301
         }
302 302
         echo "\n        <link href='/{$cacheDir}/all{$timeMd5}.css' rel='stylesheet' type='text/css' />";
303 303
     }
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                     if (strpos($css, '//') !== false)
330 330
                         $href = $css;
331 331
                     else
332
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
332
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
333 333
                     $hrefs[$href] = $href;
334 334
                 }
335 335
                 break;
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
                     if (strpos($css, '://') !== false)
343 343
                         $href = $css;
344 344
                     else
345
-                        $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}";
345
+                        $href = $this->app->templatesPath."/{$this->template->name}/css/{$css}";
346 346
                     $hrefs[$href] = $href;
347 347
                 }
348 348
                 break;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                     if (strpos($css, '//') !== false)
356 356
                         $href = $css;
357 357
                     else
358
-                        $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css;
358
+                        $href = ($this->app->type != 'app' ? '/'.$this->app->name : '').$css;
359 359
                     $hrefs[$href] = $href;
360 360
                 }
361 361
                 break;
@@ -375,9 +375,9 @@  discard block
 block discarded – undo
375 375
         if (!empty($this->app->config['site']['metatags'])) {
376 376
             foreach ($this->app->config['site']['metatags'] as $meta) {
377 377
                 if (!empty($meta['name'])) {
378
-                    $metas['metaName:' . $meta['name']] = $meta;
378
+                    $metas['metaName:'.$meta['name']] = $meta;
379 379
                 } elseif (!empty($meta['property'])) {
380
-                    $metas['metaProperty:' . $meta['property']] = $meta;
380
+                    $metas['metaProperty:'.$meta['property']] = $meta;
381 381
                 }
382 382
             }
383 383
         }
@@ -390,9 +390,9 @@  discard block
 block discarded – undo
390 390
     public function addMetaTag($meta)
391 391
     {
392 392
         if (!empty($meta['name'])) {
393
-            $this->dynMetas['metaName:' . $meta['name']] = $meta;
393
+            $this->dynMetas['metaName:'.$meta['name']] = $meta;
394 394
         } elseif (!empty($meta['property'])) {
395
-            $this->dynMetas['metaProperty:' . $meta['property']] = $meta;
395
+            $this->dynMetas['metaProperty:'.$meta['property']] = $meta;
396 396
         }
397 397
     }
398 398
 
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
                 if (file_exists($path)) {
417 417
                     $nativeUrl[$script] = $script;
418 418
                     $urls[$script] = $path;
419
-                    $timeStr.=filemtime($path);
419
+                    $timeStr .= filemtime($path);
420 420
                 } else {
421 421
                     $noParsedScripts[$script] = $script;
422 422
                 }
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
                     if (!empty($script['name'])) {
432 432
                         $onLoadModules[$script['name']] = $script['name'];
433 433
                     }
434
-                    $timeStr.=filemtime($path);
434
+                    $timeStr .= filemtime($path);
435 435
                 } else {
436 436
                     $noParsedScripts[$script] = $script;
437 437
                 }
@@ -440,20 +440,20 @@  discard block
 block discarded – undo
440 440
 
441 441
         $timeMd5 = md5($timeStr);
442 442
         $cacheDir = Cache::getDir('static');
443
-        if (!file_exists($cacheDir . '/all' . $timeMd5 . '.js')) {
443
+        if (!file_exists($cacheDir.'/all'.$timeMd5.'.js')) {
444 444
             foreach ($urls as $url) {
445
-                $scriptAll .= ';' . file_get_contents($url);
445
+                $scriptAll .= ';'.file_get_contents($url);
446 446
             }
447
-            file_put_contents($cacheDir . '/all' . $timeMd5 . '.js', $scriptAll);
447
+            file_put_contents($cacheDir.'/all'.$timeMd5.'.js', $scriptAll);
448 448
         }
449 449
         $options = [
450 450
             'scripts' => array_values($noParsedScripts),
451 451
             'compresedScripts' => $nativeUrl,
452 452
             'styles' => [],
453
-            'appRoot' => $this->app->type == 'app' ? '/' : '/' . $this->app->name . '/',
453
+            'appRoot' => $this->app->type == 'app' ? '/' : '/'.$this->app->name.'/',
454 454
             'onLoadModules' => $onLoadModules
455 455
         ];
456
-        $options['scripts'][] = '/' . $cacheDir . '/all' . $timeMd5 . '.js';
456
+        $options['scripts'][] = '/'.$cacheDir.'/all'.$timeMd5.'.js';
457 457
         $this->widget('View\bodyEnd', compact('options'));
458 458
     }
459 459
 
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
                     if (strpos($js, '//') !== false)
501 501
                         $href = $js;
502 502
                     else
503
-                        $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}";
503
+                        $href = $this->app->templatesPath."/{$this->template->name}/js/{$js}";
504 504
                     $resultArray[] = $href;
505 505
                 }
506 506
                 break;
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
     public function setTitle($title, $add = true)
537 537
     {
538 538
         if ($add && !empty($this->app->config['site']['name'])) {
539
-            $this->title = $title . ' - ' . $this->app->config['site']['name'];
539
+            $this->title = $title.' - '.$this->app->config['site']['name'];
540 540
         } else {
541 541
             $this->title = $title;
542 542
         }
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
                     }
563 563
                 }
564 564
                 if (!$paramArray)
565
-                    $lineParams = ':' . implode(':', $_params);
565
+                    $lineParams = ':'.implode(':', $_params);
566 566
             }
567 567
         }
568 568
         echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n";
@@ -581,24 +581,24 @@  discard block
 block discarded – undo
581 581
         if (strpos($widgetName, '\\')) {
582 582
             $widgetName = explode('\\', $widgetName);
583 583
 
584
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
585
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName[0] . '/' . $widgetName[1] . '.php';
584
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'/'.$widgetName[1].'.php';
585
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName[0].'/'.$widgetName[1].'.php';
586 586
             App::$cur->$widgetName[0];
587 587
             $modulePaths = Module::getModulePaths(ucfirst($widgetName[0]));
588 588
             foreach ($modulePaths as $pathName => $path) {
589
-                $paths[$pathName . '_widgetDir'] = $path . '/widgets/' . $widgetName[1] . '/' . $widgetName[1] . '.php';
590
-                $paths[$pathName] = $path . '/widgets/' . $widgetName[1] . '.php';
589
+                $paths[$pathName.'_widgetDir'] = $path.'/widgets/'.$widgetName[1].'/'.$widgetName[1].'.php';
590
+                $paths[$pathName] = $path.'/widgets/'.$widgetName[1].'.php';
591 591
             }
592 592
             return $paths;
593 593
         } else {
594
-            $paths['templatePath_widgetDir'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
595
-            $paths['templatePath'] = $this->templatesPath . '/' . $this->template->name . '/widgets/' . $widgetName . '.php';
594
+            $paths['templatePath_widgetDir'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
595
+            $paths['templatePath'] = $this->templatesPath.'/'.$this->template->name.'/widgets/'.$widgetName.'.php';
596 596
 
597
-            $paths['curAppPath_widgetDir'] = $this->app->path . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
598
-            $paths['curAppPath'] = $this->app->path . '/widgets/' . $widgetName . '.php';
597
+            $paths['curAppPath_widgetDir'] = $this->app->path.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
598
+            $paths['curAppPath'] = $this->app->path.'/widgets/'.$widgetName.'.php';
599 599
 
600
-            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '/' . $widgetName . '.php';
601
-            $paths['systemPath'] = INJI_SYSTEM_DIR . '/widgets/' . $widgetName . '.php';
600
+            $paths['systemPath_widgetDir'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'/'.$widgetName.'.php';
601
+            $paths['systemPath'] = INJI_SYSTEM_DIR.'/widgets/'.$widgetName.'.php';
602 602
         }
603 603
         return $paths;
604 604
     }
Please login to merge, or discard this patch.
system/modules/View/appControllers/ViewController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function editorcssAction()
14 14
     {
15
-        if (file_exists($this->view->template->path . '/css/editor.css')) {
16
-            Tools::redirect('/static/templates/' . $this->view->template['name'] . '/css/editor.css');
15
+        if (file_exists($this->view->template->path.'/css/editor.css')) {
16
+            Tools::redirect('/static/templates/'.$this->view->template['name'].'/css/editor.css');
17 17
         } else {
18 18
             header("Content-type: text/css");
19 19
             exit();
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
         if ($args) {
27 27
             $moduleName = ucfirst($args[0]);
28 28
             $params = array_slice($args, 1);
29
-            if (file_exists($this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php')) {
30
-                include_once $this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php';
29
+            if (file_exists($this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php')) {
30
+                include_once $this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php';
31 31
                 $module = new $moduleName($this->module->app);
32 32
                 $cotroller = $module->findController();
33 33
                 $cotroller->params = $params;
Please login to merge, or discard this patch.
system/modules/View/objects/Template.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $this->setParams($params);
96 96
         if (!$this->path) {
97
-            $this->path = $this->app->view->templatesPath . '/' . $this->name;
97
+            $this->path = $this->app->view->templatesPath.'/'.$this->name;
98 98
         }
99 99
         $this->loadConfig();
100 100
         $this->setPage();
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     public function loadConfig($configPath = '')
111 111
     {
112 112
         if (!$configPath) {
113
-            $configPath = $this->path . '/config.php';
113
+            $configPath = $this->path.'/config.php';
114 114
         }
115 115
         $this->configPath = $configPath;
116 116
         $this->config = \Config::custom($this->configPath);
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
         }
141 141
         $this->page = $page;
142 142
         if (!$this->pagePath) {
143
-            $this->pagePath = $this->path . '/' . $this->page . '.html';
143
+            $this->pagePath = $this->path.'/'.$this->page.'.html';
144 144
         }
145 145
         $this->pagePath = \Tools::pathsResolve($this->getPagePaths(), $this->pagePath);
146 146
     }
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
             $page = $this->page;
158 158
         }
159 159
         return [
160
-            'template' => $this->path . '/' . $page . '.html',
161
-            'defaultPage' => \Module::getModulePath('View') . '/templatePages/' . $page . '.html'
160
+            'template' => $this->path.'/'.$page.'.html',
161
+            'defaultPage' => \Module::getModulePath('View').'/templatePages/'.$page.'.html'
162 162
         ];
163 163
     }
164 164
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                 $this->content = \Controller::$cur->method;
195 195
             }
196 196
             if ((!$this->contentPath || $content) && \Module::$cur) {
197
-                $this->contentPath = \Module::$cur->path . '/' . \Module::$cur->app->type . "Controllers/content/{$this->content}.php";
197
+                $this->contentPath = \Module::$cur->path.'/'.\Module::$cur->app->type."Controllers/content/{$this->content}.php";
198 198
             }
199 199
             $this->contentPath = \Tools::pathsResolve($this->getContentPaths(), $this->contentPath);
200 200
         }
@@ -214,33 +214,33 @@  discard block
 block discarded – undo
214 214
         $paths = [];
215 215
         if ($this->module) {
216 216
             if (\Controller::$cur) {
217
-                $paths['templateModuleController'] = $this->path . "/modules/{$this->module->moduleName}/" . \Controller::$cur->name . "/{$content}.php";
217
+                $paths['templateModuleController'] = $this->path."/modules/{$this->module->moduleName}/".\Controller::$cur->name."/{$content}.php";
218 218
             }
219
-            $paths['templateModule'] = $this->path . "/modules/{$this->module->moduleName}/{$content}.php";
219
+            $paths['templateModule'] = $this->path."/modules/{$this->module->moduleName}/{$content}.php";
220 220
         }
221 221
         if (\Module::$cur) {
222 222
             if (\Controller::$cur) {
223
-                $paths['templateCurModuleController'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
223
+                $paths['templateCurModuleController'] = $this->path."/modules/".\Module::$cur->moduleName."/".\Controller::$cur->name."/{$content}.php";
224 224
             }
225
-            $paths['templateCurModule'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/{$content}.php";
225
+            $paths['templateCurModule'] = $this->path."/modules/".\Module::$cur->moduleName."/{$content}.php";
226 226
         }
227 227
         if (\Controller::$cur) {
228
-            $paths['appControllerContentController'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
229
-            $paths['appControllerContent'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
230
-            $paths['controllerContentController'] = \Controller::$cur->path . "/content/" . \Controller::$cur->name . "/{$content}.php";
231
-            $paths['controllerContent'] = \Controller::$cur->path . "/content/{$content}.php";
232
-            $paths['moduleControllerContentController'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
233
-            $paths['moduleControllerContent'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
228
+            $paths['appControllerContentController'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
229
+            $paths['appControllerContent'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
230
+            $paths['controllerContentController'] = \Controller::$cur->path."/content/".\Controller::$cur->name."/{$content}.php";
231
+            $paths['controllerContent'] = \Controller::$cur->path."/content/{$content}.php";
232
+            $paths['moduleControllerContentController'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
233
+            $paths['moduleControllerContent'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
234 234
         }
235 235
         if ($this->module) {
236 236
             if (\Controller::$cur) {
237
-                $paths['customModuleTemplateControllerContentController'] = $this->path . "/modules/" . $this->module->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
237
+                $paths['customModuleTemplateControllerContentController'] = $this->path."/modules/".$this->module->moduleName."/".\Controller::$cur->name."/{$content}.php";
238 238
             }
239
-            $paths['customModuleTemplateControllerContent'] = $this->path . "/modules/" . $this->module->moduleName . "/{$content}.php";
239
+            $paths['customModuleTemplateControllerContent'] = $this->path."/modules/".$this->module->moduleName."/{$content}.php";
240 240
         }
241 241
         if ($this->module && \Controller::$cur) {
242
-            $paths['customModuleControllerContentController'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
243
-            $paths['customModuleControllerContent'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
242
+            $paths['customModuleControllerContentController'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
243
+            $paths['customModuleControllerContent'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
244 244
         }
245 245
         return $paths;
246 246
     }
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
260 260
         if (!$templatesPath) {
261 261
             $templatesPath = $app->view->templatesPath;
262 262
         }
263
-        if (file_exists($templatesPath . '/' . $templateName)) {
263
+        if (file_exists($templatesPath.'/'.$templateName)) {
264 264
             return new Template([
265 265
                 'name' => $templateName,
266
-                'path' => $templatesPath . '/' . $templateName,
266
+                'path' => $templatesPath.'/'.$templateName,
267 267
                 'app' => $app
268 268
             ]);
269 269
         }
Please login to merge, or discard this patch.
system/modules/View/objects/Adapter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function el($name, $option = [])
14 14
     {
15
-        $className = get_called_class() . '\\' . $name;
15
+        $className = get_called_class().'\\'.$name;
16 16
         if (class_exists($className)) {
17 17
             return new $className();
18 18
         }
Please login to merge, or discard this patch.
system/modules/Users/models/User/Info.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,16 +89,16 @@
 block discarded – undo
89 89
 
90 90
     public function name()
91 91
     {
92
-        if ($this->first_name . $this->last_name . $this->middle_name) {
92
+        if ($this->first_name.$this->last_name.$this->middle_name) {
93 93
             $name = '';
94 94
             if ($this->first_name) {
95
-                $name.=$this->first_name;
95
+                $name .= $this->first_name;
96 96
             }
97 97
             if ($this->middle_name) {
98
-                $name.=($name ? ' ' : '') . $this->middle_name;
98
+                $name .= ($name ? ' ' : '').$this->middle_name;
99 99
             }
100 100
             if ($this->last_name) {
101
-                $name.=($name ? ' ' : '') . $this->last_name;
101
+                $name .= ($name ? ' ' : '').$this->last_name;
102 102
             }
103 103
             return $name;
104 104
         } else {
Please login to merge, or discard this patch.
system/modules/Users/appAdminControllers/UsersController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     {
24 24
         $user = Users\User::get($userId);
25 25
         App::$cur->users->newSession($user);
26
-        Tools::redirect('/', 'Теперь вы на сайте под пользователем ' . $user->name());
26
+        Tools::redirect('/', 'Теперь вы на сайте под пользователем '.$user->name());
27 27
     }
28 28
 
29 29
 }
Please login to merge, or discard this patch.
system/modules/Users/install_script.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = []) {
3
+return function($step = NULL, $params = []) {
4 4
 
5 5
     $groups = [
6 6
         [
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     } else {
46 46
         $user = new Users\User(array(
47 47
             'user_login' => 'admin',
48
-            'user_mail' => 'admin@' . idn_to_utf8(INJI_DOMAIN_NAME),
48
+            'user_mail' => 'admin@'.idn_to_utf8(INJI_DOMAIN_NAME),
49 49
             'user_pass' => password_hash('admin', PASSWORD_DEFAULT),
50 50
             'user_group_id' => $groupObject->id,
51 51
             'user_role_id' => $roleObject->id,
Please login to merge, or discard this patch.
system/modules/Users/appControllers/content/login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
           if ($socials) {
10 10
               echo 'Войти через: ';
11 11
               foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
12
+                  $text = $social->image ? '<img src ="'.Statics::file($social->image->path, '25x25', 'q').'">' : $social->name();
13 13
                   echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14 14
               }
15 15
           }
Please login to merge, or discard this patch.
system/modules/Users/appControllers/SocialController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         if (!$social) {
21 21
             Tools::redirect('/', 'Такой соц. сети не найдено');
22 22
         }
23
-        $helper = 'Users\SocialHelper\\' . $social->object_name;
23
+        $helper = 'Users\SocialHelper\\'.$social->object_name;
24 24
         $helper::auth();
25 25
     }
26 26
 
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
         foreach (\Users\User::$cur->socials as $userSocial) {
37 37
             if ($userSocial->social_id == $social->id) {
38 38
                 $userSocial->delete();
39
-                Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' была удалена');
39
+                Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' была удалена');
40 40
             }
41 41
         }
42
-        Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' не найдена');
42
+        Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' не найдена');
43 43
     }
44 44
 
45 45
 }
Please login to merge, or discard this patch.