GEANT / CAT

web/lib/admin/http/AddUserCommand.php

Spacing +5 added lines, -5 removed lines

@@ -23,7 +23,7 @@ 
      * @param string $commandToken
      * @param SilverbulletContext $context
      */
-    public function __construct($commandToken, $context){
+    public function __construct($commandToken, $context) {
         parent::__construct($commandToken, $context);
         $this->context = $context;
     }
@@ -33,15 +33,15 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\http\AbstractCommand::execute()
      */
-    public function execute(){
-        if(isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])){
+    public function execute() {
+        if (isset($_POST[self::PARAM_NAME]) && isset($_POST[self::PARAM_EXPIRY])) {
             $name = $this->parseString(filter_input(INPUT_POST, self::PARAM_NAME, FILTER_SANITIZE_STRING));
             $expiry = $this->parseString($_POST[self::PARAM_EXPIRY]);
             $user = $this->context->createUser($name, $expiry, $this);
-            if(!empty($user->getIdentifier())){
+            if (!empty($user->getIdentifier())) {
                 $this->storeInfoMessage(_('User was added successfully!'));
             }
-        }else{
+        } else {
             $this->storeErrorMessage(_('User name or expiry parameters are missing!'));
         }
     }

core/common/Language.php

Spacing +2 added lines, -2 removed lines

@@ -84,14 +84,14 @@
             $langConverted[] = $hardSetLang;
         }
         if (!empty($_REQUEST['lang'])) {
-            $recoverLang = filter_input(INPUT_GET,'lang', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
+            $recoverLang = filter_input(INPUT_GET, 'lang', FILTER_SANITIZE_STRING) ?? filter_input(INPUT_POST, 'lang', FILTER_SANITIZE_STRING);
             $langConverted[] = $recoverLang;
         }
         if (!empty($_SESSION['language'])) {
             $langConverted[] = $_SESSION['language'];
         }
         if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $langs = explode(",", filter_input(INPUT_SERVER,"HTTP_ACCEPT_LANGUAGE", FILTER_SANITIZE_STRING));
+            $langs = explode(",", filter_input(INPUT_SERVER, "HTTP_ACCEPT_LANGUAGE", FILTER_SANITIZE_STRING));
             foreach ($langs as $lang) {
                 $result = [];
                 preg_match("/(.*);+.*/", $lang, $result);

web/accountstatus/accountstatus.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 $cleanToken = FALSE;
 $tokenStatus = ["status" => \core\ProfileSilverbullet::SB_TOKENSTATUS_INVALID,
-    "cert_status" => [],];
+    "cert_status" => [], ];
 $profile = NULL;
 $idp = NULL;
 $fed = NULL;
@@ -38,7 +38,7 @@ 
         // it can be VALID (exists and not redeemed, EXPIRED, REDEEMED or INVALID (non existent)
         $tokenStatus = \core\ProfileSilverbullet::tokenStatus($cleanToken);
     }
-} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0']) ) {
+} elseif (isset($_SERVER['SSL_CLIENT_SAN_Email']) || isset($_SERVER['SSL_CLIENT_SAN_Email_0'])) {
     // maybe the user authenticated with his client cert? Then pick any of his
     // tokens to go on
     $certname = $_SERVER['SSL_CLIENT_SAN_Email'] ?? $_SERVER['SSL_CLIENT_SAN_Email_0'];

core/IdP.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
         $this->entityOptionTable = "institution_option";
         $this->entityIdColumn = "institution_id";
         if (!is_numeric($instId)) {
-            throw new Exception("An ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_inst']." is identified by an integer index!");
+            throw new Exception("An " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_inst'] . " is identified by an integer index!");
         }
         $this->identifier = (int) $instId;
 
@@ -317,7 +317,7 @@ 
             $alreadyUsed = $this->databaseHandle->exec("SELECT DISTINCT external_db_id FROM institution WHERE external_db_id = ? AND external_db_syncstate = ?", "si", $identifier, $syncState);
 
             if (mysqli_num_rows($alreadyUsed) == 0) {
-                $this->databaseHandle->exec("UPDATE institution SET external_db_id = ?, external_db_syncstate = ? WHERE inst_id = ?", "sii", $identifier, $syncState, $this->identifier );
+                $this->databaseHandle->exec("UPDATE institution SET external_db_id = ?, external_db_syncstate = ? WHERE inst_id = ?", "sii", $identifier, $syncState, $this->identifier);
             }
         }
     }

core/DBConnection.php

Spacing +3 added lines, -3 removed lines

@@ -94,7 +94,7 @@ 
             }
             $prepResult = $statementObject->prepare($querystring);
             if ($prepResult === FALSE) {
-                throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> ". $statementObject->error ." <--.");
+                throw new Exception("DB: Unable to prepare statement! Statement was --> $querystring <--, error was --> " . $statementObject->error . " <--.");
             }
 
             // we have a variable number of arguments packed into the ... array
