LBRYCommunity/block-explorer
1
0
Fork 0
Code Issues 31 Pull requests 4 Projects Releases Packages Wiki Activity

Updated CakePHP

Browse source
This commit is contained in:
marcdeb1 2019-01-26 20:37:30 +01:00
parent 9e984c94c1
commit 2941698c2b
3 changed files with 476 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": ">=5.6",
"cakephp/cakephp": "3.4.*",
"cakephp/cakephp": "3.7.1",
"mobiledetect/mobiledetectlib": "2.*",
"cakephp/migrations": "~1.0",
"cakephp/plugin-installer": "~1.0",

480
composer.lock generated
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": "f951a6637387b0718e7749c8fbda8202",
"packages": [
{
"name": "aura/intl",
@ -99,7 +99,7 @@
],
"description": "BaconQrCode is a QR code generator for PHP.",
"homepage": "https://github.com/Bacon/BaconQrCode",
"time": "2017-10-17T09:59:25+00:00"
"time": "2018-04-25T17:53:56+00:00"
},
{
"name": "cakephp/cakephp",
@ -117,7 +117,7 @@
},
"require": {
"aura/intl": "^3.0.0",
"cakephp/chronos": "^1.0.0",
"cakephp/chronos": "^1.0.1",
"ext-intl": "*",
"ext-mbstring": "*",
"php": ">=5.6.0",
@ -145,7 +145,7 @@
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "^5.7|^6.0"
"phpunit/phpunit": "^5.7.14|^6.0"
},
"suggest": {
"ext-curl": "To enable more efficient network calls in Http\\Client.",
@ -155,7 +155,7 @@
"type": "library",
"autoload": {
"psr-4": {
"Cake\\": "src"
"Cake\\": "src/"
},
"files": [
"src/Core/functions.php",
@ -187,7 +187,7 @@
"rapid-development",
"validation"
],
"time": "2018-05-21T01:19:34+00:00"
"time": "2018-12-18T02:39:37+00:00"
},
{
"name": "cakephp/chronos",
@ -429,16 +429,16 @@
},
{
"name": "endroid/qr-code",
"version": "3.5.0",
"version": "3.5.2",
"source": {
"type": "git",
"url": "https://github.com/endroid/qr-code.git",
"reference": "0095706c3bf2389f15f6c097bab4a00a48fc5ff7"
"reference": "d95143907cf178f9073523af4b37feb25bd6cdd0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/endroid/qr-code/zipball/0095706c3bf2389f15f6c097bab4a00a48fc5ff7",
"reference": "0095706c3bf2389f15f6c097bab4a00a48fc5ff7",
"url": "https://api.github.com/repos/endroid/qr-code/zipball/d95143907cf178f9073523af4b37feb25bd6cdd0",
"reference": "d95143907cf178f9073523af4b37feb25bd6cdd0",
"shasum": ""
},
"require": {
@ -485,7 +485,7 @@
"qr",
"qrcode"
],
"time": "2018-12-01T12:34:40+00:00"
"time": "2018-12-16T12:37:37+00:00"
},
{
"name": "fgrosse/phpasn1",
@ -830,7 +830,7 @@
"datetime",
"time"
],
"time": "2018-11-22T18:23:02+00:00"
"time": "2018-12-28T10:07:33+00:00"
},
{
"name": "predis/predis",
@ -979,6 +979,54 @@
],
"time": "2018-11-20T15:27:04+00:00"
},
{
"name": "psr/simple-cache",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/simple-cache.git",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\SimpleCache\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for simple caching",
"keywords": [
"cache",
"caching",
"psr",
"psr-16",
"simple-cache"
],
"time": "2017-10-23T01:57:42+00:00"
},
{
"name": "robmorgan/phinx",
"version": "v0.8.1",
@ -1244,7 +1292,7 @@
"interoperability",
"standards"
],
"time": "2018-11-24T09:35:08+00:00"
"time": "2018-12-05T08:06:11+00:00"
},
{
"name": "symfony/debug",
@ -1719,7 +1767,7 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2018-11-27T07:20:32+00:00"
"time": "2018-12-06T10:45:32+00:00"
},
{
"name": "symfony/yaml",
@ -1846,6 +1894,177 @@
}
],
"packages-dev": [
{
"name": "ajgl/breakpoint-twig-extension",
"version": "0.3.2",
"source": {
"type": "git",
"url": "https://github.com/ajgarlag/AjglBreakpointTwigExtension.git",
"reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ajgarlag/AjglBreakpointTwigExtension/zipball/bb419d13775d8fb5cd03b31012eaf496b31b444f",
"reference": "bb419d13775d8fb5cd03b31012eaf496b31b444f",
"shasum": ""
},
"require": {
"php": ">=5.6",
"twig/twig": "^1.14|^2.0"
},
"require-dev": {
"symfony/framework-bundle": "^2.7|^3.2|^4.1",
"symfony/phpunit-bridge": "^3.4|^4.1",
"symfony/twig-bundle": "^2.7|^3.2|^4.1"
},
"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": "2018-12-10T08:22:36+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.9.1",
@ -1868,7 +2087,7 @@
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
"phpunit/phpunit": "~5.7 | ~6.0"
"phpunit/phpunit": "^5.7.14|^6.0"
},
"type": "cakephp-plugin",
"autoload": {
@ -1886,7 +2105,7 @@
"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",
@ -1918,10 +2137,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": {
@ -2378,6 +2597,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",
@ -2939,6 +3218,171 @@
"dump"
],
"time": "2018-11-25T12:50:42+00:00"
},
{
"name": "twig/twig",
"version": "v1.37.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62",
"reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62",
"shasum": ""
},
"require": {
"php": ">=5.4.0",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.4.19|^4.1.8"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.37-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": "2019-01-14T14:59:29+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.8",
"source": {
"type": "git",
"url": "https://github.com/WyriHaximus/TwigView.git",
"reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
"reference": "a5ec66690aa045d6eda17ab1c8a5baf0efdcfa45",
"shasum": ""
},
"require": {
"ajgl/breakpoint-twig-extension": "^0.3.0",
"aptoma/twig-markdown": "^2.0",
"asm89/twig-cache-extension": "^1.0",
"cakephp/cakephp": "^3.6",
"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-12-17T21:08:25+00:00"
}
],
"aliases": [],

