Resolved merge conflict.

[com.zyxware.civiwci.git] / extern / wciwidget.php

diff --git a/extern/wciwidget.php b/extern/wciwidget.php
index 3f89330d30bdeafa0a87327fd43430d3e7cdc8e8..d86822833e02cf746681ff693f8915773d7b0b88 100644 (file)
--- a/extern/wciwidget.php
+++ b/extern/wciwidget.php
@@ -51,17 +51,22 @@ $embed = CRM_Utils_Request::retrieve('embed', 'Positive', CRM_Core_DAO::$_nullOb
 
 if (isset($format)) {
   $jsonvar .= $cpageId;
-}
+} else {
+  $data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);
+
+  $template->assign('wciform', $data);
+  $template->assign('cpageId', $data['button_link_to']);
 
-$data = "";
-$data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);
-$template->assign('wciform', $data);
-$template->assign('cpageId', $data['button_link_to']);
-$template->assign('embed', $embed);
+  if ($data["override"] == '0') {
+    $template->template_dir[] = getWciWidgetTemplatePath();
+    $wcidata = $template->fetch('wciwidget.tpl');
+  } else {
 
-$template->template_dir[] = getWciWidgetTemplatePath();
-$wcidata = $template->fetch('wciwidget.tpl');
-$output = 'var wciwidgetcode =  ' . json_encode($wcidata) . ';';
-echo $output;
+        $wcidata = $template->fetch('string:' . base64_decode($data['custom_template']));
+  }
+  $output = 'var wciwidgetcode =  ' . json_encode($wcidata) . ';';
+  echo $output;
+
+}
 
 CRM_Utils_System::civiExit();