@@ -106,11 +106,11 @@ 
             array_unshift($localArray, $types);
             $retval = call_user_func_array([$statementObject, "bind_param"], $localArray);
             if ($retval === FALSE) {
-                throw new Exception("DB: Unuable to bind parameters to prepared statement! Argument array was --> ". var_export($localArray, TRUE) ." <--. Error was --> ". $statementObject->error ." <--");
+                throw new Exception("DB: Unuable to bind parameters to prepared statement! Argument array was --> " . var_export($localArray, TRUE) . " <--. Error was --> " . $statementObject->error . " <--");
             }
             $result = $statementObject->execute();
             if ($result === FALSE) {
-                throw new Exception("DB: Unuable to execute prepared statement! Error was --> ". $statementObject->error ." <--");
+                throw new Exception("DB: Unuable to execute prepared statement! Error was --> " . $statementObject->error . " <--");
             }
             $selectResult = $statementObject->get_result();
             if ($selectResult !== FALSE) {

tests/unit/web/lib/admin/domain/SilverbulletControllerTest.php

Spacing +12 added lines, -12 removed lines

@@ -15,24 +15,24 @@ 
 use web\lib\admin\http\SilverbulletContext;
 use web\lib\admin\domain\SilverbulletInvitation;
 
-if ( !isset( $_SESSION ) ) $_SESSION = array();
+if (!isset($_SESSION)) $_SESSION = array();
 
-class MockInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockInstitutionPageBuilder extends InstitutionPageBuilder {
     
     private $profile;
     
-    public function __construct($profile){
+    public function __construct($profile) {
         parent::__construct(new DefaultHtmlPage("Test Page"));
         $this->profile = $profile; 
     }
     
-    public function getProfile(){
+    public function getProfile() {
         return $this->profile;
     }
     
 }
 
-class SilverbulletControllerTest extends PHPUnit_Framework_TestCase{
+class SilverbulletControllerTest extends PHPUnit_Framework_TestCase {
     
     private $username = 'testusername';
     
@@ -44,7 +44,7 @@ 
     
     private $factory;
     
-    protected function setUp(){
+    protected function setUp() {
         $this->databaseHandle = \core\DBConnection::handle('INST');
         
         $this->profile = new MockProfileSilverbullet($this->databaseHandle);
@@ -64,7 +64,7 @@ 
         $usersAfter = count(SilverbulletUser::getList($this->profile->identifier));
         $this->assertFalse($usersAfter > $usersBefore);
         
-        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d',strtotime("tomorrow"));
+        $_POST[AddUserCommand::PARAM_EXPIRY] = date('Y-m-d', strtotime("tomorrow"));
         $this->factory->parseRequest();
 
         // Is not going to work since the $_POST variables can't be modified at runtime for filter_input function
@@ -73,10 +73,10 @@ 
         
     }
 
-    private function countActiveUsers($users){
+    private function countActiveUsers($users) {
         $count = 0;
         foreach ($users as $user) {
-            if(!$user->isDeactivated()){
+            if (!$user->isDeactivated()) {
                 $count++;
             }
         }
@@ -154,7 +154,7 @@ 
     public function testRevokeGeneratedCertificate() {
         $serial = '29837498273948';
         $cn = 'testCommonName';
-        $expiry = date('Y-m-d',strtotime("tomorrow"));
+        $expiry = date('Y-m-d', strtotime("tomorrow"));
         
         $this->user->save();
 
@@ -181,9 +181,9 @@ 
         
     }
     
-    protected function tearDown(){
+    protected function tearDown() {
         $this->user->delete();
-        $this->databaseHandle->exec("DELETE FROM `".SilverbulletUser::TABLE."` WHERE `".SilverbulletUser::USERNAME."`='".$this->username."'");
+        $this->databaseHandle->exec("DELETE FROM `" . SilverbulletUser::TABLE . "` WHERE `" . SilverbulletUser::USERNAME . "`='" . $this->username . "'");
         $this->profile->delete();
     }
 }

tests/unit/web/lib/admin/http/ValidateEmailAddressTest.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 use web\lib\admin\http\DefaultContext;
 use web\lib\admin\http\ValidateEmailAddress;
 
-class ValidateEmailAddressTest extends PHPUnit_Framework_TestCase{
+class ValidateEmailAddressTest extends PHPUnit_Framework_TestCase {
 
     /**
      *
@@ -24,7 +24,7 @@ 
         $this->command = new ValidateEmailAddress(ValidateEmailAddress::COMMAND, new DefaultContext($this->page));
     }
 
-    public function testExecute(){
+    public function testExecute() {
 
         $this->command->execute();
         $response = $this->page->getResponse();
@@ -36,7 +36,7 @@ 
 
         $this->command->execute();
         $renderedResponse = $response->__toString();
-        $this->assertTrue(strpos($renderedResponse, '<email')!==false);
+        $this->assertTrue(strpos($renderedResponse, '<email') !== false);
         // Is not going to work since the $_POST variables can't be modified at runtime for filter_input function
         //$this->assertTrue(strpos($renderedResponse, 'address="'.$_POST[ValidateEmailAddress::PARAM_ADDRESS].'"')!==false);
         $this->assertFalse(strpos($renderedResponse, 'isValid="true"'));

web/lib/admin/domain/SilverbulletInvitation.php

Spacing +12 added lines, -12 removed lines

@@ -82,7 +82,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
             !empty($this->get(self::PROFILEID)) &&
             !empty($this->get(self::SILVERBULLETUSERID))
@@ -109,7 +109,7 @@ 
      * 
      * @param int $quantity
      */
-    public function setQuantity($quantity){
+    public function setQuantity($quantity) {
         $this->set(self::QUANTITY, $quantity);
     }
 
@@ -117,7 +117,7 @@ 
      *
      * @return string
      */
-    public function getRemainingActivations(){
+    public function getRemainingActivations() {
         return sprintf(_("%s of %s"), count($this->certificates), $this->get(self::QUANTITY));
     }
     
@@ -125,12 +125,12 @@ 
      * 
      * @return boolean
      */
-    public function isRevoked(){
+    public function isRevoked() {
         $quantity = $this->get(self::QUANTITY);
         return $quantity <= 0;
     }
     
-    public function isAbsent(){
+    public function isAbsent() {
         $quantity = $this->get(self::QUANTITY);
         return count($this->certificates) >= $quantity;
     }
@@ -162,7 +162,7 @@ 
             }
             $link .= $_SERVER['SERVER_NAME'];
             $relPath = dirname(dirname($_SERVER['SCRIPT_NAME']));
-            if ($relPath[strlen($relPath) -1] == '/') {
+            if ($relPath[strlen($relPath) - 1] == '/') {
                 $relPath = substr($relPath, 0, strlen($relPath) - 1);
             }
             $link = $link . $relPath;
@@ -170,11 +170,11 @@ 
             $link = $host;
         }
         
-        if ($this->isRevoked()){
+        if ($this->isRevoked()) {
             $link = _('This token has been revoked!');
-        }else if($this->isAbsent()){
+        } else if ($this->isAbsent()) {
             $link = _('All available activations were used!');
-        }else if ($this->isExpired()) {
+        } else if ($this->isExpired()) {
             $link = _('User did not consume the token and it expired!');
         } else {
             $link .= '/accountstatus/accountstatus.php?token=' . $this->get(self::TOKEN);
@@ -234,7 +234,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate[]
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
     
@@ -243,7 +243,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentEntity::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load($searchAttribute);
         $this->certificates = SilverbulletCertificate::getList(null, new Attribute(SilverbulletCertificate::SILVERBULLETINVITATIONID, $this->getIdentifier(), Attribute::TYPE_INTEGER));
         return $state;
@@ -276,7 +276,7 @@ 
             $attrValue = $searchAttribute->value;
             $query = sprintf("SELECT * FROM `%s` WHERE `%s`=? AND `%s`=? ORDER BY `%s` DESC", self::TABLE, self::SILVERBULLETUSERID, $searchAttribute->key, self::EXPIRY);
             $result = $databaseHandle->exec($query, $userType . $attrType, $userValue, $attrValue);
-        } else if($silverbulletUser != null) {
+        } else if ($silverbulletUser != null) {
             $userId = $silverbulletUser->getAttribute(self::ID);
             $userType = $userId->getType();
             $userValue = $userId->value;

web/lib/admin/domain/PersistentEntity.php

Spacing +28 added lines, -28 removed lines

@@ -56,7 +56,7 @@ 
      * @param string $table
      * @param string $databaseType
      */
-    public function __construct($table, $databaseType = 'INST'){
+    public function __construct($table, $databaseType = 'INST') {
         $this->table = $table;
         $this->setAttributeType(self::ID, Attribute::TYPE_INTEGER);
         $this->databaseHandle = \core\DBConnection::handle($databaseType);
@@ -67,7 +67,7 @@ 
      * @param string $key
      * @param string $type
      */
-    protected function setAttributeType($key, $type){
+    protected function setAttributeType($key, $type) {
         $this->types[$key] = $type; 
     }
     
@@ -76,7 +76,7 @@ 
      * @param string $key
      * @return string
      */
-    protected function getAttributeType($key){
+    protected function getAttributeType($key) {
         return isset($this->types[$key]) ? $this->types[$key] : Attribute::TYPE_STRING;
     }
     
@@ -86,7 +86,7 @@ 
      * @param string $key
      * @return string
      */
-    public function get($key){
+    public function get($key) {
         return isset($this->row[$key]) ? $this->row[$key]->value : "";
     }
     
@@ -95,7 +95,7 @@ 
      * @param string $key
      * @return NULL|\web\lib\admin\domain\Attribute
      */
-    public function getAttribute($key){
+    public function getAttribute($key) {
         return isset($this->row[$key]) ? $this->row[$key] : new Attribute('', '');
     }
     
@@ -105,7 +105,7 @@ 
      * @param string $key
      * @param mixed $value
      */
-    protected function set($key, $value){
+    protected function set($key, $value) {
         $attribute = new Attribute($key, $value, $this->getAttributeType($key));
         $this->row[$key] = $attribute;
     }
@@ -114,9 +114,9 @@ 
      * 
      * @param array $row
      */
-    public function setRow($row){
+    public function setRow($row) {
         $this->clear();
-        foreach ($row as $key => $value){
+        foreach ($row as $key => $value) {
             $this->set($key, $value);
         }
     }
@@ -124,7 +124,7 @@ 
     /**
      * 
      */
-    public function clear(){
+    public function clear() {
         $this->row = array();
     }
     
@@ -132,7 +132,7 @@ 
      * 
      * @return string
      */
-    public function getIdentifier(){
+    public function getIdentifier() {
         return $this->get(self::ID);
     }
     
@@ -141,12 +141,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::save()
      */
-    public function save(){
+    public function save() {
         $result = false;
-        if(count($this->row) > 0){
-            if(isset($this->row[self::ID])){
+        if (count($this->row) > 0) {
+            if (isset($this->row[self::ID])) {
                 $result = $this->executeUpdateQuery();
-            }else{
+            } else {
                 $result = $this->executeInsertQuery();
             }
         }
@@ -157,7 +157,7 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeInsertQuery(){
+    private function executeInsertQuery() {
         $result = false;
         $query = sprintf("INSERT INTO `%s`", $this->table);
         $keyString = "(";
@@ -165,8 +165,8 @@ 
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if($keyString != "(") $keyString .= " ,";
-            if($valueString != "(") $valueString .= " ,";
+            if ($keyString != "(") $keyString .= " ,";
+            if ($valueString != "(") $valueString .= " ,";
             $keyString .= "`" . $key . "`";
             $valueString .= "?";
             $types .= $attribute->getType();
@@ -175,10 +175,10 @@ 
         $keyString .= ")";
         $valueString .= ")";
         $isValid = $this->validate();
-        if($isValid && $keyString != "()"){
-            $query .= " " .$keyString . " VALUES " . $valueString;
+        if ($isValid && $keyString != "()") {
+            $query .= " " . $keyString . " VALUES " . $valueString;
             $result = $this->databaseHandle->exec($query, $types, ...$arguments);
-            if($result){
+            if ($result) {
                 $this->set(self::ID, $this->databaseHandle->lastID());
             }
         }
@@ -189,21 +189,21 @@ 
      * 
      * @return boolean|mixed
      */
-    private function executeUpdateQuery(){
+    private function executeUpdateQuery() {
         $result = false;
         $query = sprintf("UPDATE `%s`", $this->table);
         $updateString = "";
         $types = '';
         $arguments = array();
         foreach ($this->row as $key => $attribute) {
-            if(!empty($updateString)) $updateString .= " ,";
-            else $updateString .=" SET ";
+            if (!empty($updateString)) $updateString .= " ,";
+            else $updateString .= " SET ";
             $updateString .= "`" . $key . "`=?";
             $types .= $attribute->getType();
             $arguments [] = $attribute->value;
         }
-        if(!empty($updateString)){
-            $query .= " " .$updateString . " WHERE `" .self::ID. "`=?";
+        if (!empty($updateString)) {
+            $query .= " " . $updateString . " WHERE `" . self::ID . "`=?";
             $id = $this->getAttribute(self::ID);
             $types .= $id->getType();
             $arguments [] = $id->value;
@@ -216,13 +216,13 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = false;
         $id = $this->getAttribute(self::ID);
         $query = sprintf("SELECT * FROM `%s` WHERE `%s` =?", $this->table, self::ID);
         $value = $id->value;
         $result = $this->databaseHandle->exec($query, $id->getType(), $value);
-        if(mysqli_num_rows($result)>0){
+        if (mysqli_num_rows($result) > 0) {
             $this->setRow(mysqli_fetch_assoc($result));
             $state = true;
         }
@@ -234,7 +234,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $id = $this->getAttribute(self::ID);
         $query = sprintf("DELETE FROM `%s` WHERE `%s`=?", $this->table, self::ID);
         $type = $id->getType();