28
src/Controller/MainController.php
View file

@ -145,7 +145,6 @@ class MainController extends AppController {
}
$offset = ($page - 1) * $pageLimit;
//$claims = $this->Claims->find()->distinct(['Claims.claim_id'])->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
$claims = $this->Claims->find()->select($this->Claims)->select(['publisher' => 'C.name'])->leftJoin(['C' => 'claim'], ['C.claim_id = Claims.publisher_id'])->order(['Claims.created_at' => 'DESC'])->offset($offset)->limit($pageLimit)->toArray();
for ($i = 0; $i < count($claims); $i++) {
@ -533,13 +532,12 @@ class MainController extends AppController {
$qrCode->setWriterByName('png');
$qrCode->setMargin(10);
$qrCode->setEncoding('UTF-8');
$qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::LOW));
$qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevel(ErrorCorrectionLevel::HIGH));
$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);
header('Content-Type: '.$qrCode->getContentType());
echo $qrCode->writeString();
exit(0);
@ -903,18 +901,18 @@ class MainController extends AppController {
}
}
private function _gettxoutsetinfo() {
$req = ['method' => 'gettxoutsetinfo', 'params' => []];
try {
$res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
if (!isset($res->result)) {
return 0;
}
return $res->result;
} catch (\Exception $e) {
return 'N/A';
}
}
// private function _gettxoutsetinfo() {
// $req = ['method' => 'gettxoutsetinfo', 'params' => []];
// try {
// $res = json_decode(self::curl_json_post(self::$rpcurl, json_encode($req)));
// if (!isset($res->result)) {
// return 0;
// }
// return $res->result;
// } catch (\Exception $e) {
// return 'N/A';
// }
// }
private static function curl_json_post($url, $data, $headers = []) {
$ch = curl_init();