diff --git a/mollom.admin.inc b/mollom.admin.inc index 50ff664..e1b21ee 100644 --- a/mollom.admin.inc +++ b/mollom.admin.inc @@ -156,53 +156,52 @@ function mollom_admin_form_list() { '%module' => isset($module_info[$mollom_form['module']]['name']) ? t($module_info[$mollom_form['module']]['name']) : $mollom_form['module'], )), 'warning'); } - if ($exportable) { - // Remove protection. - if ($mollom_form['export_type'] === EXPORT_IN_DATABASE) { - $row[] = array('data' => array( - '#type' => 'link', - '#title' => t('Unprotect'), - '#href' => 'admin/config/content/mollom/unprotect/' . $form_id, - )); - } - elseif (empty($mollom_form['disabled'])) { - $row[] = array('data' => array( - '#type' => 'link', - '#title' => t('Disable'), - '#href' => 'admin/config/content/mollom/disable/' . $form_id, - )); - } - else { - $row[] = array('data' => array( - '#type' => 'link', - '#title' => t('Enable'), - '#href' => 'admin/config/content/mollom/enable/' . $form_id, - )); - } - // Storage operations - if (!empty($mollom_form['disabled'])) { - $row[] = t('Disabled'); - } - else { - if ($mollom_form['export_type'] & EXPORT_IN_DATABASE && $mollom_form['export_type'] & EXPORT_IN_CODE) { - $row[] = t('Database overriding code (!revert | !export)', array('!revert' => l(t('revert'), 'admin/config/content/mollom/revert/' . $form_id), '!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); - } - elseif ($mollom_form['export_type'] & EXPORT_IN_DATABASE) { - $row[] = t('In database (!export)', array('!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); - } - elseif ($mollom_form['export_type'] & EXPORT_IN_CODE) { - $row[] = t('In code (!export)', array('!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); - } - } - } - else { - $row[] = array('data' => array( - '#type' => 'link', - '#title' => t('Unprotect'), - '#href' => 'admin/config/content/mollom/unprotect/' . $form_id, - )); - } - + if ($exportable) { + // Remove protection. + if ($mollom_form['export_type'] === EXPORT_IN_DATABASE) { + $row[] = array('data' => array( + '#type' => 'link', + '#title' => t('Unprotect'), + '#href' => 'admin/config/content/mollom/unprotect/' . $form_id, + )); + } + elseif (empty($mollom_form['disabled'])) { + $row[] = array('data' => array( + '#type' => 'link', + '#title' => t('Disable'), + '#href' => 'admin/config/content/mollom/disable/' . $form_id, + )); + } + else { + $row[] = array('data' => array( + '#type' => 'link', + '#title' => t('Enable'), + '#href' => 'admin/config/content/mollom/enable/' . $form_id, + )); + } + // Storage operations + if (!empty($mollom_form['disabled'])) { + $row[] = t('Disabled'); + } + else { + if ($mollom_form['export_type'] & EXPORT_IN_DATABASE && $mollom_form['export_type'] & EXPORT_IN_CODE) { + $row[] = t('Database overriding code (!revert | !export)', array('!revert' => l(t('revert'), 'admin/config/content/mollom/revert/' . $form_id), '!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); + } + elseif ($mollom_form['export_type'] & EXPORT_IN_DATABASE) { + $row[] = t('In database (!export)', array('!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); + } + elseif ($mollom_form['export_type'] & EXPORT_IN_CODE) { + $row[] = t('In code (!export)', array('!export' => l(t('export'), 'admin/config/content/mollom/export/' . $form_id))); + } + } + } + else { + $row[] = array('data' => array( + '#type' => 'link', + '#title' => t('Unprotect'), + '#href' => 'admin/config/content/mollom/unprotect/' . $form_id, + )); + } $rows[] = $row_attributes + array('data' => $row); } diff --git a/mollom.install b/mollom.install index f419701..b65af88 100644 --- a/mollom.install +++ b/mollom.install @@ -280,7 +280,7 @@ function mollom_schema() { 'size' => 'tiny', 'not null' => TRUE, 'default' => 0, - 'export callback' => 'mollom_ctools_var_export', + 'export callback' => 'mollom_ctools_var_export', ), 'checks' => array( 'description' => 'Text analyis checks to perform.', @@ -335,10 +335,10 @@ function mollom_schema() { 'key' => 'form_id', 'bulk export' => TRUE, 'api' => array( - 'owner' => 'mollom', - 'api' => 'mollom', - 'minimum_version' => 1, - 'current_version' => 1, + 'owner' => 'mollom', + 'api' => 'mollom', + 'minimum_version' => 1, + 'current_version' => 1, ), ), ); diff --git a/mollom.module b/mollom.module index 8521fa6..ac15fe0 100644 --- a/mollom.module +++ b/mollom.module @@ -845,7 +845,7 @@ function mollom_form_alter(&$form, &$form_state, $form_id) { if (isset($forms['protected'][$form_id]) && ($mollom_form = mollom_form_load($form_id))) { // If form is disabled bypass validation. if (!empty($mollom_form['disabled'])) { - return; + return; } // Determine whether to bypass validation for the current user. foreach ($mollom_form['bypass access'] as $permission) { @@ -1201,8 +1201,8 @@ function mollom_form_load_all($reset = FALSE) { else { $result = db_query("SELECT * FROM {mollom_form}"); foreach ($result as $mollom_form) { - $mollom_form->enabled_fields = unserialize($mollom_form->enabled_fields); - $mollom_forms[$mollom_form->form_id] = $mollom_form; + $mollom_form->enabled_fields = unserialize($mollom_form->enabled_fields); + $mollom_forms[$mollom_form->form_id] = $mollom_form; } } foreach ($mollom_forms as $id => $mollom_form) { @@ -1214,9 +1214,9 @@ function mollom_form_load_all($reset = FALSE) { // Ensure default values (partially for administrative configuration). $mollom_form += array( - 'form_id' => $id, - 'title' => $id, - 'elements' => array(), + 'form_id' => $id, + 'title' => $id, + 'elements' => array(), ); $mollom_forms[$id] = $mollom_form; @@ -1239,14 +1239,14 @@ function mollom_form_load($form_id) { if (module_exists('ctools')) { ctools_include('export'); if ($objects = ctools_export_load_object('mollom_form', 'names', array($form_id))) { - $mollom_form = (array) $objects[$form_id]; + $mollom_form = (array) $objects[$form_id]; } } else { $mollom_form = db_query('SELECT * FROM {mollom_form} WHERE form_id = :form_id', array(':form_id' => $form_id))->fetchAssoc(); if ($mollom_form) { - $mollom_form['checks'] = unserialize($mollom_form['checks']); - $mollom_form['enabled_fields'] = unserialize($mollom_form['enabled_fields']); + $mollom_form['checks'] = unserialize($mollom_form['checks']); + $mollom_form['enabled_fields'] = unserialize($mollom_form['enabled_fields']); } } if (!empty($mollom_form)) {