adamjakab / SuiteCRM

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Metadata.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 
 class OneLogin_Saml2_Metadata
 {
-    const TIME_VALID = 172800;  // 2 days
+    const TIME_VALID = 172800; // 2 days
     const TIME_CACHED = 604800; // 1 week
 
     /**
@@ -27,9 +27,9 @@ 
     {
 
         if (!isset($validUntil)) {
-            $validUntil =  time() + self::TIME_VALID;
+            $validUntil = time() + self::TIME_VALID;
         }
-        $validUntilTime =  gmdate('Y-m-d\TH:i:s\Z', $validUntil);
+        $validUntilTime = gmdate('Y-m-d\TH:i:s\Z', $validUntil);
 
         if (!isset($cacheDuration)) {
             $cacheDuration = self::TIME_CACHED;
@@ -103,7 +103,7 @@ 
             $attrCsDesc = '';
             if (isset($sp['attributeConsumingService']['serviceDescription'])) {
                 $attrCsDesc = sprintf(
-                    '            <md:ServiceDescription xml:lang="en">%s</md:ServiceDescription>' . PHP_EOL,
+                    '            <md:ServiceDescription xml:lang="en">%s</md:ServiceDescription>'.PHP_EOL,
                     $sp['attributeConsumingService']['serviceDescription']
                 );
             }
@@ -130,7 +130,7 @@ 
                         $attribute['attributeValue'] = array($attribute['attributeValue']);
                     }
                     foreach ($attribute['attributeValue'] as $attrValue) {
-                        $reqAttrAuxStr .=<<<ATTRIBUTEVALUE
+                        $reqAttrAuxStr .= <<<ATTRIBUTEVALUE
 
                 <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">{$attrValue}</saml:AttributeValue>
 ATTRIBUTEVALUE;
@@ -138,7 +138,7 @@ 
                     $reqAttrAuxStr .= "\n            </md:RequestedAttribute>";
                 }
 
-                $requestedAttributeData[] = $requestedAttributeStr . $reqAttrAuxStr;
+                $requestedAttributeData[] = $requestedAttributeStr.$reqAttrAuxStr;
             }
 
             $requestedAttributeStr = implode(PHP_EOL, $requestedAttributeData);
@@ -206,7 +206,7 @@ 
             if (!$xml) {
                 throw new Exception('Error parsing metadata');
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw new Exception('Error parsing metadata. '.$e->getMessage());
         }
 

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/LogoutRequest.php

Spacing +1 added lines, -1 removed lines

@@ -376,7 +376,7 @@
             }
 
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Response.php

Spacing +6 added lines, -6 removed lines

@@ -398,7 +398,7 @@ 
                 }
             }
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {
@@ -736,7 +736,7 @@ 
 
             $attributeValues = array();
             foreach ($entry->childNodes as $childNode) {
-                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '') . 'AttributeValue';
+                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '').'AttributeValue';
                 if ($childNode->nodeType == XML_ELEMENT_NODE && $childNode->tagName === $tagName) {
                     $attributeValues[] = $childNode->nodeValue;
                 }
@@ -961,7 +961,7 @@ 
         $xpath->registerNamespace('xenc', OneLogin_Saml2_Constants::NS_XENC);
 
         $assertionNode = '/samlp:Response/saml:Assertion';
-        $signatureQuery = $assertionNode . '/ds:Signature/ds:SignedInfo/ds:Reference';
+        $signatureQuery = $assertionNode.'/ds:Signature/ds:SignedInfo/ds:Reference';
         $assertionReferenceNode = $xpath->query($signatureQuery)->item(0);
         if (!$assertionReferenceNode) {
             // is the response signed as a whole?
@@ -974,9 +974,9 @@ 
                 } else {
                     $id = substr($responseReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
                 }
-                $nameQuery = "/samlp:Response[@ID='$id']/saml:Assertion" . $assertionXpath;
+                $nameQuery = "/samlp:Response[@ID='$id']/saml:Assertion".$assertionXpath;
             } else {
-                $nameQuery = "/samlp:Response/saml:Assertion" . $assertionXpath;
+                $nameQuery = "/samlp:Response/saml:Assertion".$assertionXpath;
             }
         } else {
             $uri = $assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue;
@@ -985,7 +985,7 @@ 
             } else {
                 $id = substr($assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
             }
-            $nameQuery = $assertionNode."[@ID='$id']" . $assertionXpath;
+            $nameQuery = $assertionNode."[@ID='$id']".$assertionXpath;
         }
 
         return $xpath->query($nameQuery);

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Auth.php

Spacing +6 added lines, -6 removed lines

@@ -155,7 +155,7 @@ 
      */
     public function setStrict($value)
     {
-        if (! (is_bool($value))) {
+        if (!(is_bool($value))) {
             throw new OneLogin_Saml2_Error(
                 'Invalid value passed to setStrict()',
                 OneLogin_Saml2_Error::SETTINGS_INVALID_SYNTAX
@@ -269,7 +269,7 @@ 
 
                 $security = $this->_settings->getSecurityData();
                 if (isset($security['logoutResponseSigned']) && $security['logoutResponseSigned']) {
-                    $signature = $this->buildResponseSignature($logoutResponse, isset($parameters['RelayState'])? $parameters['RelayState']: null, $security['signatureAlgorithm']);
+                    $signature = $this->buildResponseSignature($logoutResponse, isset($parameters['RelayState']) ? $parameters['RelayState'] : null, $security['signatureAlgorithm']);
                     $parameters['SigAlg'] = $security['signatureAlgorithm'];
                     $parameters['Signature'] = $signature;
                 }
@@ -579,13 +579,13 @@ 
             if (isset($relayState)) {
                 $msg .= '&RelayState='.rawurlencode($relayState);
             }
-            $msg .= '&SigAlg=' . rawurlencode($signAlgorithm);
+            $msg .= '&SigAlg='.rawurlencode($signAlgorithm);
         } else {
             $msg = 'SAMLRequest='.urlencode($samlRequest);
             if (isset($relayState)) {
                 $msg .= '&RelayState='.urlencode($relayState);
             }
-            $msg .= '&SigAlg=' . urlencode($signAlgorithm);
+            $msg .= '&SigAlg='.urlencode($signAlgorithm);
         }
         $signature = $objKey->signData($msg);
         return base64_encode($signature);
@@ -622,13 +622,13 @@ 
             if (isset($relayState)) {
                 $msg .= '&RelayState='.rawurlencode($relayState);
             }
-            $msg .= '&SigAlg=' . rawurlencode($signAlgorithm);
+            $msg .= '&SigAlg='.rawurlencode($signAlgorithm);
         } else {
             $msg = 'SAMLResponse='.urlencode($samlResponse);
             if (isset($relayState)) {
                 $msg .= '&RelayState='.urlencode($relayState);
             }
-            $msg .= '&SigAlg=' . urlencode($signAlgorithm);
+            $msg .= '&SigAlg='.urlencode($signAlgorithm);
         }
         $signature = $objKey->signData($msg);
         return base64_encode($signature);

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/IdPMetadataParser.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
             } else {
                 throw new Exception(curl_error($ch), curl_errno($ch));
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
         }
         return $metadataInfo;
     }
@@ -63,7 +63,7 @@ 
                 $data = file_get_contents($filepath);
                 $metadataInfo = self::parseXML($data, $entityId);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
         }
         return $metadataInfo;
     }
