Merge pull request #3 from ctgraham/sprint-dev

Sprint dev

PlagiarismSettingsForm.inc.php

@@ -32,11 +32,13 @@ 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'),
-			'ithenticate_forced' => isset($username) && isset($password);
+			'ithenticate_forced' => isset($username) && isset($password)
 		);
 	}
 

README.txt

@@ -17,7 +17,10 @@ ithenticate = On
 
 ; default credentials
 ; The username to access the API (usually an email address)
-username = "[email protected]"
+;username = "[email protected]"
 
 ; 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.

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."