From 7ad9c0d442e3b43d891e9dbe2d15544fe30eba0f Mon Sep 17 00:00:00 2001 From: Clinton Graham Date: Wed, 15 Jun 2022 08:30:50 -0400 Subject: [PATCH 1/2] bugfixes: missing locale key, array return syntax --- PlagiarismPlugin.inc.php | 4 +++- PlagiarismSettingsForm.inc.php | 4 +++- locale/en_US/locale.po | 3 +++ templates/settingsForm.tpl | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/PlagiarismPlugin.inc.php b/PlagiarismPlugin.inc.php index 71a5371..2775f08 100644 --- a/PlagiarismPlugin.inc.php +++ b/PlagiarismPlugin.inc.php @@ -85,7 +85,9 @@ public function callback($hookName, $args) { // try to get credentials for current context otherwise use default config $contextId = $context->getId(); - ($username, $password) = $this->getForcedCredentials(); + $credentials = $this->getForcedCredentials(); + $username = $credentials[0]; + $password = $credentials[1]; if (!isset($username) || !isset($password)) { $username = $this->getSetting($contextId, 'ithenticate_user'); $password = $this->getSetting($contextId, 'ithenticate_pass'); diff --git a/PlagiarismSettingsForm.inc.php b/PlagiarismSettingsForm.inc.php index 303038e..934c0d4 100644 --- a/PlagiarismSettingsForm.inc.php +++ b/PlagiarismSettingsForm.inc.php @@ -30,7 +30,9 @@ function __construct($plugin, $contextId) { * Initialize form data. */ function initData() { - ($username, $password) = $this->_plugin->getForcedCredentials(); + $credentials = $this->_plugin->getForcedCredentials(); + $username = $credentials[0]; + $password = $credentials[1]; $this->_data = array( 'ithenticate_user' => $this->_plugin->getSetting($this->_contextId, 'ithenticate_user'), 'ithenticate_pass' => $this->_plugin->getSetting($this->_contextId, 'ithenticate_pass'), diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po index 314072e..2dfd6bf 100644 --- a/locale/en_US/locale.po +++ b/locale/en_US/locale.po @@ -34,3 +34,6 @@ msgstr "iThenticate Usename is required" msgid "plugins.generic.plagiarism.manager.settings.passwordRequired" msgstr "iThenticate Password is required" + +msgid "plugins.generic.plagiarism.manager.settings.areForced" +msgstr "iThenticate settings are in config.inc.php and changes here will not be used." diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl index ea31854..6e4cae9 100644 --- a/templates/settingsForm.tpl +++ b/templates/settingsForm.tpl @@ -16,7 +16,7 @@ {fbvFormArea id="webFeedSettingsFormArea"} {fbvElement type="text" id="ithenticate_user" value=$ithenticate_user label="plugins.generic.plagiarism.manager.settings.username"} - {fbvElement type="text" id="ithenticate_pass" value=$ithenticate_pass label="plugins.generic.plagiarism.manager.settings.password"} + {fbvElement type="password" id="ithenticate_pass" value=$ithenticate_pass label="plugins.generic.plagiarism.manager.settings.password"} {/fbvFormArea} From fb1a1653c58d5d688a8288869e4f86632a030261 Mon Sep 17 00:00:00 2001 From: Clinton Graham Date: Wed, 15 Jun 2022 08:45:58 -0400 Subject: [PATCH 2/2] debugging and README updates --- PlagiarismSettingsForm.inc.php | 3 ++- README.txt | 7 +++++-- templates/settingsForm.tpl | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PlagiarismSettingsForm.inc.php b/PlagiarismSettingsForm.inc.php index 934c0d4..75a6563 100644 --- a/PlagiarismSettingsForm.inc.php +++ b/PlagiarismSettingsForm.inc.php @@ -1,3 +1,4 @@ +_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' => isset($username) && isset($password) ); } diff --git a/README.txt b/README.txt index a918026..4cff3b2 100644 --- a/README.txt +++ b/README.txt @@ -17,7 +17,10 @@ ithenticate = On ; default credentials ; The username to access the API (usually an email address) -username = "user@email.com" +;username = "user@email.com" ; The password to access the API -password = "password" +;password = "password" + + +You may set the credentials in config.inc.php, or you may set the credentials per-journal in the plugin settings. If credentials are present in config.inc.php, they will override those entered in the plugin settings form. diff --git a/templates/settingsForm.tpl b/templates/settingsForm.tpl index 6e4cae9..ea31854 100644 --- a/templates/settingsForm.tpl +++ b/templates/settingsForm.tpl @@ -16,7 +16,7 @@ {fbvFormArea id="webFeedSettingsFormArea"} {fbvElement type="text" id="ithenticate_user" value=$ithenticate_user label="plugins.generic.plagiarism.manager.settings.username"} - {fbvElement type="password" id="ithenticate_pass" value=$ithenticate_pass label="plugins.generic.plagiarism.manager.settings.password"} + {fbvElement type="text" id="ithenticate_pass" value=$ithenticate_pass label="plugins.generic.plagiarism.manager.settings.password"} {/fbvFormArea}