simplesamlphp / simplesamlphp-module-casserver

lib/Cas/Ticket/SQLTicketStore.php

Spacing +21 added lines, -21 removed lines

@@ -37,7 +37,7 @@ 
         $dsn = $storeConfig->getString('dsn');
         $username = $storeConfig->getString('username');
         $password = $storeConfig->getString('password');
-        $options =  $storeConfig->getArray('options', array());
+        $options = $storeConfig->getArray('options', array());
         $this->prefix = $storeConfig->getString('prefix', '');
 
         $this->pdo = new PDO($dsn, $username, $password, $options);
@@ -87,7 +87,7 @@ 
      */
     private function scopeTicketId($ticketId)
     {
-        return $this->prefix . '.' . $ticketId;
+        return $this->prefix.'.'.$ticketId;
     }
 
     private function initTableVersionTable()
@@ -96,15 +96,15 @@ 
         $this->tableVersions = array();
 
         try {
-            $fetchTableVersion = $this->pdo->query('SELECT _name, _version FROM ' . $this->prefix . '_tableVersion');
+            $fetchTableVersion = $this->pdo->query('SELECT _name, _version FROM '.$this->prefix.'_tableVersion');
         } catch (PDOException $e) {
-            $this->pdo->exec('CREATE TABLE ' . $this->prefix
+            $this->pdo->exec('CREATE TABLE '.$this->prefix
                 . '_tableVersion (_name VARCHAR(30) NOT NULL UNIQUE, _version INTEGER NOT NULL)');
             return;
         }
 
         while (($row = $fetchTableVersion->fetch(PDO::FETCH_ASSOC)) !== false) {
-            $this->tableVersions[$row['_name']] = (int)$row['_version'];
+            $this->tableVersions[$row['_name']] = (int) $row['_version'];
         }
     }
 
@@ -115,11 +115,11 @@ 
             return;
         }
 
-        $query = 'CREATE TABLE ' . $this->prefix
+        $query = 'CREATE TABLE '.$this->prefix
             . '_kvstore (_key VARCHAR(50) NOT NULL, _value TEXT NOT NULL, _expire TIMESTAMP, PRIMARY KEY (_key))';
         $this->pdo->exec($query);
 
-        $query = 'CREATE INDEX ' . $this->prefix . '_kvstore_expire ON ' . $this->prefix . '_kvstore (_expire)';
+        $query = 'CREATE INDEX '.$this->prefix.'_kvstore_expire ON '.$this->prefix.'_kvstore (_expire)';
         $this->pdo->exec($query);
 
         $this->setTableVersion('kvstore', 1);
