FINAL suepr merge step : added all modules to this super repos

sites/all/modules/contrib/fields/content_taxonomy/LICENSE.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

sites/all/modules/contrib/fields/content_taxonomy/README.txt

@@ -0,0 +1,21 @@
+Content Taxonomy:
+*****************
+
+Migration from D6 to D7:
+
+- backup your DB
+- run the core upgrade path
+- download and install the Content Migrate (CCK) module
+- download and install the Content Taxonomy Migrate module
+- goto Structure > Migrate and select your fields to upgrade
+- clear caches
+- check if the data is available or rollback
+
+note: the content taxonomy module allows you to select the parent term, but all other advanced settings of content taxonomy will be lost.
+
+
+Author:
+-------
+Matthias Hutterer
+mh86@drupal.org
+m_hutterer@hotmail.com

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy.info

@@ -0,0 +1,16 @@
+name = Content Taxonomy
+description = Extends the Taxonomy Reference Fields
+
+core = 7.x
+package = Fields
+
+dependencies[] = taxonomy
+
+
+
+; Information added by drupal.org packaging script on 2013-02-13
+version = "7.x-1.0-beta2"
+core = "7.x"
+project = "content_taxonomy"
+datestamp = "1360767812"
+

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy.module

@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * Implements hook_form_ID_alter().
+ */
+function content_taxonomy_form_field_ui_field_edit_form_alter(&$form, &$form_state, $form_id) {
+  $field = $form['#field'];
+  $instance = $form['#instance'];
+
+  // Add parent selector to term reference fields,
+  // except to the autocomplete widget, as it ignores the parent setting.
+  if ($field['type'] == 'taxonomy_term_reference'
+    && !($instance['widget']['type'] == 'taxonomy_autocomplete' || $instance['widget']['type'] == 'autocomplete_deluxe_taxonomy')) {
+
+    // add parent form.
+    foreach ($field['settings']['allowed_values'] as $delta => $tree) {
+      $options[0] = '---';
+      // todo this might break with huge vocs
+      $voc = taxonomy_vocabulary_machine_name_load($tree['vocabulary']);
+      foreach (taxonomy_get_tree($voc->vid) as $term) {
+        $options[$term->tid] = str_repeat('- ', $term->depth) . $term->name;
+      }
+
+      $form['field']['settings']['allowed_values'][$delta]['parent']  = array(
+        '#type' => 'select',
+        '#title' => t('Parent'),
+        '#options' => $options,
+        '#default_value' => isset($tree['parent']) ? $tree['parent'] : 0,
+      );
+
+      $form['field']['settings']['allowed_values'][$delta]['depth']  = array(
+        '#type' => 'textfield',
+        '#title' => t('Tree depth'),
+        '#default_value' => isset($tree['depth']) ? $tree['depth'] : '',
+        '#description' => t('Set the depth of the tree. Leave empty to load all terms.'),
+        '#element_validate' => array('_element_validate_integer_positive'),
+      );
+    }
+  }
+
+  // Add opt group setting.
+  if ($field['type'] == 'taxonomy_term_reference' && $instance['widget']['type'] == 'options_select') {
+    $form['instance']['widget']['settings']['content_taxonomy_opt_groups']  = array(
+      '#type' => 'checkbox',
+      '#title' => t('Render parent terms as opt-groups'),
+      '#default_value' => isset($instance['widget']['settings']['content_taxonomy_opt_groups']) ? $instance['widget']['settings']['content_taxonomy_opt_groups'] : FALSE,
+      '#description' => t('This option only works if you have a 2-level hierarchy in your vocabulary. Then the parents in the first level get opt-groups and the child terms will be selectable.'),
+    );
+  }
+}
+
+/**
+ * Implements hook_field_info_alter().
+ */
+function content_taxonomy_field_info_alter(&$info) {
+  // Use own options callback for handling additional configuration options.
+  $info['taxonomy_term_reference']['settings']['options_list_callback'] = 'content_taxonomy_allowed_values';
+
+  // Add depth option.
+  foreach ($info['taxonomy_term_reference']['settings']['allowed_values'] as $key => $values) {
+    $info['taxonomy_term_reference']['settings']['allowed_values'][$key]['depth'] = 0;
+  }
+}
+
+/**
+ * Returns the set of valid terms for a taxonomy field.
+ * Extends taxonomy_allowed_values() with the tree depth option.
+ *
+ * @param $field
+ *   The field definition.
+ * @return
+ *   The array of valid terms for this field, keyed by term id.
+ */
+function content_taxonomy_allowed_values($field) {
+  $options = array();
+  foreach ($field['settings']['allowed_values'] as $tree) {
+    if ($vocabulary = taxonomy_vocabulary_machine_name_load($tree['vocabulary'])) {
+      $max_depth = (isset($tree['depth']) && !empty($tree['depth'])) ? $tree['depth'] : NULL;
+      if ($terms = taxonomy_get_tree($vocabulary->vid, $tree['parent'], $max_depth)) {
+        foreach ($terms as $term) {
+          $options[$term->tid] = str_repeat('- ', $term->depth) . $term->name;
+        }
+      }
+    }
+  }
+  return $options;
+}
+
+/**
+ * Implements hook_field_widget_info_alter().
+ */
+function content_taxonomy_field_widget_info_alter(&$info) {
+  if (isset($info['options_select']['settings'])) {
+    $info['options_select']['settings'] += array(
+      'content_taxonomy_opt_groups' => FALSE,
+    );
+  }
+}
+
+/**
+ * Implements hook_field_widget_form_alter().
+ */
+function content_taxonomy_field_widget_form_alter(&$element, &$form_state, $context) {
+  $field = $context['field'];
+  $instance = $context['instance'];
+
+  if (!empty($instance['widget']['settings']['content_taxonomy_opt_groups'])) {
+    $options = content_taxonomy_allowed_values_opt_groups($field);
+    if (isset($element['#options']['_none'])) {
+      $options = array('_none' => $element['#options']['_none']) + $options;
+    }
+    $element['#options'] = $options;
+  }
+}
+
+/**
+ * Helper function for generating opt groups.
+ *
+ * Similar to content_taxonomy_allowed_values(), but unfortunately we cannot
+ * directly change content_taxonomy_allowed_values() as it only has the field
+ * variable and opt groups are settings on the instance level. Still, this is
+ * not a big performance issue, as taxonomy_get_tree statically caches some
+ * data.
+ */
+function content_taxonomy_allowed_values_opt_groups($field) {
+  $options = array();
+  foreach ($field['settings']['allowed_values'] as $tree) {
+    if ($vocabulary = taxonomy_vocabulary_machine_name_load($tree['vocabulary'])) {
+      if ($terms = taxonomy_get_tree($vocabulary->vid, 0, 2)) {
+        $current_group_term = NULL;
+        foreach ($terms as $term) {
+          if ($term->depth == 0) {
+            $current_group_term = $term;
+          }
+          elseif ($term->depth == 1 && !is_null($current_group_term)) {
+            $options[$current_group_term->name][$term->tid] = $term->name;
+          }
+        }
+      }
+    }
+  }
+  return $options;
+}

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy_autocomplete.info

