Detect SuiteCRM only with global variable ['sugarcrm']

This commit is contained in:
Manuel Cillero 2017-08-11 01:05:49 +02:00
parent 052824e4b7
commit 3249260653
6 changed files with 153 additions and 147 deletions

View file

@ -389,9 +389,7 @@ function stormperson_form(&$node) {
* Implements hook_form_FORM_ID_alter().
*/
function stormperson_form_stormperson_node_form_alter(&$form, &$form_state) {
global $conf;
if ($conf['storm_suitecrm']) {
if (storm_suitecrm_is_defined()) {
$form['group1']['#access'] = FALSE;
$form['group3']['#access'] = FALSE;
$form['group4']['#access'] = FALSE;
@ -501,7 +499,7 @@ function _stormperson_aftersave(&$node) {
}
function stormperson_nodeapi(&$node, $op, $teaser, $page) {
global $base_url, $conf;
global $base_url;
if ($node->type != 'stormperson') {
return;
@ -512,7 +510,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
$name = $node->field_stormperson_name[0]['value'];
$lastname = $node->field_stormperson_lastname[0]['value'];
$fullname = empty($lastname) ? $name : $lastname . ', ' . $name;
if (!$conf['storm_suitecrm'] || empty($fullname)) {
if (!storm_suitecrm_is_defined() || empty($fullname)) {
return;
}
// Checking if exists the contact in SuiteCRM:
@ -544,7 +542,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
break;
case 'presave':
if ($conf['storm_suitecrm']) {
if (storm_suitecrm_is_defined()) {
$sugarid = $node->field_stormperson_sugarid[0]['value'];
db_set_active('sugarcrm');
@ -566,7 +564,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
case 'insert':
case 'update':
if ($conf['storm_suitecrm']) {
if (storm_suitecrm_is_defined()) {
$sugarid = $node->field_stormperson_sugarid[0]['value'];
if (!empty($sugarid)) {
db_set_active('sugarcrm');
@ -577,7 +575,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
break;
case 'delete':
if ($conf['storm_suitecrm']) {
if (storm_suitecrm_is_defined()) {
$sugarid = $node->field_stormperson_sugarid[0]['value'];
if (!empty($sugarid)) {
db_set_active('sugarcrm');
@ -593,7 +591,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
break;
case 'view':
if ($conf['storm_suitecrm'] && !storm_cron_is_running()) {
if (storm_suitecrm_is_defined() && !storm_cron_is_running()) {
$sugarid = $node->field_stormperson_sugarid[0]['value'];
if (!empty($sugarid)) {
db_set_active('sugarcrm');
@ -606,7 +604,7 @@ function stormperson_nodeapi(&$node, $op, $teaser, $page) {
if ($node->field_stormperson_sugarmod[0]['value'] != $suitecrm_contact['date_modified']) {
$node_update = node_load($node->nid);
// Prepare node for a submit.
$node_update = node_submit($node_update);
$node_update = node_submit($node_update);
node_save($node_update);
drupal_set_message(t('SuiteCRM contact has been updated, refresh to view changes.'));
}