@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | <hr /> |
23 | 23 | <div class="row"> |
24 | 24 | <div class="col-md-12"> |
25 | - <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add field'), ['class' => 'btn btn-primary pull-right']) ?> |
|
25 | + <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> '.__('Add field'), ['class' => 'btn btn-primary pull-right']) ?> |
|
26 | 26 | </div> |
27 | 27 | </div> |
28 | 28 | <?php if ($records->count() > 0): |
@@ -37,10 +37,10 @@ discard block |
||
37 | 37 | $items[] = [ |
38 | 38 | ['text' => $row->id], |
39 | 39 | ['text' => $row->getLocaled('name')], |
40 | - ['text' => '<span class="' . $labelClass . '">' . $row->type . '</span>', 'html' => true], |
|
41 | - ['text' => '<code>' . ($row->reg_cond == 0 ? '!' : null) . 'preg_match("' . $row->reg_exp . '", input)' . '</code>', 'html' => true], |
|
40 | + ['text' => '<span class="'.$labelClass.'">'.$row->type.'</span>', 'html' => true], |
|
41 | + ['text' => '<code>'.($row->reg_cond == 0 ? '!' : null).'preg_match("'.$row->reg_exp.'", input)'.'</code>', 'html' => true], |
|
42 | 42 | [ |
43 | - 'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]) . |
|
43 | + 'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]). |
|
44 | 44 | Url::link(['profile/fielddelete', $row->id], '<i class="fa fa-trash-o fa-lg"></i>', ['html' => true]), |
45 | 45 | 'html' => true, |
46 | 46 | 'property' => ['class' => 'text-center'] |
@@ -65,6 +65,9 @@ |
||
65 | 65 | ] |
66 | 66 | ]); |
67 | 67 | ?> |
68 | -<?php else: ?> |
|
68 | +<?php else { |
|
69 | + : ?> |
|
69 | 70 | <p class="alert alert-warning"><?= __('No additional fields is add yet!') ?></p> |
70 | -<?php endif; ?> |
|
71 | 71 | \ No newline at end of file |
72 | +<?php endif; |
|
73 | +} |
|
74 | +?> |
|
72 | 75 | \ No newline at end of file |
@@ -79,7 +79,7 @@ |
||
79 | 79 | |
80 | 80 | <br /> |
81 | 81 | |
82 | -<?php if($model->checkAll()): ?> |
|
82 | +<?php if ($model->checkAll()): ?> |
|
83 | 83 | <div class="row"> |
84 | 84 | <div class="col-xs-3" style="padding-top: 5px;padding-left: 25px;"> |
85 | 85 | <input type="checkbox" id="agree-license" /> <label for="agree-license"><?= __('Accept license') ?></label> |
@@ -88,9 +88,12 @@ |
||
88 | 88 | <a href="#license" class="btn btn-success btn-block" id="install-link" disabled="disabled"><?= __('Start install') ?></a> |
89 | 89 | </div> |
90 | 90 | </div> |
91 | -<?php else: ?> |
|
91 | +<?php else { |
|
92 | + : ?> |
|
92 | 93 | <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?> |
93 | -<?php endif; ?> |
|
94 | +<?php endif; |
|
95 | +} |
|
96 | +?> |
|
94 | 97 | <script> |
95 | 98 | $(document).ready(function () { |
96 | 99 | $('#agree-license').change(function () { |
@@ -52,12 +52,12 @@ |
||
52 | 52 | throw new \Exception('Wrong definition for loader. You shoud use front, admin, api'); |
53 | 53 | } |
54 | 54 | |
55 | - $namespace = 'Apps\Model\\' . $loader . '\\' . $controller; |
|
55 | + $namespace = 'Apps\Model\\'.$loader.'\\'.$controller; |
|
56 | 56 | $tpl = File::read('/Private/Carcase/Model.tphp'); |
57 | 57 | $code = Str::replace(['%namespace%', '%name%'], [$namespace, $name], $tpl); |
58 | - $path = '/Apps/Model/' . $loader . '/' . $controller . '/' . $name . '.php'; |
|
58 | + $path = '/Apps/Model/'.$loader.'/'.$controller.'/'.$name.'.php'; |
|
59 | 59 | File::write($path, $code); |
60 | - $output->writeln('Model are successful created: ' . $path); |
|
60 | + $output->writeln('Model are successful created: '.$path); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | } |
64 | 64 | \ No newline at end of file |
@@ -41,8 +41,8 @@ |
||
41 | 41 | $tpl = File::read('/Private/Carcase/ActiveRecord.tphp'); |
42 | 42 | $code = Str::replace('%name%', $name, $tpl); |
43 | 43 | |
44 | - $path = '/Apps/ActiveRecord/' . $name . '.php'; |
|
44 | + $path = '/Apps/ActiveRecord/'.$name.'.php'; |
|
45 | 45 | File::write($path, $code); |
46 | - $output->writeln('ActiveRecord are successful created: ' . $path); |
|
46 | + $output->writeln('ActiveRecord are successful created: '.$path); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | \ No newline at end of file |
@@ -53,17 +53,17 @@ |
||
53 | 53 | preg_match_all('/public function action(\w*?)\(/', $byte, $matches); // matches[0] contains all methods ;) |
54 | 54 | if (Any::isArray($matches[1]) && count($matches[1]) > 0) { |
55 | 55 | foreach ($matches[1] as $perm) { |
56 | - $fullPerm = 'Admin/' . $className . '/' . $perm; |
|
56 | + $fullPerm = 'Admin/'.$className.'/'.$perm; |
|
57 | 57 | $permissions[] = $fullPerm; |
58 | - $output->writeln("\tAdd permission: " . $fullPerm); |
|
58 | + $output->writeln("\tAdd permission: ".$fullPerm); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | } |
62 | 62 | // prepare save string |
63 | - $stringSave = "<?php \n\nreturn " . Arr::exportVar($permissions) . ';'; |
|
63 | + $stringSave = "<?php \n\nreturn ".Arr::exportVar($permissions).';'; |
|
64 | 64 | File::write('/Private/Config/Permissions.php', $stringSave); |
65 | 65 | |
66 | - $output->writeln('Permissions configuration is successful updated! Founded permissions: ' . count($permissions)); |
|
66 | + $output->writeln('Permissions configuration is successful updated! Founded permissions: '.count($permissions)); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -50,12 +50,12 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | // prepare code & write |
53 | - $template = File::read('/Private/Carcase/' . $loader . '/Controller.tphp'); |
|
53 | + $template = File::read('/Private/Carcase/'.$loader.'/Controller.tphp'); |
|
54 | 54 | $code = Str::replace(['%name%'], [$name], $template); |
55 | 55 | |
56 | - $savePath = '/Apps/Controller/' . $loader . '/' . $name . '.php'; |
|
56 | + $savePath = '/Apps/Controller/'.$loader.'/'.$name.'.php'; |
|
57 | 57 | File::write($savePath, $code); |
58 | 58 | |
59 | - $output->write('Controller are successful created: ' . $savePath); |
|
59 | + $output->write('Controller are successful created: '.$savePath); |
|
60 | 60 | } |
61 | 61 | } |
62 | 62 | \ No newline at end of file |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $output->write('Migration table is always exists!'); |
37 | 37 | return; |
38 | 38 | } |
39 | - DatabaseManager::schema($this->dbConnection)->create('migrations', function ($table){ |
|
39 | + DatabaseManager::schema($this->dbConnection)->create('migrations', function($table) { |
|
40 | 40 | $table->increments('id'); |
41 | 41 | $table->string('migration', 127)->unique(); |
42 | 42 | $table->timestamps(); |
@@ -44,10 +44,10 @@ |
||
44 | 44 | foreach (self::$installDirs as $obj) { |
45 | 45 | if (Directory::exist($obj)) { |
46 | 46 | Directory::recursiveChmod($obj, 0777); |
47 | - $output->writeln('Write recursive permissions 0777 for all directories in: ' . $obj); |
|
47 | + $output->writeln('Write recursive permissions 0777 for all directories in: '.$obj); |
|
48 | 48 | } elseif (File::exist($obj)) { |
49 | - chmod(root . $obj, 0777); |
|
50 | - $output->writeln('Write permissions 0777 for file: ' . $obj); |
|
49 | + chmod(root.$obj, 0777); |
|
50 | + $output->writeln('Write permissions 0777 for file: '.$obj); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | } |
56 | 56 | // get password and role and check validity |
57 | 57 | $password = $this->optionOrAsk('password', 'User password'); |
58 | - $roleId = (int)$this->optionOrAsk('role', 'RoleId', '1'); |
|
58 | + $roleId = (int) $this->optionOrAsk('role', 'RoleId', '1'); |
|
59 | 59 | $records = Role::all()->toArray(); |
60 | 60 | $roles = Arr::pluck('id', $records); |
61 | 61 | if (!Arr::in($roleId, $roles)) { |