NatLibFi / Skosmos

controller/Controller.php

Indentation +37 added lines, -37 removed lines

@@ -46,45 +46,45 @@
             $this->languages[$langcode]['lemma'] = Punic\Language::getName($langcode, $langcode);
         }
 
-		// Check if we have an authentication provider configured
-		// If so; check if the configured provider is actually a class we can use
-		if ( ( $authProvider = $this->model->getConfig()->getAuthenticationProvider() ) && class_exists( $authProvider ) ) {
-			$this->invokeAuthenticationLayer( new $authProvider($this) );
-		}
+    // Check if we have an authentication provider configured
+    // If so; check if the configured provider is actually a class we can use
+    if ( ( $authProvider = $this->model->getConfig()->getAuthenticationProvider() ) && class_exists( $authProvider ) ) {
+      $this->invokeAuthenticationLayer( new $authProvider($this) );
+    }
     }
 
-	/**
-	 * Invokes the authentication layer
-	 *
-	 * @param BaseAuthInterface $provider
-	 * @return void
-	 */
-	private function invokeAuthenticationLayer( BaseAuthInterface $authProvider ) {
-
-		// Validate the authentication provider's configuration parameters
-		if ( $authProvider->validate() ) {
-
-			// We don't have a valid user session; so sign in the user
-			if ( !$authProvider->isSignedIn() ) {
-				$authProvider->signIn();
-
-			// We have a valid session for this user; see if it wants to do anything..
-			} else if ( isset ( $_GET[ 'auth_do' ] ) ) {
-				$action = $_GET[ 'auth_do' ];
-
-				// Signout
-				if ( $action === 'signout' ) {
-					$authProvider->signOut();
-
-				// Retrieve user info
-				} else if ( $action === 'info' ) {
-					echo json_encode( $authProvider->getUserAttributes() );
-					$this->sendHeader('Content-Type: application/json' );
-					exit();
-				}
-			}
-		}
-	}
+  /**
+   * Invokes the authentication layer
+   *
+   * @param BaseAuthInterface $provider
+   * @return void
+   */
+  private function invokeAuthenticationLayer( BaseAuthInterface $authProvider ) {
+
+    // Validate the authentication provider's configuration parameters
+    if ( $authProvider->validate() ) {
+
+      // We don't have a valid user session; so sign in the user
+      if ( !$authProvider->isSignedIn() ) {
+        $authProvider->signIn();
+
+      // We have a valid session for this user; see if it wants to do anything..
+      } else if ( isset ( $_GET[ 'auth_do' ] ) ) {
+        $action = $_GET[ 'auth_do' ];
+
+        // Signout
+        if ( $action === 'signout' ) {
+          $authProvider->signOut();
+
+        // Retrieve user info
+        } else if ( $action === 'info' ) {
+          echo json_encode( $authProvider->getUserAttributes() );
+          $this->sendHeader('Content-Type: application/json' );
+          exit();
+        }
+      }
+    }
+  }
 
     /**
      * Sets the locale language properties from the parameter (used by gettext and some Model classes).

Spacing +16 added lines, -16 removed lines

@@ -48,8 +48,8 @@ 
 
 		// Check if we have an authentication provider configured
 		// If so; check if the configured provider is actually a class we can use
-		if ( ( $authProvider = $this->model->getConfig()->getAuthenticationProvider() ) && class_exists( $authProvider ) ) {
-			$this->invokeAuthenticationLayer( new $authProvider($this) );
+		if (($authProvider = $this->model->getConfig()->getAuthenticationProvider()) && class_exists($authProvider)) {
+			$this->invokeAuthenticationLayer(new $authProvider($this));
 		}
     }
 
@@ -59,27 +59,27 @@ 
 	 * @param BaseAuthInterface $provider
 	 * @return void
 	 */
