#29801 - Fix for hard coded path to widget controller and template.

diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php
index aa40ab57b19abf6161123a853c2707e8e80321b3..8f29ae749a5d5e9d548235605a548c85c19da663 100644 (file)
--- a/CRM/Wci/Form/CreateWidget.php
+++ b/CRM/Wci/Form/CreateWidget.php
@@ -213,8 +213,16 @@ where w.id=" . $this->_id;
               'custom_template' => $cust_templ));
         }
       }
+      $widget_controller_path = getWciWidgetControllerPath();
+      
       $emb_code = "<script src=\"http://code.jquery.com/jquery-1.9.1.min.js\"></script>
-<script type=\"text/javascript\" src=\"http://localhost/F3/sites/all/modules/civicrm/extensions/civicrm-wci/extern/wciwidget.php?widgetId=" . $this->_id . "\"></script>";
+<script type=\"text/javascript\" src=\"" . $widget_controller_path . "?widgetId=" . $this->_id . "\"></script>
+$( document ).ready(function() {
+$('#widgetwci').html(wciwidgetcode);
+});
+</script>
+<div id='widgetwci'>
+</div>";
       $this->getElement('embd_code')->setValue($emb_code);
     }
     else {

diff --git a/CRM/Wci/Form/ProgressBar.php b/CRM/Wci/Form/ProgressBar.php
index 0a453fe2db2e8f2925282ae8818f9017960a2f52..012d6f5183552154a78ccca1d8fc1fe2f890e2f8 100644 (file)
--- a/CRM/Wci/Form/ProgressBar.php
+++ b/CRM/Wci/Form/ProgressBar.php
@@ -14,7 +14,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form {
   private $_id;  
   function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE, NULL, 'REQUEST');
-    CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.wci', 'F3/sites/all/modules/civicrm/extensions/civicrm-wci/addmore.js');
+    CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.wci', 'addmore.js');
     parent::preProcess();
   }
   function fillData() {

diff --git a/extern/wciwidget.php b/extern/wciwidget.php
index 9dcf43a1d19532cb49e0db41031632fae9dc751e..50b820dd50f63f46f1f4a2ff1ad935eb0dc315e3 100644 (file)
--- a/extern/wciwidget.php
+++ b/extern/wciwidget.php
@@ -38,6 +38,7 @@
 */  
 
 require_once '../../../civicrm.config.php';
+require_once '../wci-helper-functions.php';
 require_once 'CRM/Core/Config.php';
 require_once 'CRM/Contribute/BAO/Widget.php';
 require_once 'CRM/Utils/Request.php';
@@ -59,7 +60,7 @@ if (isset($embed) && (true == $embed)) {
   $data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);
   $template->assign('wciform', $data);
 
-  $template->template_dir[] = $_SERVER['DOCUMENT_ROOT'] . "/F3/sites/all/modules/civicrm/extensions/civicrm-wci/templates/CRM/Wci/Page";
+  $template->template_dir[] = getWciWidgetTemplatePath();
   $wcidata = $template->fetch('wciwidget.tpl');
   $output = 'var wciwidgetcode =  ' . json_encode($wcidata) . ';';
   echo $output;

diff --git a/templates/CRM/Wci/Form/CreateWidget.tpl b/templates/CRM/Wci/Form/CreateWidget.tpl
index 1a4ca1bef65370a7ba392476947a6e4cc88f006d..e4046780fd4b75548d1531a7c69e5a18d4117ffc 100644 (file)
--- a/templates/CRM/Wci/Form/CreateWidget.tpl
+++ b/templates/CRM/Wci/Form/CreateWidget.tpl
@@ -21,7 +21,7 @@
       $data = CRM_Wci_BAO_Widget::getWidgetData($wid_id);
       $template = CRM_Core_Smarty::singleton();
       $template->assign('wciform', $data);
-      $template->template_dir[] = $_SERVER['DOCUMENT_ROOT'] . "/F3/sites/all/modules/civicrm/extensions/civicrm-wci/templates/CRM/Wci/Page";
+      $template->template_dir[] = getWciWidgetTemplatePath();
       $wcidata = $template->fetch('wciwidget.tpl');
     }
   {/php}

diff --git a/wci-helper-functions.php b/wci-helper-functions.php
index c38981bb0b101d07dda57bd28ffcfa5f3ea8c6c1..2828fa054049a17e4b4aa93ea70df6b2f5cb0086 100644 (file)
--- a/wci-helper-functions.php
+++ b/wci-helper-functions.php
@@ -12,3 +12,19 @@
     
     return $options;
   }
+  
+  function getExtensionRootPath() {
+    return '//' . $_SERVER['SERVER_NAME'] . str_replace($_SERVER['DOCUMENT_ROOT'], '', __DIR__);
+  }
+  
+  function getWciWidgetControllerPath() {
+    $widget_controller_path = getExtensionRootPath() . '/extern/wciwidget.php';
+    
+    return $widget_controller_path;
+  }
+  
+  function getWciWidgetTemplatePath() {
+    $widget_tpl_path = getExtensionRootPath() . '/templates/CRM/Wci/Page';
+    
+    return $widget_tpl_path;
+  }
\ No newline at end of file