simplesamlphp / simplesamlphp-module-casserver

templates/loggedIn.php

Spacing +1 added lines, -1 removed lines

@@ -36,5 +36,5 @@
 $this->includeAtTemplateBase('includes/footer.php');
 
 if (isset($this->data['autofocus'])) {
-    echo '<script type="text/javascript">window.onload = function() {document.getElementById(\'' . $this->data['autofocus'] . '\').focus();}</script>';
+    echo '<script type="text/javascript">window.onload = function() {document.getElementById(\''.$this->data['autofocus'].'\').focus();}</script>';
 }
\ No newline at end of file

templates/loggedOut.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 <?php
 if (isset($this->data['url'])) {
-    echo('<p><a href="' . $this->data["url"] . '">' . $this->t('{casserver:casserver:continue_heading}') . '</a>');
+    echo('<p><a href="'.$this->data["url"].'">'.$this->t('{casserver:casserver:continue_heading}').'</a>');
 }
 ?>
 
@@ -42,5 +42,5 @@ 
 $this->includeAtTemplateBase('includes/footer.php');
 
 if (isset($this->data['autofocus'])) {
-    echo '<script type="text/javascript">window.onload = function() {document.getElementById(\'' . $this->data['autofocus'] . '\').focus();}</script>';
+    echo '<script type="text/javascript">window.onload = function() {document.getElementById(\''.$this->data['autofocus'].'\').focus();}</script>';
 }
\ No newline at end of file

config-templates/module_casserver.php

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
        IdPs listed by the disco service will be restricted to entityIDs in the specified set. */
     'scopes' => array('mobile' => array('https://idp1.domain:1234/saml2/idp/metadata.php',
                                         'https://idp2.domain:5678/saml2/idp/metadata.php'),
-                      'desktop' => array('https://idp3.domain:1234/saml2/idp/metadata.php', 
-                                         'https://idp4.domain:5678/saml2/idp/metadata.php')),
+                        'desktop' => array('https://idp3.domain:1234/saml2/idp/metadata.php', 
+                                            'https://idp4.domain:5678/saml2/idp/metadata.php')),
 
     'legal_service_urls' => array( //Any service url string matching any of the following prefixes is accepted
         'http://host1.domain:1234/path1',

www/proxy.php

Spacing +9 added lines, -9 removed lines

@@ -63,42 +63,42 @@
 
             echo $protocol->getProxySuccessResponse($proxyTicket['id']);
         } else {
-            $message = 'Ticket ' . var_export($_GET['pgt'], true) . ' has expired';
+            $message = 'Ticket '.var_export($_GET['pgt'], true).' has expired';
 
-            SimpleSAML_Logger::debug('casserver:' . $message);
+            SimpleSAML_Logger::debug('casserver:'.$message);
 
             echo $protocol->getProxyFailureResponse('BAD_PGT', $message);
         }
     } elseif (!$ticketFactory->isProxyGrantingTicket($proxyGrantingTicket)) {
-        $message = 'Not a valid proxy granting ticket id: ' . var_export($_GET['pgt'], true);
+        $message = 'Not a valid proxy granting ticket id: '.var_export($_GET['pgt'], true);
 
-        SimpleSAML_Logger::debug('casserver:' . $message);
+        SimpleSAML_Logger::debug('casserver:'.$message);
 
         echo $protocol->getProxyFailureResponse('BAD_PGT', $message);
     } else {
-        $message = 'Ticket ' . var_export($_GET['pgt'], true) . ' not recognized';
+        $message = 'Ticket '.var_export($_GET['pgt'], true).' not recognized';
 
-        SimpleSAML_Logger::debug('casserver:' . $message);
+        SimpleSAML_Logger::debug('casserver:'.$message);
 
         echo $protocol->getProxyFailureResponse('BAD_PGT', $message);
     }
 } elseif (!array_key_exists('targetService', $_GET)) {
     $message = 'Missing target service parameter [targetService]';
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
 } elseif (!checkServiceURL(sanitize($_GET['targetService']), $legal_target_service_urls)) {
     $message = 'Target service parameter not listed as a legal service: [targetService] = '
         . var_export($_GET['targetService'], true);
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
 } else {
     $message = 'Missing proxy granting ticket parameter: [pgt]';
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
 }

www/validate.php

Spacing +8 added lines, -8 removed lines

