removed encode function

diff --git a/CRM/Wci/BAO/Widget.php b/CRM/Wci/BAO/Widget.php
index a3420b5f25d258db173af33ef8a07eb939c1c4a4..e881e0fd40a070c9658316bc5028014cf7b612c4 100644 (file)
--- a/CRM/Wci/BAO/Widget.php
+++ b/CRM/Wci/BAO/Widget.php
@@ -141,7 +141,7 @@ class CRM_Wci_BAO_Widget extends CRM_Wci_DAO_Widget {
       $data["button_title"] = $dao->button_title;
       $data["button_link_to"] = $dao->button_link_to;
       $data["progress_bar_id"] = $dao->progress_bar_id;
-      $data["description"] = strip_tags(base64_decode($dao->description));
+      $data["description"] = $dao->description;
       $data["email_signup_group_id"] = $dao->email_signup_group_id;
       $data["size_variant"] = $dao->size_variant;
       $data["color_title"] = $dao->color_title;

diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php
index 1df514827c02cbbb424f1bff032ce46469ff26b0..188f9a833b618a64721d4ce174b1d15941620b86 100644 (file)
--- a/CRM/Wci/Form/CreateWidget.php
+++ b/CRM/Wci/Form/CreateWidget.php
@@ -151,7 +151,7 @@ where w.id=" . $this->_id;*/
 
         $this->setDefaults(array(
               'progress_bar' => $dao->progress_bar_id/*$dao->pbid*/));
-        $description = base64_decode($wid_page[$dao->id]['description']);
+        $description = $wid_page[$dao->id]['description'];
         $this->setDefaults(array(
               'description' => $description));
         $this->setDefaults(array(
@@ -175,7 +175,7 @@ where w.id=" . $this->_id;*/
         $this->setDefaults(array(
               'color_button_bg' => $wid_page[$dao->id]['color_button_bg']));
         $this->setDefaults(array(
-              'style_rules' => base64_decode($wid_page[$dao->id]['style_rules'])));
+              'style_rules' => $wid_page[$dao->id]['style_rules']));
         $this->setDefaults(array(
               'override' => $wid_page[$dao->id]['override']));
         $this->setDefaults(array(
@@ -185,7 +185,7 @@ where w.id=" . $this->_id;*/
         $this->setDefaults(array(
               'hide_pbcap' => $wid_page[$dao->id]['hide_pbcap']));
         if(true == $wid_page[$dao->id]['override']) {
-          $cust_templ = base64_decode($wid_page[$dao->id]['custom_template']);
+          $cust_templ =  html_entity_decode($wid_page[$dao->id]['custom_template']);
           $this->setDefaults(array(
               'custom_template' => $cust_templ));
         } else {
@@ -223,7 +223,7 @@ where w.id=" . $this->_id;*/
     */
     if(isset($values['override'])){
       $override = $values['override'];
-      $cust_tmpl = base64_encode(html_entity_decode($values['custom_template']));
+      $cust_tmpl = str_replace("'", "''", $values['custom_template']);
       $cust_tmpl_col = "custom_template";
       $coma = ",";
       $equals = " = ";
@@ -246,7 +246,7 @@ where w.id=" . $this->_id;*/
         . $values['image'] . "', button_title = '" . $values['button_title'] 
         . "', button_link_to = '" . $values['button_link_to'] 
         . "', progress_bar_id = '" . $values['progress_bar'] 
-        . "', description = '" . base64_encode($values['description']) 
+        . "', description = '" . str_replace("'", "''", $values['description']) 
         . "', email_signup_group_id = '" . $values['email_signup_group_id'] 
         . "', size_variant = '" . $values['size_variant'] 
         . "', color_title = '" . $values['color_title'] 
@@ -260,7 +260,7 @@ where w.id=" . $this->_id;*/
         . "', hide_title = '" . $hide_title
         . "', hide_border = '" . $hide_border
         . "', hide_pbcap = '" . $hide_pbcap
-        . "', style_rules = '" . base64_encode($values['style_rules']) . "', override = '" 
+        . "', style_rules = '" . str_replace("'", "''", $values['style_rules']) . "', override = '" 
         . $override . $quote . $coma . $cust_tmpl_col . $equals . $quote . $cust_tmpl . "' where id =" . $this->_id ;
     }
     else {
@@ -272,7 +272,7 @@ where w.id=" . $this->_id;*/
       VALUES ('" . $title . "','" . $values['logo_image'] . "','" . 
       $values['image'] . "','" . $values['button_title'] . "','" . 
       $values['button_link_to'] . "','" . $values['progress_bar'] . "','" . 
-      base64_encode($values['description']) . "','" . 
+      str_replace("'", "''", $values['description']) . "','" . 
       $values['email_signup_group_id'] . "','" . 
       $values['size_variant'] . "','" . $values['color_title'] . "','" . 
       $values['color_title_bg'] . "','" . $values['color_bar'] . "','" . 
@@ -280,7 +280,7 @@ where w.id=" . $this->_id;*/
       $values['color_border'] . "','" . $values['color_button'] . "','" . 
       $values['color_button_bg'] . "','" . $hide_title . "','" .
       $hide_border . "','" . $hide_pbcap . "','"
-      . base64_encode($values['style_rules']) . "','" . 
+      . str_replace("'", "''", $values['style_rules']) . "','" . 
       $override . $quote . $coma . $quote . $cust_tmpl
         . "')";
     }

diff --git a/CRM/Wci/Page/WidgetList.php b/CRM/Wci/Page/WidgetList.php
index c3b0ce02c9958ca62bf96e688faf588a1fde2603..f2277fae9365af1b106654fb003b0a2660d9fdac 100644 (file)
--- a/CRM/Wci/Page/WidgetList.php
+++ b/CRM/Wci/Page/WidgetList.php
@@ -51,7 +51,7 @@ class CRM_Wci_Page_WidgetList extends CRM_Core_Page {
       $wid_page[$dao->id] = array();
       CRM_Core_DAO::storeValues($dao, $wid_page[$dao->id]);
       $wid_page[$dao->id]['title'] = $wid_page[$dao->id]['title'];
-      $description = base64_decode($wid_page[$dao->id]['description']);
+      $description = $wid_page[$dao->id]['description'];
       $wid_page[$dao->id]['description'] = strip_tags($description);
      
       $action = array_sum(array_keys($this->actionLinks())); 

diff --git a/ReleaseNotes b/ReleaseNotes
index 77b6c147317a6c97b039a593cc47ff1885c076b6..96f2050c2955251b33ba6868b949cc4162a0845c 100644 (file)
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -1,5 +1,12 @@
-Release Notes for civicrm-wci CiciCRM extension. Alpha - III
+Release Notes for civicrm-wci CiciCRM extension. Beta - I
 ===========================================================
+
+Beta - I
+------------------------------------------
+1. Fixed UT Bugs
+2. Decoupled widget id from widget
+3. Show and hide checkboxes
+
 Alpha - III. 10/30/2014
 ------------------------------------------
 1. Fixed UT Bugs

diff --git a/extern/wciwidget.php b/extern/wciwidget.php
index 59730c423d3d4c089f55d41f2665f268d175ada7..04373663e444a364e7406417a57af73ded823ed5 100644 (file)
--- a/extern/wciwidget.php
+++ b/extern/wciwidget.php
@@ -67,7 +67,7 @@ if (isset($format)) {
     $template->template_dir[] = getWciWidgetTemplatePath();
     $wcidata = $template->fetch('wciwidget.tpl');
   } else {
-    $wcidata = $template->fetch('string:' . base64_decode($data['custom_template']));
+    $wcidata = $template->fetch('string:' . html_entity_decode($data['custom_template']));
   }
   $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 783b41bdb78060867ed74fc0f6894809852b911e..5c1bf99fb6ea2407c84e0094ea8b4e5110f8ae43 100644 (file)
--- a/templates/CRM/Wci/Form/CreateWidget.tpl
+++ b/templates/CRM/Wci/Form/CreateWidget.tpl
@@ -25,7 +25,7 @@
           $template->template_dir[] = getWciWidgetTemplatePath();
           $wcidata = $template->fetch('wciwidget.tpl');
         } else {
-          $wcidata = $template->fetch('string:' . base64_decode($wid_page[$dao->id]['custom_template']));
+          $wcidata = $template->fetch('string:' . $wid_page[$dao->id]['custom_template']);
         }
         $widget_controller_path = getWciWidgetControllerPath();
         $extension_root_path = getExtensionRootPath();