Merge pull request #19 from spekulatius/remove-trailing-spaces

Remove trailing spaces in the source code
lekoala · Jan 15, 2016 · b7470a2 · b7470a2
2 parents de127b8 + e908553
commit b7470a2
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 41 deletions.
diff --git a/code/MandrillEmail.php b/code/MandrillEmail.php
@@ -154,7 +154,7 @@ public function getParseBody()
 
     /**
      * Set if body should be parsed or not
-     * 
+     *
      * @param bool $v
      * @return \MandrillEmail
      */
@@ -417,7 +417,7 @@ public function getSidebar()
 
     /**
      * Get rendered body
-     * 
+     *
      * @return string
      */
     public function getRenderedBody()
@@ -428,7 +428,7 @@ public function getRenderedBody()
 
     /**
      * Set image in the body of the message - see BasicEmail.ss
-     * 
+     *
      * @param Image|int $image Image or ImageID
      * @param int $size
      */
@@ -487,7 +487,7 @@ public static function getPathForTemplate($templateName)
     }
 
     /**
-     * 
+     *
      * @return string
      */
     public function getTheme()
@@ -533,7 +533,7 @@ public function getThemeOptions()
 
     /**
      * Set theme variables - see getTheme for available options
-     * 
+     *
      * @param array $vars
      */
     public function setThemeOptions($vars)
@@ -613,7 +613,7 @@ public function setSampleRequiredObjects()
 
     /**
      * Get recipient as member
-     * 
+     *
      * @return Member
      */
     public function getToMember()
@@ -630,7 +630,7 @@ public function getToMember()
 
     /**
      * Set recipient
-     * 
+     *
      * @param string $val
      * @return Email
      */
@@ -677,7 +677,7 @@ public function setToMember(Member $member)
 
     /**
      * Set current member as recipient
-     * 
+     *
      * @return MandrillEmail
      */
     public function setToCurrentMember()
@@ -707,7 +707,7 @@ public function getFromMember()
 
     /**
      * Set From Member
-     * 
+     *
      * @param Member $member
      * @return MandrillEmail
      */
@@ -720,7 +720,7 @@ public function setFromMember(Member $member)
 
     /**
      * Get custom api params for this message.
-     * 
+     *
      * @return array
      */
     public function getApiParams()

diff --git a/code/MandrillMailer.php b/code/MandrillMailer.php
@@ -3,12 +3,12 @@
 
 /*
  * MandrillMailer for Silverstripe
- * 
+ *
  * Features
  * - Global tag support
  * - Multiple recipient support (use comma separated list, not array)
  * - File attachment support
- * 
+ *
  * @link https://mandrillapp.com/api/docs/messages.php.html#method-send
  * @package Mandrill
  * @author LeKoala <thomas@lekoala.be>
@@ -335,7 +335,7 @@ public function sendHTML($to, $from, $subject, $htmlContent,
 
     /**
      * Normalize a recipient to an array of email and name
-     * 
+     *
      * @param string|array $recipient
      * @return array
      */
@@ -389,7 +389,7 @@ protected function appendTo($arr, $recipients, $type = 'to')
 
     /**
      * Send the email through mandrill
-     * 
+     *
      * @param string|array $to
      * @param string $from
      * @param string $subject

diff --git a/code/controllers/MandrillAdmin.php b/code/controllers/MandrillAdmin.php
@@ -2,7 +2,7 @@
 
 /**
  * Mandrill admin section
- * 
+ *
  * Allow you to see messages sent through the api key used to send messages
  *
  * @package Mandrill
@@ -468,7 +468,7 @@ public function CanConfigureWebhooks()
 
     /**
      * Install hook form
-     * 
+     *
      * @return \Form
      */
     public function InstallHookForm()

diff --git a/code/extensions/MandrillSiteConfig.php b/code/extensions/MandrillSiteConfig.php
@@ -47,7 +47,7 @@ public function updateCMSFields(FieldList $fields)
             _t('MandrillSiteConfig.EmailLogo', 'Email Logo')));
         $emailLogo->setDescription(_t('MandrillSiteConfig.EmailLogoDesc',
                 'Will default to Logo if none defined'));
-        
+
         return $fields;
     }
 