@@ -95,9 +95,9 @@ 
 
             $customIdPStr = '';
             if (!empty($entityId)) {
-                $customIdPStr = '[@entityID="' . $entityId . '"]';
+                $customIdPStr = '[@entityID="'.$entityId.'"]';
             }
-            $idpDescryptorXPath = '//md:EntityDescriptor' . $customIdPStr . '/md:IDPSSODescriptor';
+            $idpDescryptorXPath = '//md:EntityDescriptor'.$customIdPStr.'/md:IDPSSODescriptor';
 
             $idpDescriptorNodes = OneLogin_Saml2_Utils::query($dom, $idpDescryptorXPath);
 
@@ -179,7 +179,7 @@ 
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw new Exception('Error parsing metadata. '.$e->getMessage());
         }
 

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/LogoutResponse.php

Spacing +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
                 }
             }
             return true;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->_error = $e->getMessage();
             $debug = $this->_settings->isDebugActive();
             if ($debug) {

modules/Users/authentication/SAML2Authenticate/lib/onelogin/php-saml/lib/Saml2/Utils.php

Spacing +28 added lines, -28 removed lines

@@ -124,7 +124,7 @@ 
             }
         }
 
-        $schemaFile = dirname(__FILE__).'/schemas/' . $schema;
+        $schemaFile = dirname(__FILE__).'/schemas/'.$schema;
         $oldEntityLoader = libxml_disable_entity_loader(false);
         $res = $dom->schemaValidate($schemaFile);
         libxml_disable_entity_loader($oldEntityLoader);
