diff --git a/app/Library/IpsHasher.php b/app/Library/IpsHasher.php deleted file mode 100644 index 5fb28d2f..00000000 --- a/app/Library/IpsHasher.php +++ /dev/null @@ -1,53 +0,0 @@ -. - */ - -use Illuminate\Contracts\Hashing\Hasher; - -class IpsHasher implements Hasher -{ - public function make($value, array $options = array()) - { - return md5(md5($options['salt']) . md5(static::ips_sanitize($value))); - } - - public function check($value, $hashedValue, array $options = array()) - { - return static::make($value, ['salt' => $options['salt']]) === $hashedValue; - } - - public function needsRehash($hashedValue, array $options = array()) - { - return false; - } - - static public function ips_sanitize($value) - { - $value = str_replace('&', '&', $value); - $value = str_replace('\\', '\', $value); - $value = str_replace('!', '!', $value); - $value = str_replace('$', '$', $value); - $value = str_replace('"', '"', $value); - $value = str_replace('<', '<', $value); - $value = str_replace('>', '>', $value); - $value = str_replace('\'', ''', $value); - - return $value; - } -} diff --git a/app/Library/PFMAuth.php b/app/Library/PFMAuth.php deleted file mode 100644 index af68f278..00000000 --- a/app/Library/PFMAuth.php +++ /dev/null @@ -1,45 +0,0 @@ -. - */ - -use Illuminate\Auth\EloquentUserProvider; -use Illuminate\Contracts\Hashing\Hasher; - -class NullHasher implements Hasher -{ - public function make($value, array $options = array()) - { - } - - public function check($value, $hashedValue, array $options = array()) - { - } - - public function needsRehash($hashedValue, array $options = array()) - { - } -} - -class PFMAuth extends EloquentUserProvider -{ - function __construct() - { - parent::__construct(new NullHasher(), 'Poniverse\Ponyfm\Models\User'); - } -} diff --git a/composer.json b/composer.json index e1aa7a46..3c072416 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,6 @@ "php": ">=7.0.1", "laravel/framework": "5.1.*", "codescale/ffmpeg-php": "2.7.0", - "kriswallsmith/assetic": "1.2.*@dev", "intouch/laravel-newrelic": "*", "barryvdh/laravel-ide-helper": "^2.1", "guzzlehttp/guzzle": "~6.0", diff --git a/composer.lock b/composer.lock index a215e567..56be2782 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "3bd61c88ad775531ffc26d83323d4598", - "content-hash": "be4e60cde6dc921af9be5a5fb94ac4e3", + "hash": "d99fa4165b8a1c9e929248bbb16183ad", + "content-hash": "31347c82515003f78f1f9adef010f1f5", "packages": [ { "name": "barryvdh/laravel-ide-helper", @@ -1127,83 +1127,6 @@ ], "time": "2015-12-05 17:17:57" }, - { - "name": "kriswallsmith/assetic", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "5bea57990f7ddbeb3d57e7ef96eae9ddd56c4297" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/5bea57990f7ddbeb3d57e7ef96eae9ddd56c4297", - "reference": "5bea57990f7ddbeb3d57e7ef96eae9ddd56c4297", - "shasum": "" - }, - "require": { - "php": ">=5.3.1", - "symfony/process": "~2.1|~3.0" - }, - "conflict": { - "twig/twig": "<1.23" - }, - "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", - "leafo/lessphp": "*", - "leafo/scssphp": "*", - "leafo/scssphp-compass": "*", - "mrclay/minify": "*", - "patchwork/jsqueeze": "*", - "phpunit/phpunit": "~3.7", - "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "twig/twig": "~1.6" - }, - "suggest": { - "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", - "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", - "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", - "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor", - "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", - "twig/twig": "Assetic provides the integration with the Twig templating engine" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-0": { - "Assetic": "src/" - }, - "files": [ - "src/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kris Wallsmith", - "email": "kris.wallsmith@gmail.com", - "homepage": "http://kriswallsmith.net/" - } - ], - "description": "Asset Management for PHP", - "homepage": "https://github.com/kriswallsmith/assetic", - "keywords": [ - "assets", - "compression", - "minification" - ], - "time": "2014-07-08 11:30:40" - }, { "name": "laravel/framework", "version": "v5.1.27", @@ -4143,13 +4066,11 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "kriswallsmith/assetic": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.5.9" + "php": ">=7.0.1" }, "platform-dev": [] }