Compare commits

..
4 Commits
Author SHA1 Message Date
Niko Storni 70c04cca47 fully upgrade phpcake 2018-12-03 18:09:10 -05:00
Niko Storni ed508182b5 fix more deprecations 2018-12-03 17:55:33 -05:00
Niko Storni 3d28c44fde fix deprecations
change default statusCode to 200
2018-12-03 17:52:22 -05:00
Niko Storni 6c61179546 add caching to api
update deprecated methods
swap qr library
2018-12-03 17:27:41 -05:00
33 changed files with 607 additions and 191 deletions

No files matched your search

+1 -1
View File
@@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": ">=5.6",
"cakephp/cakephp": "3.4.*",
"cakephp/cakephp": "^3.6",
"mobiledetect/mobiledetectlib": "2.*",
"cakephp/migrations": "~1.0",
"cakephp/plugin-installer": "~1.0",
Generated
+437 -40
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e64d13561bc0e6896ed8629290b55669",
"content-hash": "256edf12def1dab07052f75395a87692",
"packages": [
{
"name": "aura/intl",
@@ -103,21 +103,21 @@
},
{
"name": "cakephp/cakephp",
"version": "3.4.14",
"version": "3.6.13",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp.git",
"reference": "57fcdfcf9376670ca4f6f5bd39100ede762afb88"
"reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/cakephp/zipball/57fcdfcf9376670ca4f6f5bd39100ede762afb88",
"reference": "57fcdfcf9376670ca4f6f5bd39100ede762afb88",
"url": "https://api.github.com/repos/cakephp/cakephp/zipball/6a0b9c74710a56c5974d1c8229c7a91dac780402",
"reference": "6a0b9c74710a56c5974d1c8229c7a91dac780402",
"shasum": ""
},
"require": {
"aura/intl": "^3.0.0",
"cakephp/chronos": "^1.0.0",
"cakephp/chronos": "^1.0.1",
"ext-intl": "*",
"ext-mbstring": "*",
"php": ">=5.6.0",
@@ -144,7 +144,7 @@
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "^5.7|^6.0"
"phpunit/phpunit": "^5.7.14|^6.0"
},
"suggest": {
"ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
@@ -153,7 +153,7 @@
"type": "library",
"autoload": {
"psr-4": {
"Cake\\": "src"
"Cake\\": "src/"
},
"files": [
"src/Core/functions.php",
@@ -185,7 +185,7 @@
"rapid-development",
"validation"
],
"time": "2018-05-21T01:19:34+00:00"
"time": "2018-11-04T20:29:27+00:00"
},
{
"name": "cakephp/chronos",
@@ -246,29 +246,29 @@
},
{
"name": "cakephp/migrations",
"version": "1.7.2",
"version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/migrations.git",
"reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda"
"reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/migrations/zipball/a5612adfd2efa8c90d29cb3b0c969de872a99eda",
"reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda",
"url": "https://api.github.com/repos/cakephp/migrations/zipball/cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
"reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
"shasum": ""
},
"require": {
"cakephp/cache": "~3.2",
"cakephp/orm": "~3.2",
"php": ">=5.5.9",
"cakephp/cache": "^3.6.0",
"cakephp/orm": "^3.6.0",
"php": ">=5.6.0",
"robmorgan/phinx": "0.8.1"
},
"require-dev": {
"cakephp/bake": "@stable",
"cakephp/cakephp": "~3.2",
"cakephp/bake": "^1.7.0",
"cakephp/cakephp": "^3.6.0",
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "~4.1"
"phpunit/phpunit": "^5.7.14"
},
"suggest": {
"cakephp/bake": "Required if you want to generate migrations."
@@ -295,7 +295,7 @@
"cakephp",
"migrations"
],
"time": "2017-12-12T21:01:38+00:00"
"time": "2018-04-16T01:35:59+00:00"
},
{
"name": "cakephp/plugin-installer",
@@ -1845,27 +1845,199 @@
],
"packages-dev": [
{
"name": "cakephp/bake",
"version": "1.3.7",
"name": "ajgl/breakpoint-twig-extension",
"version": "0.3.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/bake.git",
"reference": "4bbb541ee27d12fe63f15cf5acf70b94553de209"
"url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git",
"reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/bake/zipball/4bbb541ee27d12fe63f15cf5acf70b94553de209",
"reference": "4bbb541ee27d12fe63f15cf5acf70b94553de209",
"url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/360ec6351ad7e1968ee78abb31430046c2e04fc5",
"reference": "360ec6351ad7e1968ee78abb31430046c2e04fc5",
"shasum": ""
},
"require": {
"cakephp/cakephp": ">=3.4.0 <4.0.0",
"cakephp/plugin-installer": "*",
"php": ">=5.6.0"
"php": ">=5.6",
"twig/twig": "^1.14|^2.0"
},
"require-dev": {
"phpunit/phpunit": "^5",
"symfony/framework-bundle": "^2.7|^3.2",
"symfony/twig-bundle": "^2.7|^3.2"
},
"suggest": {
"ext-xdebug": "The Xdebug extension is required for the breakpoint to work",
"symfony/framework-bundle": "The framework bundle to integrate the extension into Symfony",
"symfony/twig-bundle": "The twig bundle to integrate the extension into Symfony"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.3.x-dev"
}
},
"autoload": {
"psr-4": {
"Ajgl\\Twig\\Extension\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Antonio J. García Lagar",
"email": "aj@garcialagar.es",
"homepage": "http://aj.garcialagar.es",
"role": "developer"
}
],
"description": "Twig extension to set breakpoints",
"homepage": "https://github.com/ajgarlag/AjglBreakpointTwigExtension",
"keywords": [
"Xdebug",
"breakpoint",
"twig"
],
"time": "2017-11-20T13:04:11+00:00"
},
{
"name": "aptoma/twig-markdown",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/aptoma/twig-markdown.git",
"reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aptoma/twig-markdown/zipball/64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
"reference": "64a9c5c7418c08faf91c4410b34bdb65fb25c23d",
"shasum": ""
},
"require": {
"twig/twig": "~1.12"
},
"require-dev": {
"codeclimate/php-test-reporter": "dev-master",
"erusev/parsedown": "^1.6",
"knplabs/github-api": "~1.2",
"league/commonmark": "~0.5",
"michelf/php-markdown": "~1",
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "~0.6"
},
"suggest": {
"knplabs/github-api": "Needed for using GitHub's Markdown engine provided through their API.",
"michelf/php-markdown": "Original Markdown engine with MarkdownExtra."
},
"type": "library",
"autoload": {
"psr-0": {
"Aptoma": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Joris Berthelot",
"email": "joris@berthelot.tel"
},
{
"name": "Gunnar Lium",
"email": "gunnar@aptoma.com"
}
],
"description": "Twig extension to work with Markdown content",
"keywords": [
"markdown",
"twig"
],
"time": "2015-10-23T20:27:08+00:00"
},
{
"name": "asm89/twig-cache-extension",
"version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/asm89/twig-cache-extension.git",
"reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/asm89/twig-cache-extension/zipball/630ea7abdc3fc62ba6786c02590a1560e449cf55",
"reference": "630ea7abdc3fc62ba6786c02590a1560e449cf55",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
"twig/twig": "^1.0|^2.0"
},
"require-dev": {
"doctrine/cache": "~1.0"
},
"suggest": {
"psr/cache-implementation": "To make use of PSR-6 cache implementation via PsrCacheAdapter."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
}
},
"autoload": {
"psr-4": {
"": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alexander",
"email": "iam.asm89@gmail.com"
}
],
"description": "Cache fragments of templates directly within Twig.",
"homepage": "https://github.com/asm89/twig-cache-extension",
"keywords": [
"cache",
"extension",
"twig"
],
"time": "2017-01-10T22:04:15+00:00"
},
{
"name": "cakephp/bake",
"version": "1.8.6",
"source": {
"type": "git",
"url": "https://github.com/cakephp/bake.git",
"reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/bake/zipball/bfa552a92a01cb1c878b3a3a67899fcd21569818",
"reference": "bfa552a92a01cb1c878b3a3a67899fcd21569818",
"shasum": ""
},
"require": {
"cakephp/cakephp": "^3.6.12",
"cakephp/plugin-installer": "^1.0",
"php": ">=5.6.0",
"wyrihaximus/twig-view": "^4.3.4"
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "~5.7 | ~6.0"
"phpunit/phpunit": "^5.7.14|^6.0"
},
"type": "cakephp-plugin",
"autoload": {
@@ -1883,30 +2055,30 @@
"homepage": "https://github.com/cakephp/bake/graphs/contributors"
}
],
"description": "Bake plugin for CakePHP 3.0",
"description": "Bake plugin for CakePHP 3",
"homepage": "https://github.com/cakephp/bake",
"keywords": [
"bake",
"cakephp"
],
"time": "2017-07-01T15:59:12+00:00"
"time": "2018-11-17T03:34:24+00:00"
},
{
"name": "cakephp/debug_kit",
"version": "3.14.2",
"version": "3.16.6",
"source": {
"type": "git",
"url": "https://github.com/cakephp/debug_kit.git",
"reference": "b5e11f386b9ff28694950f68ef3e0456c242051b"
"reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b5e11f386b9ff28694950f68ef3e0456c242051b",
"reference": "b5e11f386b9ff28694950f68ef3e0456c242051b",
"url": "https://api.github.com/repos/cakephp/debug_kit/zipball/b6a75d47b2b1be6f6db31fbdf60ed5e062f310db",
"reference": "b6a75d47b2b1be6f6db31fbdf60ed5e062f310db",
"shasum": ""
},
"require": {
"cakephp/cakephp": "^3.4.0",
"cakephp/cakephp": "^3.6.0",
"cakephp/chronos": "^1.0.0",
"cakephp/plugin-installer": "^1.0.0",
"composer/composer": "^1.3.0",
@@ -1915,10 +2087,10 @@
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "^5.7|^6.0"
"phpunit/phpunit": "^5.7.14|^6.0"
},
"suggest": {
"ext-sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
"ext-pdo_sqlite": "DebugKit needs to store panel data in a database. SQLite is simple and easy to use."
},
"type": "cakephp-plugin",
"autoload": {
@@ -1949,7 +2121,7 @@
"debug",
"kit"
],
"time": "2018-03-08T18:21:10+00:00"
"time": "2018-11-22T15:19:18+00:00"
},
{
"name": "composer/ca-bundle",
@@ -2375,6 +2547,66 @@
"description": "Highlight PHP code in terminal",
"time": "2018-09-29T18:48:56+00:00"
},
{
"name": "jasny/twig-extensions",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/jasny/twig-extensions.git",
"reference": "30bdf3a3903c021544f36332c9d5d4d563527da4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jasny/twig-extensions/zipball/30bdf3a3903c021544f36332c9d5d4d563527da4",
"reference": "30bdf3a3903c021544f36332c9d5d4d563527da4",
"shasum": ""
},
"require": {
"php": ">=7.0.0 | >=5.6.0",
"twig/twig": "^2.0 | ^1.12"
},
"require-dev": {
"ext-intl": "*",
"ext-pcre": "*",
"jasny/php-code-quality": "^2.1",
"phpunit/phpunit": "^5.0"
},
"suggest": {
"ext-intl": "Required for the use of the LocalDate Twig extension",
"ext-pcre": "Required for the use of the PCRE Twig extension"
},
"type": "library",
"autoload": {
"psr-4": {
"Jasny\\Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Arnold Daniels",
"email": "arnold@jasny.net",
"homepage": "http://www.jasny.net"
}
],
"description": "A set of useful Twig filters",
"homepage": "http://github.com/jasny/twig-extensions#README",
"keywords": [
"PCRE",
"array",
"date",
"datetime",
"preg",
"regex",
"templating",
"text",
"time"
],
"time": "2017-09-13T07:38:01+00:00"
},
{
"name": "jdorn/sql-formatter",
"version": "v1.2.17",
@@ -2936,6 +3168,171 @@
"dump"
],
"time": "2018-11-25T12:50:42+00:00"
},
{
"name": "twig/twig",
"version": "v1.35.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.35-dev"
}
},
"autoload": {
"psr-0": {
"Twig_": "lib/"
},
"psr-4": {
"Twig\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com",
"homepage": "http://fabien.potencier.org",
"role": "Lead Developer"
},
{
"name": "Armin Ronacher",
"email": "armin.ronacher@active-4.com",
"role": "Project Founder"
},
{
"name": "Twig Team",
"homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "https://twig.symfony.com",
"keywords": [
"templating"
],
"time": "2018-07-13T07:12:17+00:00"
},
{
"name": "umpirsky/twig-php-function",
"version": "v0.1",
"source": {
"type": "git",
"url": "https://github.com/umpirsky/twig-php-function.git",
"reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/umpirsky/twig-php-function/zipball/53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
"reference": "53b4b1eb0c5eacbd7d66c504b7d809c79b4bedbc",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"twig/twig": "~1.12"
},
"require-dev": {
"phpspec/phpspec": "~2.0",
"phpunit/phpunit": "~4.4"
},
"type": "library",
"autoload": {
"psr-0": {
"Umpirsky\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Saša Stamenković",
"email": "umpirsky@gmail.com"
}
],
"description": "Call (almost) any PHP function from your Twig templates.",
"time": "2016-03-12T16:36:32+00:00"
},
{
"name": "wyrihaximus/twig-view",
"version": "4.3.5",
"source": {
"type": "git",
"url": "https://github.com/WyriHaximus/TwigView.git",
"reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/ec2771e6a1fe799f9b16eff19da424cd04d593b7",
"reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7",
"shasum": ""
},
"require": {
"ajgl/breakpoint-twig-extension": "^0.3.0",
"aptoma/twig-markdown": "^2.0",
"asm89/twig-cache-extension": "^1.0",
"cakephp/cakephp": "^3.5",
"jasny/twig-extensions": "^1.0",
"php": "^5.6 || ^7.0",
"twig/twig": "^1.27",
"umpirsky/twig-php-function": "0.1"
},
"require-dev": {
"cakephp/bake": "^1.5",
"cakephp/debug_kit": "^3.0",
"phake/phake": "^1.0.4",
"phpunit/phpunit": "^5.7.14",
"squizlabs/php_codesniffer": "^1.5.6",
"wyrihaximus/phpunit-class-reflection-helpers": "dev-master"
},
"type": "cakephp-plugin",
"autoload": {
"psr-4": {
"WyriHaximus\\TwigView\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Cees-Jan Kiewiet",
"email": "ceesjank@gmail.com",
"homepage": "http://wyrihaximus.net/"
}
],
"description": "Twig powered View for CakePHP3",
"keywords": [
"cakephp",
"cakephp3",
"twig",
"view"
],
"time": "2018-07-03T15:46:29+00:00"
}
],
"aliases": [],
+2
View File
@@ -1,4 +1,6 @@
<?php
namespace App\config;
return [
/**
* Debug Level:
+4 -29
View File
@@ -15,22 +15,19 @@
// You can remove this if you are confident that your PHP version is sufficient.
if (version_compare(PHP_VERSION, '5.6.0') < 0) {
trigger_error('Your PHP version must be equal or higher than 5.6.0 to use CakePHP.', E_USER_ERROR);
}
trigger_error('Your PHP version must be equal or higher than 5.6.0 to}
/*
* You can remove this if you are confident you have intl installed.
*/
if (!extension_loaded('intl')) {
trigger_error('You must enable the intl extension to use CakePHP.', E_USER_ERROR);
}
trigger_error('You must enable the intl extension to}
/*
* You can remove this if you are confident you have mbstring installed.
*/
if (!extension_loaded('mbstring')) {
trigger_error('You must enable the mbstring extension to use CakePHP.', E_USER_ERROR);
}
trigger_error('You must enable the mbstring extension to}
/*
* Configure paths required to find CakePHP + general filepath
@@ -49,20 +46,6 @@ require __DIR__ . '/paths.php';
*/
require CORE_PATH . 'config' . DS . 'bootstrap.php';
use Cake\Cache\Cache;
use Cake\Console\ConsoleErrorHandler;
use Cake\Core\App;
use Cake\Core\Configure;
use Cake\Core\Configure\Engine\PhpConfig;
use Cake\Core\Plugin;
use Cake\Database\Type;
use Cake\Datasource\ConnectionManager;
use Cake\Error\ErrorHandler;
use Cake\Log\Log;
use Cake\Mailer\Email;
use Cake\Network\Request;
use Cake\Utility\Inflector;
use Cake\Utility\Security;
/*
* Read configuration file and inject configuration into various
@@ -153,7 +136,7 @@ ConnectionManager::setConfig(Configure::consume('Datasources'));
Email::setConfigTransport(Configure::consume('EmailTransport'));
Email::setConfig(Configure::consume('Email'));
Log::setConfig(Configure::consume('Log'));
Security::salt(Configure::consume('Security.salt'));
Security::setSalt(Configure::consume('Security.salt'));
/*
* The default crypto extension in 3.0 is OpenSSL.
@@ -213,13 +196,5 @@ Type::build('timestamp')
*
*/
/*
* Only try to load DebugKit in development mode
* Debug Kit should not be installed on a production system
*/
if (Configure::read('debug')) {
Plugin::load('DebugKit', ['bootstrap' => true]);
}
Configure::load('lbry');
+2
View File
@@ -12,6 +12,8 @@
* @since 3.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace App\config;
use Cake\Core\Configure;
use Cake\Core\Exception\MissingPluginException;
use Cake\Core\Plugin;
+2
View File
@@ -1,5 +1,7 @@
<?php
namespace App\config;
return [
'Lbry' => [
'RpcUrl' => 'http://user:password@127.0.0.1:9245',
+2
View File
@@ -11,6 +11,8 @@
* @since 3.0.0
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
namespace App\config;
/**
* Use the DS to separate the directories in other defines
+39
View File
@@ -0,0 +1,39 @@
<?php
/**
* CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://cakephp.org CakePHP(tm) Project
* @since 3.5.0
* @license https://opensource.org/licenses/mit-license.php MIT License
*/
/*
* You can empty out this file, if you are certain that you match all requirements.
*/
/*
* You can remove this if you are confident that your PHP version is sufficient.
*/
if (version_compare(PHP_VERSION, '5.6.0') < 0) {
trigger_error('Your PHP version must be equal or higher than 5.6.0 to use CakePHP.' . PHP_EOL, E_USER_ERROR);
}
/*
* You can remove this if you are confident you have intl installed.
*/
if (!extension_loaded('intl')) {
trigger_error('You must enable the intl extension to use CakePHP.' . PHP_EOL, E_USER_ERROR);
}
/*
* You can remove this if you are confident you have mbstring installed.
*/
if (!extension_loaded('mbstring')) {
trigger_error('You must enable the mbstring extension to use CakePHP.' . PHP_EOL, E_USER_ERROR);
}
+1 -11
View File
@@ -18,10 +18,6 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
use Cake\Core\Plugin;
use Cake\Routing\RouteBuilder;
use Cake\Routing\Router;
use Cake\Routing\Route\DashedRoute;
/**
* The default class to use for all routes
@@ -71,10 +67,4 @@ Router::scope('/', function (RouteBuilder $routes) {
$routes->connect('/api/v1/claims/browse', ['controller' => 'Claims', 'action' => 'apibrowse']);
//$routes->fallbacks(DashedRoute::class);
});
/**
* Load all plugin routes. See the Plugin documentation on
* how to customize the loading of plugin routes.
*/
Plugin::routes();
});
+1 -1
View File
@@ -74,7 +74,7 @@ CREATE TABLE `Addresses`
`TotalReceived` DECIMAL(18,8) DEFAULT 0 NOT NULL,
`TotalSent` DECIMAL(18,8) DEFAULT 0 NOT NULL,
`Balance` DECIMAL(18,8) AS (`TotalReceived` - `TotalSent`) PERSISTENT,
`Tag` VARCHAR(30),
`Tag` VARCHAR(30) NOT NULL,
`TagUrl` VARCHAR(200),
`Created` DATETIME NOT NULL,
`Modified` DATETIME NOT NULL,
+14 -2
View File
@@ -12,9 +12,11 @@
* @since 3.3.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace App;
use Cake\Core\Configure;
use Cake\Core\Plugin;
use Cake\Error\Middleware\ErrorHandlerMiddleware;
use Cake\Http\BaseApplication;
use Cake\Routing\Middleware\AssetMiddleware;
@@ -40,13 +42,23 @@ class Application extends BaseApplication
// Catch any exceptions in the lower layers,
// and make an error page/response
->add(ErrorHandlerMiddleware::class)
// Handle plugin/theme assets like CakePHP normally does.
->add(AssetMiddleware::class)
// Apply routing
->add(RoutingMiddleware::class);
return $middleware;
}
public function bootstrap()
{
parent::bootstrap(); // TODO: Change the autogenerated stub
/*
* Only try to load DebugKit in development mode
* Debug Kit should not be installed on a production system
*/
if (Configure::read('debug')) {
$this->addPlugin(\DebugKit\Plugin::class);
}
}
}
+1 -1
View File
@@ -47,7 +47,7 @@ class Installer
if (in_array($arg, ['Y', 'y', 'N', 'n'])) {
return $arg;
}
throw new Exception('This is not a valid answer. Please choose Y or n.');
throw new \Exception('This is not a valid answer. Please choose Y or n.');
};
$setFolderPermissions = $io->askAndValidate(
'<info>Set Folder Permissions ? (Default to Y)</info> [<comment>Y,n</comment>]? ',
+6 -5
View File
@@ -36,6 +36,7 @@ class AppController extends Controller
* e.g. `$this->loadComponent('Security');`
*
* @return void
* @throws \Exception
*/
public function initialize()
{
@@ -61,17 +62,17 @@ class AppController extends Controller
public function beforeRender(Event $event)
{
if (!array_key_exists('_serialize', $this->viewVars) &&
in_array($this->response->type(), ['application/json', 'application/xml'])
in_array($this->response->getType(), ['application/json', 'application/xml'])
) {
$this->set('_serialize', true);
}
}
protected function _jsonResponse($object = [], $statusCode = null)
protected function _jsonResponse($object = [], $statusCode = 200)
{
$this->response->statusCode($statusCode);
$this->response->type('json');
$this->response->body(json_encode($object));
$this->response->withStatus($statusCode);
$this->response->withType('json');
$this->response->withStringBody(json_encode($object));
}
protected function _jsonError($message, $statusCode = null) {
+5 -4
View File
@@ -2,6 +2,7 @@
namespace App\Controller;
use App\Controller\AppController;
use Cake\Datasource\ConnectionManager;
use Cake\Log\Log;
@@ -11,10 +12,10 @@ class ClaimsController extends AppController {
$this->loadModel('Claims');
$pageLimit = 48;
$beforeId = intval($this->request->query('before'));
$afterId = intval($this->request->query('after'));
$sort = trim($this->request->query('sort'));
$nsfw = trim($this->request->query('nsfw'));
$beforeId = intval($this->request->getQuery('before'));
$afterId = intval($this->request->getQuery('after'));
$sort = trim($this->request->getQuery('sort'));
$nsfw = trim($this->request->getQuery('nsfw'));
switch ($sort) {
case 'popular':
// TODO: sort by upvote/downvote score
+2
View File
@@ -14,6 +14,7 @@
*/
namespace App\Controller;
use App\Controller\AppController;
use Cake\Event\Event;
/**
@@ -27,6 +28,7 @@ class ErrorController extends AppController
* Initialization hook method.
*
* @return void
* @throws \Exception
*/
public function initialize()
{
+33 -25
View File
@@ -2,18 +2,18 @@
namespace App\Controller;
use Mdanter\Ecc\EccFactory;
use Mdanter\Ecc\Crypto\Signature\Signer;
use Mdanter\Ecc\Serializer\PublicKey\PemPublicKeySerializer;
use Mdanter\Ecc\Serializer\PublicKey\DerPublicKeySerializer;
use Mdanter\Ecc\Serializer\Signature\DerSignatureSerializer;
use App\Controller\AppController;
use Cake\Core\Configure;
use Cake\Datasource\ConnectionManager;
use Cake\Log\Log;
use Endroid\QrCode\ErrorCorrectionLevel;
use Endroid\QrCode\LabelAlignment;
use Endroid\QrCode\QrCode;
use Endroid\QrCode\Response\QrCodeResponse;
use Mdanter\Ecc\Crypto\Signature\Signer;
use Mdanter\Ecc\EccFactory;
use Mdanter\Ecc\Serializer\PublicKey\DerPublicKeySerializer;
use Mdanter\Ecc\Serializer\PublicKey\PemPublicKeySerializer;
use Mdanter\Ecc\Serializer\Signature\DerSignatureSerializer;
class MainController extends AppController {
@@ -130,7 +130,7 @@ class MainController extends AppController {
// paginate claims
$offset = 0;
$pageLimit = 96;
$page = intval($this->request->query('page'));
$page = intval($this->request->getQuery('page'));
$conn = ConnectionManager::get('default');
$stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM Claims');
@@ -331,7 +331,7 @@ class MainController extends AppController {
}
public function find() {
$criteria = $this->request->query('q');
$criteria = $this->request->getQuery('q');
$this->loadModel('Blocks');
$this->loadModel('Claims');
@@ -378,7 +378,7 @@ class MainController extends AppController {
}
}
}
public function blocks($height = null) {
$this->loadModel('Blocks');
@@ -386,7 +386,7 @@ class MainController extends AppController {
// paginate blocks
$offset = 0;
$pageLimit = 50;
$page = intval($this->request->query('page'));
$page = intval($this->request->getQuery('page'));
$conn = ConnectionManager::get('default');
$stmt = $conn->execute('SELECT COUNT(Id) AS Total FROM Blocks');
@@ -453,8 +453,8 @@ class MainController extends AppController {
$this->loadModel('Inputs');
$this->loadModel('Outputs');
$this->loadModel('Claims');
$sourceAddress = $this->request->query('address');
$sourceAddress = $this->request->getQuery('address');
$tx = $this->Transactions->find()->select(
['Id', 'BlockHash', 'InputCount', 'OutputCount', 'Hash', 'Value', 'TransactionTime', 'TransactionSize', 'Created', 'Version', 'LockTime', 'Raw'])->where(['Hash' => $hash])->first();
@@ -513,7 +513,7 @@ class MainController extends AppController {
if (isset($priceInfo->price)) {
$priceRate = $priceInfo->price;
}
$lbryAddresses = ['rFLUohPG4tP3gZHYoyhvADCtrDMiaYb7Qd', 'r9PGXsejVJb9ZfMf3QVdDEJCzxkd9JLxzL', 'r9srwX7DEN7Mex3a8oR1mKSqQmLBizoJvi', 'bRo4FEeqqxY7nWFANsZsuKEWByEgkvz8Qt', 'bU2XUzckfpdEuQNemKvhPT1gexQ3GG3SC2', 'bay3VA6YTQBL4WLobbG7CthmoGeUKXuXkD', 'bLPbiXBp6Vr3NSnsHzDsLNzoy5o36re9Cz', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bVUrbCK8hcZ5XWti7b9eNxKEBxzc1rr393', 'bZja2VyhAC84a9hMwT8dwTU6rDRXowrjxH', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc', 'bMgqQqYfwzWWYBk5o5dBMXtCndVAoeqy6h', 'bMvUBo1h5WS46ThHtmfmXftz3z33VHL7wc'];
$totalBalance = 0;
$maxBalance = 0;
@@ -551,7 +551,7 @@ class MainController extends AppController {
$offset = 0;
$pageLimit = 50;
$numTransactions = 0;
$page = intval($this->request->query('page'));
$page = intval($this->request->getQuery('page'));
$canTag = false;
$totalRecvAmount = 0;
@@ -560,6 +560,12 @@ class MainController extends AppController {
$recentTxs = [];
$tagRequestAmount = 0;
// Check for pending tag request
$this->loadModel('TagAddressRequests');
$pending = $this->TagAddressRequests->find()->where(['Address' => $addr, 'IsVerified <>' => 1])->first();
if (!$pending) {
$tagRequestAmount = '25.' . rand(11111111, 99999999);
}
$address = $this->Addresses->find()->where(['Address' => $addr])->first();
if (!$address) {
@@ -578,7 +584,7 @@ class MainController extends AppController {
$stmt = $conn->execute('SELECT COUNT(TransactionId) AS Total FROM TransactionsAddresses WHERE AddressId = ?', [$addressId]);
$count = $stmt->fetch(\PDO::FETCH_OBJ);
$numTransactions = $count->Total;
$all = $this->request->query('all');
$all = $this->request->getQuery('all');
if ($all === 'true') {
$offset = 0;
$pageLimit = $numTransactions;
@@ -620,6 +626,8 @@ class MainController extends AppController {
$this->set('offset', $offset);
$this->set('canTag', $canTag);
$this->set('pending', $pending);
$this->set('tagRequestAmount', $tagRequestAmount);
$this->set('address', $address);
$this->set('totalReceived', $totalRecvAmount);
$this->set('totalSent', $totalSentAmount);
@@ -642,15 +650,15 @@ class MainController extends AppController {
$qrCode->setSize(300);
// Set advanced options
$qrCode->setWriterByName('png');
$qrCode->setMargin(10);
$qrCode->setEncoding('UTF-8');
$qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::LOW));
$qrCode->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0, 'a' => 0]);
$qrCode->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255, 'a' => 0]);
$qrCode->setLogoWidth(150);
$qrCode->setValidateResult(false);
$qrCode
->setWriterByName('png')
->setMargin(10)
->setEncoding('UTF-8')
->setErrorCorrectionLevel(ErrorCorrectionLevel::LOW)
->setForegroundColor(['r' => 0, 'g' => 0, 'b' => 0])
->setBackgroundColor(['r' => 255, 'g' => 255, 'b' => 255])
->setLogoWidth(150)
->setValidateResult(false);
header('Content-Type: '.$qrCode->getContentType());
echo $qrCode->writeString();
@@ -708,7 +716,7 @@ class MainController extends AppController {
$lastTOSIDt = new \DateTime($txOutSetInfo->time);
$diff = $now->diff($lastTOSIDt);
$diffMinutes = $diff->i;
if ($diffMinutes >= 15 || $txOutSetInfo->set == 'N/A') {
if ($diffMinutes >= 15 || $txOutSetInfo->set == 0) { // 15 minutes (or if the price is 0)
$shouldRefreshSet = true;
}
}
+4 -3
View File
@@ -14,9 +14,10 @@
*/
namespace App\Controller;
use App\Controller\AppController;
use Cake\Core\Configure;
use Cake\Network\Exception\ForbiddenException;
use Cake\Network\Exception\NotFoundException;
use Cake\Http\Exception\ForbiddenException;
use Cake\Http\Exception\NotFoundException;
use Cake\View\Exception\MissingTemplateException;
/**
@@ -33,7 +34,7 @@ class PagesController extends AppController
* Displays a view
*
* @param string ...$path Path segments.
* @return void|\Cake\Network\Response
* @return \Cake\Http\Response
* @throws \Cake\Network\Exception\ForbiddenException When a directory traversal attempt.
* @throws \Cake\Network\Exception\NotFoundException When the view file could not
* be found or \Cake\View\Exception\MissingTemplateException in debug mode.
+1 -1
View File
@@ -2,9 +2,9 @@
namespace App\Model\Behavior;
use Cake\Event\Event;
use Cake\ORM\Behavior;
use Cake\ORM\Entity;
use Cake\Event\Event;
use Cake\Routing\Router;
class SimpleAuditBehavior extends Behavior {
+2 -2
View File
@@ -8,8 +8,8 @@ class AddressesTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Addresses');
$this->setPrimaryKey('Id');
$this->setTable('Addresses');
$this->addBehavior('SimpleAudit');
}
+3 -5
View File
@@ -8,11 +8,9 @@ class BlocksTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Blocks');
$this->setPrimaryKey('Id');
$this->setTable('Blocks');
$this->addBehavior('SimpleAudit');
}
}
?>
}
+3 -5
View File
@@ -8,11 +8,9 @@ class ClaimStreamsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('ClaimStreams');
$this->setPrimaryKey('Id');
$this->setTable('ClaimStreams');
//$this->addBehavior('SimpleAudit');
}
}
?>
}
+3 -5
View File
@@ -8,8 +8,8 @@ class ClaimsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Claims');
$this->setPrimaryKey('Id');
$this->setTable('Claims');
//$this->addBehavior('SimpleAudit');
$this->addAssociations([
@@ -31,6 +31,4 @@ class ClaimsTable extends Table {
]
]);
}
}
?>
}
+3 -5
View File
@@ -8,8 +8,8 @@ class InputsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Inputs');
$this->setPrimaryKey('Id');
$this->setTable('Inputs');
$this->addBehavior('SimpleAudit');
@@ -25,6 +25,4 @@ class InputsTable extends Table {
]
]);
}
}
?>
}
+3 -5
View File
@@ -8,8 +8,8 @@ class OutputsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Outputs');
$this->setPrimaryKey('Id');
$this->setTable('Outputs');
$this->addBehavior('SimpleAudit');
@@ -32,6 +32,4 @@ class OutputsTable extends Table {
]
]);
}
}
?>
}
+3 -5
View File
@@ -8,9 +8,7 @@ class PriceHistoryTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('PriceHistory');
$this->setPrimaryKey('Id');
$this->setTable('PriceHistory');
}
}
?>
}
+3 -5
View File
@@ -8,11 +8,9 @@ class TagAddressRequestsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('TagAddressRequests');
$this->setPrimaryKey('Id');
$this->setTable('TagAddressRequests');
$this->addBehavior('SimpleAudit');
}
}
?>
}
+3 -5
View File
@@ -8,11 +8,9 @@ class TransactionsTable extends Table {
public function initialize(array $config) {
parent::initialize($config);
$this->primaryKey('Id');
$this->table('Transactions');
$this->setPrimaryKey('Id');
$this->setTable('Transactions');
$this->addBehavior('SimpleAudit');
}
}
?>
}
+1 -3
View File
@@ -219,6 +219,4 @@ class AuxShell extends Shell {
return $response;
}
}
?>
}
+12 -12
View File
@@ -1339,8 +1339,8 @@ print_r($response); print_r($json);
$inputs[] = [
'PrevoutHash' => $in['txid'],
'PrevoutN' => $in['vout'],
'ScriptSigAsm' => $in['scriptSig']['asm'],
'ScriptSigHex' => $in['scriptSig']['hex'],
'ScriptSigAsm' => $in->scriptSig['asm'],
'ScriptSigHex' => $in->scriptSig['hex'],
'Sequence' => $in['sequence']
];
}
@@ -1350,16 +1350,16 @@ print_r($response); print_r($json);
$outputs[] = [
'Vout' => $out['vout'],
'Value' => bcdiv($out['value'], 100000000, 8),
'Type' => isset($out['scriptPubKey']['type']) ? $out['scriptPubKey']['type'] : '',
'ScriptPubKeyAsm' => isset($out['scriptPubKey']['asm']) ? $out['scriptPubKey']['asm'] : '',
'ScriptPubKeyHex' => isset($out['scriptPubKey']['hex']) ? $out['scriptPubKey']['hex'] : '',
'RequiredSignatures' => isset($out['scriptPubKey']['reqSigs']) ? $out['scriptPubKey']['reqSigs'] : '',
'Hash160' => isset($out['scriptPubKey']['hash160']) ? $out['scriptPubKey']['hash160'] : '',
'Addresses' => isset($out['scriptPubKey']['addresses']) ? json_encode($out['scriptPubKey']['addresses']) : null
'Type' => isset($out->scriptPubKey['type']) ? $out->scriptPubKey['type'] : '',
'ScriptPubKeyAsm' => isset($out->scriptPubKey['asm']) ? $out->scriptPubKey['asm'] : '',
'ScriptPubKeyHex' => isset($out->scriptPubKey['hex']) ? $out->scriptPubKey['hex'] : '',
'RequiredSignatures' => isset($out->scriptPubKey['reqSigs']) ? $out->scriptPubKey['reqSigs'] : '',
'Hash160' => isset($out->scriptPubKey['hash160']) ? $out->scriptPubKey['hash160'] : '',
'Addresses' => isset($out->scriptPubKey['addresses']) ? json_encode($out->scriptPubKey['addresses']) : null
];
if (isset($out['scriptPubKey']['addresses'])) {
foreach ($out['scriptPubKey']['addresses'] as $address) {
if (isset($out->scriptPubKey['addresses'])) {
foreach ($out->scriptPubKey['addresses'] as $address) {
$addresses[$address] = $address;
}
}
@@ -1983,10 +1983,10 @@ print_r($response); print_r($json);
$return = $define[$tx_type];
if ($tx_type === 'p2pk') {
$return['hash160'] = self::hash160($data[$define[$tx_type]['data_index_for_hash']]);
$return['addresses'][0] = self::hash160_to_address($return['hash160'], self::pubKeyAddress[0]);
$return->addresses[0] = self::hash160_to_address($return['hash160'], self::pubKeyAddress[0]);
} else {
$return['hash160'] = $data[$define[$tx_type]['data_index_for_hash']];
$return['addresses'][0] = self::hash160_to_address($return['hash160'], ($tx_type === 'p2sh') ? self::scriptAddress[0] : self::pubKeyAddress[0]); // TODO: Pay to claim transaction?
$return->addresses[0] = self::hash160_to_address($return['hash160'], ($tx_type === 'p2sh') ? self::scriptAddress[0] : self::pubKeyAddress[0]); // TODO: Pay to claim transaction?
}
unset($return['data_index_for_hash']);
}
+1 -1
View File
@@ -110,7 +110,7 @@ if (strlen(trim($desc)) == 0) {
<div class="desc">This is an identity claim.</div>
<?php else: ?>
<div class="title"><?php echo $claim->Title ?></div>
<div class="desc"><?php echo str_replace("\n", '<br />', $desc) ?></div>
<div class="desc"><?php echo str_replace("\n", '<br/>', $desc) ?></div>
<div class="details">
<div class="label half-width">Author</div>
+1 -1
View File
@@ -113,7 +113,7 @@
<div class="home-container">
<div class="home-container-cell">
<div class="main">
<div class="title">LBRY Block Explorer</div><br>
<div class="title">LBRY Block Explorer</div><br/>
<form method="get" action="/find">
<input class="search-input" name="q" type="text" placeholder="Enter a block height or hash, claim id or name, transaction hash or address" />
<div class="ctls">
+4 -4
View File
@@ -92,14 +92,14 @@
$setAddressIds = [];
foreach ($inputs as $in):
?>
<div id="input-<?php echo $in->Id ?>" class="input <?php if (isset($in['InputAddresses']) && count($in['InputAddresses']) > 0 && $in['InputAddresses'][0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
<div id="input-<?php echo $in->Id ?>" class="input <?php if (isset($in['InputAddresses']) && count($in['InputAddresses']) > 0 && $in->inputAddresses[0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
<?php if ($in['IsCoinbase']): ?>
<div>Block Reward (New Coins)</div>
<?php else: ?>
<?php if (strlen(trim($in->Value)) == 0): ?>
<div>Incomplete data</div>
<?php else:
$addr = $in['InputAddresses'][0];
$addr = $in->inputAddresses[0];
if (!isset($setAddressIds[$addr->Address])):
$setAddressIds[$addr->Address] = 1; ?>
@@ -134,7 +134,7 @@
<?php
foreach ($outputs as $out): ?>
<div id="output-<?php echo $out->Vout ?>" class="output <?php if (isset($out['OutputAddresses']) && count($out['OutputAddresses']) > 0 && $out['OutputAddresses'][0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
<div id="output-<?php echo $out->Vout ?>" class="output <?php if (isset($out['OutputAddresses']) && count($out['OutputAddresses']) > 0 && $out->outputAddresses[0]->Address == $sourceAddress): ?>is-source<?php endif; ?>">
<div class="labels">
<?php if($out->Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim)): ?><a class="view-claim" href="<?php echo $out->Claim->getExplorerLink() ?>">View</a><?php endif; ?>
<?php if($out->IsSupportClaim): ?><div class="support">SUPPORT</div><?php endif; ?>
@@ -145,7 +145,7 @@
<?php if (strlen(trim($out['Value'])) == 0): ?>
<div>Incomplete data</div>
<?php else:
$addr = $out['OutputAddresses'][0];
$addr = $out->outputAddresses[0];
if (!isset($setAddressIds[$addr->Address])):
$setAddressIds[$addr->Address] = 1; ?>
+5 -5
View File
@@ -59,8 +59,8 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
<div id="url-rewriting-warning" class="alert url-rewriting">
<ul>
<li class="bullet problem">
URL rewriting is not properly configured on your server.<br />
1) <a target="_blank" href="http://book.cakephp.org/3.0/en/installation.html#url-rewriting">Help me configure it</a><br />
URL rewriting is not properly configured on your server.<br/>
1) <a target="_blank" href="http://book.cakephp.org/3.0/en/installation.html#url-rewriting">Help me configure it</a><br/>
2) <a target="_blank" href="http://book.cakephp.org/3.0/en/development/configuration.html#general-configuration">I don't / can't use URL rewriting</a>
</li>
</ul>
@@ -139,7 +139,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
if (method_exists($connectionError, 'getAttributes')):
$attributes = $connectionError->getAttributes();
if (isset($errorMsg['message'])):
$errorMsg .= '<br />' . $attributes['message'];
$errorMsg .= '<br/>' . $attributes['message'];
endif;
endif;
}
@@ -148,7 +148,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
<?php if ($connected): ?>
<li class="bullet success">CakePHP is able to connect to the database.</li>
<?php else: ?>
<li class="bullet problem">CakePHP is NOT able to connect to the database.<br /><?= $errorMsg ?></li>
<li class="bullet problem">CakePHP is NOT able to connect to the database.<br/><?= $errorMsg ?></li>
<?php endif; ?>
</ul>
</div>
@@ -188,7 +188,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
<div class="columns large-12 text-center">
<h3 class="more">More about Cake</h3>
<p>
CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Front Controller and MVC.<br />
CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Front Controller and MVC.<br/>
Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.
</p>
</div>