@@ -220,7 +220,7 @@ 
      */
     public static function getStringBetween($str, $start, $end)
     {
-        $str = ' ' . $str;
+        $str = ' '.$str;
         $ini = strpos($str, $start);
 
         if ($ini == 0) {
@@ -249,13 +249,13 @@ 
         assert('is_array($parameters)');
 
         if (substr($url, 0, 1) === '/') {
-            $url = self::getSelfURLhost() . $url;
+            $url = self::getSelfURLhost().$url;
         }
 
         /* Verify that the URL is to a http or https site. */
         if (!preg_match('@^https?:\/\/@i', $url)) {
             throw new OneLogin_Saml2_Error(
-                'Redirect to invalid URL: ' . $url,
+                'Redirect to invalid URL: '.$url,
                 OneLogin_Saml2_Error::REDIRECT_INVALID_URL
             );
         }
@@ -274,17 +274,17 @@ 
             } else if (is_array($value)) {
                 $param = "";
                 foreach ($value as $val) {
-                    $param .= urlencode($name) . "[]=" . urlencode($val). '&';
+                    $param .= urlencode($name)."[]=".urlencode($val).'&';
                 }
                 if (!empty($param)) {
                     $param = substr($param, 0, -1);
                 }
             } else {
-                $param = urlencode($name) . '=' . urlencode($value);
+                $param = urlencode($name).'='.urlencode($value);
             }
 
             if (!empty($param)) {
-                $url .= $paramPrefix . $param;
+                $url .= $paramPrefix.$param;
                 $paramPrefix = '&';
             }
         }
@@ -295,7 +295,7 @@ 
 
         header('Pragma: no-cache');
         header('Cache-Control: no-cache, must-revalidate');
-        header('Location: ' . $url);
+        header('Location: '.$url);
         exit();
     }
 
@@ -376,10 +376,10 @@ 
         $portnumber = self::getSelfPort();
 
         if (isset($portnumber) && ($portnumber != '80') && ($portnumber != '443')) {
-            $port = ':' . $portnumber;
+            $port = ':'.$portnumber;
         }
 
-        return $protocol."://" . $currenthost . $port;
+        return $protocol."://".$currenthost.$port;
     }
 
     /**
@@ -400,7 +400,7 @@ 
         } else if ($baseurlpath == '/') {
             self::$_baseurlpath = '/';
         } else {
-            self::$_baseurlpath = '/' . trim($baseurlpath, '/') . '/';
+            self::$_baseurlpath = '/'.trim($baseurlpath, '/').'/';
         }
     }
 
@@ -570,7 +570,7 @@ 
             $route = $infoWithBaseURLPath;
         }
 
-        $selfRoutedURLNoQuery = $selfURLhost . $route;
+        $selfRoutedURLNoQuery = $selfURLhost.$route;
         return $selfRoutedURLNoQuery;
     }
 
@@ -598,7 +598,7 @@ 
             $requestURI = $infoWithBaseURLPath;
         }
 
-        return $selfURLhost . $requestURI;
+        return $selfURLhost.$requestURI;
     }
 
     /**
@@ -645,7 +645,7 @@ 
      */
     public static function generateUniqueID()
     {
-        return 'ONELOGIN_' . sha1(uniqid(mt_rand(), true));
+        return 'ONELOGIN_'.sha1(uniqid(mt_rand(), true));
     }
 
     /**
@@ -682,10 +682,10 @@ 
         /* We use a very strict regex to parse the timestamp. */
         $exp1 = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)';
         $exp2 = 'T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d+)?Z$/D';
