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

lib/Cas/Ticket/MemCacheTicketStore.php

Spacing +1 added lines, -1 removed lines

@@ -70,6 +70,6 @@
      */
     private function scopeTicketId($ticketId)
     {
-        return $this->prefix . '.' . $ticketId;
+        return $this->prefix.'.'.$ticketId;
     }
 }

lib/Cas/Ticket/FileSystemTicketStore.php

Spacing +5 added lines, -5 removed lines

@@ -36,11 +36,11 @@ 
         $path = $config->resolvePath($storeConfig['directory']);
 
         if (!is_dir($path)) {
-            throw new Exception('Directory for CAS Server ticket storage [' . $path . '] does not exists. ');
+            throw new Exception('Directory for CAS Server ticket storage ['.$path.'] does not exists. ');
         }
 
         if (!is_writable($path)) {
-            throw new Exception('Directory for CAS Server ticket storage [' . $path . '] is not writable. ');
+            throw new Exception('Directory for CAS Server ticket storage ['.$path.'] is not writable. ');
         }
 
         $this->pathToTicketDirectory = preg_replace('/\/$/', '', $path);
@@ -52,7 +52,7 @@ 
      */
     public function getTicket($ticketId)
     {
-        $filename = $this->pathToTicketDirectory . '/' . $ticketId;
+        $filename = $this->pathToTicketDirectory.'/'.$ticketId;
 
         if (file_exists($filename)) {
             $content = file_get_contents($filename);
@@ -65,7 +65,7 @@ 
 
     public function addTicket(array $ticket)
     {
-        $filename = $this->pathToTicketDirectory . '/' . $ticket['id'];
+        $filename = $this->pathToTicketDirectory.'/'.$ticket['id'];
         file_put_contents($filename, serialize($ticket));
     }
 
@@ -74,7 +74,7 @@ 
      */
     public function deleteTicket($ticketId)
     {
-        $filename = $this->pathToTicketDirectory . '/' . $ticketId;
+        $filename = $this->pathToTicketDirectory.'/'.$ticketId;
 
         if (file_exists($filename)) {
             unlink($filename);

lib/Cas/Protocol/Cas10.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function getValidateSuccessResponse($username)
     {
-        return "yes\n" . $username . "\n";
+        return "yes\n".$username."\n";
     }
 
     public function getValidateFailureResponse()

lib/Cas/Protocol/Cas20.php

Spacing +2 added lines, -2 removed lines

@@ -174,7 +174,7 @@ 
     private function workAroundForBuggyJasigXmlParser($xmlString)
     {
         // when will people stop hand coding xml handling....?
-        return str_replace('><', '>' . PHP_EOL . '<', str_replace(PHP_EOL, '', $xmlString));
+        return str_replace('><', '>'.PHP_EOL.'<', str_replace(PHP_EOL, '', $xmlString));
     }
 
     private function generateCas20Attribute($xmlDocument, $attributeName, $attributeValue)
@@ -182,7 +182,7 @@ 
         $attributeValueNode = $xmlDocument->createTextNode($this->base64EncodeAttributes ?
             base64_encode($attributeValue) : $attributeValue);
 
-        $attributeElement = $xmlDocument->createElement('cas:' . $attributeName);
+        $attributeElement = $xmlDocument->createElement('cas:'.$attributeName);
 
         $attributeElement->appendChild($attributeValueNode);
 

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');