-	private function invokeAuthenticationLayer( BaseAuthInterface $authProvider ) {
+	private function invokeAuthenticationLayer(BaseAuthInterface $authProvider) {
 
 		// Validate the authentication provider's configuration parameters
-		if ( $authProvider->validate() ) {
+		if ($authProvider->validate()) {
 
 			// We don't have a valid user session; so sign in the user
-			if ( !$authProvider->isSignedIn() ) {
+			if (!$authProvider->isSignedIn()) {
 				$authProvider->signIn();
 
 			// We have a valid session for this user; see if it wants to do anything..
-			} else if ( isset ( $_GET[ 'auth_do' ] ) ) {
-				$action = $_GET[ 'auth_do' ];
+			} else if (isset ($_GET['auth_do'])) {
+				$action = $_GET['auth_do'];
 
 				// Signout
-				if ( $action === 'signout' ) {
+				if ($action === 'signout') {
 					$authProvider->signOut();
 
 				// Retrieve user info
-				} else if ( $action === 'info' ) {
-					echo json_encode( $authProvider->getUserAttributes() );
-					$this->sendHeader('Content-Type: application/json' );
+				} else if ($action === 'info') {
+					echo json_encode($authProvider->getUserAttributes());
+					$this->sendHeader('Content-Type: application/json');
 					exit();
 				}
 			}
@@ -195,18 +195,18 @@ 
         $localname = $vocab->getLocalName($uri);
         if ($localname !== $uri && $localname === urlencode($localname)) {
             // check that the prefix stripping worked, and there are no problematic chars in localname
-            $paramstr = count($params) > 0 ? '?' . http_build_query($params) : '';
+            $paramstr = count($params) > 0 ? '?'.http_build_query($params) : '';
             if ($type && $type !== '' && $type !== 'vocab' && !($localname === '' && $type === 'page')) {
-                return "$vocid/$lang/$type/$localname" . $paramstr;
+                return "$vocid/$lang/$type/$localname".$paramstr;
             }
 
-            return "$vocid/$lang/$localname" . $paramstr;
+            return "$vocid/$lang/$localname".$paramstr;
         }
 
         // case 2: URI outside vocabulary namespace, or has problematic chars
         // pass the full URI as parameter instead
         $params['uri'] = $uri;
-        return "$vocid/$lang/$type/?" . http_build_query($params);
+        return "$vocid/$lang/$type/?".http_build_query($params);
     }
 
     /**
@@ -332,7 +332,7 @@ 
     {
         if ($modifiedDate) {
             $ifModifiedSince = $this->getIfModifiedSince();
-            $this->sendHeader("Last-Modified: " . $modifiedDate->format('D, d M Y H:i:s \G\M\T'));
+            $this->sendHeader("Last-Modified: ".$modifiedDate->format('D, d M Y H:i:s \G\M\T'));
             if ($ifModifiedSince !== null && $ifModifiedSince >= $modifiedDate) {
                 $this->sendHeader("HTTP/1.0 304 Not Modified");
                 return true;

controller/Auth/BaseAuthInterface.php

Indentation +39 added lines, -39 removed lines

@@ -2,45 +2,45 @@
 
 interface BaseAuthInterface {
 
-	public function __construct( Controller $controller );
-
-	/**
-	 * Validate if all requirements are met to load this
-	 * authentication method. This function is useful for
-	 * validating configuration options inside Config.ttl.
-	 *
-	 * @return bool
-	 */
-	public function validate() :bool;
-
-	/**
-	 * Checks if the current user has a valid session on the
-	 * authorization endpoint.
-	 *
-	 * @return bool
-	 */
-	public function isSignedIn() : bool;
-
-	/**
-	 * Signs in the current user
-	 *
-	 * @return mixed
-	 */
-	public function signIn();
-
-	/**
-	 * Signs out the user
-	 *
-	 * @return mixed
-	 */
-	public function signOut();
-
-	/**
-	 * Retrieve the user's attributes
-	 *
-	 * @return array
-	 */
-	public function getUserAttributes() : array;
+  public function __construct( Controller $controller );
+
+  /**
+   * Validate if all requirements are met to load this
+   * authentication method. This function is useful for
+   * validating configuration options inside Config.ttl.
+   *
+   * @return bool
+   */
+  public function validate() :bool;
+
+  /**
+   * Checks if the current user has a valid session on the
+   * authorization endpoint.
+   *
+   * @return bool
+   */
+  public function isSignedIn() : bool;
+
+  /**
+   * Signs in the current user
+   *
+   * @return mixed
+   */
+  public function signIn();
+
+  /**
+   * Signs out the user
+   *
+   * @return mixed
+   */
+  public function signOut();
+
+  /**
+   * Retrieve the user's attributes
+   *
+   * @return array
+   */
+  public function getUserAttributes() : array;
 
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 interface BaseAuthInterface {
 
-	public function __construct( Controller $controller );
+	public function __construct(Controller $controller);
 
 	/**
 	 * Validate if all requirements are met to load this

controller/Auth/SimpleSamlPHP/SimpleSamlPHP.php

Indentation +104 added lines, -104 removed lines

@@ -10,109 +10,109 @@
  */
 class SimpleSamlPHP implements BaseAuthInterface {
 
-	/**
-	 * @var Model
-	 */
-	private $model;
-
-	/**
-	 * Placeholder of the SimpleSamlPHP authentication entity.
-	 *
-	 * @var string|null
-	 */
-	private $authEntity;
-
-	/**
-	 * The configured application URL
-	 *
-	 * @var string
-	 */
-	private $baseHref;
-
-	/**
-	 * @param Model $model
-	 */
-	public function __construct( Controller $controller ) {
-		$this->model = $controller->model;
-		$this->baseHref = $controller->getBaseHref();
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function validate(): bool {
-		$authDirectory = $this->model->getConfig()->getLiteral( 'skosmos:authProviderIncludeDirectory' );
-		if ( !$authDirectory ) {
-			return false;
-		}
-
-		$authEntity = $this->model->getConfig()->getLiteral( 'skosmos:authProviderAuthEntity' );
-		if ( !$authEntity ) {
-			return false;
-		} else {
-			$this->authEntity = $authEntity;
-		}
-
-		$sspAutoloader = $authDirectory . DIRECTORY_SEPARATOR . 'lib/_autoload.php';
-		if ( !file_exists( $sspAutoloader ) ) {
-			return false;
-		} else {
-			require $sspAutoloader;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function isSignedIn(): bool {
-		return $this->getSessionFromRequest()->isValid( $this->authEntity );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function signIn() {
-		$this->getAuthenticationSource()->requireAuth( [
-			'ReturnTo' => $this->baseHref
-		] );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function signOut() {
-		$this->getAuthenticationSource()->logout( [
-			'ReturnTo' => $this->baseHref
-		] );
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getUserAttributes(): array {
-		if ( $this->isSignedIn() ) {
-			return [];
-		}
-		return [
-			'auth_source' => $this->authEntity,
-			'attributes' => $this->getAuthenticationSource()->getAttributes()
-		];
-	}
-
-	/**
-	 * @return \SimpleSAML\Auth\Simple
-	 */
-	private function getAuthenticationSource( ) {
-		return new SimpleSAML\Auth\Simple( $this->authEntity );
-	}
-
-	/**
-	 * @return SimpleSAML\Session::getSessionFromRequest()
-	 */
-	private function getSessionFromRequest() {
-		return SimpleSAML\Session::getSessionFromRequest();
-	}
+  /**
+   * @var Model
+   */
+  private $model;
+
+  /**
+   * Placeholder of the SimpleSamlPHP authentication entity.
+   *
+   * @var string|null
+   */
+  private $authEntity;
+
+  /**
+   * The configured application URL
+   *
+   * @var string
+   */
+  private $baseHref;
+
+  /**
+   * @param Model $model
+   */
+  public function __construct( Controller $controller ) {
+    $this->model = $controller->model;
+    $this->baseHref = $controller->getBaseHref();
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function validate(): bool {
+    $authDirectory = $this->model->getConfig()->getLiteral( 'skosmos:authProviderIncludeDirectory' );
+    if ( !$authDirectory ) {
+      return false;
+    }
+
+    $authEntity = $this->model->getConfig()->getLiteral( 'skosmos:authProviderAuthEntity' );
+    if ( !$authEntity ) {
+      return false;
+    } else {
+      $this->authEntity = $authEntity;
+    }
+
+    $sspAutoloader = $authDirectory . DIRECTORY_SEPARATOR . 'lib/_autoload.php';
+    if ( !file_exists( $sspAutoloader ) ) {
+      return false;
+    } else {
+      require $sspAutoloader;
+    }
+
+    return true;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function isSignedIn(): bool {
+    return $this->getSessionFromRequest()->isValid( $this->authEntity );
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function signIn() {
+    $this->getAuthenticationSource()->requireAuth( [
+      'ReturnTo' => $this->baseHref
+    ] );
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function signOut() {
+    $this->getAuthenticationSource()->logout( [
+      'ReturnTo' => $this->baseHref
+    ] );
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function getUserAttributes(): array {
+    if ( $this->isSignedIn() ) {
+      return [];
+    }
+    return [
+      'auth_source' => $this->authEntity,
+      'attributes' => $this->getAuthenticationSource()->getAttributes()
+    ];
+  }
+
+  /**
+   * @return \SimpleSAML\Auth\Simple
+   */
+  private function getAuthenticationSource( ) {
+    return new SimpleSAML\Auth\Simple( $this->authEntity );
+  }
+
+  /**
+   * @return SimpleSAML\Session::getSessionFromRequest()
+   */
+  private function getSessionFromRequest() {
+    return SimpleSAML\Session::getSessionFromRequest();
+  }
 
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 * @param Model $model
 	 */
-	public function __construct( Controller $controller ) {
+	public function __construct(Controller $controller) {
 		$this->model = $controller->model;
 		$this->baseHref = $controller->getBaseHref();
 	}
@@ -41,20 +41,20 @@ 
 	 * @inheritDoc
 	 */
 	public function validate(): bool {
-		$authDirectory = $this->model->getConfig()->getLiteral( 'skosmos:authProviderIncludeDirectory' );
-		if ( !$authDirectory ) {
+		$authDirectory = $this->model->getConfig()->getLiteral('skosmos:authProviderIncludeDirectory');
+		if (!$authDirectory) {
 			return false;
 		}
 
-		$authEntity = $this->model->getConfig()->getLiteral( 'skosmos:authProviderAuthEntity' );
-		if ( !$authEntity ) {
+		$authEntity = $this->model->getConfig()->getLiteral('skosmos:authProviderAuthEntity');
+		if (!$authEntity) {
 			return false;
 		} else {
 			$this->authEntity = $authEntity;
 		}
 
-		$sspAutoloader = $authDirectory . DIRECTORY_SEPARATOR . 'lib/_autoload.php';
-		if ( !file_exists( $sspAutoloader ) ) {
+		$sspAutoloader = $authDirectory.DIRECTORY_SEPARATOR.'lib/_autoload.php';
+		if (!file_exists($sspAutoloader)) {
 			return false;
 		} else {
 			require $sspAutoloader;
@@ -67,32 +67,32 @@ 
 	 * @inheritDoc
 	 */
 	public function isSignedIn(): bool {
-		return $this->getSessionFromRequest()->isValid( $this->authEntity );
+		return $this->getSessionFromRequest()->isValid($this->authEntity);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function signIn() {
-		$this->getAuthenticationSource()->requireAuth( [
+		$this->getAuthenticationSource()->requireAuth([
 			'ReturnTo' => $this->baseHref
-		] );
+		]);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function signOut() {
-		$this->getAuthenticationSource()->logout( [
+		$this->getAuthenticationSource()->logout([
 			'ReturnTo' => $this->baseHref
-		] );
+		]);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function getUserAttributes(): array {
-		if ( $this->isSignedIn() ) {
+		if ($this->isSignedIn()) {
 			return [];
 		}
 		return [
@@ -105,7 +105,7 @@ 
 	 * @return \SimpleSAML\Auth\Simple
 	 */
 	private function getAuthenticationSource( ) {
-		return new SimpleSAML\Auth\Simple( $this->authEntity );
+		return new SimpleSAML\Auth\Simple($this->authEntity);
 	}
 
 	/**

model/GlobalConfig.php

Indentation +6 added lines, -6 removed lines

@@ -361,10 +361,10 @@
         return $this->getBoolean('skosmos:sparqlCollationEnabled', FALSE);
     }
 
-	/**
-	 * @return string|null
-	 */
-	public function getAuthenticationProvider() {
-		return $this->getLiteral('skosmos:authenticationProvider', false);
-	}
+  /**
+   * @return string|null
+   */
+  public function getAuthenticationProvider() {
+    return $this->getLiteral('skosmos:authenticationProvider', false);
+  }
 }

model/BaseConfig.php

Indentation +6 added lines, -6 removed lines

@@ -7,12 +7,12 @@
 abstract class BaseConfig extends DataObject
 {
 
-	/**
-     * Returns a boolean value based on a literal value from the config.ttl configuration.
-     * @param string $property the property to query
-     * @param boolean $default the default value if the value is not set in configuration
-     * @return boolean the boolean value for the given property, or the default value if not found
-     */
+  /**
+   * Returns a boolean value based on a literal value from the config.ttl configuration.
+   * @param string $property the property to query
+   * @param boolean $default the default value if the value is not set in configuration
+   * @return boolean the boolean value for the given property, or the default value if not found
+   */
     public function getBoolean($property, $default = false)
     {
         $val = $this->getResource()->getLiteral($property);

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      * @param string $lang preferred language for the literal
      * @return string string value for the given property, or the default value if not found
      */
-    public function getLiteral($property, $default=null, $lang=null)
+    public function getLiteral($property, $default = null, $lang = null)
     {
         if (!isset($lang)) {
             $lang = $this->getEnvLang();