-        if (preg_match($exp1 . $exp2, $time, $matches) == 0) {
+        if (preg_match($exp1.$exp2, $time, $matches) == 0) {
             throw new Exception(
-                'Invalid SAML2 timestamp passed to' .
-                ' parseSAML2Time: ' . $time
+                'Invalid SAML2 timestamp passed to'.
+                ' parseSAML2Time: '.$time
             );
         }
 
@@ -729,7 +729,7 @@ 
         /* Parse the duration. We use a very strict pattern. */
         $durationRegEx = '#^(-?)P(?:(?:(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)S)?)?)|(?:(\\d+)W))$#D';
         if (!preg_match($durationRegEx, $duration, $matches)) {
-            throw new Exception('Invalid ISO 8601 duration: ' . $duration);
+            throw new Exception('Invalid ISO 8601 duration: '.$duration);
         }
 
         $durYears = (empty($matches[2]) ? 0 : (int)$matches[2]);
@@ -1091,9 +1091,9 @@ 
 
             if ($inputKeyAlgo !== $symKeyInfoAlgo) {
                 throw new OneLogin_Saml2_ValidationError(
-                    'Algorithm mismatch between input key and key used to encrypt ' .
-                    ' the symmetric key for the message. Key was: ' .
-                    var_export($inputKeyAlgo, true) . '; message was: ' .
+                    'Algorithm mismatch between input key and key used to encrypt '.
+                    ' the symmetric key for the message. Key was: '.
+                    var_export($inputKeyAlgo, true).'; message was: '.
                     var_export($symKeyInfoAlgo, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
@@ -1105,7 +1105,7 @@ 
             if ($keySize === null) {
                 // To protect against "key oracle" attacks
                 throw new OneLogin_Saml2_ValidationError(
-                    'Unknown key size for encryption algorithm: ' . var_export($symmetricKey->type, true),
+                    'Unknown key size for encryption algorithm: '.var_export($symmetricKey->type, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
             }
@@ -1115,7 +1115,7 @@ 
                 $encryptedKey = $encKey->getCipherValue();
                 $pkey = openssl_pkey_get_details($symmetricKeyInfo->key);
                 $pkey = sha1(serialize($pkey), true);
-                $key = sha1($encryptedKey . $pkey, true);
+                $key = sha1($encryptedKey.$pkey, true);
 
                 /* Make sure that the key has the correct length. */
                 if (strlen($key) > $keySize) {
@@ -1129,8 +1129,8 @@ 
             $symKeyAlgo = $symmetricKey->getAlgorithm();
             if ($inputKeyAlgo !== $symKeyAlgo) {
                 throw new OneLogin_Saml2_ValidationError(
-                    'Algorithm mismatch between input key and key in message. ' .
-                    'Key was: ' . var_export($inputKeyAlgo, true) . '; message was: ' .
+                    'Algorithm mismatch between input key and key in message. '.
+                    'Key was: '.var_export($inputKeyAlgo, true).'; message was: '.
                     var_export($symKeyAlgo, true),
                     OneLogin_Saml2_ValidationError::KEY_ALGORITHM_ERROR
                 );
@@ -1243,7 +1243,7 @@ 
         $objXMLSecDSig->add509Cert($cert, true);
 
         $insertBefore = $rootNode->firstChild;
-        $messageTypes = array('AuthnRequest', 'Response', 'LogoutRequest','LogoutResponse');
+        $messageTypes = array('AuthnRequest', 'Response', 'LogoutRequest', 'LogoutResponse');
         if (in_array($rootNode->localName, $messageTypes)) {
             $issuerNodes = self::query($dom, '/'.$rootNode->tagName.'/saml:Issuer');
             if ($issuerNodes->length == 1) {
@@ -1309,7 +1309,7 @@ 
 
         try {
             $retVal = $objXMLSecDSig->validateReference();
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             throw $e;
         }
 
@@ -1401,7 +1401,7 @@ 
             if ($signAlg != XMLSecurityKey::RSA_SHA1) {
                 try {
                     $objKey = OneLogin_Saml2_Utils::castKey($objKey, $signAlg, 'public');
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $ex = new OneLogin_Saml2_ValidationError(
                         "Invalid signAlg in the recieved ".$strMessageType,
                         OneLogin_Saml2_ValidationError::INVALID_SIGNATURE

modules/Campaigns/WebToLeadCapture.php

Spacing +42 added lines, -42 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -47,7 +47,7 @@ 
 
 $mod_strings = return_module_language($sugar_config['default_language'], 'Leads');
 
-$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads','Bug'=>'Bugs',
+$app_list_strings['record_type_module'] = array('Contact'=>'Contacts', 'Account'=>'Accounts', 'Opportunity'=>'Opportunities', 'Case'=>'Cases', 'Note'=>'Notes', 'Call'=>'Calls', 'Email'=>'Emails', 'Meeting'=>'Meetings', 'Task'=>'Tasks', 'Lead'=>'Leads', 'Bug'=>'Bugs',
 
 );
 
@@ -61,22 +61,22 @@ 
 if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
 	    //adding the client ip address
 	    $_POST['client_id_address'] = query_client_ip();
-		$campaign_id=$_POST['campaign_id'];
+		$campaign_id = $_POST['campaign_id'];
 		$campaign = new Campaign();
         $campaign_id = $campaign->db->quote($_POST['campaign_id']);
-        if(!isValidId($campaign_id)) {
+        if (!isValidId($campaign_id)) {
 			throw new RuntimeException('Invalid ID requested in Lead Capture');
     	}
 		$camp_query  = "select name,id from campaigns where id='$campaign_id'";
 		$camp_query .= " and deleted=0";
-        $camp_result=$campaign->db->query($camp_query);
+        $camp_result = $campaign->db->query($camp_query);
         $camp_data = $campaign->db->fetchByAssoc($camp_result);
         // Bug 41292 - have to select marketing_id for new lead
         $db = DBManagerFactory::getInstance();
         $marketing = new EmailMarketing();
         $marketing_query = $marketing->create_new_list_query(
                 'date_start desc, date_modified desc',
-                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < " . $db->convert('', 'today'),
+                "campaign_id = '{$campaign_id}' and status = 'active' and date_start < ".$db->convert('', 'today'),
                 array('id')
         );
         $marketing_result = $db->limitQuery($marketing_query, 0, 1, true);
@@ -87,22 +87,22 @@ 
 			$current_user->retrieve($_REQUEST['assigned_user_id']);
 		} 
 
-	    if(isset($camp_data) && $camp_data != null ){
+	    if (isset($camp_data) && $camp_data != null) {
 			$leadForm = new LeadFormBase();
             $lead = new Lead();
 			$prefix = '';
-			if(!empty($_POST['prefix'])){
+			if (!empty($_POST['prefix'])) {
 				$prefix = $_POST['prefix'];
 			}
 
-			if(empty($lead->id)) {
+			if (empty($lead->id)) {
                 $lead->id = create_guid();
                 $lead->new_with_id = true;
             }
             $GLOBALS['check_notify'] = true;
 
             //bug: 47574 - make sure, that webtolead_email1 field has same required attribute as email1 field
-            if(isset($lead->required_fields['email1'])){
+            if (isset($lead->required_fields['email1'])) {
                 $lead->required_fields['webtolead_email1'] = $lead->required_fields['email1'];
             }
             
@@ -118,7 +118,7 @@ 
             // checkRequired needs a major overhaul before it works for web to lead forms.
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
             
-			if(!empty($lead)){
+			if (!empty($lead)) {
 				
 	            //create campaign log
 	            $camplog = new CampaignLog();
@@ -127,9 +127,9 @@ 
 	            $camplog->related_type = $lead->module_dir;
 	            $camplog->activity_type = "lead";
 	            $camplog->target_type = $lead->module_dir;
-	            $campaign_log->activity_date=$timedate->now();
-	            $camplog->target_id    = $lead->id;
-                if(isset($marketing_data['id']))
+	            $campaign_log->activity_date = $timedate->now();
+	            $camplog->target_id = $lead->id;
+                if (isset($marketing_data['id']))
                 {
                     $camplog->marketing_id = $marketing_data['id'];
                 }
@@ -159,7 +159,7 @@ 
                 
 		        $lead->load_relationship('campaigns');
 		        $lead->campaigns->add($camplog->id);
-                if(!empty($GLOBALS['check_notify'])) {
+                if (!empty($GLOBALS['check_notify'])) {
                     $lead->save($GLOBALS['check_notify']);
                 }
                 else {
@@ -168,47 +168,47 @@ 
             }
 
             //in case there are forms out there still using email_opt_out
-            if(isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])){
+            if (isset($_POST['webtolead_email_opt_out']) || isset($_POST['email_opt_out'])) {
                     
-                if(isset ($lead->email1) && !empty($lead->email1)){
+                if (isset ($lead->email1) && !empty($lead->email1)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email1,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email1, 0, 1);
                 }   
-                if(isset ($lead->email2) && !empty($lead->email2)){
+                if (isset ($lead->email2) && !empty($lead->email2)) {
                     $sea = new SugarEmailAddress();
-                    $sea->AddUpdateEmailAddress($lead->email2,0,1);
+                    $sea->AddUpdateEmailAddress($lead->email2, 0, 1);
                     
                 }
             }              
-			if(isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])){
+			if (isset($_POST['redirect_url']) && !empty($_POST['redirect_url'])) {
 			    // Get the redirect url, and make sure the query string is not too long
 		        $redirect_url = $_POST['redirect_url'];
 		        $query_string = '';
 				$first_char = '&';
-				if(strpos($redirect_url, '?') === FALSE){
+				if (strpos($redirect_url, '?') === FALSE) {
 					$first_char = '?';
 				}
 				$first_iteration = true;
 				$get_and_post = array_merge($_GET, $_POST);
-				foreach($get_and_post as $param => $value) {
+				foreach ($get_and_post as $param => $value) {
 
-					if($param == 'redirect_url' && $param == 'submit')
+					if ($param == 'redirect_url' && $param == 'submit')
 						continue;
 					
-					if($first_iteration){
+					if ($first_iteration) {
 						$first_iteration = false;
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "{$param}=".urlencode($value);
 				}
-				if(empty($lead)) {
-					if($first_iteration){
+				if (empty($lead)) {
+					if ($first_iteration) {
 						$query_string .= $first_char;
 					}
-					else{
+					else {
 						$query_string .= "&";
 					}
 					$query_string .= "error=1";
@@ -219,22 +219,22 @@ 
 
 				// Check if the headers have been sent, or if the redirect url is greater than 2083 characters (IE max URL length)
 				//   and use a javascript form submission if that is the case.
-			    if(headers_sent() || strlen($redirect_url) > 2083){
-    				echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    				echo '<form name="redirect" action="' .$_POST['redirect_url']. '" method="GET">';
+			    if (headers_sent() || strlen($redirect_url) > 2083) {
+    				echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    				echo '<form name="redirect" action="'.$_POST['redirect_url'].'" method="GET">';
     
-    				foreach($_POST as $param => $value) {
-    					if($param != 'redirect_url' ||$param != 'submit') {
+    				foreach ($_POST as $param => $value) {
+    					if ($param != 'redirect_url' || $param != 'submit') {
     						echo '<input type="hidden" name="'.$param.'" value="'.$value.'">';
     					}
     				}
-    				if(empty($lead)) {
+    				if (empty($lead)) {
     					echo '<input type="hidden" name="error" value="1">';
     				}
     				echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     				echo '</body></html>';
     			}
-				else{
+				else {
     				$header_URL = "Location: {$redirect_url}";
 
 					SugarApplication::headerRedirect($header_URL);
@@ -242,26 +242,26 @@ 
     				die();
 			    }
 			}
-			else{
+			else {
 				echo $mod_strings['LBL_THANKS_FOR_SUBMITTING'];
 			}
 			sugar_cleanup();
 			// die to keep code from running into redirect case below
 			die();
 	    }
-	   else{
+	   else {
 	  	  echo $mod_strings['LBL_SERVER_IS_CURRENTLY_UNAVAILABLE'];
 	  }
 }
 
 if (!empty($_POST['redirect'])) {
-    if(headers_sent()){
-    	echo '<html ' . get_language_header() . '><head><title>SugarCRM</title></head><body>';
-    	echo '<form name="redirect" action="' .$_POST['redirect']. '" method="GET">';
+    if (headers_sent()) {
+    	echo '<html '.get_language_header().'><head><title>SugarCRM</title></head><body>';
+    	echo '<form name="redirect" action="'.$_POST['redirect'].'" method="GET">';
     	echo '</form><script language="javascript" type="text/javascript">document.redirect.submit();</script>';
     	echo '</body></html>';
     }
-    else{
+    else {
     	$header_URL = "Location: {$_POST['redirect']}";
 		SugarApplication::headerRedirect($header_URL);
     	die();

modules/Campaigns/WebToPersonCapture.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     $_POST['client_id_address'] = query_client_ip();
     $campaign = new Campaign();
     $campaign_id = $campaign->db->quote($_POST['campaign_id']);
-    if(!isValidId($campaign_id)) {
+    if (!isValidId($campaign_id)) {
         throw new RuntimeException('Invalid ID requested in Person Capture');
     }
     $camp_query = "select name,id from campaigns where id='$campaign_id'";