diff --git a/known_tags.inc b/known_tags.inc index 4f757f7..9fe22d4 100644 --- a/known_tags.inc +++ b/known_tags.inc @@ -57,7 +57,7 @@ function _metatags_quick_known_fields() { 'type' => 'meta_contents', 'widget' => 'metatags_quick_checkboxes', 'title' => t('Robots'), - 'options' => 'noarchive,nofollow,noindex,noodp,nosnippet,noydir', + 'options' => 'noarchive,nofollow,noindex,noodp,nosnippet,noydir', ), // Using 'title' as the key messes up the admin. 'meta_title' => array( diff --git a/metatags_quick.admin.inc b/metatags_quick.admin.inc index 1ef64e0..68ee272 100644 --- a/metatags_quick.admin.inc +++ b/metatags_quick.admin.inc @@ -30,7 +30,7 @@ function metatags_quick_admin_settings() { '#markup' => t('No meta tags found in your installation') . '
', ); } - + $form['global']['use_path_based'] = array( '#type' => 'checkbox', '#title' => t('Use path-based meta tags'), @@ -38,8 +38,8 @@ function metatags_quick_admin_settings() { '#return_value' => 1, ); $form['global']['remove_tab'] = array( - '#type' => 'checkbox', - '#title' => t('Hide Path-based Metatags tab'), + '#type' => 'checkbox', + '#title' => t('Hide Path-based Metatags tab'), '#default_value' => variable_get('metatags_quick_remove_tab', 0), ); $form['global']['default_field_length'] = array( @@ -71,7 +71,7 @@ function metatags_quick_admin_settings() { '#suffix' => '', ); } - + $field_instances = field_info_instances(); // Build the sortable table header. @@ -82,7 +82,7 @@ function metatags_quick_admin_settings() { $header[$name] = $tag['title']; } //$header['_select_all'] = t('Select all'); - + foreach (field_info_bundles() as $entity_type => $bundles) { $entity_info = entity_get_info($entity_type); if (!$entity_info['fieldable']) { @@ -99,7 +99,7 @@ function metatags_quick_admin_settings() { $options[$entity_type]['data'][$name] = array( 'data' => array( '#type' => 'checkbox', - '#attributes' => array('class' => array('cb_bundle_parent', "cb_bundle_name_{$entity_type}_{$name}")), + '#attributes' => array('class' => array('cb_bundle_parent', "cb_bundle_name_{$entity_type}_{$name}")), '#return_value' => 1, '#checked' => FALSE, ), @@ -112,10 +112,10 @@ function metatags_quick_admin_settings() { '#checked' => FALSE, ), );*/ - + // How do we mark that specific meta is already attached to bundle $checked_markup = array( - '#markup' => theme('image', + '#markup' => theme('image', array( 'path' => 'misc/watchdog-ok.png', 'width' => 18, @@ -124,7 +124,7 @@ function metatags_quick_admin_settings() { 'title' => 'ok', )), ); - + foreach ($bundles as $key => $bundle) { // Which meta tags are set for this bundle? $meta_set = array(); @@ -132,7 +132,7 @@ function metatags_quick_admin_settings() { if ($bundle_instance['widget']['module'] == 'metatags_quick') { $field_info = field_info_field_by_id($bundle_instance['field_id']); $meta_set[$field_info['settings']['meta_name']] = 1; - } + } } $options[$entity_type . '_' . $key] = array( @@ -161,7 +161,7 @@ function metatags_quick_admin_settings() { ); } else { - $options[$entity_type . '_' . $key]['data'][$name]['data'] = $checked_markup; + $options[$entity_type . '_' . $key]['data'][$name]['data'] = $checked_markup; } } /*$options[$entity_type . '_' . $key]['data']['_select_all']['data'] = array( @@ -173,18 +173,18 @@ function metatags_quick_admin_settings() { // Now check if we have completely set bundles foreach ($known_tags as $name => $tag) { if (!$bundle_workable[$name]) { - $options[$entity_type]['data'][$name]['data'] = $checked_markup; + $options[$entity_type]['data'][$name]['data'] = $checked_markup; } } } - + $form['standard_tags']['existing'] = array( '#theme' => 'table', '#header' => $header, '#rows' => $options, '#empty' => t('No content available.'), ); - + $form['standard_tags']['basic_init_op'] = array( '#type' => 'submit', '#value' => t('Attach'), @@ -192,7 +192,7 @@ function metatags_quick_admin_settings() { $form['op'] = array( '#value' => t('Submit'), - '#type' => 'submit', + '#type' => 'submit', ); return $form; } @@ -226,7 +226,7 @@ function metatags_quick_admin_path($form, &$form_state) { else { return MENU_ACCESS_DENIED; } - + $controller = new DrupalDefaultEntityController('metatags_path_based'); $entity_id = db_select('metatags_quick_path_based', 'm') ->fields('m', array('id')) @@ -252,8 +252,8 @@ function metatags_quick_admin_path($form, &$form_state) { } $form['op'] = array( '#value' => t('Submit'), - '#type' => 'submit', - ); + '#type' => 'submit', + ); return $form; } @@ -267,11 +267,11 @@ function metatags_quick_admin_path_submit($form, &$form_state) { drupal_set_message(t('Wrong path'), 'error'); return; } - + $entity = $form_state['entity']; entity_form_submit_build_entity('metatags_path_based', $entity, $form, $form_state); field_attach_update('metatags_path_based', $entity); - + drupal_set_message('Meta tags updated', 'status'); } @@ -282,7 +282,7 @@ function _metatags_quick_admin_fields_create_attach($input) { if (!$entity_info['fieldable']) { continue; } - + foreach ($bundles as $key => $bundle) { if (isset($input[$entity_type][$key])) { foreach ($input[$entity_type][$key] as $meta_name => $meta_value) { @@ -292,40 +292,40 @@ function _metatags_quick_admin_fields_create_attach($input) { } } } - + function _metatags_quick_field_attach($entity_type, $bundle, $meta_name) { static $meta_fields = FALSE; static $field_id = array(); static $known_tags = FALSE; - + // Get metatags_quick fields info if (!$meta_fields) { include_once drupal_get_path('module', 'metatags_quick') . '/known_tags.inc'; $known_tags = _metatags_quick_known_fields(); - - foreach(field_info_fields() as $name => $field_info) { + + foreach (field_info_fields() as $name => $field_info) { if ($field_info['module'] == 'metatags_quick') { $meta_fields[$field_info['settings']['meta_name']] = $field_info; $field_id[$field_info['settings']['meta_name']] = $field_info['id']; } } } - + // Ignore unknown tags. if (!isset($known_tags[$meta_name])) { return; } // Check if meta field exists, create if necessary. - $meta_name_real = empty($known_tags[$meta_name]['meta_name']) ? $meta_name : $known_tags[$meta_name]['meta_name']; + $meta_name_real = empty($known_tags[$meta_name]['meta_name']) ? $meta_name : $known_tags[$meta_name]['meta_name']; if (empty($field_id[$meta_name_real])) { $field = array( - 'field_name' => "meta_$meta_name", - 'type' => 'metatags_quick', + 'field_name' => "meta_$meta_name", + 'type' => 'metatags_quick', 'module' => 'metatags_quick', 'settings' => array( 'meta_name' => (isset($known_tags[$meta_name]['meta_name']) ? $known_tags[$meta_name]['meta_name'] : $meta_name), 'max_length' => variable_get('metatags_quick_default_field_length', 255), - ), + ), 'cardinality' => 1, ); $field = field_create_field($field); @@ -341,7 +341,7 @@ function _metatags_quick_field_attach($entity_type, $bundle, $meta_name) { && in_array($bundle, $field['bundles'][$entity_type])) { return; } - + // Now create field instance attached to requested bundle $instance = array( 'field_name' => $field['field_name'], @@ -470,9 +470,9 @@ function metatags_quick_admin_path_based($form, $form_state) { * @param type $form_state */ function metatags_quick_admin_path_based_validate($form, $form_state) { - if(isset($form_state['values']['path'])) { + if (isset($form_state['values']['path'])) { // create path and empty entity - if(strlen(trim($form_state['values']['path'])) < 2) { + if (strlen(trim($form_state['values']['path'])) < 2) { form_set_error('path', t('Illegal path entered.')); } } @@ -535,14 +535,14 @@ function metatags_quick_admin_path_based_edit($form, &$form_state) { $entities = $controller->load(array($entity_id)); $entity = $entities[$entity_id]; } - + $form_state['entity'] = $entity; field_attach_form('metatags_path_based', $entity, $form, $form_state, LANGUAGE_NONE); // $form['entity_id'] = array( '#type' => 'hidden', '#value' => $entity_id, - ); + ); $form['path'] = array( '#type' => 'textfield', '#title' => t('Edit path'), @@ -588,10 +588,10 @@ function metatags_quick_admin_path_based_edit_cancel($form, &$form_state) { * @param type $form * @param type $form_state */ -function metatags_quick_admin_path_based_edit_validate($form, &$form_state) { - if(isset($form_state['values']['path'])) { +function metatags_quick_admin_path_based_edit_validate($form, &$form_state) { + if (isset($form_state['values']['path'])) { // Create path and empty entity - if(strlen(trim($form_state['values']['path'])) < 2) { + if (strlen(trim($form_state['values']['path'])) < 2) { form_set_error('path', t('Illegal path entered.')); } } @@ -623,7 +623,7 @@ function metatags_quick_admin_path_based_edit_submit($form, &$form_state) { ->execute() ->fetchField(); // if not continue - if(!$entity_id) { + if (!$entity_id) { db_update('metatags_quick_path_based') ->fields(array( 'path' => check_plain(trim($form_state['values']['path'])), @@ -655,26 +655,26 @@ function metatags_quick_admin_path_based_edit_submit($form, &$form_state) { */ function metatags_quick_admin_path_based_delete($form, &$form_state) { // Delete confirmation - if(isset($_GET['pid'])) { + if (isset($_GET['pid'])) { $pid = (int)$_GET['pid']; - $controller = new DrupalDefaultEntityController('metatags_path_based'); - $entities = $controller->load(array($pid)); - - if (empty($entities)) { + $controller = new DrupalDefaultEntityController('metatags_path_based'); + $entities = $controller->load(array($pid)); + + if (empty($entities)) { $form['intro'] = array( '#markup' => t('Path not found'), ); - return $form; - } - - $path_object = $entities[$pid]; - $form_state['#path_object'] = $path_object; - + return $form; + } + + $path_object = $entities[$pid]; + $form_state['#path_object'] = $path_object; + $form['intro'] = array( '#type' => 'item', '#markup' => t('Do you really want to delete the following path:'), ); - + $form['item'] = array( '#type' => 'item', '#markup' => check_plain($path_object->path) . '(' . $path_object->lang . ')', @@ -730,7 +730,7 @@ function metatags_quick_admin_path_based_delete_cancel($form, &$form_state) { function _metatags_quick_language_list() { global $language; $languages = array(); - foreach(language_list() as $lang) { + foreach (language_list() as $lang) { $languages[$lang->language] = t($lang->name); } return $languages; @@ -741,20 +741,20 @@ function _metatags_quick_language_list() { * @param object $entity */ function metatags_path_based_delete($entity) { - if(!is_object($entity)) { + if (!is_object($entity)) { $controller = new DrupalDefaultEntityController('metatags_path_based'); $entity = db_select('metatags_quick_path_based', 'm') ->fields('m', array('id')) ->condition('id', (int)$entity) ->execute() ->fetchField(); - if($entity) { - $values = array_values(entity_load('metatags_path_based', array($entity))); + if ($entity) { + $values = array_values(entity_load('metatags_path_based', array($entity))); $entity = array_pop($values); } } - if(!$entity || !is_object($entity) || !isset($entity->path)) { - return false; + if (!$entity || !is_object($entity) || !isset($entity->path)) { + return FALSE; } // do the deletion field_attach_delete('metatags_path_based', $entity); diff --git a/metatags_quick.drush.inc b/metatags_quick.drush.inc index cb1ed73..fee49ae 100644 --- a/metatags_quick.drush.inc +++ b/metatags_quick.drush.inc @@ -39,7 +39,7 @@ function drush_metatags_quick_migrate() { return drush_set_error('METATAGS_QUICK_MIGRATE_NOTHING_TO_DO', dt('No fields to migrate.')); } drush_log(dt('The following fields will be migrated: !fields', array('!fields' => implode(', ', $field_names))), 'status'); - if(!drush_confirm(dt('Do you really want to continue?'))) { + if (!drush_confirm(dt('Do you really want to continue?'))) { return drush_user_abort(); } foreach ($field_names as $name) { @@ -51,7 +51,7 @@ function drush_metatags_quick_migrate() { drush_log(dt('Migration complete'), 'status'); } -function drush_metatags_quick_migrate_fields($field_names) { +function drush_metatags_quick_migrate_fields($field_names) { if (!$field_names) { return; } @@ -65,8 +65,8 @@ function drush_metatags_quick_migrate_fields($field_names) { module_load_include('inc', 'metatags_quick', 'metatags_quick.admin'); module_load_include('inc', 'metatags_quick_import', 'metatags_quick_import.admin'); - - foreach($field_names as $field_name => $value) { + + foreach ($field_names as $field_name => $value) { if (!$value) { continue; } @@ -76,7 +76,7 @@ function drush_metatags_quick_migrate_fields($field_names) { } $fields_to_import = array(); - foreach($field_names as $field_name => $value) { + foreach ($field_names as $field_name => $value) { if ($value) { $fields_to_import[] = $field_name; } @@ -126,7 +126,7 @@ function drush_metatags_quick_migrate_get_fields($requests = array()) { 'keywords' => 'keywords', 'Revisit-After' => 'revisit-after', 'robots' => 'robots', - ); + ); $options = drupal_map_assoc(array_keys($fields)); if (!empty($requests) && !empty($options)) { $not_found = array_diff($requests, $options); @@ -135,6 +135,6 @@ function drush_metatags_quick_migrate_get_fields($requests = array()) { return drush_set_error('METATAGS_QUICK_MIGRATE_PLUGIN_NOT_FOUND', dt('The following fields were not found: !fields', array('!fields' => implode(', ', $not_found)))); } } - return $options; + return $options; } diff --git a/metatags_quick.feeds.inc b/metatags_quick.feeds.inc index dbdc3ab..a3d0eb2 100644 --- a/metatags_quick.feeds.inc +++ b/metatags_quick.feeds.inc @@ -13,7 +13,7 @@ function metatags_quick_feeds_parser_sources_alter(&$sources, $content_type) { $fields = field_info_fields(); foreach ($fields as $field) { if ($field['type'] == 'metatags_quick' && isset($field['bundles']['node']) && in_array($content_type, $field['bundles']['node'])) { - $sources['parent:metatags_quick:'. $field['meta_name']] = array( + $sources['parent:metatags_quick:' . $field['meta_name']] = array( 'name' => t('Feed node: Metatag: @meta_name', array('@meta_name' => $field['meta_name'])), 'description' => t('Metatags the parent feed node.'), 'callback' => 'metatags_quick_feeds_get_source', diff --git a/metatags_quick.install b/metatags_quick.install index 0a37ab6..1160582 100644 --- a/metatags_quick.install +++ b/metatags_quick.install @@ -6,7 +6,7 @@ /** * Implements hook_schema(). - * + * */ function metatags_quick_schema() { $schema['metatags_quick_path_based'] = array( @@ -53,7 +53,7 @@ function metatags_quick_uninstall() { field_purge_field($field); } } - + variable_del('metatags_quick_settings'); variable_del('metatags_quick_use_path_based'); variable_del('metatags_quick_default_field_length'); @@ -61,10 +61,10 @@ function metatags_quick_uninstall() { /** * Implements hook_field_schema(). - * + * */ function metatags_quick_field_schema($field) { - if(!isset($field['settings']['max_length'])) { + if (!isset($field['settings']['max_length'])) { $field['settings']['max_length'] = 255; } return array( diff --git a/metatags_quick.module b/metatags_quick.module index 7c6c1f7..a687949 100644 --- a/metatags_quick.module +++ b/metatags_quick.module @@ -195,10 +195,10 @@ function metatags_quick_page_build(&$page) { if ($path_based_id == 0 && strstr($_GET['q'], "/")) { $parts = explode("/", $_GET['q']); // iterate through parts - for($i = count($parts) - 1; $i > 0; $i--) { + for ($i = count($parts) - 1; $i > 0; $i--) { // create path $path = ""; - for($j = 0; $j < $i; $j++) { + for ($j = 0; $j < $i; $j++) { $path .= $parts[$j] . "/"; } // do wildcard query @@ -209,7 +209,7 @@ function metatags_quick_page_build(&$page) { ->execute() ->fetchField(); // check for results - if($path_based_id > 0) { + if ($path_based_id > 0) { break; } } @@ -237,7 +237,7 @@ function metatags_quick_menu_local_tasks_alter(&$data, $router_item, $root_path) if (!variable_get('metatags_quick_use_path_based', 1)) { return; } - + // Don't add meta tags editing tab. if (variable_get('metatags_quick_remove_tab', 0)) { return; @@ -277,7 +277,7 @@ function metatags_quick_menu_local_tasks_alter(&$data, $router_item, $root_path) * Implements hook_field_validate(). * */ -function metatags_quick_field_validate($obj_type, $object, $field, $instance, $langcode, $items, &$errors) { +function metatags_quick_field_validate($obj_type, $object, $field, $instance, $langcode, $items, &$errors) { if (!isset($field['settings']['max_length'])) { $field['settings']['max_length'] = 255; } @@ -505,7 +505,7 @@ function _metatags_quick_add_head($item = FALSE) { if (!empty($added_meta[$item['name']])) { return; } - + // Only output meta if content is not empty. if ($item['content']) { $content = $item['content']; @@ -521,11 +521,11 @@ function _metatags_quick_add_head($item = FALSE) { $content = trim(strip_tags($content)); $item['content'] = $content; $meta_data[] = $item; - + if (empty($item['type'])) { $item['type'] = 'default'; } - + switch ($item['type']) { case 'link' : // Unset an existing html head link with the same rel attribute, assuming that @@ -536,18 +536,18 @@ function _metatags_quick_add_head($item = FALSE) { if (strpos($key, 'drupal_add_html_head_link:' . $item['name']) === 0) { $head_elements[$key]['#access'] = FALSE; } - } + } $attributes = array( - 'rel' => $item['name'], + 'rel' => $item['name'], 'href' => url($item['content'])); drupal_add_html_head_link($attributes); break; case 'default' : default : $element = array( - '#tag' => 'meta', + '#tag' => 'meta', '#attributes' => array( - 'name' => $item['name'], + 'name' => $item['name'], 'content' => $item['content'])); drupal_add_html_head($element, 'metatags_quick_' . $item['name']); } diff --git a/metatags_quick_extra.admin.inc b/metatags_quick_extra.admin.inc index 4440d4c..8f590eb 100644 --- a/metatags_quick_extra.admin.inc +++ b/metatags_quick_extra.admin.inc @@ -1,7 +1,7 @@ */ @@ -11,12 +11,12 @@ * @param $form_state */ -function metatags_quick_admin_auto_settings($form,$form_state) { +function metatags_quick_admin_auto_settings($form, $form_state) { $current_settings = variable_get('metatags_quick_auto_settings', ''); - + // construct the options array for all content types $type_names = node_type_get_names(); - + // facility to select content types for auto-tagging. Has AJAX behavior. $form['applicable_content_types'] = array( '#type' => 'checkboxes', @@ -28,10 +28,10 @@ function metatags_quick_admin_auto_settings($form,$form_state) { 'callback' => 'metatags_quick_extra_ajax_callback', 'wrapper' => 'metatags-quick-auto-default-keywords', 'method' => 'replace' - ) + ) ); - - // Common keywords that would be applied for all chosen content types + + // Common keywords that would be applied for all chosen content types $form['global_keywords'] = array( '#type' => 'textfield', '#title' => t('Global keywords'), @@ -39,35 +39,35 @@ function metatags_quick_admin_auto_settings($form,$form_state) { '#default_value' => isset($current_settings['global_keywords'])?$current_settings['global_keywords']:'', '#description' => t('Enter a comma separated list of keywords. Global keywords will be always added to applicable content types.') ); - + // Content-type-wise special keywords. Only those content types chosen for auto-tagging would be displayed $form['default_keywords'] = array( '#type' => 'fieldset', '#title' => t('Default keywords'), - '#collapsible' => true, + '#collapsible' => TRUE, '#description' => t('Enter a comma separated list of keywords for the content types below, if you want them to be included automatifcally by default.'), - '#tree' => true, + '#tree' => TRUE, '#prefix' => '
', '#suffix' => '
' ); - + $applicable_content_types = array(); $available_content_types = array(); - + if (!empty($form_state['values']['applicable_content_types'])) { $applicable_content_types = array_values($form_state['values']['applicable_content_types']); } - elseif (isset($current_settings['applicable_content_types'])) { + elseif (isset($current_settings['applicable_content_types'])) { $applicable_content_types = array_values($current_settings['applicable_content_types']); - } - + } + foreach ($type_names as $machine_name => $type_name) { - $exists = in_array($machine_name, $applicable_content_types, true); + $exists = in_array($machine_name, $applicable_content_types, TRUE); if ($exists) { $available_content_types[$machine_name] = $type_name; } } - + foreach ($available_content_types as $machine_name => $type_name) { if (isset($current_settings['default_keywords']) && isset($current_settings['default_keywords'][$machine_name])) { $default_value = $current_settings['default_keywords'][$machine_name]; @@ -75,23 +75,23 @@ function metatags_quick_admin_auto_settings($form,$form_state) { else { $default_value = ''; } - + $form['default_keywords'][$machine_name] = array( '#type' => 'textfield', '#title' => $type_name, '#maxlength' => variable_get('metatags_quick_default_field_length', 255), '#default_value' => $default_value - ); + ); } - - + + // taxonomy vocabularies that would supply keywords $vocabularies = taxonomy_vocabulary_get_names(); $options = array(); foreach ($vocabularies as $machine_name => $vocabulary) { $options[$machine_name] = $vocabulary->name; } - + $form['auto_keywords_vocabularies'] = array( '#type' => 'checkboxes', '#title' => t('Auto-keywords vocabularies'), @@ -99,31 +99,31 @@ function metatags_quick_admin_auto_settings($form,$form_state) { '#default_value' => isset($current_settings['auto_keywords_vocabularies'])?$current_settings['auto_keywords_vocabularies']:array(), '#description' => t('Select the vocabularies which contain terms you want to add to the keywords meta tag for nodes. The terms of these vocabularies are added before the global and default keywords but after the page-specific keywords.') ); - - + + // auto settings for meta description $form['meta_description'] = array( '#type' => 'fieldset', '#title' => t('Meta Description'), - '#collapsible' => true, + '#collapsible' => TRUE, '#description' => t('These options specify how meta description is to be generated from the node content.'), - '#tree' => true - ); - + '#tree' => TRUE + ); + if (isset($current_settings['meta_description']) && isset($current_settings['meta_description']['auto_generate'])) { $default_value = $current_settings['meta_description']['auto_generate']; } else { $default_value = ''; } - + // Is auto-generation needed? $form['meta_description']['auto_generate'] = array( '#type' => 'checkbox', '#title' => t('Auto generate meta description'), '#default_value' => $default_value ); - + // if yes, from where? if (isset($current_settings['meta_description']) && isset($current_settings['meta_description']['source'])) { $default_value = $current_settings['meta_description']['source']; @@ -131,23 +131,23 @@ function metatags_quick_admin_auto_settings($form,$form_state) { else { $default_value = ''; } - + $options = array( 'body' => t('Generate meta tags content from the node body'), 'teaser' => t('Generate meta tags content from the node teaser'), 'either' => t('Generate meta tags content from the node teaser, or the node body when the node teaser is empty') ); - + $form['meta_description']['source'] = array( '#type' => 'radios', '#title' => t('Generation source'), '#options' => $options, '#default_value' => $default_value ); - + $form['op'] = array( '#value' => t('Submit'), - '#type' => 'submit', + '#type' => 'submit', ); return $form; } @@ -157,23 +157,23 @@ function metatags_quick_admin_auto_settings($form,$form_state) { * Submit function for the admin settings form. */ -function metatags_quick_admin_auto_settings_submit($form,$form_state) { +function metatags_quick_admin_auto_settings_submit($form, $form_state) { $new_settings = array( 'applicable_content_types' => $form_state['values']['applicable_content_types'], 'global_keywords' => $form_state['values']['global_keywords'], 'auto_keywords_vocabularies' => $form_state['values']['auto_keywords_vocabularies'] ); - + foreach ($form_state['values']['default_keywords'] as $machine_name => $value) { $new_settings['default_keywords'][$machine_name] = $value; } - + foreach ($form_state['values']['meta_description'] as $key => $value) { $new_settings['meta_description'][$key] = $value; - } - + } + variable_set('metatags_quick_auto_settings', $new_settings); - drupal_set_message(t('Auto settings saved for Meta tags (quick)'), 'status'); + drupal_set_message(t('Auto settings saved for Meta tags (quick)'), 'status'); } /** @@ -181,6 +181,6 @@ function metatags_quick_admin_auto_settings_submit($form,$form_state) { * @param $form * @param $form_state */ -function metatags_quick_ajax_callback($form,$form_state) { +function metatags_quick_ajax_callback($form, $form_state) { return $form['default_keywords']; } diff --git a/metatags_quick_extra.module b/metatags_quick_extra.module index 1a9848a..e1351b6 100644 --- a/metatags_quick_extra.module +++ b/metatags_quick_extra.module @@ -32,16 +32,16 @@ function metatags_quick_extra_html_head_alter(&$head_elements) { $applicable_content_type = false; if (isset($auto_settings['applicable_content_types'])) { $applicable_content_type = in_array($node->type, $auto_settings['applicable_content_types'], true); - } - - // apply auto tags if the content type is one of target content types + } + + // apply auto tags if the content type is one of target content types if ($applicable_content_type) { - // Generate automatic meta keywords + // Generate automatic meta keywords $keywords = array(); // Node-specific keywords entered in node add/edit form $node_keywords = array(); if (isset($head_elements['metatags_quick_keywords'])) { - $node_keywords = explode(',',$head_elements['metatags_quick_keywords']['#attributes']['content']); + $node_keywords = explode(',',$head_elements['metatags_quick_keywords']['#attributes']['content']); } // Taxonomy keywords $vocabularies = array_values($auto_settings['auto_keywords_vocabularies']); @@ -70,7 +70,7 @@ function metatags_quick_extra_html_head_alter(&$head_elements) { $global_keywords[$index] = token_replace($keyword); } } - + // Add/alter meta keywords $keywords = array_merge($node_keywords, $taxonomy_keywords, $default_keywords, $global_keywords); if (count($keywords)) { @@ -88,7 +88,7 @@ function metatags_quick_extra_html_head_alter(&$head_elements) { ); } } - + // Generate automatic meta description // If no meta description exists and if autogeneration is required $meta_description_exists = false; @@ -129,10 +129,10 @@ function metatags_quick_extra_html_head_alter(&$head_elements) { } } } - - + + /** - * Helper function to return an array of keywords for the given node and vocabulary + * Helper function to return an array of keywords for the given node and vocabulary * @param string $vocabulary_name * @param stdObject $node */ @@ -148,7 +148,7 @@ function _metatags_quick_get_vocabulary_keywords($vocabulary_name, $node) { break; } } - + if ($field_name) { $language = field_language('node', $node, $field_name); if (!empty($node->{$field_name})) { diff --git a/metatags_quick_import.admin.inc b/metatags_quick_import.admin.inc index f84584f..3114b1e 100644 --- a/metatags_quick_import.admin.inc +++ b/metatags_quick_import.admin.inc @@ -56,9 +56,9 @@ function metatags_quick_upgrade_submit($form, &$form_state) { form_set_error(t('No content types found. !define them first', array('!define' => l(t('define'), 'admin/structure/types')))); return; } - + module_load_include('inc', 'metatags_quick', 'metatags_quick.admin'); - foreach($form_state['values']['fields_select'] as $field_name => $value) { + foreach ($form_state['values']['fields_select'] as $field_name => $value) { if (!$value) { continue; } @@ -67,9 +67,9 @@ function metatags_quick_upgrade_submit($form, &$form_state) { } } } - + $fields_to_import = array(); - foreach($form_state['values']['fields_select'] as $field_name => $value) { + foreach ($form_state['values']['fields_select'] as $field_name => $value) { if ($value) { $fields_to_import[] = $field_name; } @@ -135,7 +135,7 @@ function metatags_quick_convert_metatags($nids, $fields_to_import) { foreach ($select as $row) { $nodewords_data[$row->id][$row->name] = unserialize($row->content); } - + foreach ($processed_nodes as $node) { $_SESSION['nodewords_upgrade_total']++; $node_changed = FALSE;