Merge pull request #16 from ulsdevteam/3.4_Updates

3.4 updates

Author: trp89

PlumAnalyticsBlockPlugin.inc.php PlumAnalyticsBlockPlugin.phpPlumAnalyticsBlockPlugin.inc.php renamed to PlumAnalyticsBlockPlugin.php

@@ -11,8 +11,11 @@
  *
  * @brief Class for Plum Analytics block plugin
  */
+namespace APP\plugins\generic\plumAnalytics;
 
-import('lib.pkp.classes.plugins.BlockPlugin');
+use PKP\plugins\BlockPlugin;
+use PKP\config\Config;
+use PKP\plugins\PluginRegistry;
 
 class PlumAnalyticsBlockPlugin extends BlockPlugin {
 

PlumAnalyticsPlugin.inc.php PlumAnalyticsPlugin.phpPlumAnalyticsPlugin.inc.php renamed to PlumAnalyticsPlugin.php

@@ -11,8 +11,19 @@
  *
  * @brief Plum Analytics plugin class
  */
+namespace APP\plugins\generic\plumAnalytics;
+
+use PKP\plugins\GenericPlugin;
+use PKP\config\Config;
+use PKP\plugins\PluginRegistry;
+use PKP\linkAction\LinkAction;
+use PKP\linkAction\request\AjaxModal;
+use PKP\core\JSONMessage;
+use PKP\plugins\Hook;
+use APP\plugins\generic\plumAnalytics\PlumAnalyticsBlockPlugin;
+use APP\plugins\generic\plumAnalytics\PlumAnalyticsSettingsForm;
+use APP\template\TemplateManager;
 
-import('lib.pkp.classes.plugins.GenericPlugin');
 
 class PlumAnalyticsPlugin extends GenericPlugin {
 
@@ -71,20 +82,15 @@ function register($category, $path, $mainContextId = null) {
 		if ($success && $this->getEnabled()) {
 			// Attach to any possible hook; actual widget hook and script hook will be determined by insertWidget()
 			foreach ($this->availableHooks as $k => $v) {
-				HookRegistry::register($v, array($this, 'insertWidget'));
+				Hook::add($v, array($this, 'insertWidget'));
 			}
 
 			// Load this plugin as a block plugin as well
-			$this->import('PlumAnalyticsBlockPlugin');
 			PluginRegistry::register(
 				'blocks',
 				new PlumAnalyticsBlockPlugin($this->getName(), $this->getPluginPath()),
 				$this->getPluginPath()
 			);
-
-			// Enable TinyMCEditor in textarea fields
-			HookRegistry::register('TinyMCEPlugin::getEnableFields', array($this, 'getTinyMCEEnabledFields'));
-
 		}
 		return $success;
 	}
@@ -110,7 +116,6 @@ function getDescription() {
 	 */
 	function getActions($request, $verb) {
 		$router = $request->getRouter();
-		import('lib.pkp.classes.linkAction.request.AjaxModal');
 		return array_merge(
 			$this->getEnabled()?array(
 				new LinkAction(
@@ -135,31 +140,18 @@ function getActions($request, $verb) {
 	 */
 	function insertWidget($hookName, $params) {
 		$output =& $params[2];
-		$templateMgr = TemplateManager::getManager();
-		
 		$request = $this->getRequest();
+		$templateMgr = TemplateManager::getManager($request);
 		$context = $request->getContext();
 		$doi = $this->getSubmissionDOI($templateMgr, $context->getId(), $hookName);
 		if ($doi) {
 			if ($hookName == 'Templates::Article::Footer::PageFooter') {
-				if (method_exists($this, 'getTemplateResource')) {
-					// OJS 3.1.2+
-					$target = $this->getTemplateResource('pageTagPlumScript.tpl');
-				} else {
-					// before OJS 3.1.2
-					$target = $this->getTemplatePath() . 'pageTagPlumScript.tpl';
-				}
+				$target = $this->getTemplateResource('pageTagPlumScript.tpl');
 				$output .= $templateMgr->fetch($target);
 			}
 			if ($this->availableHooks[$this->getSetting($context->getId(), 'hook')] == $hookName) {
 				$this->setupTemplateManager($context->getId(), $doi, $templateMgr);
-				if (method_exists($this, 'getTemplateResource')) {
-					// OJS 3.1.2+
-					$target = $this->getTemplateResource('pageTagPlumWidget.tpl');
-				} else {
-					// before OJS 3.1.2
-					$target = $this->getTemplatePath() . 'pageTagPlumWidget.tpl';
-				}
+				$target = $this->getTemplateResource('pageTagPlumWidget.tpl');
 				$output .= $templateMgr->fetch($target);
 			}
 		}
@@ -186,13 +178,7 @@ function setupTemplateManager($contextId, $doi, $templateMgr) {
 			// database setting is stored without "plum" prefix, e.g. plumSettingName is settingName
 			$templateMgr->assign($k, $this->getSetting($contextId, lcfirst(substr($k, 4))));
 		}
-		if (method_exists($this, 'getTemplateResource')) {
-			// OJS 3.1.2+
-			$templateMgr->assign('plumWidgetTemplatePath', $this->getTemplateResource('pageTagPlumWidget.tpl'));
-		} else {
-			// before OJS 3.1.2
-			$templateMgr->assign('plumWidgetTemplatePath', $this->getTemplatePath(). 'pageTagPlumWidget.tpl');
-		}
+		$templateMgr->assign('plumWidgetTemplatePath', $this->getTemplateResource('pageTagPlumWidget.tpl'));
 	}
 
 	/**
@@ -248,11 +234,9 @@ function manage($args, $request) {
 		$verb = $request->getUserVar('verb');
 		switch ($verb) {
 			case 'settings':
-				$templateMgr = TemplateManager::getManager();
-				$templateMgr->register_function('plugin_url', array($this, 'smartyPluginUrl'));
+				$templateMgr = TemplateManager::getManager($request);
+				$templateMgr->registerPlugin('function', 'plugin_url', array($this, 'smartyPluginUrl'));
 				$context = $request->getContext();
-
-				$this->import('PlumAnalyticsSettingsForm');
 				$form = new PlumAnalyticsSettingsForm($this, $context->getId());
 				if ($request->getUserVar('save')) {
 					$form->readInputData();

PlumAnalyticsSettingsForm.inc.php PlumAnalyticsSettingsForm.phpPlumAnalyticsSettingsForm.inc.php renamed to PlumAnalyticsSettingsForm.php

@@ -11,9 +11,12 @@
  *
  * @brief Form for journal managers to modify Plum Analytics plugin settings
  */
+namespace APP\plugins\generic\plumAnalytics;
 
-
-import('lib.pkp.classes.form.Form');
+use PKP\form\Form;
+use PKP\form\validation\FormValidator;
+use PKP\form\validation\FormValidatorPost;
+use APP\template\TemplateManager;
 
 class PlumAnalyticsSettingsForm extends Form {