Skip to content
Snippets Groups Projects
Commit b3d37c39 authored by scardinius's avatar scardinius
Browse files

Fix coding style

parent a79a626d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CRM/Utmaltor/Form/Settings.php
+ 11
− 9
View file @ b3d37c39
......@@ -13,21 +13,22 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
private $settings = array();
function buildQuickForm() {
public function buildQuickForm() {
$settings = $this->getFormSettings();
foreach ($settings as $name => $setting) {
if (isset($setting['quick_form_type'])) {
$add = 'add' . $setting['quick_form_type'];
if ($add == 'addElement') {
$this->$add($setting['html_type'], $name, ts($setting['title']), CRM_Utils_Array::value('html_attributes', $setting, array ()));
} else {
$this->$add($setting['html_type'], $name, ts($setting['title']), CRM_Utils_Array::value('html_attributes', $setting, array()));
}
else {
$this->$add($name, ts($setting['title']));
}
$this->assign("{$setting['description']}_description", ts('description'));
}
}
$this->addButtons(array(
array (
array(
'type' => 'submit',
'name' => ts('Submit'),
'isDefault' => TRUE,
......@@ -38,7 +39,7 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
}
function postProcess() {
public function postProcess() {
$this->submittedValues = $this->exportValues();
$this->saveSettings();
parent::postProcess();
......@@ -50,7 +51,7 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
*
* @return array (string)
*/
function getRenderableElementNames() {
private function getRenderableElementNames() {
$elementNames = array();
foreach ($this->_elements as $element) {
$label = $element->getLabel();
......@@ -67,7 +68,7 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
*
* @return array
*/
function getFormSettings() {
private function getFormSettings() {
if (empty($this->settings)) {
$settings = civicrm_api3('Setting', 'getfields', array('filters' => $this->settingFilter));
}
......@@ -78,7 +79,7 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
/**
* Get the settings we are going to allow to be set on this form.
*/
function saveSettings() {
private function saveSettings() {
$settings = $this->getFormSettings();
$values = array_intersect_key($this->submittedValues, $settings);
civicrm_api3('Setting', 'create', $values);
......@@ -90,7 +91,7 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
*
* @see CRM_Core_Form::setDefaultValues()
*/
function setDefaultValues() {
public function setDefaultValues() {
$existing = civicrm_api3('Setting', 'get', array('return' => array_keys($this->getFormSettings())));
$defaults = array();
$domainID = CRM_Core_Config::domainID();
......@@ -99,4 +100,5 @@ class CRM_Utmaltor_Form_Settings extends CRM_Core_Form {
}
return $defaults;
}
}
CRM/Utmaltor/Logic/Alter.php
+ 13
− 11
View file @ b3d37c39
......@@ -10,35 +10,35 @@ class CRM_Utmaltor_Logic_Alter {
return $url;
}
function fixUrl($url) {
private static function fixUrl($url) {
return str_replace('&', '&', $url);
}
function alterSource($url, $smarty) {
private static function alterSource($url, $smarty) {
$key = 'utm_source';
$value = CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_source');
$value = $smarty->parse($value);
$override = (boolean)CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_source_override');
$override = (boolean) CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_source_override');
return self::setKey($url, $key, $value, $override);
}
function alterMedium($url, $smarty) {
private static function alterMedium($url, $smarty) {
$key = 'utm_medium';
$value = CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_medium');
$value = $smarty->parse($value);
$override = (boolean)CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_medium_override');
$override = (boolean) CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_medium_override');
return self::setKey($url, $key, $value, $override);
}
function alterCampaign($url, $smarty) {
private static function alterCampaign($url, $smarty) {
$key = 'utm_campaign';
$value = CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_campaign');
$value = $smarty->parse($value);
$override = (boolean)CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_campaign_override');
$override = (boolean) CRM_Core_BAO_Setting::getItem('UTMaltor Preferences', 'utmaltor_campaign_override');
return self::setKey($url, $key, $value, $override);
}
function setKey($url, $key, $value, $override = FALSE) {
private static function setKey($url, $key, $value, $override = FALSE) {
if ($override) {
return self::setValue($url, $key, $value);
}
......@@ -48,7 +48,7 @@ class CRM_Utmaltor_Logic_Alter {
return $url;
}
function getValue($url, $key) {
private static function getValue($url, $key) {
$query = parse_url($url, PHP_URL_QUERY);
parse_str($query, $arr);
if (array_key_exists($key, $arr)) {
......@@ -57,11 +57,12 @@ class CRM_Utmaltor_Logic_Alter {
return "";
}
function setValue($url, $key, $value) {
private static function setValue($url, $key, $value) {
$urlParts = parse_url($url);
if (array_key_exists('query', $urlParts)) {
parse_str($urlParts['query'], $query);
} else {
}
else {
$query = array();
}
if (!array_key_exists('path', $urlParts)) {
......@@ -81,4 +82,5 @@ class CRM_Utmaltor_Logic_Alter {
$newUrl = str_replace(array_keys($tokens), array_values($tokens), $newUrl);
return $newUrl;
}
}
CRM/Utmaltor/Logic/Hooks.php
+ 2
− 1
View file @ b3d37c39
......@@ -4,7 +4,8 @@ class CRM_Utmaltor_Logic_Hooks {
static $null = NULL;
static function alterSmartyVariables($op, $objectName, $id, $params, &$smartyVariables) {
public static function alterSmartyVariables($op, $objectName, $id, $params, &$smartyVariables) {
return CRM_Utils_Hook::singleton()->invoke(5, $op, $objectName, $id, $params, $smartyVariables, self::$null, 'civicrm_utmaltorAlterSmartyVariables');
}
}
CRM/Utmaltor/Logic/Smarty.php
+ 8
− 7
View file @ b3d37c39
......@@ -4,16 +4,16 @@ class CRM_Utmaltor_Logic_Smarty {
public $variables = array();
private $smarty = null;
private $smarty = NULL;
private $smartyCache;
private static $instance = false;
private static $instance = FALSE;
private static $instanceParams = array();
public static function singleton($params) {
if (self::$instance == false || self::hasNewParams($params)) {
if (self::$instance == FALSE || self::hasNewParams($params)) {
self::$instanceParams = $params;
self::$instance = new CRM_Utmaltor_Logic_Smarty($params);
}
......@@ -23,14 +23,14 @@ class CRM_Utmaltor_Logic_Smarty {
private static function hasNewParams($params) {
/* assumption: $params never be empty */
if (empty(self::$instanceParams)) {
return true;
return TRUE;
}
/* Assumption: this class uses smarty only with variables listed in $variables */
if (self::$instanceParams['id'] == $params['id']
if (self::$instanceParams['id'] == $params['id']
&& self::$instanceParams['campaign_id'] == $params['campaign_id']) {
return false;
return FALSE;
}
return true;
return TRUE;
}
private function __construct($params) {
......@@ -61,4 +61,5 @@ class CRM_Utmaltor_Logic_Smarty {
$locale = $campaign->getLanguage();
return strtoupper(substr($locale, 0, 2));
}
}
utmaltor.php
+ 4
− 3
View file @ b3d37c39
......@@ -110,7 +110,7 @@ function utmaltor_civicrm_caseTypes(&$caseTypes) {
* @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
*/
function utmaltor_civicrm_angularModules(&$angularModules) {
_utmaltor_civix_civicrm_angularModules($angularModules);
_utmaltor_civix_civicrm_angularModules($angularModules);
}
/**
......@@ -138,7 +138,7 @@ function utmaltor_civicrm_pre($op, $objectName, $id, &$params) {
}
foreach ($urls as $old => $new) {
if ($old != $new) {
$params['body_html'] = str_replace('href="'.$old.'"', 'href="'.$new.'"', $params['body_html']);
$params['body_html'] = str_replace('href="' . $old . '"', 'href="' . $new . '"', $params['body_html']);
}
}
}
......@@ -165,7 +165,8 @@ function utmaltor_civicrm_alterUrl(&$url, $params) {
if ($url2) {
$url = $url2;
} elseif ($url1) {
}
elseif ($url1) {
$url = $url1;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment