@@ -39,7 +39,7 @@ |
||
39 | 39 | 'password' |
40 | 40 | ]; |
41 | 41 | |
42 | - protected function _setPassword($password) |
|
42 | + protected function _setPassword($password) |
|
43 | 43 | { |
44 | 44 | return (new DefaultPasswordHasher)->hash($password); |
45 | 45 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | // Admin account |
28 | 28 | |
29 | 29 | |
30 | - if(!Configure::read('Security.salt')) |
|
30 | + if (!Configure::read('Security.salt')) |
|
31 | 31 | { |
32 | 32 | $salt = $this->in('Salt:'); |
33 | 33 | } |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | Configure::write('Datasources.default.quoteIdentifiers', false); |
49 | 49 | Configure::write('Datasources.default.url', env('DATABASE_URL', null)); |
50 | 50 | $file = new File('config/app_local.php', false); |
51 | - if(!$file->exists()) { |
|
52 | - if($ris = Configure::dump('app_local', 'default')) { |
|
51 | + if (!$file->exists()) { |
|
52 | + if ($ris = Configure::dump('app_local', 'default')) { |
|
53 | 53 | $this->out("Wrote config file app_local.php"); |
54 | 54 | } |
55 | 55 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | 'limit' => 11, |
19 | 19 | 'null' => false, |
20 | 20 | ]); |
21 | - $table->addColumn('name', 'string', [ |
|
21 | + $table->addColumn('name', 'string', [ |
|
22 | 22 | 'default' => null, |
23 | 23 | 'limit' => 255, |
24 | 24 | 'null' => false, |
@@ -20,7 +20,7 @@ |
||
20 | 20 | { |
21 | 21 | $tickettypes = $this->paginate($this->Tickettypes); |
22 | 22 | |
23 | - $title = "Type of ticket"; |
|
23 | + $title = "Type of ticket"; |
|
24 | 24 | |
25 | 25 | $this->set(compact(['tickettypes', 'title'])); |
26 | 26 | $this->set('_serialize', ['tickettypes']); |
@@ -86,29 +86,41 @@ discard block |
||
86 | 86 | <ul> |
87 | 87 | <?php if (version_compare(PHP_VERSION, '7.2.0', '>=')) : ?> |
88 | 88 | <li class="bullet success">Your version of PHP is 7.2.0 or higher (detected <?php echo PHP_VERSION ?>).</li> |
89 | - <?php else : ?> |
|
89 | + <?php else { |
|
90 | + : ?> |
|
90 | 91 | <li class="bullet problem">Your version of PHP is too low. You need PHP 7.2.0 or higher to use CakePHP (detected <?php echo PHP_VERSION ?>).</li> |
91 | - <?php endif; ?> |
|
92 | + <?php endif; |
|
93 | +} |
|
94 | +?> |
|
92 | 95 | |
93 | 96 | <?php if (extension_loaded('mbstring')) : ?> |
94 | 97 | <li class="bullet success">Your version of PHP has the mbstring extension loaded.</li> |
95 | - <?php else : ?> |
|
98 | + <?php else { |
|
99 | + : ?> |
|
96 | 100 | <li class="bullet problem">Your version of PHP does NOT have the mbstring extension loaded.</li> |
97 | - <?php endif; ?> |
|
101 | + <?php endif; |
|
102 | +} |
|
103 | +?> |
|
98 | 104 | |
99 | 105 | <?php if (extension_loaded('openssl')) : ?> |
100 | 106 | <li class="bullet success">Your version of PHP has the openssl extension loaded.</li> |
101 | 107 | <?php elseif (extension_loaded('mcrypt')) : ?> |
102 | 108 | <li class="bullet success">Your version of PHP has the mcrypt extension loaded.</li> |
103 | - <?php else : ?> |
|
109 | + <?php else { |
|
110 | + : ?> |
|
104 | 111 | <li class="bullet problem">Your version of PHP does NOT have the openssl or mcrypt extension loaded.</li> |
105 | - <?php endif; ?> |
|
112 | + <?php endif; |
|
113 | +} |
|
114 | +?> |
|
106 | 115 | |
107 | 116 | <?php if (extension_loaded('intl')) : ?> |
108 | 117 | <li class="bullet success">Your version of PHP has the intl extension loaded.</li> |
109 | - <?php else : ?> |
|
118 | + <?php else { |
|
119 | + : ?> |
|
110 | 120 | <li class="bullet problem">Your version of PHP does NOT have the intl extension loaded.</li> |
111 | - <?php endif; ?> |
|
121 | + <?php endif; |
|
122 | +} |
|
123 | +?> |
|
112 | 124 | </ul> |
113 | 125 | </div> |
114 | 126 | <div class="column"> |
@@ -116,22 +128,31 @@ discard block |
||
116 | 128 | <ul> |
117 | 129 | <?php if (is_writable(TMP)) : ?> |
118 | 130 | <li class="bullet success">Your tmp directory is writable.</li> |
119 | - <?php else : ?> |
|
131 | + <?php else { |
|
132 | + : ?> |
|
120 | 133 | <li class="bullet problem">Your tmp directory is NOT writable.</li> |
121 | - <?php endif; ?> |
|
134 | + <?php endif; |
|
135 | +} |
|
136 | +?> |
|
122 | 137 | |
123 | 138 | <?php if (is_writable(LOGS)) : ?> |
124 | 139 | <li class="bullet success">Your logs directory is writable.</li> |
125 | - <?php else : ?> |
|
140 | + <?php else { |
|
141 | + : ?> |
|
126 | 142 | <li class="bullet problem">Your logs directory is NOT writable.</li> |
127 | - <?php endif; ?> |
|
143 | + <?php endif; |
|
144 | +} |
|
145 | +?> |
|
128 | 146 | |
129 | 147 | <?php $settings = Cache::getConfig('_cake_core_'); ?> |
130 | 148 | <?php if (!empty($settings)) : ?> |
131 | 149 | <li class="bullet success">The <em><?php echo $settings['className'] ?>Engine</em> is being used for core caching. To change the config edit config/app.php</li> |
132 | - <?php else : ?> |
|
150 | + <?php else { |
|
151 | + : ?> |
|
133 | 152 | <li class="bullet problem">Your cache is NOT working. Please check the settings in config/app.php</li> |
134 | - <?php endif; ?> |
|
153 | + <?php endif; |
|
154 | +} |
|
155 | +?> |
|
135 | 156 | </ul> |
136 | 157 | </div> |
137 | 158 | </div> |
@@ -157,9 +178,12 @@ discard block |
||
157 | 178 | <ul> |
158 | 179 | <?php if ($connected) : ?> |
159 | 180 | <li class="bullet success">CakePHP is able to connect to the database.</li> |
160 | - <?php else : ?> |
|
181 | + <?php else { |
|
182 | + : ?> |
|
161 | 183 | <li class="bullet problem">CakePHP is NOT able to connect to the database.<br /><?php echo $errorMsg ?></li> |
162 | - <?php endif; ?> |
|
184 | + <?php endif; |
|
185 | +} |
|
186 | +?> |
|
163 | 187 | </ul> |
164 | 188 | </div> |
165 | 189 | <div class="column"> |
@@ -167,9 +191,12 @@ discard block |
||
167 | 191 | <ul> |
168 | 192 | <?php if (Plugin::isLoaded('DebugKit')) : ?> |
169 | 193 | <li class="bullet success">DebugKit is loaded.</li> |
170 | - <?php else : ?> |
|
194 | + <?php else { |
|
195 | + : ?> |
|
171 | 196 | <li class="bullet problem">DebugKit is NOT loaded. You need to either install pdo_sqlite, or define the "debug_kit" connection name.</li> |
172 | - <?php endif; ?> |
|
197 | + <?php endif; |
|
198 | +} |
|
199 | +?> |
|
173 | 200 | </ul> |
174 | 201 | </div> |
175 | 202 | </div> |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | // ask if the permissions should be changed |
119 | 119 | if ($io->isInteractive()) { |
120 | - $validator = function ($arg) { |
|
120 | + $validator = function($arg) { |
|
121 | 121 | if (in_array($arg, ['Y', 'y', 'N', 'n'])) { |
122 | 122 | return $arg; |
123 | 123 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | // Change the permissions on a path and output the results. |
139 | - $changePerms = function ($path) use ($io) { |
|
139 | + $changePerms = function($path) use ($io) { |
|
140 | 140 | $currentPerms = fileperms($path) & 0777; |
141 | 141 | $worldWritable = $currentPerms | 0007; |
142 | 142 | if ($worldWritable == $currentPerms) { |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | } |
152 | 152 | }; |
153 | 153 | |
154 | - $walker = function ($dir) use (&$walker, $changePerms) { |
|
154 | + $walker = function($dir) use (&$walker, $changePerms) { |
|
155 | 155 | $files = array_diff(scandir($dir), ['.', '..']); |
156 | 156 | foreach ($files as $file) { |
157 | 157 | $path = $dir . '/' . $file; |
@@ -166,12 +166,12 @@ |
||
166 | 166 | /* |
167 | 167 | * Setup detectors for mobile and tablet. |
168 | 168 | */ |
169 | -ServerRequest::addDetector('mobile', function ($request) { |
|
169 | +ServerRequest::addDetector('mobile', function($request) { |
|
170 | 170 | $detector = new \Detection\MobileDetect(); |
171 | 171 | |
172 | 172 | return $detector->isMobile(); |
173 | 173 | }); |
174 | -ServerRequest::addDetector('tablet', function ($request) { |
|
174 | +ServerRequest::addDetector('tablet', function($request) { |
|
175 | 175 | $detector = new \Detection\MobileDetect(); |
176 | 176 | |
177 | 177 | return $detector->isTablet(); |
@@ -86,29 +86,41 @@ discard block |
||
86 | 86 | <ul> |
87 | 87 | <?php if (version_compare(PHP_VERSION, '7.2.0', '>=')) : ?> |
88 | 88 | <li class="bullet success">Your version of PHP is 7.2.0 or higher (detected <?php echo PHP_VERSION ?>).</li> |
89 | - <?php else : ?> |
|
89 | + <?php else { |
|
90 | + : ?> |
|
90 | 91 | <li class="bullet problem">Your version of PHP is too low. You need PHP 7.2.0 or higher to use CakePHP (detected <?php echo PHP_VERSION ?>).</li> |
91 | - <?php endif; ?> |
|
92 | + <?php endif; |
|
93 | +} |
|
94 | +?> |
|
92 | 95 | |
93 | 96 | <?php if (extension_loaded('mbstring')) : ?> |
94 | 97 | <li class="bullet success">Your version of PHP has the mbstring extension loaded.</li> |
95 | - <?php else : ?> |
|
98 | + <?php else { |
|
99 | + : ?> |
|
96 | 100 | <li class="bullet problem">Your version of PHP does NOT have the mbstring extension loaded.</li> |
97 | - <?php endif; ?> |
|
101 | + <?php endif; |
|
102 | +} |
|
103 | +?> |
|
98 | 104 | |
99 | 105 | <?php if (extension_loaded('openssl')) : ?> |
100 | 106 | <li class="bullet success">Your version of PHP has the openssl extension loaded.</li> |
101 | 107 | <?php elseif (extension_loaded('mcrypt')) : ?> |
102 | 108 | <li class="bullet success">Your version of PHP has the mcrypt extension loaded.</li> |
103 | - <?php else : ?> |
|
109 | + <?php else { |
|
110 | + : ?> |
|
104 | 111 | <li class="bullet problem">Your version of PHP does NOT have the openssl or mcrypt extension loaded.</li> |
105 | - <?php endif; ?> |
|
112 | + <?php endif; |
|
113 | +} |
|
114 | +?> |
|
106 | 115 | |
107 | 116 | <?php if (extension_loaded('intl')) : ?> |
108 | 117 | <li class="bullet success">Your version of PHP has the intl extension loaded.</li> |
109 | - <?php else : ?> |
|
118 | + <?php else { |
|
119 | + : ?> |
|
110 | 120 | <li class="bullet problem">Your version of PHP does NOT have the intl extension loaded.</li> |
111 | - <?php endif; ?> |
|
121 | + <?php endif; |
|
122 | +} |
|
123 | +?> |
|
112 | 124 | </ul> |
113 | 125 | </div> |
114 | 126 | <div class="column"> |
@@ -116,22 +128,31 @@ discard block |
||
116 | 128 | <ul> |
117 | 129 | <?php if (is_writable(TMP)) : ?> |
118 | 130 | <li class="bullet success">Your tmp directory is writable.</li> |
119 | - <?php else : ?> |
|
131 | + <?php else { |
|
132 | + : ?> |
|
120 | 133 | <li class="bullet problem">Your tmp directory is NOT writable.</li> |
121 | - <?php endif; ?> |
|
134 | + <?php endif; |
|
135 | +} |
|
136 | +?> |
|
122 | 137 | |
123 | 138 | <?php if (is_writable(LOGS)) : ?> |
124 | 139 | <li class="bullet success">Your logs directory is writable.</li> |
125 | - <?php else : ?> |
|
140 | + <?php else { |
|
141 | + : ?> |
|
126 | 142 | <li class="bullet problem">Your logs directory is NOT writable.</li> |
127 | - <?php endif; ?> |
|
143 | + <?php endif; |
|
144 | +} |
|
145 | +?> |
|
128 | 146 | |
129 | 147 | <?php $settings = Cache::getConfig('_cake_core_'); ?> |
130 | 148 | <?php if (!empty($settings)) : ?> |
131 | 149 | <li class="bullet success">The <em><?php echo $settings['className'] ?>Engine</em> is being used for core caching. To change the config edit config/app.php</li> |
132 | - <?php else : ?> |
|
150 | + <?php else { |
|
151 | + : ?> |
|
133 | 152 | <li class="bullet problem">Your cache is NOT working. Please check the settings in config/app.php</li> |
134 | - <?php endif; ?> |
|
153 | + <?php endif; |
|
154 | +} |
|
155 | +?> |
|
135 | 156 | </ul> |
136 | 157 | </div> |
137 | 158 | </div> |
@@ -157,9 +178,12 @@ discard block |
||
157 | 178 | <ul> |
158 | 179 | <?php if ($connected) : ?> |
159 | 180 | <li class="bullet success">CakePHP is able to connect to the database.</li> |
160 | - <?php else : ?> |
|
181 | + <?php else { |
|
182 | + : ?> |
|
161 | 183 | <li class="bullet problem">CakePHP is NOT able to connect to the database.<br /><?php echo $errorMsg ?></li> |
162 | - <?php endif; ?> |
|
184 | + <?php endif; |
|
185 | +} |
|
186 | +?> |
|
163 | 187 | </ul> |
164 | 188 | </div> |
165 | 189 | <div class="column"> |
@@ -167,9 +191,12 @@ discard block |
||
167 | 191 | <ul> |
168 | 192 | <?php if (Plugin::isLoaded('DebugKit')) : ?> |
169 | 193 | <li class="bullet success">DebugKit is loaded.</li> |
170 | - <?php else : ?> |
|
194 | + <?php else { |
|
195 | + : ?> |
|
171 | 196 | <li class="bullet problem">DebugKit is NOT loaded. You need to either install pdo_sqlite, or define the "debug_kit" connection name.</li> |
172 | - <?php endif; ?> |
|
197 | + <?php endif; |
|
198 | +} |
|
199 | +?> |
|
173 | 200 | </ul> |
174 | 201 | </div> |
175 | 202 | </div> |
@@ -30,11 +30,11 @@ |
||
30 | 30 | <li class="nav-item dropdown"> |
31 | 31 | <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> |
32 | 32 | <?php if($this->request->session()->check('Auth.User')) { |
33 | - echo $this->request->session()->read('Auth.User.email'); |
|
34 | - } else { |
|
35 | - echo "User profile "; |
|
36 | - } |
|
37 | - ?> |
|
33 | + echo $this->request->session()->read('Auth.User.email'); |
|
34 | + } else { |
|
35 | + echo "User profile "; |
|
36 | + } |
|
37 | + ?> |
|
38 | 38 | <span class="caret"></span> |
39 | 39 | </a> |
40 | 40 | <div class="dropdown-menu" aria-labelledby="navbarDropdown"> |
@@ -1,20 +1,20 @@ discard block |
||
1 | 1 | <div class="row"> |
2 | 2 | <nav class="navbar sticky-top navbar-expand-xl navbar-light bg-light"> |
3 | 3 | <!-- Brand and toggle get grouped for better mobile display --> |
4 | - <?= $this->Html->link('FC Home', ['controller'=>'dashboard', 'action'=>'index'],['class'=>'navbar-brand']); ?> |
|
4 | + <?= $this->Html->link('FC Home', ['controller'=>'dashboard', 'action'=>'index'], ['class'=>'navbar-brand']); ?> |
|
5 | 5 | <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation"> |
6 | 6 | <span class="navbar-toggler-icon"></span> |
7 | 7 | </button> |
8 | 8 | <!-- Collect the nav links, forms, and other content for toggling --> |
9 | 9 | <div class="collapse navbar-collapse" id="navbarMain"> |
10 | 10 | <ul class="navbar-nav mr-auto"> |
11 | - <li class="nav-item"><?= $this->Html->link('Tickets', ['controller'=>'tickets', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
12 | - <li class="nav-item"><?= $this->Html->link('Warehouses', ['controller'=>'warehouses', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
13 | - <li class="nav-item"><?= $this->Html->link('Documents', ['controller'=>'documents', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
14 | - <li class="nav-item"><?= $this->Html->link('Assets', ['controller'=>'assets', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
15 | - <li class="nav-item"><?= $this->Html->link('Contacts', ['controller'=>'contacts', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
16 | - <li class="nav-item"><?= $this->Html->link('Products', ['controller'=>'products', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
17 | - <li class="nav-item"><?= $this->Html->link('Organizations', ['controller'=>'organizations', 'action'=>'index'],['class'=>'nav-link']); ?></li> |
|
11 | + <li class="nav-item"><?= $this->Html->link('Tickets', ['controller'=>'tickets', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
12 | + <li class="nav-item"><?= $this->Html->link('Warehouses', ['controller'=>'warehouses', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
13 | + <li class="nav-item"><?= $this->Html->link('Documents', ['controller'=>'documents', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
14 | + <li class="nav-item"><?= $this->Html->link('Assets', ['controller'=>'assets', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
15 | + <li class="nav-item"><?= $this->Html->link('Contacts', ['controller'=>'contacts', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
16 | + <li class="nav-item"><?= $this->Html->link('Products', ['controller'=>'products', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
17 | + <li class="nav-item"><?= $this->Html->link('Organizations', ['controller'=>'organizations', 'action'=>'index'], ['class'=>'nav-link']); ?></li> |
|
18 | 18 | </ul> |
19 | 19 | <!-- |
20 | 20 | <form class="form-inline ml-auto"> |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | <ul class="navbar-nav mr-auto"> |
30 | 30 | <li class="nav-item dropdown"> |
31 | 31 | <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> |
32 | - <?php if($this->request->session()->check('Auth.User')) { |
|
32 | + <?php if ($this->request->session()->check('Auth.User')) { |
|
33 | 33 | echo $this->request->session()->read('Auth.User.email'); |
34 | 34 | } else { |
35 | 35 | echo "User profile "; |
@@ -47,12 +47,12 @@ discard block |
||
47 | 47 | <i class="fa fa-cogs" aria-hidden="true"></i> Administration <span class="caret"></span> |
48 | 48 | </a> |
49 | 49 | <div class="dropdown-menu" aria-labelledby="navbarDropdown"> |
50 | - <?= $this->Html->link('Users', ['controller'=>'users', 'action'=>'index'], [ 'class' =>'dropdown-item']); ?> |
|
51 | - <?= $this->Html->link('Types', ['controller'=>'tickettypes', 'action'=>'index'], [ 'class' =>'dropdown-item']); ?> |
|
52 | - <?= $this->Html->link('Statuses', ['controller'=>'ticketstatuses', 'action'=>'index'], [ 'class' =>'dropdown-item']); ?> |
|
50 | + <?= $this->Html->link('Users', ['controller'=>'users', 'action'=>'index'], ['class' =>'dropdown-item']); ?> |
|
51 | + <?= $this->Html->link('Types', ['controller'=>'tickettypes', 'action'=>'index'], ['class' =>'dropdown-item']); ?> |
|
52 | + <?= $this->Html->link('Statuses', ['controller'=>'ticketstatuses', 'action'=>'index'], ['class' =>'dropdown-item']); ?> |
|
53 | 53 | </div> |
54 | 54 | </li> |
55 | - <li class="nav-item"><?= $this->Html->link('<i class="fa fa-sign-out" aria-hidden="true"></i> Logout', ['controller'=>'users', 'action'=>'logout'], [ 'class'=>'nav-link', 'escape' => false ]);?></li> |
|
55 | + <li class="nav-item"><?= $this->Html->link('<i class="fa fa-sign-out" aria-hidden="true"></i> Logout', ['controller'=>'users', 'action'=>'logout'], ['class'=>'nav-link', 'escape' => false]); ?></li> |
|
56 | 56 | </ul> |
57 | 57 | </div><!-- /.navbar-collapse --> |
58 | 58 | </nav> |