Commit dbb978bb authored by Natalia Gabrieleva's avatar Natalia Gabrieleva
Browse files

Cleanup

parent 90ceda06

entityform_block.module

+34 −13
Original line number Diff line number Diff line
@@ -26,15 +26,20 @@ function entityform_block_block_info() { 
 * Implements hook_block_view().

 */

function entityform_block_block_view($delta = '') {

  

  $types = variable_get('entityform_block_types');

  if (entityform_block_exists($types, $delta)) {

  $entity_form = entityform_block_get_entity($delta);

  $subject = $entity_form[1]->label;

  dpm($entity_form);

  if ($entity_form) {

    $subject = $entity_form->label;

    $block = array();

     module_load_include('inc', 'entityform', 'entityform.admin');

    $block['subject'] = $subject;

  $block['content'] = entityform_form_wrapper(entityform_empty_load($delta));    

    $block['content'] = drupal_render(entityform_form_wrapper(entityform_empty_load($delta)));    

    return $block;

  }

  }

}



/**

 * Implements hook_form_alter().
@@ -69,7 +74,7 @@ function entityform_block_form_alter(&$form, &$form_state, $form_id) { 
    $form['#submit'][] = 'entityform_block_submit';

    

  }

  dpm($form);

  

}



/*
@@ -106,12 +111,14 @@ function entityform_block_submit(&$form, &$form_state) { 
  } elseif (!isset($enabled) && $block_exists) { 

      $key = array_search($original_type, $types); 

      unset($types[$key]);

      // Delete from database just in case.

      entityform_block_delete($original_type);

    }

  variable_set('entityform_block_types', $types);

  //dpm($form_state);

 

}



function entityform_block_exists($types = array(), $type, $original_type = '') {

function entityform_block_exists($types, $type, $original_type = '') {

  

  if (!empty($original_type) && $type !== $original_type) {

    $type_check = $original_type;
@@ -133,17 +140,31 @@ function entityform_block_change_name($original_type, $new_type) { 
          ->condition('delta', $original_type)

          ->execute();

}



/*

 * Delete the block from database.

 */

function entityform_block_delete($delta) {

  $query = db_delete('block')

    ->condition('delta', $delta)

    ->execute();

}



/*

 * Using entity field query to retrieve the entity object.

 */

function entityform_block_get_entity($type){

  

  $query = new EntityFieldQuery();

  $query->entityCondition('entity_type', 'entityform_type')

        ->propertyCondition('type', $type);

  $result = $query->execute();

  $id = $result['entityform_type'][1]->id;

  

  if(!empty($result)) {

    $id = key($result['entityform_type']);      

    $entity_form = entity_load('entityform_type', array($id));  

  return $entity_form;

    dpm($entity_form);

    return $entity_form[$id];

  } else return FALSE;

}