@@ -0,0 +1,18 @@
+name = Content Taxonomy Autocomplete
+description = Extends the Taxonomy Autocomplete Widget
+
+core = 7.x
+package = Fields
+
+dependencies[] = content_taxonomy
+
+files[] = includes/content_taxonomy_autocomplete_moderated_terms.inc
+
+
+
+; Information added by drupal.org packaging script on 2013-02-13
+version = "7.x-1.0-beta2"
+core = "7.x"
+project = "content_taxonomy"
+datestamp = "1360767812"
+

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy_autocomplete.module

@@ -0,0 +1,163 @@
+<?php
+
+/**
+ * Implements hook_field_widget_info_alter().
+ */
+function content_taxonomy_autocomplete_field_widget_info_alter(&$info) {
+  // Add a setting for validating new terms.
+  $ct_settings = array(
+    'content_taxonomy_autocomplete_new_terms' => 'allow',
+  );
+  $info['taxonomy_autocomplete']['settings'] += $ct_settings;
+
+  // Add this to the autocomplete deluxe as well, if enabled.
+  if (isset($info['autocomplete_deluxe_taxonomy']['settings'])) {
+    $info['autocomplete_deluxe_taxonomy']['settings'] += $ct_settings;
+  }
+}
+
+/**
+ * Implements hook_form_ID_alter().
+ */
+function content_taxonomy_autocomplete_form_field_ui_field_edit_form_alter(&$form, &$form_state, $form_id) {
+  $field = $form['#field'];
+  $instance = $form['#instance'];
+  if ($instance['widget']['type'] == 'taxonomy_autocomplete' || $instance['widget']['type'] == 'autocomplete_deluxe_taxonomy') {
+    // Add a setting form for validating new terms.
+    $options = array(
+      'allow' => t('Allow and insert new terms'),
+      'moderate' => t('Allow new terms and insert them into a separate vocabulary'),
+      'deny' => t('Deny any new terms'),
+    );
+    $form['instance']['widget']['settings']['content_taxonomy_autocomplete_new_terms'] = array(
+      '#type' => 'radios',
+      '#title' => t('Autocomplete settings'),
+      '#options' => $options,
+      '#default_value' => isset($instance['widget']['settings']['content_taxonomy_autocomplete_new_terms']) ? $instance['widget']['settings']['content_taxonomy_autocomplete_new_terms'] : 'allow',
+      '#description' => t('If option 2 is selected, re-save this settings form and afterwards select a second vocabulary for new terms in the field settings. In case the Autocomplete Deluxe widget is used, new terms can be hidden from the suggestion list.'),
+    );
+  }
+
+  // Show form for second vocabulary.
+  if (isset($instance['widget']['settings']['content_taxonomy_autocomplete_new_terms']) && $instance['widget']['settings']['content_taxonomy_autocomplete_new_terms'] == 'moderate') {
+    // Initialize settings, if not set.
+    if (!isset($field['settings']['allowed_values'][1])) {
+      $field['settings']['allowed_values'][1] = array(
+        'vocabulary' => $field['settings']['allowed_values'][0]['vocabulary'],
+        'parent' => 0,
+      );
+    }
+    $vocabularies = taxonomy_get_vocabularies();
+    $options = array();
+    $options[''] = '---';
+    foreach ($vocabularies as $vocabulary) {
+      $options[$vocabulary->machine_name] = $vocabulary->name;
+    }
+    $form['field']['settings']['allowed_values'][1]['vocabulary'] = array(
+      '#type' => 'select',
+      '#title' => t('Vocabulary for new terms'),
+      '#default_value' => isset($field['settings']['allowed_values'][1]['vocabulary']) ? $field['settings']['allowed_values'][1]['vocabulary'] : '',
+      '#options' => $options,
+      '#description' => t('New terms form autocompletes will be inserted in this vocabulary.'),
+      //'#disabled' => $has_data, //todo
+    );
+    $form['field']['settings']['allowed_values'][1]['parent'] = array(
+      '#type' => 'value',
+      '#value' => $field['settings']['allowed_values'][1]['parent'],
+    );
+    if($instance['widget']['type'] == 'autocomplete_deluxe_taxonomy') {
+      // todo: should this setting be added field_info_alter?
+      $form['field']['settings']['allowed_values'][1]['content_taxonomy_ignore_in_suggestions'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Ignore vocabulary above for suggested terms.'),
+        '#default_value' => isset($field['settings']['allowed_values'][1]['content_taxonomy_ignore_in_suggestions']) ? $field['settings']['allowed_values'][1]['content_taxonomy_ignore_in_suggestions'] : FALSE,
+      );
+    }
+  }
+}
+
+/**
+ * Implements hook_field_attach_form().
+ */
+function content_taxonomy_autocomplete_field_attach_form($entity_type, $entity, &$form, &$form_state, $langcode) {
+  // Add validation function to taxonomy_autocompletes, if necessary.
+  $instances = field_info_instances($form['#entity_type'], $form['#bundle']);
+  foreach ($instances as $instance) {
+    if (($instance['widget']['type'] == 'taxonomy_autocomplete' || $instance['widget']['type'] == 'autocomplete_deluxe_taxonomy') 
+      && isset($form[$instance['field_name']]) 
+      && isset($instance['widget']['settings']['content_taxonomy_autocomplete_new_terms'])) {
+
+      // Use the language that is used in this form (which doesn't necessarily
+      // be the default language in $langcode).
+      $lang_key = $form[$instance['field_name']]['#language'];
+      if ($instance['widget']['settings']['content_taxonomy_autocomplete_new_terms'] == 'moderate') {
+        $form[$instance['field_name']][$lang_key]['#element_validate'][] = 'content_taxonomy_autocomplete_validate_moderate_new_terms';
+      }
+      else if ($instance['widget']['settings']['content_taxonomy_autocomplete_new_terms'] == 'deny') {
+        $form[$instance['field_name']][$lang_key]['#element_validate'][] = 'content_taxonomy_autocomplete_validate_deny_new_terms';
+      }
+    }
+  }
+}
+
+/**
+ * Form element validate handler for taxonomy term autocomplete element, which denies any new terms.
+ */
+function content_taxonomy_autocomplete_validate_deny_new_terms($element, &$form_state, $form) {
+  $values = $form_state['values'];
+  foreach ($element['#array_parents'] as $parent) {
+    $values = $values[$parent];
+  }
+  foreach ($values as $delta => $value) {
+    if ($value['tid'] == 'autocreate') {
+      form_error($element, t('%name: new terms are not allowed. Please choose from the given list.', array('%name' => $element['#title'])));
+    }
+  }
+}
+
+/**
+ * Form element validate handler for taxonomy term autocomplete element, which inserts new terms into a separate voc.
+ */
+function content_taxonomy_autocomplete_validate_moderate_new_terms($element, &$form_state) {
+  // taxonomy_field_validate() is invoked before.
+  // Reset vocabulary id for new terms.
+  $field = field_widget_field($element, $form_state);
+  $values =& $form_state['values'];
+  foreach ($element['#array_parents'] as $parent) {
+    $values =& $values[$parent];
+  }
+  if (isset($field['settings']['allowed_values'][1])) {
+    if ($voc2 = taxonomy_vocabulary_machine_name_load($field['settings']['allowed_values'][1]['vocabulary'])) {
+      foreach ($values as $delta => $value) {
+        if ($value['tid'] == 'autocreate') {
+          $values[$delta]['vid'] = $voc2->vid;
+          $values[$delta]['vocabulary_machine_name'] = $voc2->machine_name;
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_query_TAG_alter().
+ */
+function content_taxonomy_autocomplete_query_autocomplete_deluxe_taxonomy_autocomplete_alter(QueryAlterableInterface $query) {
+  $field = field_info_field($query->getMetaData('field_name'));
+  if (isset($field['settings']['allowed_values'][1]) && isset($field['settings']['allowed_values'][1]['content_taxonomy_ignore_in_suggestions']) && $field['settings']['allowed_values'][1]['content_taxonomy_ignore_in_suggestions']) {
+    if ($voc1 = taxonomy_vocabulary_machine_name_load($field['settings']['allowed_values'][0]['vocabulary'])) {
+      $query->condition('t.vid', $voc1->vid);
+    }
+  }
+}
+
+/**
+ * Implements hook_search_api_processor_info().
+ */
+function content_taxonomy_autocomplete_search_api_processor_info() {
+  $callbacks['content_taxonomy_autocomplete_moderated_terms'] = array(
+    'name' => t('Content Taxonomy Autocomplete Moderated Terms Filter'),
+    'description' => t('Filters terms from autocompletes that belong to the moderated vocabulary.'),
+    'class' => 'ContentTaxonomyAutocompleteModeratedTermsSearchAPIProcessor',
+  );
+  return $callbacks;
+}

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy_migrate.info

@@ -0,0 +1,17 @@
+name = Content Taxonomy Migrate
+description = Migration from Content Taxonomy to Term Reference Fields
+
+core = 7.x
+package = Fields
+
+dependencies[] = taxonomy
+dependencies[] = content_migrate
+
+
+
+; Information added by drupal.org packaging script on 2013-02-13
+version = "7.x-1.0-beta2"
+core = "7.x"
+project = "content_taxonomy"
+datestamp = "1360767812"
+

sites/all/modules/contrib/fields/content_taxonomy/content_taxonomy_migrate.module

@@ -0,0 +1,64 @@
+<?php
+
+function content_taxonomy_migrate_content_migrate_field_alter(&$field_value, $instance_value) {
+  if ($field_value['type'] == 'content_taxonomy') {
+    $field_value['type'] = 'taxonomy_term_reference';
+    $field_value['module'] = 'taxonomy';
+    
+    // transform field settings
+    $old_settings = $field_value['settings'];
+    $vocabulary = taxonomy_vocabulary_load($old_settings['vid']);
+    $field_value['settings'] = array();
+    $field_value['settings']['allowed_values'] = array();
+    $field_value['settings']['allowed_values'][0]['vocabulary'] = $vocabulary->machine_name;
+    $field_value['settings']['allowed_values'][0]['parent'] = $old_settings['parent'];
+  }
+}
+  
+function content_taxonomy_migrate_content_migrate_instance_alter(&$instance_value, $field_value) {
+  if ($instance_value['widget_type'] == "content_taxonomy_autocomplete") {
+    $instance_value['widget_type'] = 'taxonomy_autocomplete';
+    $instance_value['widget']['type'] = 'taxonomy_autocomplete';
+    $instance_value['widget']['module'] = 'taxonomy';
+  }
+  else if ($instance_value['widget_type'] == "content_taxonomy_options" || $instance_value['widget_type'] == "content_taxonomy_tree") {
+    $instance_value['widget_type'] = 'options_buttons';
+    $instance_value['widget']['type'] = 'options_buttons';
+    $instance_value['widget']['module'] = 'options';
+  }
+  else if ($instance_value['widget_type'] == "content_taxonomy_select" || $instance_value['widget_type'] == 'content_taxonomy_hs') {
+    $instance_value['widget_type'] = 'options_select';
+    $instance_value['widget']['type'] = 'options_select';
+    $instance_value['widget']['module'] = 'options';
+  }
+  
+  // fix formatter
+  foreach ($instance_value['display'] as $context => $settings) {
+    if ($instance_value['display'][$context]['type'] == 'default') {
+      $instance_value['display'][$context]['type'] = 'taxonomy_term_reference_plain';
+    }
+    else if ($instance_value['display'][$context]['type'] == 'link') {
+      $instance_value['display'][$context]['type'] = 'taxonomy_term_reference_link';
+    }
+  }
+}
+
+function content_taxonomy_migrate_content_migrate_data_record_alter(&$record, $field) {
+  // fill the taxonomy_index
+  if ($field['type'] == 'taxonomy_term_reference') {
+    if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $record['entity_type'] == 'node') {
+      if (isset($record[$field['field_name'] . "_tid"]) && $record[$field['field_name'] . "_tid"]) {
+        $entity = node_load($record['entity_id']);
+        db_delete('taxonomy_index')->condition('nid', $entity->nid)->condition('tid', $record[$field['field_name'] . "_tid"])->execute();
+        $query = db_insert('taxonomy_index')->fields(array('nid', 'tid', 'sticky', 'created', ));
+        $query->values(array(
+          'nid' => $entity->nid,
+          'tid' => $record[$field['field_name'] . "_tid"],
+          'sticky' => $entity->sticky,
+          'created' => $entity->created,
+        ));
+        $query->execute();
+      }
+    }
+  }
+}

sites/all/modules/contrib/fields/content_taxonomy/includes/content_taxonomy_autocomplete_moderated_terms.inc

@@ -0,0 +1,124 @@
+<?php
+
+/**
+ * Search API Processor that filters out terms from moderated vocabularies.
+ */
+class ContentTaxonomyAutocompleteModeratedTermsSearchAPIProcessor extends SearchApiAbstractProcessor {
+
+  /**
+   * Confiuration callback.
+   *
+   * Only allow users to select taxonomy fields.
+   */
+  public function configurationForm() {
+    $form = parent::configurationForm();
+    $form['fields']['#options'] = $this->filterTaxonomyFieldsOptions($form['fields']['#options']);
+    return $form;
+  }
+
+  /**
+   * Postprocess items while indexing and filter out the moderated terms.
+   */
+  public function preprocessIndexItems(array &$items) {
+    $fields = $this->getTaxonomyFields($this->options['fields']);
+    foreach ($items as &$item) {
+      foreach ($fields as $search_api_property_name => $field) {
+        if (isset($item[$search_api_property_name])) {
+          $this->processTaxonomyField($item[$search_api_property_name]['value'], $item[$search_api_property_name]['type'], $field);
+        }
+      }
+    }
+  }
+
+  /**
+   * Processes a single field on a single item and does the actual filtering.
+   *
+   * As such a field can be nested, recursions are used until we reach the top
+   * level.
+   */
+  protected function processTaxonomyField(&$value, &$type, $field) {
+    if (!isset($value) || $value === '') {
+      return;
+    }
+    if (substr($type, 0, 10) == 'list<list<') {
+      $inner_type = $t1 = substr($type, 5, -1);
+      foreach ($value as &$v) {
+        $t1 = $inner_type;
+        $this->processTaxonomyField($v, $t1, $field);
+      }
+      return;
+    }
+    if (is_array($value)) {
+      foreach ($value as $key => $v) {
+        if ($this->fieldValueIsModerated($v, $field)) {
+          unset($value[$key]);
+        }
+      }
+    }
+    elseif ($this->fieldValueIsModerated($value, $field)) {
+      $value = NULL;
+    }
+  }
+
+  /**
+   * Returns TRUE if the given term id is from moderated vocabulary.
+   *
+   * @param $value
+   *  The term id.
+   * @param $field
+   *  The according field API field.
+   */
+  private function fieldValueIsModerated($value, $field) {
+    $allowed_voc = $field['settings']['allowed_values'][0]['vocabulary'];
+    $term = taxonomy_term_load($value);
+    if ($term && $term->vocabulary_machine_name == $allowed_voc) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
+  /**
+   * Helper function that filters the configuration field options for taxonomy
+   * fields.
+   */
+  private function filterTaxonomyFieldsOptions($options) {
+    $taxonomy_fields = array();
+    foreach ($options as $search_api_property_name => $label) {
+      if ($this->getTaxonomyField($search_api_property_name)) {
+        $taxonomy_fields[$search_api_property_name] = $label;
+      }
+    }
+    return $taxonomy_fields;
+  }
+
+  /**
+   * Helper function that returns the taxonomy fields for the given search API
+   * property names.
+   */
+  private function getTaxonomyFields($search_api_properties) {
+    $taxonomy_fields = array();
+    foreach ($search_api_properties as $search_api_property_name => $label) {
+      if ($field = $this->getTaxonomyField($search_api_property_name)) {
+        $taxonomy_fields[$search_api_property_name] = $field;
+      }
+    }
+    return $taxonomy_fields;
+  }
+
+  /**
+   * Helper function that extracts the taxonomy field from a search API property
+   * name.
+   */
+  private function getTaxonomyField($search_api_property_name) {
+    $parts = explode(':', $search_api_property_name);
+    foreach ($parts as $part) {
+      if (substr($part, 0, 6) == 'field_') {
+        $field = field_info_field($part);
+        if ($field && isset($field['type']) && $field['type'] == "taxonomy_term_reference") {
+          return $field;
+        }
+      }
+    }
+    return FALSE;
+  }
+}