From bccdda0266102e2d0726257a50475b73971703b3 Mon Sep 17 00:00:00 2001 From: Jagadedes Date: Fri, 21 Nov 2014 12:42:57 +0530 Subject: [PATCH] 31453 31498 code cleanup --- CRM/Wci/BAO/EmbedCode.php | 35 +- CRM/Wci/BAO/ProgressBar.php | 45 +- CRM/Wci/BAO/Widget.php | 39 +- CRM/Wci/BAO/WidgetCache.php | 27 +- CRM/Wci/DAO/NewEmbedCode.php | 46 +- CRM/Wci/DAO/ProgressBar.php | 44 +- CRM/Wci/DAO/ProgressBarFormula.php | 47 +- CRM/Wci/DAO/Widget.php | 64 ++- CRM/Wci/DAO/WidgetCache.php | 45 +- CRM/Wci/Form/CreateWidget.php | 94 ++-- CRM/Wci/Form/NewEmbedCode.php | 49 ++- CRM/Wci/Form/ProgressBar.php | 86 ++-- CRM/Wci/Form/WCISettings.php | 38 +- CRM/Wci/Page/ManageEmbedCode.php | 45 +- CRM/Wci/Page/ProgressBarList.php | 40 +- CRM/Wci/Page/WidgetList.php | 51 ++- CRM/Wci/Upgrader.php | 24 +- CRM/Wci/Upgrader/Base.php | 22 + CRM/Wci/WidgetCode.php | 30 +- Changelog.txt | 13 +- License.txt | 661 +++++++++++++++++++++++++++++ extern/embed.php | 24 +- info.xml | 4 +- js/addmore.js | 33 +- js/createwidget.js | 26 +- settings/wci.setting.php | 24 +- wci-helper-functions.php | 36 +- wci.civix.php | 23 +- wci.php | 58 ++- 29 files changed, 1372 insertions(+), 401 deletions(-) create mode 100644 License.txt diff --git a/CRM/Wci/BAO/EmbedCode.php b/CRM/Wci/BAO/EmbedCode.php index 0eeb73e..d8d6118 100644 --- a/CRM/Wci/BAO/EmbedCode.php +++ b/CRM/Wci/BAO/EmbedCode.php @@ -1,27 +1,24 @@ fetch()) { $widgetId = $dao->widget_id; - } - + } + return $widgetId; - } + } } diff --git a/CRM/Wci/BAO/ProgressBar.php b/CRM/Wci/BAO/ProgressBar.php index 358c80f..01fbf8d 100644 --- a/CRM/Wci/BAO/ProgressBar.php +++ b/CRM/Wci/BAO/ProgressBar.php @@ -1,27 +1,24 @@ fetch()) { @@ -55,13 +52,13 @@ class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { return $pbList; } - + /** * Returns percentage value of a progressbar * @param integer progressbar id * @return decimal percentage value * @access public - */ + */ public static function getPBCollectedAmount($pbId) { $bp = 0; $query = "SELECT * FROM civicrm_wci_progress_bar_formula WHERE progress_bar_id =" . $pbId; @@ -72,7 +69,7 @@ class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { $for_page[$daoPbf->id] = array(); CRM_Core_DAO::storeValues($daoPbf, $for_page[$daoPbf->id]); $px = $for_page[$daoPbf->id]['percentage']; - + $query = "SELECT * FROM civicrm_contribution where contribution_page_id =" . $for_page[$daoPbf->id]['contribution_page_id']; $params = array(); @@ -88,7 +85,7 @@ class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { } return floor($bp); } - + public static function getProgressbarInfo($pbId) { $ga = 0; $query = "SELECT * FROM civicrm_wci_progress_bar where id=" . $pbId; @@ -106,6 +103,7 @@ class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { return $pbInfo; } + public static function getProgressbarPercentage($pbId, &$pbInfo) { $pbInfo = CRM_Wci_BAO_ProgressBar::getProgressbarInfo($pbId); @@ -114,18 +112,19 @@ class CRM_Wci_BAO_ProgressBar extends CRM_Wci_DAO_ProgressBar { + $pbInfo['starting_amount']; (0 == $ga) ? $currAmt = 0: $perc = ($currAmnt / $ga ) * 100; if (100 < $perc){ - $perc = 100; + $perc = 100; } - return floor($perc); + return floor($perc); } + public static function getProgressbarData($pbId, &$pbData) { if(0 != $pbId) { - $pbInfo = array();//CRM_Wci_BAO_ProgressBar::getProgressbarInfo($pbId); + $pbInfo = array(); $pbData["pb_percentage"] = CRM_Wci_BAO_ProgressBar::getProgressbarPercentage($pbId, $pbInfo); $pbData["starting_amount"] = floor($pbInfo['starting_amount']); $pbData["goal_amount"] = ceil($pbInfo['goal_amount']); - + ($pbData["show_pb_perc"]) ? $pbData["pb_caption"] = $pbData["pb_percentage"] : $pbData["pb_caption"] = CRM_Wci_BAO_ProgressBar::getPBCollectedAmount($pbId) + $pbData["starting_amount"]; diff --git a/CRM/Wci/BAO/Widget.php b/CRM/Wci/BAO/Widget.php index 6598530..b78d259 100644 --- a/CRM/Wci/BAO/Widget.php +++ b/CRM/Wci/BAO/Widget.php @@ -1,27 +1,24 @@ title; $data["logo_image"] = $dao->logo_image; $data["image"] = $dao->image; - - (empty($dao->button_title)) ? $contrin_title = "Donate" : + + (empty($dao->button_title)) ? $contrin_title = "Donate" : $contrin_title = $dao->button_title; - + $data["button_title"] = $contrin_title; - + $data["button_link_to"] = $dao->button_link_to; $data["progress_bar_id"] = $dao->progress_bar_id; $data["description"] = $dao->description; @@ -90,12 +87,12 @@ class CRM_Wci_BAO_Widget extends CRM_Wci_DAO_Widget { * Fields : id, name * @return widget array * @access public - */ + */ public static function getWidgetList() { $query = "SELECT * FROM civicrm_wci_widget"; $params = array(); $widgList = array(); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { diff --git a/CRM/Wci/BAO/WidgetCache.php b/CRM/Wci/BAO/WidgetCache.php index 7de9a9c..12a9dc4 100644 --- a/CRM/Wci/BAO/WidgetCache.php +++ b/CRM/Wci/BAO/WidgetCache.php @@ -1,27 +1,24 @@ array(time(), 'Integer')), TRUE, 'CRM_Wci_DAO_WidgetCache'); if ($dao->fetch()) { $code = $dao->widget_code; - } + } return $code; } diff --git a/CRM/Wci/DAO/NewEmbedCode.php b/CRM/Wci/DAO/NewEmbedCode.php index 88a1412..0528dc6 100644 --- a/CRM/Wci/DAO/NewEmbedCode.php +++ b/CRM/Wci/DAO/NewEmbedCode.php @@ -1,29 +1,27 @@ __table = 'civicrm_wci_embed_code'; diff --git a/CRM/Wci/DAO/ProgressBar.php b/CRM/Wci/DAO/ProgressBar.php index 480b6a0..9d126af 100644 --- a/CRM/Wci/DAO/ProgressBar.php +++ b/CRM/Wci/DAO/ProgressBar.php @@ -1,29 +1,27 @@ __table = 'civicrm_wci_widget'; @@ -441,7 +439,7 @@ class CRM_Wci_DAO_Widget extends CRM_Core_DAO 'type' => CRM_Utils_Type::T_BOOLEAN, 'title' => ts('Override default template', array('domain' => 'org.civicrm.wci')) , 'required' => false, - ) , + ) , 'hide_title' => array( 'name' => 'hide_title', 'type' => CRM_Utils_Type::T_BOOLEAN, @@ -472,7 +470,7 @@ class CRM_Wci_DAO_Widget extends CRM_Core_DAO 'title' => ts('Widget custom template', array('domain' => 'org.civicrm.wci')) , 'required' => false, ) , - + 'color_btn_newsletter' => array( 'name' => 'color_btn_newsletter', 'type' => CRM_Utils_Type::T_STRING, @@ -528,8 +526,8 @@ class CRM_Wci_DAO_Widget extends CRM_Core_DAO 'size_variant' => 'size_variant', 'color_title' => 'color_title', 'color_title_bg' => 'color_title_bg', - 'color_progress_bar' => 'color_progress_bar', - 'color_progress_bar_bg' => 'color_progress_bar_bg', + 'color_progress_bar' => 'color_progress_bar', + 'color_progress_bar_bg' => 'color_progress_bar_bg', 'color_widget_bg' => 'color_widget_bg', 'color_description' => 'color_description', 'color_border' => 'color_border', diff --git a/CRM/Wci/DAO/WidgetCache.php b/CRM/Wci/DAO/WidgetCache.php index 7e8b2f6..fce4f1a 100644 --- a/CRM/Wci/DAO/WidgetCache.php +++ b/CRM/Wci/DAO/WidgetCache.php @@ -1,28 +1,25 @@ __table = 'civicrm_wci_widget_cache'; diff --git a/CRM/Wci/Form/CreateWidget.php b/CRM/Wci/Form/CreateWidget.php index 69e74d5..c2c3c84 100644 --- a/CRM/Wci/Form/CreateWidget.php +++ b/CRM/Wci/Form/CreateWidget.php @@ -1,5 +1,26 @@ addScriptFile('org.civicrm.wci', 'js/createwidget.js'); parent::preProcess(); - $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, + $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE, NULL, 'REQUEST' ); $this->_colorFields = array('color_title' => array(ts('Title Text Color'), @@ -123,7 +144,6 @@ class CRM_Wci_Form_CreateWidget extends CRM_Core_Form { $this->addWysiwyg('description', ts('Description'), ''); $this->add('select', 'email_signup_group_id', ts('Newsletter signup'), $this->getGroupOptions()); $this->add('select', 'size_variant', ts('Size variant'), $this->getSizeOptions()); - // $fieldset = $this->addElement('fieldset')->setLabel('Advanced Settings'); $this->add('checkbox', 'hide_title', ts('Hide Title')); $this->add('checkbox', 'hide_border', ts('Hide border')); $this->add('checkbox', 'hide_pbcap', ts('Hide progress bar caption')); @@ -154,14 +174,10 @@ class CRM_Wci_Form_CreateWidget extends CRM_Core_Form { // export form elements $this->assign('elementNames', $this->getRenderableElementNames()); if (isset($this->_id)) { - /** Updating existing widget*/ - - /*$query = "SELECT pb.id as pbid, w.* FROM civicrm_wci_widget w INNER JOIN civicrm_wci_progress_bar pb on pb.id = w.progress_bar_id -where w.id=" . $this->_id;*/ $query = "SELECT * FROM civicrm_wci_widget WHERE id=%1"; $params = array(1 => array($this->_id, 'Integer')); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { @@ -178,7 +194,7 @@ where w.id=" . $this->_id;*/ $this->setDefaults(array( 'button_title' => $wid_page[$dao->id]['button_title'])); $this->setDefaults(array( - 'progress_bar' => $dao->progress_bar_id/*$dao->pbid*/)); + 'progress_bar' => $dao->progress_bar_id)); $description = $wid_page[$dao->id]['description']; $this->setDefaults(array( 'description' => $description)); @@ -225,7 +241,7 @@ where w.id=" . $this->_id;*/ 'newsletter_text' => $wid_page[$dao->id]['newsletter_text'])); $this->setDefaults(array( 'color_newsletter_text' => $wid_page[$dao->id]['color_newsletter_text'])); - + if(true == $wid_page[$dao->id]['override']) { $cust_templ = html_entity_decode($wid_page[$dao->id]['custom_template']); $this->setDefaults(array( @@ -308,33 +324,33 @@ where w.id=" . $this->_id;*/ 25 => array($values['color_newsletter_text'], 'String'), 26 => array($values['style_rules'], 'String'), 27 => array($override, 'Integer'), - 28 => array($values['custom_template'], 'String'), + 28 => array($values['custom_template'], 'String'), 29 => array($values['show_pb_perc'], 'Integer'),); if (isset($this->_id)) { - $sql = "UPDATE civicrm_wci_widget SET title = %1, logo_image =%2, - image = %3, button_title =%4, button_link_to =%5, + $sql = "UPDATE civicrm_wci_widget SET title = %1, logo_image =%2, + image = %3, button_title =%4, button_link_to =%5, progress_bar_id = %6, description = %7, email_signup_group_id = %8, - size_variant = %9, color_title = %10, color_title_bg = %11, - color_progress_bar = %12, color_progress_bar_bg = %13, - color_widget_bg=%14, color_description=%15, color_border = %16, - color_button = %17, color_button_bg = %18, hide_title = %19, - hide_border = %20, hide_pbcap = %21, color_btn_newsletter = %22, - color_btn_newsletter_bg = %23, newsletter_text = %24, - color_newsletter_text = %25, style_rules = %26, override = %27, + size_variant = %9, color_title = %10, color_title_bg = %11, + color_progress_bar = %12, color_progress_bar_bg = %13, + color_widget_bg=%14, color_description=%15, color_border = %16, + color_button = %17, color_button_bg = %18, hide_title = %19, + hide_border = %20, hide_pbcap = %21, color_btn_newsletter = %22, + color_btn_newsletter_bg = %23, newsletter_text = %24, + color_newsletter_text = %25, style_rules = %26, override = %27, custom_template = %28, show_pb_perc = %29 where id = %30"; - + $params += array(30 => array($this->_id, 'Integer'),); } else { - $sql = "INSERT INTO civicrm_wci_widget (title, logo_image, image, - button_title, button_link_to, progress_bar_id, description, - email_signup_group_id, size_variant, color_title, color_title_bg, - color_progress_bar, color_progress_bar_bg, color_widget_bg, color_description, color_border, - color_button, color_button_bg, hide_title, hide_border, hide_pbcap, - color_btn_newsletter, color_btn_newsletter_bg, newsletter_text, - color_newsletter_text, style_rules, override, custom_template, show_pb_perc) - VALUES (%1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, + $sql = "INSERT INTO civicrm_wci_widget (title, logo_image, image, + button_title, button_link_to, progress_bar_id, description, + email_signup_group_id, size_variant, color_title, color_title_bg, + color_progress_bar, color_progress_bar_bg, color_widget_bg, color_description, color_border, + color_button, color_button_bg, hide_title, hide_border, hide_pbcap, + color_btn_newsletter, color_btn_newsletter_bg, newsletter_text, + color_newsletter_text, style_rules, override, custom_template, show_pb_perc) + VALUES (%1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17, %18, %19, %20, %21, %22, %23, %24, %25, %26, %27, %28, %29)"; } @@ -353,22 +369,22 @@ where w.id=" . $this->_id;*/ $widget_id = CRM_Core_DAO::singleValueQuery('SELECT LAST_INSERT_ID()'); } CRM_Core_Session::setStatus(ts('Widget created successfuly'), '', 'success'); - + if(isset($_REQUEST['_qf_CreateWidget_next'])) { CRM_Utils_System::redirect('?action=update&reset=1&id=' . $widget_id); } else { CRM_Utils_System::redirect('widget?reset=1'); } - } + } catch (Exception $e) { CRM_Core_Session::setStatus(ts('Failed to create widget. '). $e->getMessage(), '', 'error'); $transaction->rollback(); } - + parent::postProcess(); } - + function getProgressBars() { $options = array( 0 => ts('- select -'), @@ -385,15 +401,15 @@ where w.id=" . $this->_id;*/ $options = array( 0 => ts('- select -'), ); - + $result = civicrm_api3('group', 'get', array( - 'group_type' => '2' // group type of newsletter(2) + 'group_type' => '2' // 2 is for group type - newsletter )); if (0 != $result['count']) { foreach ($result['values'] as $group) { $options[$group['id']] = $group['title']; } - } + } return $options; } @@ -403,7 +419,7 @@ where w.id=" . $this->_id;*/ 'normal' => ts('Normal (200px)'), 'wide' => ts('Wide (250px)'), ); - + return $options; } diff --git a/CRM/Wci/Form/NewEmbedCode.php b/CRM/Wci/Form/NewEmbedCode.php index c39820d..93db95a 100644 --- a/CRM/Wci/Form/NewEmbedCode.php +++ b/CRM/Wci/Form/NewEmbedCode.php @@ -1,5 +1,26 @@ _id = CRM_Utils_Request::retrieve('id', 'Positive', $this, + $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE, NULL, 'REQUEST' ); } - + function buildQuickForm() { $this->add('text', 'title', ts('Title'),true, true)->setSize(45); // add form elements @@ -42,7 +63,7 @@ class CRM_Wci_Form_NewEmbedCode extends CRM_Core_Form { if (isset($this->_id)) { $query = "SELECT * FROM civicrm_wci_embed_code WHERE id= %1"; $params = array(1 => array($this->_id, 'Integer')); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_EmbedCode'); while ($dao->fetch()) { @@ -59,7 +80,7 @@ class CRM_Wci_Form_NewEmbedCode extends CRM_Core_Form { } else { CRM_Utils_System::setTitle(ts('New embed code')); - } + } // export form elements $this->assign('elementNames', $this->getRenderableElementNames()); parent::buildQuickForm(); @@ -69,35 +90,37 @@ class CRM_Wci_Form_NewEmbedCode extends CRM_Core_Form { $values = $this->exportValues(); $title = str_replace("'", "''", $values['title']); - + $params = array(1 => array($title, 'String'), + 2 => array($values['widget'], 'Integer'), + ); if (isset($this->_id)) { - $sql = "UPDATE civicrm_wci_embed_code SET name = '" . $title - . "', widget_id = '" . $values['widget'] . "' where id =" . $this->_id ; + $params += array(3 => array($this->_id, 'Integer'),); + $sql = "UPDATE civicrm_wci_embed_code SET name = %1, widget_id = %2 where id = %3" ; } else { - $sql = "INSERT INTO civicrm_wci_embed_code (name, widget_id)VALUES ('" - . $title . "','" . $values['widget'] . "')"; + $sql = "INSERT INTO civicrm_wci_embed_code (name, widget_id)VALUES (%1, %2)"; } $errorScope = CRM_Core_TemporaryErrorScope::useException(); try { $transaction = new CRM_Core_Transaction(); - CRM_Core_DAO::executeQuery($sql); + CRM_Core_DAO::executeQuery($sql, $params); $transaction->commit(); CRM_Core_Session::setStatus(ts('Embed code created successfuly'), '', 'success'); if(isset($_REQUEST['_qf_NewEmbedCode_next'])) { - (isset($this->_id)) ? $embed_id = $this->_id : + (isset($this->_id)) ? $embed_id = $this->_id : $embed_id = CRM_Core_DAO::singleValueQuery('SELECT LAST_INSERT_ID()'); CRM_Utils_System::redirect('?action=update&reset=1&id=' . $embed_id); } else { CRM_Utils_System::redirect('embed-code?reset=1'); } - } + } catch (Exception $e) { CRM_Core_Session::setStatus(ts('Failed to create embed code'), '', 'error'); $transaction->rollback(); } parent::postProcess(); } + function getWidgets() { $options = array( '' => ts('- select -'), diff --git a/CRM/Wci/Form/ProgressBar.php b/CRM/Wci/Form/ProgressBar.php index 04428ae..9480801 100644 --- a/CRM/Wci/Form/ProgressBar.php +++ b/CRM/Wci/Form/ProgressBar.php @@ -1,5 +1,26 @@ _id = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE, NULL, 'REQUEST'); CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.wci', 'js/addmore.js'); parent::preProcess(); } + function fillData() { $count = 1; if (isset($this->_id)) { /** Updating existing progress bar*/ $query = "SELECT * FROM civicrm_wci_progress_bar where id=%1"; $params = array(1 => array($this->_id, 'Integer')); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { @@ -36,7 +59,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { $this->setDefaults(array( 'goal_amount' => $con_page[$dao->id]['goal_amount'])); } - + $query = "SELECT * FROM civicrm_wci_progress_bar_formula WHERE progress_bar_id =%1"; $params = array(1 => array($this->_id, 'Integer')); @@ -59,7 +82,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { 'Percentage of contribution taken', // field label false // is required ); - //save formula id + //save formula id $this->addElement('hidden', 'contrib_elem_'.$count , $for_page[$dao->id]['id']); $this->setDefaults(array( @@ -71,7 +94,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { } CRM_Utils_System::setTitle(ts('Edit Progress Bar')); $count--; // because last iteration increments it to the next - } + } else { /** New progress bar*/ $this->add( @@ -89,12 +112,12 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { ); CRM_Utils_System::setTitle(ts('Create Progress Bar')); } - + $this->addElement('hidden', 'contrib_count', $count); } - + function buildQuickForm() { - + $this->add( 'text', // field type 'progressbar_name', // field name @@ -113,9 +136,9 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { 'Goal amount', // field label true // is required )->setSize(35); - + $this->fillData(); - + $this->addElement('link', 'addmore_link',' ', 'addmore', 'Add another contribution page'); $this->addButtons(array( @@ -128,7 +151,7 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { // export form elements $this->assign('elementNames', $this->getRenderableElementNames()); - + parent::buildQuickForm(); } @@ -137,11 +160,11 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { if (isset($this->_id)) { try { $transaction = new CRM_Core_Transaction(); - - $sql = "UPDATE civicrm_wci_progress_bar SET name = %1, + + $sql = "UPDATE civicrm_wci_progress_bar SET name = %1, starting_amount = %2, goal_amount = %3 where id = %4"; - - CRM_Core_DAO::executeQuery($sql, + + CRM_Core_DAO::executeQuery($sql, array(1=>array($_REQUEST['progressbar_name'], 'String'), 2=>array($_REQUEST['starting_amount'], 'Float'), 3=>array($_REQUEST['goal_amount'], 'Float'), @@ -156,16 +179,16 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { $perc = 'percentage_' . (string)$i; $sql = "INSERT INTO civicrm_wci_progress_bar_formula - (contribution_page_id, progress_bar_id, percentage) + (contribution_page_id, progress_bar_id, percentage) VALUES (%1, %2, %3)"; - CRM_Core_DAO::executeQuery($sql, + CRM_Core_DAO::executeQuery($sql, array(1 => array($_REQUEST[$page], 'Integer'), 2 => array($this->_id, 'Integer'), 3 => array($_REQUEST[$perc], 'Float'), )); } - + $transaction->commit(); CRM_Core_Session::setStatus(ts('Progress bar created successfuly'), '', 'success'); CRM_Utils_System::redirect('progress-bar?reset=1'); @@ -174,28 +197,28 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { CRM_Core_Session::setStatus(ts('Failed to create progress bar'), '', 'error'); $transaction->rollback(); } - - } + + } else { - $sql = "INSERT INTO civicrm_wci_progress_bar + $sql = "INSERT INTO civicrm_wci_progress_bar (name, starting_amount, goal_amount) VALUES (%1, %2, %3)"; try { $transaction = new CRM_Core_Transaction(); - CRM_Core_DAO::executeQuery($sql, + CRM_Core_DAO::executeQuery($sql, array(1=>array($_REQUEST['progressbar_name'], 'String'), 2=>array($_REQUEST['starting_amount'], 'Float'), - 3=>array($_REQUEST['goal_amount'], 'Float'), + 3=>array($_REQUEST['goal_amount'], 'Float'), )); $progressbar_id = CRM_Core_DAO::singleValueQuery('SELECT LAST_INSERT_ID()'); for($i = 1; $i <= (int)$_REQUEST['contrib_count']; $i++): $page = 'contribution_page_' . (string)$i; $perc = 'percentage_' . (string)$i; - $sql = "INSERT INTO civicrm_wci_progress_bar_formula - (contribution_page_id, progress_bar_id, percentage) + $sql = "INSERT INTO civicrm_wci_progress_bar_formula + (contribution_page_id, progress_bar_id, percentage) VALUES (%1, %2, %3)"; - - CRM_Core_DAO::executeQuery($sql, + + CRM_Core_DAO::executeQuery($sql, array(1 => array($_REQUEST[$page], 'Integer'), 2 => array($progressbar_id, 'Integer'), 3 => array($_REQUEST[$perc], 'Float'), @@ -203,14 +226,14 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { endfor; $transaction->commit(); CRM_Utils_System::redirect('civicrm/wci/progress-bar?reset=1'); - } + } catch (Exception $e) { - CRM_Core_Session::setStatus(ts('Failed to create Progress bar. ') . + CRM_Core_Session::setStatus(ts('Failed to create Progress bar. ') . $e->getMessage(), '', 'error'); $transaction->rollback(); } $elem = $this->getElement('contrib_count'); - $elem->setValue('1'); + $elem->setValue('1'); } parent::postProcess(); } @@ -235,4 +258,3 @@ class CRM_Wci_Form_ProgressBar extends CRM_Core_Form { return $elementNames; } } - diff --git a/CRM/Wci/Form/WCISettings.php b/CRM/Wci/Form/WCISettings.php index 0a028ba..fc68bb6 100644 --- a/CRM/Wci/Form/WCISettings.php +++ b/CRM/Wci/Form/WCISettings.php @@ -1,5 +1,26 @@ 'Wci Preference', 'name' => 'widget_cache_timeout')); $defProf = civicrm_api3('setting', 'getValue', array('group' => 'Wci Preference', 'name' => 'default_wci_profile')); - /*$this->setDefaults(array( - 'default_widget' => $widgetId));*/ $this->setDefaults(array( 'default_profile' => $defProf)); $this->setDefaults(array( @@ -32,22 +51,22 @@ $cacheTime = 1; $this->assign('elementNames', $this->getRenderableElementNames()); CRM_Utils_System::setTitle(ts('Widget Settings')); - + parent::buildQuickForm(); } function postProcess() { $values = $this->exportValues(); - /*civicrm_api3('setting', 'create', array('domain_id' => 1, 'default_wci_widget' => $values['default_widget'],));*/ civicrm_api3('setting', 'create', array('sequential' => 1, 'default_wci_profile' => $values['default_profile'])); civicrm_api3('setting', 'create', array('sequential' => 1, 'widget_cache_timeout' => $values['widget_cache_timeout'])); CRM_Core_Session::setStatus(ts('Widget settings are saved to database'), '', 'success'); parent::postProcess(); } - + function getProfiles() { - /*$params = array(); - $result = civicrm_api3('Profile', 'get', $params); + /* not API to get all profiles now. + $params = array(); + $result = civicrm_api3('Profile', 'get', $params); $result = civicrm_api('Profile', 'getcount', $params); print_r($result);*/ } @@ -58,7 +77,7 @@ $cacheTime = 1; $widgetlist = array( '' => ts('- select -'), ); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { @@ -67,7 +86,6 @@ $cacheTime = 1; return $widgetlist; } - /** * Get the fields/elements defined in this form. * diff --git a/CRM/Wci/Page/ManageEmbedCode.php b/CRM/Wci/Page/ManageEmbedCode.php index af78d03..89e5d3a 100644 --- a/CRM/Wci/Page/ManageEmbedCode.php +++ b/CRM/Wci/Page/ManageEmbedCode.php @@ -1,10 +1,32 @@ set('id', $id); $controller->process(); return $controller->run(); - } + } elseif ($action & CRM_Core_Action::DELETE) { try { $transaction = new CRM_Core_Transaction(); - + $sql = "DELETE FROM civicrm_wci_embed_code where id = %1"; $params = array(1 => array($id, 'Integer')); CRM_Core_DAO::executeQuery($sql, $params); $transaction->commit(); } catch (Exception $e) { - //TODO - print_r($e->getMessage()); + CRM_Core_Session::setStatus(ts('Failed to delete embed code. ') . $e->getMessage(), '', 'error'); $transaction->rollback(); - } + } } - CRM_Utils_System::setTitle(ts('Embed Code List')); $query = "SELECT * FROM civicrm_wci_embed_code"; $params = array(); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_EmbedCode'); while ($dao->fetch()) { @@ -54,18 +74,17 @@ class CRM_Wci_Page_ManageEmbedCode extends CRM_Core_Page { CRM_Core_DAO::storeValues($dao, $emb_code[$dao->id]); $emb_code[$dao->id]['id'] = $emb_code[$dao->id]['id']; $emb_code[$dao->id]['name'] = $emb_code[$dao->id]['name']; - - $action = array_sum(array_keys($this->actionLinks())); + + $action = array_sum(array_keys($this->actionLinks())); //build the normal action links. $emb_code[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), - $action, array('id' => $dao->id)); + $action, array('id' => $dao->id)); } - + if (isset($emb_code)) { $this->assign('rows', $emb_code); } - parent::run(); } function &actionLinks() { diff --git a/CRM/Wci/Page/ProgressBarList.php b/CRM/Wci/Page/ProgressBarList.php index b20e6d5..4a04157 100644 --- a/CRM/Wci/Page/ProgressBarList.php +++ b/CRM/Wci/Page/ProgressBarList.php @@ -1,10 +1,32 @@ set('id', $id); $controller->process(); return $controller->run(); - } + } elseif ($action & CRM_Core_Action::DELETE) { $errorScope = CRM_Core_TemporaryErrorScope::useException(); try { @@ -33,7 +55,7 @@ class CRM_Wci_Page_ProgressBarList extends CRM_Core_Page { $sql = "DELETE FROM civicrm_wci_progress_bar_formula where progress_bar_id = %1"; $params = array(1 => array($id, 'Integer')); CRM_Core_DAO::executeQuery($sql, $params); - + $sql = "DELETE FROM civicrm_wci_progress_bar where id = %1"; $params = array(1 => array($id, 'Integer')); CRM_Core_DAO::executeQuery($sql, $params); @@ -42,22 +64,22 @@ class CRM_Wci_Page_ProgressBarList extends CRM_Core_Page { catch (Exception $e) { $errmgs = $e->getMessage() . ts('. Check whether progressbar is used by any widget or not'); CRM_Core_Session::setStatus($errmgs, '', 'error'); - $transaction->rollback(); - } + $transaction->rollback(); + } } // Example: Set the page-title dynamically; alternatively, declare a static title in xml/Menu/*.xml CRM_Utils_System::setTitle(ts('Progress Bar List')); $query = "SELECT * FROM civicrm_wci_progress_bar"; $params = array(); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_ProgressBar'); while ($dao->fetch()) { $con_page[$dao->id] = array(); CRM_Core_DAO::storeValues($dao, $con_page[$dao->id]); - - $action = array_sum(array_keys($this->actionLinks())); + + $action = array_sum(array_keys($this->actionLinks())); //build the normal action links. $con_page[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action, array('id' => $dao->id)); @@ -68,7 +90,7 @@ class CRM_Wci_Page_ProgressBarList extends CRM_Core_Page { } return parent::run(); } - + function &actionLinks() { // check if variable _actionsLinks is populated if (!isset(self::$_actionLinks)) { diff --git a/CRM/Wci/Page/WidgetList.php b/CRM/Wci/Page/WidgetList.php index b45209f..1164156 100644 --- a/CRM/Wci/Page/WidgetList.php +++ b/CRM/Wci/Page/WidgetList.php @@ -1,10 +1,32 @@ set('id', $id); $controller->process(); return $controller->run(); - } + } elseif ($action & CRM_Core_Action::DELETE) { try { $transaction = new CRM_Core_Transaction(); - + $sql = "DELETE FROM civicrm_wci_widget where id = %1"; $params = array(1 => array($id, 'Integer')); CRM_Core_DAO::executeQuery($sql, $params); $transaction->commit(); } catch (Exception $e) { - //TODO - print_r($e->getMessage()); - $transaction->rollback(); - } - } - + CRM_Core_Session::setStatus(ts('Failed to delete widget. ') . $e->getMessage(), '', 'error'); + $transaction->rollback(); + } + } + CRM_Utils_System::setTitle(ts('Widget List')); $query = "SELECT * FROM civicrm_wci_widget"; $params = array(); - + $dao = CRM_Core_DAO::executeQuery($query, $params, TRUE, 'CRM_Wci_DAO_Widget'); while ($dao->fetch()) { @@ -54,20 +75,20 @@ class CRM_Wci_Page_WidgetList extends CRM_Core_Page { $wid_page[$dao->id]['title'] = $wid_page[$dao->id]['title']; $description = $wid_page[$dao->id]['description']; $wid_page[$dao->id]['description'] = strip_tags($description); - - $action = array_sum(array_keys($this->actionLinks())); + + $action = array_sum(array_keys($this->actionLinks())); //build the normal action links. $wid_page[$dao->id]['action'] = CRM_Core_Action::formLink(self::actionLinks(), $action, array('id' => $dao->id)); } - + if (isset($wid_page)) { $this->assign('rows', $wid_page); } - + parent::run(); } - + function &actionLinks() { // check if variable _actionsLinks is populated if (!isset(self::$_actionLinks)) { diff --git a/CRM/Wci/Upgrader.php b/CRM/Wci/Upgrader.php index 08f32e8..947b16c 100644 --- a/CRM/Wci/Upgrader.php +++ b/CRM/Wci/Upgrader.php @@ -1,4 +1,26 @@ ctx->log->info('Applying update 1001'); diff --git a/CRM/Wci/Upgrader/Base.php b/CRM/Wci/Upgrader/Base.php index 7309db6..d37b6ca 100644 --- a/CRM/Wci/Upgrader/Base.php +++ b/CRM/Wci/Upgrader/Base.php @@ -1,4 +1,26 @@ fetch('string:' . html_entity_decode($data['custom_template'])); } - + $code = json_encode($wcidata); - + if ($data['progress_bar_id'] != 0) { $dynamic_content = TRUE; } return array('dynamic' => $dynamic_content, 'code' => $code); } - + static function get_widget_code($embedId, $preview = 0) { $code = ''; if ($preview) { @@ -46,4 +69,3 @@ class CRM_Wci_WidgetCode { return $code; } } - diff --git a/Changelog.txt b/Changelog.txt index 140ee9b..6b1d511 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,12 @@ -Release Notes for civicrm-wci CiciCRM extension. 1.0-rc1 +Release Notes for civicrm-wci CiciCRM extension. 1.0-rc2 =========================================================== +1.0-rc2, 11/21/2014 +--------------------- +1. 1.0-rc1 bug fixes. +2. Added help texts and layout fixes +3. Code cleanup. + 1.0-rc1, 11/19/2014 --------------------- 1. Implemented widget cache system. @@ -8,7 +14,7 @@ Release Notes for civicrm-wci CiciCRM extension. 1.0-rc1 Beta - 3, 11/16/2014 --------------------- -1. Fixed db error due to invalid data type in select widgets. +1. Fixed db error due to invalid data type in select widgets. Beta - 2, 11/13/2014 ------------------------------------------ @@ -31,7 +37,7 @@ Alpha - 3, 10/30/2014 Alpha - 2, 10/23/2014 ------------------------------------------ -1. Newsletter signup feature +1. Newsletter signup feature 2. Added preview button 3. Widget properties specified the creation form applied to widget @@ -47,4 +53,3 @@ Alpha - 1, 10/16/2014 8. Edit widget 9. Preview progressbar in create widget form 10. Embed progessbar external clients - diff --git a/License.txt b/License.txt new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/License.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/extern/embed.php b/extern/embed.php index aef47f7..fd6cce4 100644 --- a/extern/embed.php +++ b/extern/embed.php @@ -1,30 +1,26 @@ Manoj K, Jagadees Pillai manoj.k@zyxware.com, jagadees.pillai@zyxware.com - 2014-11-13 - 1.0-rc1 + 2014-11-21 + 1.0-rc2 beta 4.4 diff --git a/js/addmore.js b/js/addmore.js index 1120d21..dddf1f9 100644 --- a/js/addmore.js +++ b/js/addmore.js @@ -1,6 +1,27 @@ -// Updated to wait until the document is loaded. addmore_link +/* + +--------------------------------------------------------------------+ + | CiviCRM Widget Creation Interface (WCI) Version 1.0 | + +--------------------------------------------------------------------+ + | Copyright Zyxware Technologies (c) 2014 | + +--------------------------------------------------------------------+ + | This file is a part of CiviCRM WCI. | + | | + | CiviCRM WCI is free software; you can copy, modify, and distribute | + | it under the terms of the GNU Affero General Public License | + | Version 3, 19 November 2007. | + | | + | CiviCRM WCI is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | + | See the GNU Affero General Public License for more details. | + | | + | You should have received a copy of the GNU Affero General Public | + | License along with this program; if not, contact Zyxware | + | Technologies at info[AT]zyxware[DOT]com. | + +--------------------------------------------------------------------+ +*/ -cj(function ( $ ) { +cj(function ( $ ) { $(document).ready(function(){ var count = parseInt($('input[name=contrib_count]').val()); for ( var i = 2; i <= count; i++ ) { @@ -66,20 +87,20 @@ cj(function ( $ ) { $( "#contribution_page_" + count).rules( "add", { required: true }); - + $( "#percentage_" + count).rules( "add", { required: true, max: 100, number: true }); - + $('input[name=contrib_count]').val(count); - + }); $(document).on('click', '#remove_link', function( e ) { e.preventDefault(); - + var rem_name = e.target.name; //assuming that - is the delimiter. second string will be the count var rem_name_ar = rem_name.split('-'); diff --git a/js/createwidget.js b/js/createwidget.js index b5a1907..f55a454 100644 --- a/js/createwidget.js +++ b/js/createwidget.js @@ -1,4 +1,25 @@ -// +/* + +--------------------------------------------------------------------+ + | CiviCRM Widget Creation Interface (WCI) Version 1.0 | + +--------------------------------------------------------------------+ + | Copyright Zyxware Technologies (c) 2014 | + +--------------------------------------------------------------------+ + | This file is a part of CiviCRM WCI. | + | | + | CiviCRM WCI is free software; you can copy, modify, and distribute | + | it under the terms of the GNU Affero General Public License | + | Version 3, 19 November 2007. | + | | + | CiviCRM WCI is distributed in the hope that it will be useful, | + | but WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | + | See the GNU Affero General Public License for more details. | + | | + | You should have received a copy of the GNU Affero General Public | + | License along with this program; if not, contact Zyxware | + | Technologies at info[AT]zyxware[DOT]com. | + +--------------------------------------------------------------------+ +*/ cj(function ( $ ) { function setState() { if ($('#override').is(':checked') == true) { @@ -8,7 +29,7 @@ cj(function ( $ ) { $('#custom_template').attr("disabled",true); } if( $('#progress_bar').val() != "") { - $('#embd_code').parents('.crm-section').show(); + $('#embd_code').parents('.crm-section').show(); } else { $('#embd_code').parents('.crm-section').hide(); } @@ -17,4 +38,3 @@ cj(function ( $ ) { $('#override').click(setState); }); - diff --git a/settings/wci.setting.php b/settings/wci.setting.php index 276e8ae..9f17ca0 100644 --- a/settings/wci.setting.php +++ b/settings/wci.setting.php @@ -1,4 +1,26 @@ array( 'group_name' => 'Wci Preference', @@ -19,5 +41,3 @@ return array( 'help_text' => 'widget timeout', ), ); - - diff --git a/wci-helper-functions.php b/wci-helper-functions.php index c8a307c..8dc4b0f 100644 --- a/wci-helper-functions.php +++ b/wci-helper-functions.php @@ -1,30 +1,52 @@ ts('- select -'), ); - + $result = civicrm_api3('contribution_page', 'get'); foreach ($result['values'] as $contribution_page) { $options[$contribution_page['id']] = $contribution_page['title']; } - + return $options; } - + function getExtensionRootPath() { return 'http://' . $_SERVER['SERVER_NAME'] . str_replace($_SERVER['DOCUMENT_ROOT'], '', __DIR__); } - + function getWciWidgetControllerPath() { $widget_controller_path = getExtensionRootPath() . '/extern/embed.php'; - + return $widget_controller_path; } - + function getWciWidgetTemplatePath() { $widget_tpl_path = __DIR__ . '/templates/CRM/Wci/Page'; - + return $widget_tpl_path; } diff --git a/wci.civix.php b/wci.civix.php index ae56ebc..4dd1640 100644 --- a/wci.civix.php +++ b/wci.civix.php @@ -1,5 +1,26 @@ array ( @@ -125,7 +146,7 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 0, - 'parentID' => 0, + 'parentID' => 0, 'navID' => $navId, 'active' => 1), 'child' => array ( @@ -137,22 +158,22 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+1, 'active' => 1)), - + '2' => array ( 'attributes' => array ( - 'label' => ts('Manage Widget'), + 'label' => ts('Manage Widgets'), 'name' => 'manage_widget', 'url' => 'civicrm/wci/widget?reset=1', 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+2, 'active' => 1)), - + '3' => array ( 'attributes' => array ( 'label' => ts('New Progress Bar'), @@ -161,22 +182,22 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+3, 'active' => 1)), - + '4' => array ( 'attributes' => array ( - 'label' => ts('Manage Progress Bar'), + 'label' => ts('Manage Progress Bars'), 'name' => 'manage_progress_bar', 'url' => 'civicrm/wci/progress-bar?reset=1', 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+4, 'active' => 1)), - + '5' => array ( 'attributes' => array ( 'label' => ts('New Embed Code'), @@ -185,7 +206,7 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+5, 'active' => 1)), @@ -197,10 +218,10 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+6, 'active' => 1)), - + '7' => array ( 'attributes' => array ( 'label' => ts('Widget Settings'), @@ -209,10 +230,9 @@ function wci_civicrm_navigationMenu( &$params ) { 'permission' => 'access CiviReport,access CiviContribute', 'operator' => 'OR', 'separator' => 1, - 'parentID' => $navId, + 'parentID' => $navId, 'navID' => $navId+7, 'active' => 1)), ), ); } - -- 2.25.1