Permalink
Browse files

Cleaned up the code, moved license and updated docs.

  • Loading branch information...
1 parent a8a37e4 commit cd3575122bf8b6deed4ea7e31c00794e4aaa1343 @joelcox joelcox committed Aug 23, 2011
Showing with 33 additions and 32 deletions.
  1. +8 −0 CHANGELOG.md
  2. +19 −0 LICENSE.md
  3. +2 −1 README.md
  4. +3 −9 controllers/test_amazon_ses.php
  5. +1 −22 libraries/Amazon_ses.php
View
@@ -0,0 +1,8 @@
+Changelog
+=========
+This log includes all changes to the public API of this library. Check the project's commit history for a more detailed look and for changes that impact the internals of this library.
+
+v0.3
+----
+* Added support for a vanity 'from' name. This can be set using the second parameter in the 'from' method or setting the 'amazon_ses_from_name' config parameter.
+* Added an extra check to overcome conflicting certificates. Thanks Stephen Frank.
View
@@ -0,0 +1,19 @@
+Copyright (c) 2011 Joël Cox and contributors
+
+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.
View
@@ -93,4 +93,5 @@ I am a firm believer of social coding, so <strike>if</strike> when you find a bu
Thanks to
---------
* [Phil Sturgeon](http://philsturgeon.co.uk), for creating the CodeIgniter [cURL library](http://github.com/philsturgeon/codeigniter-curl) and thus taking care of all the cURL hassle.
-* [Ben Hartard](http://github.com/bhartard), for adding the email verification method.
+* [Ben Hartard](http://github.com/bhartard), for adding the email verification method.
+* [Stephen Frank](https://github.com/stephenfrank), for sorting out SSL conflict issues.
@@ -1,19 +1,13 @@
-<?php
-
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* Small test suite for the Amazon Simple Email Service library
*
* @see /application/libraries/Amazon_ses.php
*/
-if (! defined('BASEPATH')) exit('No direct script access');
-
class Test_amazon_ses extends CI_Controller {
- function __construct(){
- parent::__construct();
- }
-
- function index() {
+ function index()
+ {
// Load the required libraries
$this->load->spark('amazon-ses/dev');
View
@@ -10,29 +10,8 @@
* @link https://github.com/joelcox/codeigniter-amazon-ses
* @link http://joelcox.nl
* @license http://www.opensource.org/licenses/mit-license.html
- *
- * Copyright (c) 2011 Joël Cox and contributors
- *
- * 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.
*/
-class Amazon_ses
-{
+class Amazon_ses {
private $_ci; // CodeIgniter instance
private $_cert_path; // Path to SSL certificate

0 comments on commit cd35751

Please sign in to comment.