diff --git a/code/models/EmailTemplate.php b/code/models/EmailTemplate.php
@@ -168,7 +168,7 @@ public function getCMSFields()
      * Base models always available
      *
      * These models are defined in MandrillEmail::templateData()
-     * 
+     *
      * @return array
      */
     public function getBaseModels()
@@ -233,7 +233,7 @@ public function getAvailableModels()
 
     /**
      * Get an email template by code
-     * 
+     *
      * @param string $code
      * @return EmailTemplate
      */
@@ -259,7 +259,7 @@ public static function getByCode($code)
 
     /**
      * A shorthand to get an email by code
-     * 
+     *
      * @param string $code
      * @return MandrillEmail
      */
@@ -280,7 +280,7 @@ public function onBeforeWrite()
 
     /**
      * Provide content for the Preview tab
-     * 
+     *
      * @return \Tab
      */
     protected function previewTab()
@@ -311,7 +311,7 @@ protected function previewTab()
 
     /**
      * Returns an instance of MandrillEmail with the content of the template
-     * 
+     *
      * @return \MandrillEmail
      */
     public function getEmail()

diff --git a/code/thirdparty/Mandrill.php b/code/thirdparty/Mandrill.php
@@ -45,7 +45,7 @@
  */
 class Mandrill
 {
-    
+
     public $apikey;
     public $ch;
     public $root = 'https://mandrillapp.com/api/1.0';
@@ -241,7 +241,7 @@ public function call($url, $params)
         if ($result === null) {
             throw new Mandrill_Error('We were unable to decode the JSON response from the Mandrill API: ' . $response_body);
         }
-        
+
         if (floor($info['http_code'] / 100) >= 4) {
             throw $this->castError($result);
         }

diff --git a/code/viewables/MandrillMessage.php b/code/viewables/MandrillMessage.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Mandrill message to be displayed in a gridfield
- * 
+ *
  * @link https://mandrillapp.com/api/docs/messages.JSON.html#method=search
  * @package Mandrill
  * @author LeKoala <thomas@lekoala.be>
@@ -45,7 +45,7 @@ public function __construct($data = array())
 
     /**
      * Get color for a given state
-     * 
+     *
      * @param string $state
      * @return string
      */

diff --git a/templates/Includes/MandrillAdmin_Content.ss b/templates/Includes/MandrillAdmin_Content.ss
@@ -5,7 +5,7 @@
 			<a class="ss-ui-button" data-icon="back" href="/admin/mandrill" data-pjax-target="Content"><% _t('BackLink_Button_ss.Back') %></a>
 			<% end_if %>
 			<% include CMSBreadcrumbs %>
-		</div>	
+		</div>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content cms-panel-padded">

diff --git a/templates/Includes/MandrillAdmin_NotConfigured.ss b/templates/Includes/MandrillAdmin_NotConfigured.ss
@@ -2,7 +2,7 @@
 	<div class="cms-content-header north">
 		<div class="cms-content-header-info">
 			<% include CMSBreadcrumbs %>
-		</div>	
+		</div>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content cms-panel-padded">

diff --git a/templates/email/LogoEmail.ss b/templates/email/LogoEmail.ss
@@ -16,22 +16,22 @@
 				-ms-text-size-adjust:100%;
 			}
 
-			img{ 
+			img{
 				width:100%;
 				height:auto;
-				border:none; 
-				font-size:14px; 
-				font-weight:bold; 
-				line-height:100%; 
-				outline:none; 
-				text-decoration:none; 
+				border:none;
+				font-size:14px;
+				font-weight:bold;
+				line-height:100%;
+				outline:none;
+				text-decoration:none;
 				text-transform:capitalize;
 			}
 
-			#backgroundTable{ 
-				height:100% !important; 
-				margin:0; 
-				padding:0; 
+			#backgroundTable{
+				height:100% !important;
+				margin:0;
+				padding:0;
 				width:100% !important;
 			}
 
@@ -41,7 +41,7 @@
 			}
 
 			p a{
-				color: #00afcb; 
+				color: #00afcb;
 				text-decoration:underline;
 				word-wrap:break-word;
 			}
@@ -262,7 +262,7 @@
 														<p>$Body</p>
 													</span>
 													<% end_if %>
-											</div>										
+											</div>
 										</td>
 									</tr>
 								</tbody>