@@ -68,34 +68,34 @@ 
                     echo $protocol->getValidateFailureResponse();
                 } else {
                     if ($ticketFactory->isExpired($serviceTicket)) {
-                        $message = 'Ticket has ' . var_export($_GET['ticket'], true) . ' expired';
+                        $message = 'Ticket has '.var_export($_GET['ticket'], true).' expired';
                     } else {
                         if (sanitize($serviceTicket['service']) == sanitize($_GET['service'])) {
                             $message = 'Mismatching service parameters: expected '
                                 . var_export($serviceTicket['service'], true)
-                                . ' but was: ' . var_export($_GET['service'], true);
+                                . ' but was: '.var_export($_GET['service'], true);
                         } else {
                             $message = 'Ticket was issue from single sign on session';
                         }
                     }
-                    SimpleSAML_Logger::debug('casserver:' . $message);
+                    SimpleSAML_Logger::debug('casserver:'.$message);
 
                     echo $protocol->getValidateFailureResponse();
                 }
             }
         } else {
             if (is_null($serviceTicket)) {
-                $message = 'ticket: ' . var_export($_GET['ticket'], true) . ' not recognized';
+                $message = 'ticket: '.var_export($_GET['ticket'], true).' not recognized';
             } else {
-                $message = 'ticket: ' . var_export($_GET['ticket'], true) . ' is not a service ticket';
+                $message = 'ticket: '.var_export($_GET['ticket'], true).' is not a service ticket';
             }
 
-            SimpleSAML_Logger::debug('casserver:' . $message);
+            SimpleSAML_Logger::debug('casserver:'.$message);
 
             echo $protocol->getValidateFailureResponse();
         }
     } catch (Exception $e) {
-        SimpleSAML_Logger::error('casserver:validate: internal server error. ' . var_export($e->getMessage(), true));
+        SimpleSAML_Logger::error('casserver:validate: internal server error. '.var_export($e->getMessage(), true));
 
         echo $protocol->getValidateFailureResponse();
     }
@@ -106,7 +106,7 @@ 
         $message = 'Missing ticket parameter: [ticket]';
     }
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     echo $protocol->getValidateFailureResponse();
 }

www/cas.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 if (!isset($validFunctions[$function])) {
     $message = 'Not a valid function for cas.php.';
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     throw new Exception($message);
 }
 
-include(dirname(__FILE__) . '/' . $validFunctions[$function] . '.php');
+include(dirname(__FILE__).'/'.$validFunctions[$function].'.php');

www/utility/validateTicket.php

Spacing +16 added lines, -16 removed lines

