simplesamlphp / simplesamlphp-module-consent

lib/Store.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
         }
 
         if (!is_array($config)) {
-            throw new \Exception('Invalid configuration for consent store option: ' . var_export($config, true));
+            throw new \Exception('Invalid configuration for consent store option: '.var_export($config, true));
         }
 
         if (!array_key_exists(0, $config)) {

www/getconsent.php

Spacing +21 added lines, -21 removed lines

@@ -72,12 +72,12 @@ 
         $attributeSet = $state['consent:store.attributeSet'];
 
         \SimpleSAML\Logger::debug(
-            'Consent - saveConsent() : [' . $userId . '|' . $targetedId . '|' . $attributeSet . ']'
+            'Consent - saveConsent() : ['.$userId.'|'.$targetedId.'|'.$attributeSet.']'
         );
         try {
             $store->saveConsent($userId, $targetedId, $attributeSet);
         } catch (\Exception $e) {
-            \SimpleSAML\Logger::error('Consent: Error writing to storage: ' . $e->getMessage());
+            \SimpleSAML\Logger::error('Consent: Error writing to storage: '.$e->getMessage());
         }
     }
 
@@ -228,38 +228,38 @@ 
 
     $alternate = ['odd', 'even'];
     $i = 0;
-    $summary = 'summary="' . $translator->t('{consent:consent:table_summary}') . '"';
+    $summary = 'summary="'.$translator->t('{consent:consent:table_summary}').'"';
 
     if (strlen($nameParent) > 0) {
-        $parentStr = strtolower($nameParent) . '_';
-        $str = '<table class="attributes" ' . $summary . '>';
+        $parentStr = strtolower($nameParent).'_';
+        $str = '<table class="attributes" '.$summary.'>';
     } else {
         $parentStr = '';
-        $str = '<table id="table_with_attributes" class="attributes" ' . $summary . '>';
-        $str .= "\n" . '<caption>' . $translator->t('{consent:consent:table_caption}') . '</caption>';
+        $str = '<table id="table_with_attributes" class="attributes" '.$summary.'>';
+        $str .= "\n".'<caption>'.$translator->t('{consent:consent:table_caption}').'</caption>';
     }
 
     foreach ($attributes as $name => $value) {
         $nameraw = $name;
-        $name = $translator->getAttributeTranslation($parentStr . $nameraw);
+        $name = $translator->getAttributeTranslation($parentStr.$nameraw);
 
         if (preg_match('/^child_/', $nameraw)) {
             // insert child table
             $parentName = preg_replace('/^child_/', '', $nameraw);
             foreach ($value as $child) {
-                $str .= "\n" . '<tr class="odd"><td class="td_odd">' .
-                    present_attributes($t, $child, $parentName) . '</td></tr>';
+                $str .= "\n".'<tr class="odd"><td class="td_odd">'.
+                    present_attributes($t, $child, $parentName).'</td></tr>';
             }
         } else {
             // insert values directly
 
-            $str .= "\n" . '<tr class="' . $alternate[($i++ % 2)] .
-                '"><td><span class="attrname">' . htmlspecialchars($name) . '</span></td>';
+            $str .= "\n".'<tr class="'.$alternate[($i++ % 2)].
+                '"><td><span class="attrname">'.htmlspecialchars($name).'</span></td>';
 
             $isHidden = in_array($nameraw, $t->data['hiddenAttributes'], true);
             if ($isHidden) {
                 $hiddenId = \SimpleSAML\Utils\Random::generateID();
-                $str .= '<td><span class="attrvalue hidden" id="hidden_' . $hiddenId . '">';
+                $str .= '<td><span class="attrvalue hidden" id="hidden_'.$hiddenId.'">';
             } else {
                 $hiddenId = '';
                 $str .= '<td><span class="attrvalue">';
@@ -270,18 +270,18 @@ 
                 $str .= '<ul>';
                 foreach ($value as $listitem) {
                     if ($nameraw === 'jpegPhoto') {
-                        $str .= '<li><img src="data:image/jpeg;base64,' .
-                            htmlspecialchars($listitem) . '" alt="User photo" /></li>';
+                        $str .= '<li><img src="data:image/jpeg;base64,'.
+                            htmlspecialchars($listitem).'" alt="User photo" /></li>';
                     } else {
-                        $str .= '<li>' . htmlspecialchars($listitem) . '</li>';
+                        $str .= '<li>'.htmlspecialchars($listitem).'</li>';
                     }
                 }
                 $str .= '</ul>';
             } elseif (isset($value[0])) {
                 // we hawe only one value
                 if ($nameraw === 'jpegPhoto') {
-                    $str .= '<img src="data:image/jpeg;base64,' .
-                        htmlspecialchars($value[0]) . '" alt="User photo" />';
+                    $str .= '<img src="data:image/jpeg;base64,'.
+                        htmlspecialchars($value[0]).'" alt="User photo" />';
                 } else {
                     $str .= htmlspecialchars($value[0]);
                 }
@@ -289,10 +289,10 @@ 
             $str .= '</span>';
 
             if ($isHidden) {
-                $str .= '<div class="attrvalue consent_showattribute" id="visible_' . $hiddenId . '">';
+                $str .= '<div class="attrvalue consent_showattribute" id="visible_'.$hiddenId.'">';
                 $str .= '... ';
-                $str .= '<a class="consent_showattributelink" href="javascript:SimpleSAML_show(\'hidden_' . $hiddenId;
-                $str .= '\'); SimpleSAML_hide(\'visible_' . $hiddenId . '\');">';
+                $str .= '<a class="consent_showattributelink" href="javascript:SimpleSAML_show(\'hidden_'.$hiddenId;
+                $str .= '\'); SimpleSAML_hide(\'visible_'.$hiddenId.'\');">';
                 $str .= $translator->t('{consent:consent:show_attribute}');
                 $str .= '</a>';
                 $str .= '</div>';

lib/Consent/Store/Database.php

Spacing +20 added lines, -20 removed lines

@@ -170,8 +170,8 @@ 
     public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool
     {
         $st = $this->execute(
-            'UPDATE ' . $this->table . ' ' .
-            'SET usage_date = ' . $this->dateTime . ' ' .
+            'UPDATE '.$this->table.' '.
+            'SET usage_date = '.$this->dateTime.' '.
             'WHERE hashed_user_id = ? AND service_id = ? AND attribute = ?',
             [$userId, $destinationId, $attributeSet]
         );
@@ -207,8 +207,8 @@ 
     {
         // Check for old consent (with different attribute set)
         $st = $this->execute(
-            'UPDATE ' . $this->table . ' ' .
-            'SET consent_date = ' . $this->dateTime . ', usage_date = ' . $this->dateTime . ', attribute = ? ' .
+            'UPDATE '.$this->table.' '.
+            'SET consent_date = '.$this->dateTime.', usage_date = '.$this->dateTime.', attribute = ? '.
             'WHERE hashed_user_id = ? AND service_id = ?',
             [$attributeSet, $userId, $destinationId]
         );
@@ -225,8 +225,8 @@ 
 
         // Add new consent
         $st = $this->execute(
-            'INSERT INTO ' . $this->table . ' (' . 'consent_date, usage_date, hashed_user_id, service_id, attribute' .
-            ') ' . 'VALUES (' . $this->dateTime . ', ' . $this->dateTime . ', ?, ?, ?)',
+            'INSERT INTO '.$this->table.' ('.'consent_date, usage_date, hashed_user_id, service_id, attribute'.
+            ') '.'VALUES ('.$this->dateTime.', '.$this->dateTime.', ?, ?, ?)',
             [$userId, $destinationId, $attributeSet]
         );
 
@@ -250,7 +250,7 @@ 
     public function deleteConsent(string $userId, string $destinationId): int
     {
         $st = $this->execute(
-            'DELETE FROM ' . $this->table . ' WHERE hashed_user_id = ? AND service_id = ?;',
+            'DELETE FROM '.$this->table.' WHERE hashed_user_id = ? AND service_id = ?;',
             [$userId, $destinationId]
         );
 
@@ -278,7 +278,7 @@ 
     public function deleteAllConsents(string $userId): int
     {
         $st = $this->execute(
-            'DELETE FROM ' . $this->table . ' WHERE hashed_user_id = ?',
+            'DELETE FROM '.$this->table.' WHERE hashed_user_id = ?',
             [$userId]
         );
 
@@ -287,7 +287,7 @@ 
         }
 
         if ($st->rowCount() > 0) {
-            Logger::debug('consent:Database - Deleted (' . $st->rowCount() . ') consent(s) . ');
+            Logger::debug('consent:Database - Deleted ('.$st->rowCount().') consent(s) . ');
             return $st->rowCount();
         }
 
@@ -310,7 +310,7 @@ 
         $ret = [];
 
         $st = $this->execute(
-            'SELECT service_id, attribute, consent_date, usage_date FROM ' . $this->table .
+            'SELECT service_id, attribute, consent_date, usage_date FROM '.$this->table.
             ' WHERE hashed_user_id = ?',
             [$userId]
         );
@@ -349,16 +349,16 @@ 
         $st = $db->prepare($statement);
         if ($st === false) {
             Logger::error(
-                'consent:Database - Error preparing statement \'' .
-                $statement . '\': ' . self::formatError($db->errorInfo())
+                'consent:Database - Error preparing statement \''.
+                $statement.'\': '.self::formatError($db->errorInfo())
             );
             return false;
         }
 
         if ($st->execute($parameters) !== true) {
             Logger::error(
-                'consent:Database - Error executing statement \'' .
-                $statement . '\': ' . self::formatError($st->errorInfo())
+                'consent:Database - Error executing statement \''.
+                $statement.'\': '.self::formatError($st->errorInfo())
             );
             return false;
         }
@@ -382,7 +382,7 @@ 
         $ret = [];
 
         // Get total number of consents
-        $st = $this->execute('SELECT COUNT(*) AS no FROM ' . $this->table, []);
+        $st = $this->execute('SELECT COUNT(*) AS no FROM '.$this->table, []);
 
         if ($st === false) {
             return [];
@@ -394,8 +394,8 @@ 
 
         // Get total number of users that has given consent
         $st = $this->execute(
-            'SELECT COUNT(*) AS no ' .
-            'FROM (SELECT DISTINCT hashed_user_id FROM ' . $this->table . ' ) AS foo',
+            'SELECT COUNT(*) AS no '.
+            'FROM (SELECT DISTINCT hashed_user_id FROM '.$this->table.' ) AS foo',
             []
         );
 
@@ -409,7 +409,7 @@ 
 
         // Get total number of services that has been given consent to
         $st = $this->execute(
-            'SELECT COUNT(*) AS no FROM (SELECT DISTINCT service_id FROM ' . $this->table . ') AS foo',
+            'SELECT COUNT(*) AS no FROM (SELECT DISTINCT service_id FROM '.$this->table.') AS foo',
             []
         );
 
@@ -465,7 +465,7 @@ 
     {
         Assert::greaterThanEq(count($error), 3);
 
-        return $error[0] . ' - ' . $error[2] . ' (' . $error[1] . ')';
+        return $error[0].' - '.$error[2].' ('.$error[1].')';
     }
 
 
@@ -477,7 +477,7 @@ 
     public function selftest(): bool
     {
         $st = $this->execute(
-            'SELECT * FROM ' . $this->table . ' WHERE hashed_user_id = ? AND service_id = ? AND attribute = ?',
+            'SELECT * FROM '.$this->table.' WHERE hashed_user_id = ? AND service_id = ? AND attribute = ?',
             ['test', 'test', 'test']
         );
 

lib/Consent/Store/Cookie.php

Spacing +9 added lines, -9 removed lines

@@ -43,19 +43,19 @@ 
     {
         $cookieName = self::getCookieName($userId, $destinationId);
 
-        $data = $userId . ':' . $attributeSet . ':' . $destinationId;
+        $data = $userId.':'.$attributeSet.':'.$destinationId;
 
-        Logger::debug('Consent cookie - Get [' . $data . ']');
+        Logger::debug('Consent cookie - Get ['.$data.']');
 
         if (!array_key_exists($cookieName, $_COOKIE)) {
             Logger::debug(
-                'Consent cookie - no cookie with name \'' . $cookieName . '\'.'
+                'Consent cookie - no cookie with name \''.$cookieName.'\'.'
             );
             return false;
         }
         if (!is_string($_COOKIE[$cookieName])) {
             Logger::warning(
-                'Value of consent cookie wasn\'t a string. Was: ' .
+                'Value of consent cookie wasn\'t a string. Was: '.
                 var_export($_COOKIE[$cookieName], true)
             );
             return false;
@@ -93,9 +93,9 @@ 
     public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool
     {
         $name = self::getCookieName($userId, $destinationId);
-        $value = $userId . ':' . $attributeSet . ':' . $destinationId;
+        $value = $userId.':'.$attributeSet.':'.$destinationId;
 
-        Logger::debug('Consent cookie - Set [' . $value . ']');
+        Logger::debug('Consent cookie - Set ['.$value.']');
 
         $value = self::sign($value);
         return $this->setConsentCookie($name, $value);
@@ -165,7 +165,7 @@ 
             $tmp = explode(':', $value, 3);
             if (count($tmp) !== 3) {
                 Logger::warning(
-                    'Consent cookie with invalid value: ' . $value
+                    'Consent cookie with invalid value: '.$value
                 );
                 continue;
             }
@@ -196,7 +196,7 @@ 
     {
         $secretSalt = \SimpleSAML\Utils\Config::getSecretSalt();
 
-        return sha1($secretSalt . $data . $secretSalt) . ':' . $data;
+        return sha1($secretSalt.$data.$secretSalt).':'.$data;
     }
 
 
@@ -240,7 +240,7 @@ 
      */
     private static function getCookieName(string $userId, string $destinationId): string
     {
-        return '\SimpleSAML\Module\consent:' . sha1($userId . ':' . $destinationId);
+        return '\SimpleSAML\Module\consent:'.sha1($userId.':'.$destinationId);
     }
 
 

lib/Auth/Process/Consent.php

Spacing +24 added lines, -24 removed lines

@@ -86,8 +86,8 @@ 
         if (array_key_exists('includeValues', $config)) {
             if (!is_bool($config['includeValues'])) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: includeValues must be boolean. ' .
-                    var_export($config['includeValues'], true) . ' given.'
+                    'Consent: includeValues must be boolean. '.
+                    var_export($config['includeValues'], true).' given.'
                 );
             }
             $this->includeValues = $config['includeValues'];
@@ -96,8 +96,8 @@ 
         if (array_key_exists('checked', $config)) {
             if (!is_bool($config['checked'])) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: checked must be boolean. ' .
-                    var_export($config['checked'], true) . ' given.'
+                    'Consent: checked must be boolean. '.
+                    var_export($config['checked'], true).' given.'
                 );
             }
             $this->checked = $config['checked'];
@@ -106,8 +106,8 @@ 
         if (array_key_exists('focus', $config)) {
             if (!in_array($config['focus'], ['yes', 'no'], true)) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: focus must be a string with values `yes` or `no`. ' .
-                    var_export($config['focus'], true) . ' given.'
+                    'Consent: focus must be a string with values `yes` or `no`. '.
+                    var_export($config['focus'], true).' given.'
                 );
             }
             $this->focus = $config['focus'];
@@ -116,8 +116,8 @@ 
         if (array_key_exists('hiddenAttributes', $config)) {
             if (!is_array($config['hiddenAttributes'])) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: hiddenAttributes must be an array. ' .
-                    var_export($config['hiddenAttributes'], true) . ' given.'
+                    'Consent: hiddenAttributes must be an array. '.
+                    var_export($config['hiddenAttributes'], true).' given.'
                 );
             }
             $this->hiddenAttributes = $config['hiddenAttributes'];
@@ -126,8 +126,8 @@ 
         if (array_key_exists('attributes.exclude', $config)) {
             if (!is_array($config['attributes.exclude'])) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: attributes.exclude must be an array. ' .
-                    var_export($config['attributes.exclude'], true) . ' given.'
+                    'Consent: attributes.exclude must be an array. '.
+                    var_export($config['attributes.exclude'], true).' given.'
                 );
             }
             $this->noconsentattributes = $config['attributes.exclude'];
@@ -135,8 +135,8 @@ 
             Logger::warning("The 'noconsentattributes' option has been deprecated in favour of 'attributes.exclude'.");
             if (!is_array($config['noconsentattributes'])) {
                 throw new \SimpleSAML\Error\Exception(
-                    'Consent: noconsentattributes must be an array. ' .
-                    var_export($config['noconsentattributes'], true) . ' given.'
+                    'Consent: noconsentattributes must be an array. '.
+                    var_export($config['noconsentattributes'], true).' given.'
                 );
             }
             $this->noconsentattributes = $config['noconsentattributes'];
@@ -147,7 +147,7 @@ 
                 $this->store = \SimpleSAML\Module\consent\Store::parseStoreConfig($config['store']);
             } catch (\Exception $e) {
                 Logger::error(
-                    'Consent: Could not create consent storage: ' .
+                    'Consent: Could not create consent storage: '.
                     $e->getMessage()
                 );
             }
@@ -264,7 +264,7 @@ 
             isset($state['Source']['consent.disable']) &&
             self::checkDisable($state['Source']['consent.disable'], $spEntityId)
         ) {
-            Logger::debug('Consent: Consent disabled for entity ' . $spEntityId . ' with IdP ' . $idpEntityId);
+            Logger::debug('Consent: Consent disabled for entity '.$spEntityId.' with IdP '.$idpEntityId);
             Stats::log('consent:disabled', $statsData);
             return;
         }
@@ -272,14 +272,14 @@ 
             isset($state['Destination']['consent.disable']) &&
             self::checkDisable($state['Destination']['consent.disable'], $idpEntityId)
         ) {
-            Logger::debug('Consent: Consent disabled for entity ' . $spEntityId . ' with IdP ' . $idpEntityId);
+            Logger::debug('Consent: Consent disabled for entity '.$spEntityId.' with IdP '.$idpEntityId);
             Stats::log('consent:disabled', $statsData);
             return;
         }
 
         if ($this->store !== null) {
-            $source = $state['Source']['metadata-set'] . '|' . $idpEntityId;
-            $destination = $state['Destination']['metadata-set'] . '|' . $spEntityId;
+            $source = $state['Source']['metadata-set'].'|'.$idpEntityId;
+            $destination = $state['Destination']['metadata-set'].'|'.$spEntityId;
             $attributes = $state['Attributes'];
 
             // Remove attributes that do not require consent
@@ -289,16 +289,16 @@ 
                 }
             }
 
-            Logger::debug('Consent: userid: ' . $state['UserID']);
-            Logger::debug('Consent: source: ' . $source);
-            Logger::debug('Consent: destination: ' . $destination);
+            Logger::debug('Consent: userid: '.$state['UserID']);
+            Logger::debug('Consent: source: '.$source);
+            Logger::debug('Consent: destination: '.$destination);
 
             $userId = self::getHashedUserID($state['UserID'], $source);
             $targetedId = self::getTargetedID($state['UserID'], $source, $destination);
             $attributeSet = self::getAttributeHash($attributes, $this->includeValues);
 
             Logger::debug(
-                'Consent: hasConsent() [' . $userId . '|' . $targetedId . '|' . $attributeSet . ']'
+                'Consent: hasConsent() ['.$userId.'|'.$targetedId.'|'.$attributeSet.']'
             );
 
             try {
@@ -317,7 +317,7 @@ 
                 $state['consent:store.destination'] = $targetedId;
                 $state['consent:store.attributeSet'] = $attributeSet;
             } catch (\Exception $e) {
-                Logger::error('Consent: Error reading from storage: ' . $e->getMessage());
+                Logger::error('Consent: Error reading from storage: '.$e->getMessage());
                 Logger::stats('Consent failed');
                 Stats::log('consent:failed', $statsData);
             }
@@ -358,7 +358,7 @@ 
      */
     public static function getHashedUserID(string $userid, string $source): string
     {
-        return hash('sha1', $userid . '|' . Utils\Config::getSecretSalt() . '|' . $source);
+        return hash('sha1', $userid.'|'.Utils\Config::getSecretSalt().'|'.$source);
     }
 
 
@@ -373,7 +373,7 @@ 
      */
     public static function getTargetedID(string $userid, string $source, string $destination): string
     {
-        return hash('sha1', $userid . '|' . Utils\Config::getSecretSalt() . '|' . $source . '|' . $destination);
+        return hash('sha1', $userid.'|'.Utils\Config::getSecretSalt().'|'.$source.'|'.$destination);
     }