@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param alpha\Util\Http\Request $request |
| 98 | 98 | * |
| 99 | - * @return alpha\Util\Http\Response |
|
| 99 | + * @return Response |
|
| 100 | 100 | * |
| 101 | 101 | * @since 1.0 |
| 102 | 102 | */ |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * |
| 121 | 121 | * @param alpha\Util\Http\Request $request |
| 122 | 122 | * |
| 123 | - * @return alpha\Util\Http\Response |
|
| 123 | + * @return Response |
|
| 124 | 124 | * |
| 125 | 125 | * @since 1.0 |
| 126 | 126 | */ |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use Alpha\Model\Type\Boolean; |
| 9 | 9 | use Alpha\Model\Type\Relation; |
| 10 | 10 | use Alpha\Util\Logging\Logger; |
| 11 | -use Alpha\Util\Config\Configprovider; |
|
| 12 | 11 | use Alpha\Util\Http\Session\SessionProviderFactory; |
| 13 | 12 | use Alpha\Exception\ValidationException; |
| 14 | 13 | use Alpha\Exception\FileNotFoundException; |
@@ -2,15 +2,15 @@ |
||
| 2 | 2 | |
| 3 | 3 | require_once __DIR__.'/../vendor/autoload.php'; |
| 4 | 4 | |
| 5 | -use Alpha\Controller\Front\FrontController; |
|
| 6 | -use Alpha\Util\Config\ConfigProvider; |
|
| 7 | -use Alpha\Util\Http\Filter\ClientBlacklistFilter; |
|
| 8 | -use Alpha\Util\Http\Filter\IPBlacklistFilter; |
|
| 9 | -use Alpha\Util\Http\Filter\ClientTempBlacklistFilter; |
|
| 10 | -use Alpha\Util\Http\Request; |
|
| 11 | -use Alpha\Util\Http\Response; |
|
| 12 | -use Alpha\Exception\ResourceNotFoundException; |
|
| 13 | -use Alpha\Exception\ResourceNotAllowedException; |
|
| 5 | +use Alpha\Controller\Front\FrontController; |
|
| 6 | +use Alpha\Util\Config\ConfigProvider; |
|
| 7 | +use Alpha\Util\Http\Filter\ClientBlacklistFilter; |
|
| 8 | +use Alpha\Util\Http\Filter\IPBlacklistFilter; |
|
| 9 | +use Alpha\Util\Http\Filter\ClientTempBlacklistFilter; |
|
| 10 | +use Alpha\Util\Http\Request; |
|
| 11 | +use Alpha\Util\Http\Response; |
|
| 12 | +use Alpha\Exception\ResourceNotFoundException; |
|
| 13 | +use Alpha\Exception\ResourceNotAllowedException; |
|
| 14 | 14 | use Alpha\View\View; |
| 15 | 15 | |
| 16 | 16 | try {
|
@@ -14,36 +14,36 @@ |
||
| 14 | 14 | use Alpha\View\View; |
| 15 | 15 | |
| 16 | 16 | try {
|
| 17 | - $config = ConfigProvider::getInstance(); |
|
| 17 | + $config = ConfigProvider::getInstance(); |
|
| 18 | 18 | |
| 19 | - set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
|
|
| 20 | - set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
|
|
| 19 | + set_exception_handler('Alpha\Util\ErrorHandlers::catchException');
|
|
| 20 | + set_error_handler('Alpha\Util\ErrorHandlers::catchError', $config->get('php.error.log.level'));
|
|
| 21 | 21 | |
| 22 | - $front = new FrontController(); |
|
| 22 | + $front = new FrontController(); |
|
| 23 | 23 | |
| 24 | - if ($config->get('security.client.blacklist.filter.enabled')) {
|
|
| 25 | - $front->registerFilter(new ClientBlacklistFilter()); |
|
| 26 | - } |
|
| 24 | + if ($config->get('security.client.blacklist.filter.enabled')) {
|
|
| 25 | + $front->registerFilter(new ClientBlacklistFilter()); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - if ($config->get('security.ip.blacklist.filter.enabled')) {
|
|
| 29 | - $front->registerFilter(new IPBlacklistFilter()); |
|
| 30 | - } |
|
| 28 | + if ($config->get('security.ip.blacklist.filter.enabled')) {
|
|
| 29 | + $front->registerFilter(new IPBlacklistFilter()); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - if ($config->get('security.client.temp.blacklist.filter.enabled')) {
|
|
| 33 | - $front->registerFilter(new ClientTempBlacklistFilter()); |
|
| 34 | - } |
|
| 32 | + if ($config->get('security.client.temp.blacklist.filter.enabled')) {
|
|
| 33 | + $front->registerFilter(new ClientTempBlacklistFilter()); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - $request = new Request(); |
|
| 37 | - $response = $front->process($request); |
|
| 36 | + $request = new Request(); |
|
| 37 | + $response = $front->process($request); |
|
| 38 | 38 | |
| 39 | 39 | } catch (ResourceNotFoundException $rnfe) {
|
| 40 | - $response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
|
|
| 40 | + $response = new Response(404, View::renderErrorPage(404, $rnfe->getMessage(), array('Content-Type' => 'text/html')));
|
|
| 41 | 41 | } catch (ResourceNotAllowedException $rnae) {
|
| 42 | - $response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
|
|
| 42 | + $response = new Response(403, View::renderErrorPage(403, $rnae->getMessage(), array('Content-Type' => 'text/html')));
|
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if ($config->get('security.http.header.x.frame.options') != '' && $response->getHeader('X-Frame-Options') == null) {
|
| 46 | - $response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
|
|
| 46 | + $response->setHeader('X-Frame-Options', $config->get('security.http.header.x.frame.options'));
|
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | echo $response->send(); |
@@ -9,19 +9,19 @@ |
||
| 9 | 9 | $config = ConfigProvider::getInstance(); |
| 10 | 10 | |
| 11 | 11 | $dirs = array( |
| 12 | - $config->get('app.file.store.dir').'logs', |
|
| 13 | - $config->get('app.file.store.dir').'cache', |
|
| 14 | - $config->get('app.file.store.dir').'cache/html', |
|
| 15 | - $config->get('app.file.store.dir').'cache/images', |
|
| 16 | - $config->get('app.file.store.dir').'cache/pdf', |
|
| 17 | - $config->get('app.file.store.dir').'cache/xls', |
|
| 18 | - $config->get('app.file.store.dir').'attachments', |
|
| 19 | - ); |
|
| 12 | + $config->get('app.file.store.dir').'logs', |
|
| 13 | + $config->get('app.file.store.dir').'cache', |
|
| 14 | + $config->get('app.file.store.dir').'cache/html', |
|
| 15 | + $config->get('app.file.store.dir').'cache/images', |
|
| 16 | + $config->get('app.file.store.dir').'cache/pdf', |
|
| 17 | + $config->get('app.file.store.dir').'cache/xls', |
|
| 18 | + $config->get('app.file.store.dir').'attachments', |
|
| 19 | + ); |
|
| 20 | 20 | |
| 21 | 21 | foreach ($dirs as $dir) { |
| 22 | - if (!file_exists($dir)) { |
|
| 23 | - mkdir($dir, 0774); |
|
| 24 | - } |
|
| 22 | + if (!file_exists($dir)) { |
|
| 23 | + mkdir($dir, 0774); |
|
| 24 | + } |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | ?> |
| 28 | 28 | \ No newline at end of file |
@@ -615,7 +615,7 @@ |
||
| 615 | 615 | } |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | - // route URIs with params missing (will attempt to layer on defaults later on in Request class) |
|
| 618 | + // route URIs with params missing (will attempt to layer on defaults later on in Request class) |
|
| 619 | 619 | foreach ($this->routes as $route => $callback) { |
| 620 | 620 | $pattern = '#^'.$route.'$#s'; |
| 621 | 621 | $pattern = preg_replace('#\/\{\S+\}#', '\/?', $pattern); |
@@ -175,145 +175,145 @@ discard block |
||
| 175 | 175 | throw new BadRequestException('Request character encoding does not match expected UTF-8'); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - $this->addRoute('/', function ($request) { |
|
| 178 | + $this->addRoute('/', function($request) { |
|
| 179 | 179 | $controller = new IndexController(); |
| 180 | 180 | |
| 181 | 181 | return $controller->process($request); |
| 182 | 182 | }); |
| 183 | 183 | |
| 184 | - $this->addRoute('/a/{title}/{view}', function ($request) { |
|
| 184 | + $this->addRoute('/a/{title}/{view}', function($request) { |
|
| 185 | 185 | $controller = new ArticleController(); |
| 186 | 186 | |
| 187 | 187 | return $controller->process($request); |
| 188 | 188 | })->value('title', null)->value('view', 'detailed'); |
| 189 | 189 | |
| 190 | - $this->addRoute('/articles/{start}/{limit}', function ($request) { |
|
| 190 | + $this->addRoute('/articles/{start}/{limit}', function($request) { |
|
| 191 | 191 | $controller = new ArticleController(); |
| 192 | 192 | |
| 193 | 193 | return $controller->process($request); |
| 194 | 194 | })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); |
| 195 | 195 | |
| 196 | - $this->addRoute('/attach/{articleID}/{filename}', function ($request) { |
|
| 196 | + $this->addRoute('/attach/{articleID}/{filename}', function($request) { |
|
| 197 | 197 | $controller = new AttachmentController(); |
| 198 | 198 | |
| 199 | 199 | return $controller->process($request); |
| 200 | 200 | }); |
| 201 | 201 | |
| 202 | - $this->addRoute('/cache', function ($request) { |
|
| 202 | + $this->addRoute('/cache', function($request) { |
|
| 203 | 203 | $controller = new CacheController(); |
| 204 | 204 | |
| 205 | 205 | return $controller->process($request); |
| 206 | 206 | }); |
| 207 | 207 | |
| 208 | - $this->addRoute('/denum/{denumID}', function ($request) { |
|
| 208 | + $this->addRoute('/denum/{denumID}', function($request) { |
|
| 209 | 209 | $controller = new DEnumController(); |
| 210 | 210 | |
| 211 | 211 | return $controller->process($request); |
| 212 | 212 | })->value('denumID', null); |
| 213 | 213 | |
| 214 | - $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function ($request) { |
|
| 214 | + $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordID}', function($request) { |
|
| 215 | 215 | $controller = new ExcelController(); |
| 216 | 216 | |
| 217 | 217 | return $controller->process($request); |
| 218 | 218 | })->value('ActiveRecordID', null); |
| 219 | 219 | |
| 220 | - $this->addRoute('/feed/{ActiveRecordType}/{type}', function ($request) { |
|
| 220 | + $this->addRoute('/feed/{ActiveRecordType}/{type}', function($request) { |
|
| 221 | 221 | $controller = new FeedController(); |
| 222 | 222 | |
| 223 | 223 | return $controller->process($request); |
| 224 | 224 | })->value('type', 'Atom'); |
| 225 | 225 | |
| 226 | - $this->addRoute('/gensecure', function ($request) { |
|
| 226 | + $this->addRoute('/gensecure', function($request) { |
|
| 227 | 227 | $controller = new GenSecureQueryStringController(); |
| 228 | 228 | |
| 229 | 229 | return $controller->process($request); |
| 230 | 230 | }); |
| 231 | 231 | |
| 232 | - $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function ($request) { |
|
| 232 | + $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function($request) { |
|
| 233 | 233 | $controller = new ImageController(); |
| 234 | 234 | |
| 235 | 235 | return $controller->process($request); |
| 236 | 236 | })->value('var1', null)->value('var2', null); |
| 237 | 237 | |
| 238 | - $this->addRoute('/listactiverecords', function ($request) { |
|
| 238 | + $this->addRoute('/listactiverecords', function($request) { |
|
| 239 | 239 | $controller = new ListActiveRecordsController(); |
| 240 | 240 | |
| 241 | 241 | return $controller->process($request); |
| 242 | 242 | }); |
| 243 | 243 | |
| 244 | - $this->addRoute('/log/{logPath}', function ($request) { |
|
| 244 | + $this->addRoute('/log/{logPath}', function($request) { |
|
| 245 | 245 | $controller = new LogController(); |
| 246 | 246 | |
| 247 | 247 | return $controller->process($request); |
| 248 | 248 | }); |
| 249 | 249 | |
| 250 | - $this->addRoute('/login', function ($request) { |
|
| 250 | + $this->addRoute('/login', function($request) { |
|
| 251 | 251 | $controller = new LoginController(); |
| 252 | 252 | |
| 253 | 253 | return $controller->process($request); |
| 254 | 254 | }); |
| 255 | 255 | |
| 256 | - $this->addRoute('/logout', function ($request) { |
|
| 256 | + $this->addRoute('/logout', function($request) { |
|
| 257 | 257 | $controller = new LogoutController(); |
| 258 | 258 | |
| 259 | 259 | return $controller->process($request); |
| 260 | 260 | }); |
| 261 | 261 | |
| 262 | - $this->addRoute('/metric', function ($request) { |
|
| 262 | + $this->addRoute('/metric', function($request) { |
|
| 263 | 263 | $controller = new MetricController(); |
| 264 | 264 | |
| 265 | 265 | return $controller->process($request); |
| 266 | 266 | }); |
| 267 | 267 | |
| 268 | - $this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function ($request) { |
|
| 268 | + $this->addRoute('/recordselector/12m/{ActiveRecordID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function($request) { |
|
| 269 | 269 | $controller = new RecordSelectorController(); |
| 270 | 270 | |
| 271 | 271 | return $controller->process($request); |
| 272 | 272 | })->value('relationType', 'ONE-TO-MANY'); |
| 273 | 273 | |
| 274 | - $this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function ($request) { |
|
| 274 | + $this->addRoute('/recordselector/m2m/{ActiveRecordID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupIDs}/{relationType}', function($request) { |
|
| 275 | 275 | $controller = new RecordSelectorController(); |
| 276 | 276 | |
| 277 | 277 | return $controller->process($request); |
| 278 | 278 | })->value('relationType', 'MANY-TO-MANY'); |
| 279 | 279 | |
| 280 | - $this->addRoute('/search/{query}/{start}/{limit}', function ($request) { |
|
| 280 | + $this->addRoute('/search/{query}/{start}/{limit}', function($request) { |
|
| 281 | 281 | $controller = new SearchController(); |
| 282 | 282 | |
| 283 | 283 | return $controller->process($request); |
| 284 | 284 | })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); |
| 285 | 285 | |
| 286 | - $this->addRoute('/sequence/{start}/{limit}', function ($request) { |
|
| 286 | + $this->addRoute('/sequence/{start}/{limit}', function($request) { |
|
| 287 | 287 | $controller = new SequenceController(); |
| 288 | 288 | |
| 289 | 289 | return $controller->process($request); |
| 290 | 290 | })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); |
| 291 | 291 | |
| 292 | - $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function ($request) { |
|
| 292 | + $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordID}', function($request) { |
|
| 293 | 293 | $controller = new TagController(); |
| 294 | 294 | |
| 295 | 295 | return $controller->process($request); |
| 296 | 296 | }); |
| 297 | 297 | |
| 298 | - $this->addRoute('/install', function ($request) { |
|
| 298 | + $this->addRoute('/install', function($request) { |
|
| 299 | 299 | $controller = new InstallController(); |
| 300 | 300 | |
| 301 | 301 | return $controller->process($request); |
| 302 | 302 | }); |
| 303 | 303 | |
| 304 | - $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function ($request) { |
|
| 304 | + $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordID}/{view}', function($request) { |
|
| 305 | 305 | $controller = new ActiveRecordController(); |
| 306 | 306 | |
| 307 | 307 | return $controller->process($request); |
| 308 | 308 | })->value('ActiveRecordID', null)->value('view', 'detailed'); |
| 309 | 309 | |
| 310 | - $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function ($request) { |
|
| 310 | + $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function($request) { |
|
| 311 | 311 | $controller = new ActiveRecordController(); |
| 312 | 312 | |
| 313 | 313 | return $controller->process($request); |
| 314 | 314 | })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); |
| 315 | 315 | |
| 316 | - $this->addRoute('/tk/{token}', function ($request) { |
|
| 316 | + $this->addRoute('/tk/{token}', function($request) { |
|
| 317 | 317 | $params = self::getDecodeQueryParams($request->getParam('token')); |
| 318 | 318 | |
| 319 | 319 | if (isset($params['act'])) { |
@@ -340,14 +340,14 @@ discard block |
||
| 340 | 340 | return new Response(404, 'Resource not found'); |
| 341 | 341 | }); |
| 342 | 342 | |
| 343 | - $this->addRoute('/alpha/service', function ($request) { |
|
| 343 | + $this->addRoute('/alpha/service', function($request) { |
|
| 344 | 344 | $controller = new LoginController(); |
| 345 | 345 | $controller->setUnitOfWork(array('Alpha\Controller\LoginController', 'Alpha\Controller\ListActiveRecordsController')); |
| 346 | 346 | |
| 347 | 347 | return $controller->process($request); |
| 348 | 348 | }); |
| 349 | 349 | |
| 350 | - $this->addRoute('/phpinfo', function ($request) { |
|
| 350 | + $this->addRoute('/phpinfo', function($request) { |
|
| 351 | 351 | $controller = new PhpinfoController(); |
| 352 | 352 | |
| 353 | 353 | return $controller->process($request); |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | use Alpha\Util\Http\Request; |
| 11 | 11 | use Alpha\Exception\BadRequestException; |
| 12 | 12 | use Alpha\Exception\ResourceNotFoundException; |
| 13 | -use Alpha\Exception\SecurityException; |
|
| 14 | 13 | use Alpha\Exception\IllegalArguementException; |
| 15 | 14 | use Alpha\Exception\AlphaException; |
| 16 | 15 | use Alpha\Controller\Controller; |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Alpha\Util\Config\ConfigProvider; |
| 7 | 7 | use Alpha\Util\Http\Request; |
| 8 | 8 | use Alpha\Util\Http\Response; |
| 9 | -use Alpha\Util\Http\Session\SessionProviderFactory; |
|
| 10 | 9 | use Alpha\View\View; |
| 11 | 10 | use Alpha\Controller\Front\FrontController; |
| 12 | 11 | |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | * A static method that attempts to return a HighlightProviderInterface instance |
| 64 | 64 | * based on the name of the provider class supplied. |
| 65 | 65 | * |
| 66 | - * @param $providerName The fully-qualified class name of the provider class, should implement Alpha\Util\Code\Highlight\HighlightProviderInterface |
|
| 66 | + * @param string $providerName The fully-qualified class name of the provider class, should implement Alpha\Util\Code\Highlight\HighlightProviderInterface |
|
| 67 | 67 | * |
| 68 | 68 | * @throws \Alpha\Exception\IllegalArguementException |
| 69 | 69 | * |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Alpha\Model\Type\Integer; |
| 7 | 7 | use Alpha\Model\Type\Timestamp; |
| 8 | 8 | use Alpha\Model\Type\TypeInterface; |
| 9 | -use Alpha\Model\Type\Enum; |
|
| 10 | 9 | use Alpha\Model\Type\Relation; |
| 11 | 10 | use Alpha\Util\Config\ConfigProvider; |
| 12 | 11 | use Alpha\Util\Logging\Logger; |
@@ -234,16 +234,16 @@ discard block |
||
| 234 | 234 | self::$logger->debug('<<__construct()'); |
| 235 | 235 | } |
| 236 | 236 | |
| 237 | - /** |
|
| 238 | - * Facade method which will invoke our custom markdown class rather than the standard one. |
|
| 239 | - * |
|
| 240 | - * @param $text The markdown content to parse |
|
| 241 | - * |
|
| 242 | - * @since 1.0 |
|
| 243 | - */ |
|
| 244 | - private function markdown($text) |
|
| 245 | - { |
|
| 246 | - $config = ConfigProvider::getInstance(); |
|
| 237 | + /** |
|
| 238 | + * Facade method which will invoke our custom markdown class rather than the standard one. |
|
| 239 | + * |
|
| 240 | + * @param $text The markdown content to parse |
|
| 241 | + * |
|
| 242 | + * @since 1.0 |
|
| 243 | + */ |
|
| 244 | + private function markdown($text) |
|
| 245 | + { |
|
| 246 | + $config = ConfigProvider::getInstance(); |
|
| 247 | 247 | |
| 248 | 248 | /* |
| 249 | 249 | * Initialize the parser and return the result of its transform method. |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | */ |
| 252 | 252 | static $parser; |
| 253 | 253 | |
| 254 | - if (!isset($parser)) { |
|
| 255 | - $parser = new Markdown(); |
|
| 256 | - } |
|
| 254 | + if (!isset($parser)) { |
|
| 255 | + $parser = new Markdown(); |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | /* |
| 259 | 259 | * Replace all instances of $sysURL in the text with the app.url setting from config |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | // transform text using parser. |
| 265 | 265 | return $parser->transform($text); |
| 266 | - } |
|
| 266 | + } |
|
| 267 | 267 | |
| 268 | 268 | /** |
| 269 | 269 | * Fetter for the content. |