@@ -150,7 +150,7 @@ 
         assert('is_int($version)');
 
         $this->insertOrUpdate(
-            $this->prefix . '_tableVersion',
+            $this->prefix.'_tableVersion',
             array('_name'),
             array(
                 '_name' => $name,
@@ -169,17 +169,17 @@ 
     {
         assert('is_string($table)');
 
-        $colNames = '(' . implode(', ', array_keys($data)) . ')';
-        $values = 'VALUES(:' . implode(', :', array_keys($data)) . ')';
+        $colNames = '('.implode(', ', array_keys($data)).')';
+        $values = 'VALUES(:'.implode(', :', array_keys($data)).')';
 
         switch ($this->driver) {
             case 'mysql':
-                $query = 'REPLACE INTO ' . $table . ' ' . $colNames . ' ' . $values;
+                $query = 'REPLACE INTO '.$table.' '.$colNames.' '.$values;
                 $query = $this->pdo->prepare($query);
                 $query->execute($data);
                 return;
             case 'sqlite':
-                $query = 'INSERT OR REPLACE INTO ' . $table . ' ' . $colNames . ' ' . $values;
+                $query = 'INSERT OR REPLACE INTO '.$table.' '.$colNames.' '.$values;
                 $query = $this->pdo->prepare($query);
                 $query->execute($data);
                 return;
@@ -187,18 +187,18 @@ 
 
         /* Default implementation. Try INSERT, and UPDATE if that fails. */
 
-        $insertQuery = 'INSERT INTO ' . $table . ' ' . $colNames . ' ' . $values;
+        $insertQuery = 'INSERT INTO '.$table.' '.$colNames.' '.$values;
         $insertQuery = $this->pdo->prepare($insertQuery);
         try {
             $insertQuery->execute($data);
             return;
         } catch (PDOException $e) {
-            $ecode = (string)$e->getCode();
+            $ecode = (string) $e->getCode();
             switch ($ecode) {
                 case '23505': /* PostgreSQL */
                     break;
                 default:
-                    SimpleSAML\Logger::error('casserver: Error while saving data: ' . $e->getMessage());
+                    SimpleSAML\Logger::error('casserver: Error while saving data: '.$e->getMessage());
                     throw $e;
             }
         }
@@ -208,7 +208,7 @@ 
 
         foreach ($data as $col => $value) {
 
-            $tmp = $col . ' = :' . $col;
+            $tmp = $col.' = :'.$col;
 
             if (in_array($col, $keys, true)) {
                 $condCols[] = $tmp;
@@ -217,7 +217,7 @@ 
             }
         }
 
-        $updateQuery = 'UPDATE ' . $table . ' SET ' . implode(',', $updateCols) . ' WHERE '
+        $updateQuery = 'UPDATE '.$table.' SET '.implode(',', $updateCols).' WHERE '
             . implode(' AND ', $condCols);
         $updateQuery = $this->pdo->prepare($updateQuery);
         $updateQuery->execute($data);
@@ -225,7 +225,7 @@ 
 
     private function cleanKVStore()
     {
-        $query = 'DELETE FROM ' . $this->prefix . '_kvstore WHERE _expire < :now';
+        $query = 'DELETE FROM '.$this->prefix.'_kvstore WHERE _expire < :now';
         $params = array('now' => gmdate('Y-m-d H:i:s'));
 
         $query = $this->pdo->prepare($query);
@@ -244,7 +244,7 @@ 
             $key = sha1($key);
         }
 
-        $query = 'SELECT _value FROM ' . $this->prefix
+        $query = 'SELECT _value FROM '.$this->prefix
             . '_kvstore WHERE _key = :key AND (_expire IS NULL OR _expire > :now)';
         $params = array('key' => $key, 'now' => gmdate('Y-m-d H:i:s'));
 
@@ -301,7 +301,7 @@ 
             '_expire' => $expire,
         );
 
-        $this->insertOrUpdate($this->prefix . '_kvstore', array('_key'), $data);
+        $this->insertOrUpdate($this->prefix.'_kvstore', array('_key'), $data);
     }
 
     /**
@@ -319,7 +319,7 @@ 
             '_key' => $key,
         );
 
-        $query = 'DELETE FROM ' . $this->prefix . '_kvstore WHERE _key=:_key';
+        $query = 'DELETE FROM '.$this->prefix.'_kvstore WHERE _key=:_key';
         $query = $this->pdo->prepare($query);
         $query->execute($data);
     }

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/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);
 }

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/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/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/login.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 if (isset($_GET['service']) && !checkServiceURL(sanitize($_GET['service']), $legal_service_urls)) {
     $message = 'Service parameter provided to CAS server is not listed as a legal service: [service] = '
         . var_export($_GET['service'], true);
-    SimpleSAML\Logger::debug('casserver:' . $message);
+    SimpleSAML\Logger::debug('casserver:'.$message);
 
     throw new Exception($message);
 }
@@ -54,7 +54,7 @@ 
     } else {
         $message = 'Scope parameter provided to CAS server is not listed as legal scope: [scope] = '
             . var_export($_GET['scope'], true);
-        SimpleSAML\Logger::debug('casserver:' . $message);
+        SimpleSAML\Logger::debug('casserver:'.$message);
 
         throw new Exception($message);
     }
@@ -100,7 +100,7 @@ 
         $query['language'] = is_string($_GET['language']) ? $_GET['language'] : null;
     }
 
-    $returnUrl = SimpleSAML\Utils\HTTP::getSelfURLNoQuery() . '?' . http_build_query($query);
+    $returnUrl = SimpleSAML\Utils\HTTP::getSelfURLNoQuery().'?'.http_build_query($query);
 
     $params = array(
         'ForceAuthn' => $forceAuthn,