Merge pull request #4 from ctgraham/sprint-dev

Sprint dev
pkp · Jun 16, 2022 · 8720530 · 8720530
2 parents 714cbf4 + 5f08ce0
commit 8720530
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/PlagiarismPlugin.inc.php b/PlagiarismPlugin.inc.php
@@ -61,6 +61,9 @@ function getEnabled($contextId = null) {
 	 * @return array username and password, or null(s)
 	**/
 	function getForcedCredentials() {
+		$request = Application::getRequest();
+		$context = $request->getContext();
+		$contextPath = $context->getPath();
 		$username = Config::getVar('ithenticate', 'username[' . $contextPath . ']',
 				Config::getVar('ithenticate', 'username'));
 		$password = Config::getVar('ithenticate', 'password[' . $contextPath . ']',
@@ -88,7 +91,7 @@ public function callback($hookName, $args) {
 		$credentials = $this->getForcedCredentials(); 
 		$username = $credentials[0];
 		$password = $credentials[1];
-		if (!isset($username) || !isset($password)) {
+		if (empty($username) && empty($password)) {
 			$username = $this->getSetting($contextId, 'ithenticate_user');
 			$password = $this->getSetting($contextId, 'ithenticate_pass');
 		}

diff --git a/PlagiarismSettingsForm.inc.php b/PlagiarismSettingsForm.inc.php
@@ -38,7 +38,7 @@ function initData() {
 		$this->_data = array(
                         'ithenticate_user' => $this->_plugin->getSetting($this->_contextId, 'ithenticate_user'),
 			'ithenticate_pass' => $this->_plugin->getSetting($this->_contextId, 'ithenticate_pass'),
-			'ithenticate_forced' => isset($username) && isset($password)
+			'ithenticate_forced' => empty($username) || empty($password)
 		);
 	}