@@ -78,8 +78,8 @@ 
                             'sessionId' => $serviceTicket['sessionId']
                         ));
                         try {
-                            SimpleSAML\Utils\HTTP::fetch($pgtUrl . '?pgtIou=' . $proxyGrantingTicket['iou']
-                                . '&pgtId=' . $proxyGrantingTicket['id']);
+                            SimpleSAML\Utils\HTTP::fetch($pgtUrl.'?pgtIou='.$proxyGrantingTicket['iou']
+                                . '&pgtId='.$proxyGrantingTicket['id']);
 
                             $protocol->setProxyGrantingTicketIOU($proxyGrantingTicket['iou']);
 
@@ -92,29 +92,29 @@ 
                 echo $protocol->getValidateSuccessResponse($serviceTicket['userName']);
             } else {
                 if ($ticketFactory->isExpired($serviceTicket)) {
-                    $message = 'Ticket ' . var_export($_GET['ticket'], true) . ' has expired';
+                    $message = 'Ticket '.var_export($_GET['ticket'], true).' has expired';
 
-                    SimpleSAML_Logger::debug('casserver:' . $message);
+                    SimpleSAML_Logger::debug('casserver:'.$message);
 
                     echo $protocol->getValidateFailureResponse('INVALID_TICKET', $message);
                 } else {
                     if (sanitize($serviceTicket['service']) != sanitize($_GET['service'])) {
                         $message = 'Mismatching service parameters: expected '
                             . var_export($serviceTicket['service'], true)
-                            . ' but was: ' . var_export($_GET['service'], true);
+                            . ' but was: '.var_export($_GET['service'], true);
 
-                        SimpleSAML_Logger::debug('casserver:' . $message);
+                        SimpleSAML_Logger::debug('casserver:'.$message);
 
                         echo $protocol->getValidateFailureResponse('INVALID_SERVICE', $message);
                     } else {
                         if ($serviceTicket['forceAuthn'] != $forceAuthn) {
                             $message = 'Ticket was issue from single sign on session';
 
-                            SimpleSAML_Logger::debug('casserver:' . $message);
+                            SimpleSAML_Logger::debug('casserver:'.$message);
 
                             echo $protocol->getValidateFailureResponse('INVALID_TICKET', $message);
                         } else {
-                            SimpleSAML_Logger::error('casserver:' . $method . ': internal server error.');
+                            SimpleSAML_Logger::error('casserver:'.$method.': internal server error.');
 
                             echo $protocol->getValidateFailureResponse('INTERNAL_ERROR', 'Unknown internal error');
                         }
@@ -123,23 +123,23 @@ 
             }
         } else {
             if (is_null($serviceTicket)) {
-                $message = 'Ticket ' . var_export($_GET['ticket'], true) . ' not recognized';
+                $message = 'Ticket '.var_export($_GET['ticket'], true).' not recognized';
 
-                SimpleSAML_Logger::debug('casserver:' . $message);
+                SimpleSAML_Logger::debug('casserver:'.$message);
 
                 echo $protocol->getValidateFailureResponse('INVALID_TICKET', $message);
             } else {
                 if ($ticketFactory->isProxyTicket($serviceTicket) && $method == 'serviceValidate') {
-                    $message = 'Ticket ' . var_export($_GET['ticket'], true)
+                    $message = 'Ticket '.var_export($_GET['ticket'], true)
                         . ' is a proxy ticket. Use proxyValidate instead.';
 
-                    SimpleSAML_Logger::debug('casserver:' . $message);
+                    SimpleSAML_Logger::debug('casserver:'.$message);
 
                     echo $protocol->getValidateFailureResponse('INVALID_TICKET', $message);
                 } else {
-                    $message = 'Ticket ' . var_export($_GET['ticket'], true) . ' is not a service ticket';
+                    $message = 'Ticket '.var_export($_GET['ticket'], true).' is not a service ticket';
 
-                    SimpleSAML_Logger::debug('casserver:' . $message);
+                    SimpleSAML_Logger::debug('casserver:'.$message);
 
                     echo $protocol->getValidateFailureResponse('INVALID_TICKET', $message);
                 }
@@ -156,13 +156,13 @@ 
     if (!array_key_exists('service', $_GET)) {
         $message = 'Missing service parameter: [service]';
 
-        SimpleSAML_Logger::debug('casserver:' . $message);
+        SimpleSAML_Logger::debug('casserver:'.$message);
 
         echo $protocol->getValidateFailureResponse('INVALID_REQUEST', $message);
     } else {
         $message = 'Missing ticket parameter: [ticket]';
 
-        SimpleSAML_Logger::debug('casserver:' . $message);
+        SimpleSAML_Logger::debug('casserver:'.$message);
 
         echo $protocol->getValidateFailureResponse('INVALID_REQUEST', $message);
     }

www/utility/urlUtils.php

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
         }
         if (!ctype_alnum($legalUrl[0])) {
             // Probably a regex. Suppress errors incase the format is invalid
-            $result =  @preg_match($legalUrl, $service);
+            $result = @preg_match($legalUrl, $service);
             if ($result === 1) {
                 return true;
             } elseif ($result === false) {
-                SimpleSAML_Logger::warning("Invalid CAS legal service url '$legalUrl'. Error " . preg_last_error());
+                SimpleSAML_Logger::warning("Invalid CAS legal service url '$legalUrl'. Error ".preg_last_error());
             }
         } elseif (strpos($service, $legalUrl) === 0) {
             return true;

www/logout.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 if (!$casconfig->getValue('enable_logout', false)) {
     $message = 'Logout not allowed';
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     throw new Exception($message);
 }
@@ -38,7 +38,7 @@ 
 if ($skipLogoutPage && !array_key_exists('url', $_GET)) {
     $message = 'Required URL query parameter [url] not provided. (CAS Server)';
 
-    SimpleSAML_Logger::debug('casserver:' . $message);
+    SimpleSAML_Logger::debug('casserver:'.$message);
 
     throw new Exception($message);
 }