diff --git a/config/app.default.php b/config/app.default.php index c06599e..7eebd02 100644 --- a/config/app.default.php +++ b/config/app.default.php @@ -1,4 +1,6 @@ [ 'RpcUrl' => 'http://user:password@127.0.0.1:9245', diff --git a/config/paths.php b/config/paths.php index fcaba5c..6b19b52 100644 --- a/config/paths.php +++ b/config/paths.php @@ -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 diff --git a/config/requirements.php b/config/requirements.php new file mode 100644 index 0000000..d5b180f --- /dev/null +++ b/config/requirements.php @@ -0,0 +1,39 @@ +askAndValidate( 'Set Folder Permissions ? (Default to Y) [Y,n]? ', diff --git a/src/Controller/ClaimsController.php b/src/Controller/ClaimsController.php index a7718f1..662ec93 100644 --- a/src/Controller/ClaimsController.php +++ b/src/Controller/ClaimsController.php @@ -2,6 +2,7 @@ namespace App\Controller; +use App\Controller\AppController; use Cake\Datasource\ConnectionManager; use Cake\Log\Log; diff --git a/src/Controller/ErrorController.php b/src/Controller/ErrorController.php index c8af85d..50f63ec 100644 --- a/src/Controller/ErrorController.php +++ b/src/Controller/ErrorController.php @@ -14,6 +14,7 @@ */ namespace App\Controller; +use App\Controller\AppController; use Cake\Event\Event; /** diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index bc31e0a..7b608a1 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -2,17 +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 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 { diff --git a/src/Controller/PagesController.php b/src/Controller/PagesController.php index 29f7c25..53c3535 100644 --- a/src/Controller/PagesController.php +++ b/src/Controller/PagesController.php @@ -14,6 +14,7 @@ */ namespace App\Controller; +use App\Controller\AppController; use Cake\Core\Configure; use Cake\Http\Exception\ForbiddenException; use Cake\Http\Exception\NotFoundException; diff --git a/src/Model/Behavior/SimpleAuditBehavior.php b/src/Model/Behavior/SimpleAuditBehavior.php index 8d20b5b..1e717ea 100644 --- a/src/Model/Behavior/SimpleAuditBehavior.php +++ b/src/Model/Behavior/SimpleAuditBehavior.php @@ -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 { diff --git a/src/Shell/BlockShell.php b/src/Shell/BlockShell.php index f7530a8..0e91bf8 100644 --- a/src/Shell/BlockShell.php +++ b/src/Shell/BlockShell.php @@ -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']); } diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp index 0d4bfad..6176a42 100644 --- a/src/Template/Main/claims.ctp +++ b/src/Template/Main/claims.ctp @@ -110,7 +110,7 @@ if (strlen(trim($desc)) == 0) {
This is an identity claim.
Title ?>
-
', $desc) ?>
+
', $desc) ?>
Author
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp index 8b0ecf3..70081e1 100644 --- a/src/Template/Main/index.ctp +++ b/src/Template/Main/index.ctp @@ -113,7 +113,7 @@
-
LBRY Block Explorer

+
LBRY Block Explorer

diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp index f4f4523..3145432 100644 --- a/src/Template/Main/tx.ctp +++ b/src/Template/Main/tx.ctp @@ -92,14 +92,14 @@ $setAddressIds = []; foreach ($inputs as $in): ?> -
+
Block Reward (New Coins)
Value)) == 0): ?>
Incomplete data
inputAddresses[0]; if (!isset($setAddressIds[$addr->Address])): $setAddressIds[$addr->Address] = 1; ?> @@ -134,7 +134,7 @@ -
+
Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim)): ?>View IsSupportClaim): ?>
SUPPORT
@@ -145,7 +145,7 @@
Incomplete data
outputAddresses[0]; if (!isset($setAddressIds[$addr->Address])): $setAddressIds[$addr->Address] = 1; ?> diff --git a/src/Template/Pages/home.ctp b/src/Template/Pages/home.ctp index cae07dd..8f4cc0e 100644 --- a/src/Template/Pages/home.ctp +++ b/src/Template/Pages/home.ctp @@ -59,8 +59,8 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
@@ -139,7 +139,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework'; if (method_exists($connectionError, 'getAttributes')): $attributes = $connectionError->getAttributes(); if (isset($errorMsg['message'])): - $errorMsg .= '
' . $attributes['message']; + $errorMsg .= '
' . $attributes['message']; endif; endif; } @@ -148,7 +148,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';
  • CakePHP is able to connect to the database.
  • -
  • CakePHP is NOT able to connect to the database.
  • +
  • CakePHP is NOT able to connect to the database.
  • @@ -188,7 +188,7 @@ $cakeDescription = 'CakePHP: the rapid development PHP framework';

    More about Cake

    - CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Front Controller and MVC.
    + CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Front Controller and MVC.
    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.