From d7b590cf7d8dfe8ece9a90dd8dbbf913b04c8ffb Mon Sep 17 00:00:00 2001 From: Joshua Estes Date: Mon, 7 Jul 2014 09:57:13 -0400 Subject: [PATCH 1/2] Added license file --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7a8d8f8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2011-2014 BitPay LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 56241403f23b7d0e8da09e0e5f5a73af67c597f0 Mon Sep 17 00:00:00 2001 From: Joshua Estes Date: Mon, 7 Jul 2014 10:21:17 -0400 Subject: [PATCH 2/2] Added license to all files --- .coveralls.yml | 21 +++++++++++++++ .gitattributes | 21 +++++++++++++++ .gitignore | 22 ++++++++++++++++ .scrutinizer.yml | 21 +++++++++++++++ .travis.yml | 21 +++++++++++++++ README.md | 18 ++++++++----- .../Bitpay/Bitcoins/Block/Iframe.php | 21 +++++++++------ .../community/Bitpay/Bitcoins/Model/Ipn.php | 21 +++++++++------ .../Bitpay/Bitcoins/Model/PaymentMethod.php | 21 +++++++++------ .../Bitpay/Bitcoins/Model/Resource/Ipn.php | 21 +++++++++------ .../Model/Resource/Ipn/Collection.php | 21 +++++++++------ .../Bitpay/Bitcoins/Model/Source/Speed.php | 21 +++++++++------ .../Bitcoins/controllers/IndexController.php | 21 +++++++++------ .../community/Bitpay/Bitcoins/etc/config.xml | 25 ++++++++++++++++++ .../community/Bitpay/Bitcoins/etc/system.xml | 25 ++++++++++++++++++ .../Bitcoins_setup/upgrade-0.1.0-1.0.0.php | 26 ++++++++++++++++++- .../Bitcoins_setup/upgrade-1.0.0-1.1.0.php | 26 ++++++++++++++++++- .../frontend/base/default/layout/bitcoins.xml | 26 ++++++++++++++++++- .../default/template/bitcoins/iframe.phtml | 24 +++++++++++++++++ app/etc/modules/Bitpay_Bitcoins.xml | 25 ++++++++++++++++++ build.properties | 22 ++++++++++++++++ build.xml | 25 ++++++++++++++++++ lib/bitpay/bp_config_default.php | 21 +++++++++------ lib/bitpay/bp_lib.php | 21 +++++++++------ lib/bitpay/bp_options.php | 21 +++++++++------ modman | 22 ++++++++++++++++ phpunit.xml.dist | 25 ++++++++++++++++++ .../Bitpay/Bitcoins/Block/IframeTest.php | 20 +++++++++----- tests/bootstrap.php | 24 +++++++++++++++++ travis.properties | 22 ++++++++++++++++ 30 files changed, 575 insertions(+), 96 deletions(-) diff --git a/.coveralls.yml b/.coveralls.yml index 75553aa..fc0a6ab 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,2 +1,23 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. service-name: travis-ci src_dir: . diff --git a/.gitattributes b/.gitattributes index 65128d7..15a4d13 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,24 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. # These files are not included when making # an archive of this repository. /tests export-ignore diff --git a/.gitignore b/.gitignore index 079f43d..18ddf8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,25 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + *.swp lib/bitpay/bp_config.php bin/ diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 849e539..e7c33bb 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,3 +1,24 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. inherit: true tools: # @see https://scrutinizer-ci.com/docs/tools/php/security-advisory-checker/ diff --git a/.travis.yml b/.travis.yml index d278b45..ee04321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,24 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. language: php php: - 5.5 diff --git a/README.md b/README.md index df4de4d..53a4b59 100644 --- a/README.md +++ b/README.md @@ -174,11 +174,19 @@ NOTE: When contacting support it will help us is you provide: # License -©2011-2014 BITPAY, INC. +The MIT License (MIT) -Permission is hereby granted to any person obtaining a copy of this software -and associated documentation for use and/or modification in association with -the bitpay.com service. +Copyright (c) 2011-2014 BitPay LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, @@ -187,5 +195,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Bitcoin payment module for Magento Community Edition using the bitpay.com service. diff --git a/app/code/community/Bitpay/Bitcoins/Block/Iframe.php b/app/code/community/Bitpay/Bitcoins/Block/Iframe.php index e77a313..c4a24d6 100644 --- a/app/code/community/Bitpay/Bitcoins/Block/Iframe.php +++ b/app/code/community/Bitpay/Bitcoins/Block/Iframe.php @@ -1,12 +1,20 @@ + diff --git a/app/code/community/Bitpay/Bitcoins/etc/system.xml b/app/code/community/Bitpay/Bitcoins/etc/system.xml index af7e145..9dfced2 100644 --- a/app/code/community/Bitpay/Bitcoins/etc/system.xml +++ b/app/code/community/Bitpay/Bitcoins/etc/system.xml @@ -1,4 +1,29 @@ + diff --git a/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-0.1.0-1.0.0.php b/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-0.1.0-1.0.0.php index 6d486c2..89fe86f 100644 --- a/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-0.1.0-1.0.0.php +++ b/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-0.1.0-1.0.0.php @@ -1,5 +1,29 @@ startSetup(); @@ -23,4 +47,4 @@ CREATE TABLE IF NOT EXISTS `{$installer->getTable('Bitcoins/ipn')}` ( "); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-1.0.0-1.1.0.php b/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-1.0.0-1.1.0.php index 470be03..b893298 100644 --- a/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-1.0.0-1.1.0.php +++ b/app/code/community/Bitpay/Bitcoins/sql/Bitcoins_setup/upgrade-1.0.0-1.1.0.php @@ -1,8 +1,32 @@ startSetup(); $installer->run("ALTER TABLE `{$installer->getTable('Bitcoins/ipn')}` ADD `pos_data` VARCHAR( 256 ) NOT NULL AFTER `url`;"); -$installer->endSetup(); \ No newline at end of file +$installer->endSetup(); diff --git a/app/design/frontend/base/default/layout/bitcoins.xml b/app/design/frontend/base/default/layout/bitcoins.xml index 00d2581..dc8cbd8 100644 --- a/app/design/frontend/base/default/layout/bitcoins.xml +++ b/app/design/frontend/base/default/layout/bitcoins.xml @@ -1,5 +1,29 @@ - + diff --git a/app/design/frontend/base/default/template/bitcoins/iframe.phtml b/app/design/frontend/base/default/template/bitcoins/iframe.phtml index e009b5b..eb0faf1 100644 --- a/app/design/frontend/base/default/template/bitcoins/iframe.phtml +++ b/app/design/frontend/base/default/template/bitcoins/iframe.phtml @@ -1,4 +1,28 @@ GetIframeUrl(); switch($url) { diff --git a/app/etc/modules/Bitpay_Bitcoins.xml b/app/etc/modules/Bitpay_Bitcoins.xml index aadee6e..4317ca4 100644 --- a/app/etc/modules/Bitpay_Bitcoins.xml +++ b/app/etc/modules/Bitpay_Bitcoins.xml @@ -1,3 +1,28 @@ + diff --git a/build.properties b/build.properties index 32c70dd..583f05a 100644 --- a/build.properties +++ b/build.properties @@ -1,3 +1,25 @@ +# The MIT License (MIT) +# +# Copyright (c) 2011-2014 BitPay LLC +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + # Running a build locally, this also is used # to define all the default properties. DB_USER=root diff --git a/build.xml b/build.xml index 5e7a9b0..6edac6a 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,29 @@ +