Index: taxonomy_user.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_user/taxonomy_user.module,v
retrieving revision 1.4
diff -u -p -r1.4 taxonomy_user.module
--- taxonomy_user.module 16 Dec 2006 17:02:13 -0000 1.4
+++ taxonomy_user.module 9 Feb 2007 01:49:23 -0000
@@ -1,516 +1,610 @@
- 'select',
- '#title' => t('Position of terms'),
- '#default_value' => variable_get('taxonomy_user_tag_pos', TU_POS_BOTTOM),
- '#options' => array(TU_POS_LINKS => 'With all other terms', TU_POS_TOP => 'Text top', TU_POS_BOTTOM => 'Text bottom'),
- '#description' => t('Select where user taxonomy terms should show up.
- Note that if you select "With all other terms", terms of the current user and terms of all
- other users will not be set apart.'),
- );
- return $form;
-}
-
-/**
- * Implementation of hook_taxonomy().
- */
-function taxonomy_user_taxonomy($op, $type, $object = NULL) {
-
- switch ($op) {
- case 'form':
- switch ($type) {
- case 'vocabulary':
- return array('userterms' => array('#type' => 'checkboxes',
- '#title' => t('User terms'),
- '#default_value' => variable_get('taxonomy_user_vocab_'.$object['vid'], 0),
- '#options' => array(1 => t('Relate terms and users (Only works if free tagging enabled)')),
- '#description' => t('Relates terms in the vocabulary to the users that associated them to a node.'),
- '#weight' => 1,
- ));
- break;
- }
- break;
- case 'update':
- case 'insert':
- switch ($type) {
- case 'vocabulary':
- if ($object['tags'] == 1) {
- variable_set('taxonomy_user_vocab_'.$object['vid'], $object['userterms'][1]);
- if ($object['userterms'][1]) {
- db_query('UPDATE {vocabulary} SET module = "taxonomy_user" WHERE vid = %d', $object['vid']);
- }
- else {
- db_query('UPDATE {vocabulary} SET module = "taxonomy" WHERE vid = %d', $object['vid']);
- }
- }
- else {
- variable_set('taxonomy_user_vocab_'.$object['vid'], 0);
- db_query('UPDATE {vocabulary} SET module = "taxonomy" WHERE vid = %d', $object['vid']);
- }
- break;
- }
- break;
- case 'delete':
- switch ($type) {
- case 'vocabulary':
- variable_del('taxonomy_user_vocab_'.$object['vid']);
- break;
- }
- break;
- }
-}
-
-/**
- * implementation of hook_form_alter()
- */
-function taxonomy_user_form_alter($form_id, &$form) {
-
- if ($form_id == 'taxonomy_form_vocabulary') {
- $form['submit']['#weight'] = 2;
- $form['delete']['#weight'] = 2;
- }
- else if (strpos($form_id, '_node_form') !== false) {
-
- global $user;
-
- if (isset($form['taxonomy']['tags'])) {
-
- // check each free tagging category, if marked for user taxonomy -
- // if so, get all according terms from term_node_user and sort out those that are not this user's terms
- foreach ($form['taxonomy']['tags'] as $vid => $tags) {
-
- if (variable_get('taxonomy_user_vocab_'.$vid, 0)) {
-
- if (isset($form['nid']['#value'])) {
- if ($uterms = taxonomy_user_load(array('nid' => $form['nid']['#value'], 'vid' => $vid))) {
-
- $this_users_tags = array();
- $tags_others = array();
- $other_users_tags = array();
-
- foreach ($uterms as $uterm) {
- // if a tag is from this user, show it in textarea, if not, hide it in a hidden form field
- if ($uterm->uid == $user->uid) {
- $this_users_tags[] = $uterm->name;
- }
- else {
- $other_users_tags[$uterm->tid] = $uterm->name;
- $tags_others[] = array( 'uid' => $uterm->uid,
- 'tid' => $uterm->tid,
- 'name' => $uterm->name);
- }
- }
-
- $form['taxonomy']['tags_others'][$vid] = array( '#type' => 'value',
- '#value' => $tags_others,
- );
-
- $form['taxonomy']['tags'][$vid]['#default_value'] = implode(", ", $this_users_tags);
-
- if (count($other_users_tags) > 0) {
- $form['taxonomy']['tags'][$vid]['#description'] .= ''.t('Other people tagged').': '.implode(', ', $other_users_tags).'
';
- }
- }
- }
- }
- }
- }
- }
-}
-
-/**
- * Implementation of hook_nodeapi().
- */
-function taxonomy_user_nodeapi(&$node, $op, $arg = 0) {
-
- switch ($op) {
- case 'load':
- taxonomy_user_node_load($node);
- break;
- case 'submit':
- taxonomy_user_node_submit($node);
- break;
- case 'insert':
- case 'update':
- taxonomy_user_node_save($node);
- break;
- case 'delete':
- taxonomy_user_node_delete($node->nid);
- break;
- case 'view':
- taxonomy_user_node_view($node);
- break;
- }
-}
-
-/**
- * implementation of hook_block
- */
-function taxonomy_user_block($op = 'list', $delta = O, $edit = array()) {
-
- if ($op == 'view') {
- switch($delta)
- {
- case 0:
- if (module_exist('tagadelic')) {
- $blocks['subject'] = t('My tags');
- $blocks['content'] = taxonomy_user_my_tag_cloud();
- }
- break;
- }
- }
- elseif ($op == 'list') {
- $blocks[0]['info'] = t('taxonomy_user user tag cloud - requires tagadelic module');
- }
- return $blocks;
-}
-
-/**
- * loads a tid/nid/uid triple
- * $args can contain one or several of the following values
- * Array(
- * 'tid' => int(11),
- * 'nid' => int(11),
- * 'uid' => int(11),
- * )
- */
-function taxonomy_user_load($args = array()) {
-
- if (count($args) < 1) {
- return FALSE;
- }
- if (isset($args['tid'])) {
- $where[] = 'tnu.tid = %d';
- $whereargs[] = $args['tid'];
- }
- if (isset($args['nid'])) {
- $where[] = 'tnu.nid = %d';
- $whereargs[] = $args['nid'];
- }
- if (isset($args['uid']) && ($args['uid'] != 0)) {
- $where[] = 'tnu.uid = %d';
- $whereargs[] = $args['uid'];
- }
- if (isset($args['vid'])) {
- $where[] = 'td.vid = %d';
- $whereargs[] = $args['vid'];
- }
- $result = db_query('SELECT tnu.tid, td.vid, tnu.uid, tnu.nid,
- td.name, td.description, td.weight
- FROM {term_node_user} tnu
- JOIN {term_data} td ON td.tid = tnu.tid
- WHERE '.implode(' AND ', $where).' ORDER BY td.vid ASC, td.name ASC', $whereargs );
- while ($tnu = db_fetch_object($result)) {
- $return[] = $tnu;
- }
- return $return;
-}
-
-/**
- * save node's user terms
- */
-function taxonomy_user_node_save(&$node) {
- taxonomy_user_node_delete($node->nid);
-
- foreach($node->taxonomy_user as $uterm) {
- if (!$inserted[$uterm->tid][$uterm->uid]) {
- $inserted[$uterm->tid][$uterm->uid] = TRUE;
- db_query('INSERT INTO {term_node_user} (nid, tid, uid) VALUES (%d, %d, %d)', $node->nid, $uterm->tid, $uterm->uid);
- }
- }
-}
-
-/**
- * intercept node here before it goes to taxonomy.module
- */
-function taxonomy_user_node_submit(&$node) {
-
- global $user;
-
- if (isset($node->taxonomy['tags'])) {
- foreach ($node->taxonomy['tags'] as $vid => $vid_value) {
- if (variable_get('taxonomy_user_vocab_'.$vid, 0)) {
-
- // the following is taken from taxonomy.module - duplication - not the ideal solution, alas.
-
- // This regexp allows the following types of user input:
- // this, "somecmpany, llc", "and ""this"" w,o.rks", foo bar
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $vid_value, $matches);
- $typed_terms = array_unique($matches[1]);
-
- $inserted = array();
- foreach ($typed_terms as $typed_term) {
- // If a user has escaped a term (to demonstrate that it is a group,
- // or includes a comma or quote character), we remove the escape
- // formatting so to save the term into the DB as the user intends.
- $typed_term = str_replace('""', '"', preg_replace('/^"(.*)"$/', '\1', $typed_term));
- $typed_term = trim($typed_term);
- if ($typed_term == "") { continue; }
-
- // See if the term exists in the chosen vocabulary
- // and return the tid, otherwise, add a new record.
- $possibilities = taxonomy_get_term_by_name($typed_term);
- $typed_term_tid = NULL; // tid match if any.
- foreach ($possibilities as $possibility) {
- if ($possibility->vid == $vid) {
- $typed_term_tid = $possibility->tid;
- }
- }
-
- if (!$typed_term_tid) {
- $edit = array('vid' => $vid, 'name' => $typed_term);
- $status = taxonomy_save_term($edit);
- $typed_term_tid = $edit['tid'];
- }
-
- // stick stub of term on node for saving in taxonomy_user_save_node()
- $new_term = new stdClass();
- $new_term->tid = $typed_term_tid;
- $new_term->uid = $user->uid;
- $node->taxonomy_user[] = $new_term;
- }
- // now pluck off other people's tags and stick it onto the node->taxonomy_user variable as well
- if (is_array($node->taxonomy['tags_others'][$vid])) {
- foreach($node->taxonomy['tags_others'][$vid] as $term) {
- $new_term = new stdClass();
- $new_term->tid = $term['tid'];
- $new_term->uid = $term['uid'];
- $node->taxonomy_user[] = $new_term;
- // merge with original 'tags' array, so that taxonomy.module saves those tags as well
- $node->taxonomy['tags'][$vid] .= ",".$term['name'];
- }
- }
- // this would hide user terms from taxonomy module - buggy
- // unset($node->taxonomy['tags'][$vid]);
- }
- }
- }
- // unset our temp variable here, otherwise taxonomy.module takes it as yet another term category
- unset($node->taxonomy['tags_others']);
-}
-
-/**
- * delete all term/user associations for a given node
- */
-function taxonomy_user_node_delete($nid) {
-
- db_query('DELETE FROM {term_node_user} WHERE nid = %d', $nid);
-}
-
-/**
- * Renders user taxonomy for a given node
- */
-function taxonomy_user_node_view(&$node) {
-
- if (!is_array($node->taxonomy_user)) {
- return;
- }
-
- // TU_SHOW_LINKS_INLINE options needs to get a settings page implemented....
- $tagpos = variable_get('taxonomy_user_tag_pos', TU_POS_BOTTOM);
- if (($tagpos == TU_POS_TOP) || ($tagpos == TU_POS_BOTTOM)) {
- // take out those terms from taxonomy link list, that are already
- // in taxonomy user
- if (is_array($node->taxonomy)) {
- foreach($node->taxonomy_user as $term) {
- if (array_key_exists($term->tid, $node->taxonomy)) {
- unset($node->taxonomy[$term->tid]);
- }
- }
- }
- $themed_links = theme('taxonomy_user_inline_link', $node);
- if (isset($node->teaser)) {
- if ($tagpos == TU_POS_TOP) {
- $node->teaser = $themed_links.$node->teaser;
- }
- else {
- $node->teaser = $node->teaser.$themed_links;
- }
- }
- if (isset($node->body)) {
- if ($tagpos == TU_POS_TOP) {
- $node->body = $themed_links.$node->body;
- }
- else {
- $node->body = $node->body.$themed_links;
- }
- }
- }
-}
-
-/**
- * Load user taxonomy for a given node
- */
-function taxonomy_user_node_load(&$node) {
-
- $node->taxonomy_user = array();
- if ($uterms = taxonomy_user_load(array('nid' => $node->nid))) {
- global $user;
- foreach ($uterms as $uterm) {
- // do not user $uterm->tid as key, two users could have the tagged with the same $uterm->tid!
- $node->taxonomy_user[] = $uterm;
- }
- }
-}
-
-/**
- * callback function for taxonomy_term_path()
- */
-function taxonomy_user_term_path($term) {
- global $user;
- if ($term->uid == $user->uid) {
- return 'taxonomy_user/term/'.$term->tid;
- }
- return 'taxonomy/term/'.$term->tid;
-}
-
-/**
- * theme function for links
- */
-function theme_taxonomy_user_inline_link($node) {
- global $user;
- if (count($node->taxonomy_user) != 0) {
- $myterms = array();
- $otherterms = array();
- foreach ($node->taxonomy_user as $uterm) {
- if ($uterm->uid == $user->uid) {
- $myterms[] = l($uterm->name, taxonomy_term_path($uterm), array('rel' => 'tag', 'title' => strip_tags($uterm->description), 'class' => 'myterm'));
- }
- else {
- $otherterms[$uterm->tid] = l($uterm->name, taxonomy_term_path($uterm), array('rel' => 'tag', 'title' => strip_tags($uterm->description), 'class' => 'otherterm'));
- }
- }
- }
- if (count($myterms)) {
- $output = '';
- $output .= '
'.t('My tags:').'
';
- $output .= implode(' | ', $myterms);
- $output .= '
';
- if ($user->uid != 0) {
- $output .= '
'.t('Other people tagged').':
';
- }
- else {
- $output .= '
'.t('Tags').':
';
- }
- $output .= implode(' | ', $otherterms);
- $output .= '
'.t('Other people tagged').': '.implode(', ', $other_users_tags).'
';
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+
+/**
+ * Implementation of hook_nodeapi().
+ */
+function taxonomy_user_nodeapi(&$node, $op, $arg = 0) {
+
+ switch ($op) {
+ case 'load':
+ taxonomy_user_node_load($node);
+ break;
+ case 'submit':
+ taxonomy_user_node_submit($node);
+ break;
+ case 'insert':
+ case 'update':
+ taxonomy_user_node_save($node);
+ break;
+ case 'delete':
+ taxonomy_user_node_delete($node->nid);
+ break;
+ case 'view':
+ taxonomy_user_node_view($node);
+ break;
+ }
+}
+
+/**
+ * implementation of hook_block
+ */
+function taxonomy_user_block($op = 'list', $delta = O, $edit = array()) {
+
+ if ($op == 'view') {
+ switch($delta)
+ {
+ case 0:
+ if (module_exist('tagadelic')) {
+ $blocks['subject'] = t('My tags');
+ $blocks['content'] = taxonomy_user_my_tag_cloud();
+ }
+ break;
+ }
+ }
+ elseif ($op == 'list') {
+ $blocks[0]['info'] = t('taxonomy_user user tag cloud - requires tagadelic module');
+ }
+ return $blocks;
+}
+
+/**
+ * loads a tid/nid/uid triple
+ * $args can contain one or several of the following values
+ * Array(
+ * 'tid' => int(11),
+ * 'nid' => int(11),
+ * 'uid' => int(11),
+ * )
+ */
+function taxonomy_user_load($args = array()) {
+
+ if (count($args) < 1) {
+ return FALSE;
+ }
+ if (isset($args['tid'])) {
+ $where[] = 'tnu.tid = %d';
+ $whereargs[] = $args['tid'];
+ }
+ if (isset($args['nid'])) {
+ $where[] = 'tnu.nid = %d';
+ $whereargs[] = $args['nid'];
+ }
+ if (isset($args['uid']) && ($args['uid'] != 0)) {
+ $where[] = 'tnu.uid = %d';
+ $whereargs[] = $args['uid'];
+ }
+ if (isset($args['vid'])) {
+ $where[] = 'td.vid = %d';
+ $whereargs[] = $args['vid'];
+ }
+ $result = db_query('SELECT tnu.tid, td.vid, tnu.uid, tnu.nid,
+ td.name, td.description, td.weight
+ FROM {term_node_user} tnu
+ JOIN {term_data} td ON td.tid = tnu.tid
+ WHERE '.implode(' AND ', $where).' ORDER BY td.vid ASC, td.name ASC', $whereargs );
+ while ($tnu = db_fetch_object($result)) {
+ $return[] = $tnu;
+ }
+ return $return;
+}
+
+/**
+ * save node's user terms
+ */
+function taxonomy_user_node_save(&$node) {
+ // get the terms from processed taxonomy
+ global $user;
+ foreach($node->taxonomy_user_tags as $vid => $tags) {
+ if (variable_get('taxonomy_user_vocab_'. $vid, 0) == 1) {
+ // the tags are usertaggable; let's get the actual tids
+ $terms = taxonomy_node_get_terms_by_vocabulary($node->nid, $vid, 'name');
+ // we can't assume these all belong to the user, so we need to winnow
+ // so we parse the typed_string ala taxonomy_node_save
+ $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
+ preg_match_all($regexp, $tags, $matches);
+ $user_tags = array_unique($matches[1]);
+ foreach ($terms as $tag => $term) {
+ if (in_array($tag, $user_tags)) {
+ // these are worth saving as this user's
+ $user_terms[] = array('tid' => $term->tid, 'uid' => $user->uid);
+ }
+ }
+ }
+ }
+
+ // We only clear the current user's tags, since that's all we're changing.
+ taxonomy_user_node_delete($node->nid, $user->uid);
+ // save the user's terms
+ foreach($user_terms as $term) {
+ if (!isset($inserted[$term['tid']])) {
+ db_query('INSERT INTO {term_node_user} (nid, tid, uid) VALUES (%d, %d, %d)', $node->nid, $term['tid'], $term['uid']);
+ $inserted[$term['tid']] = TRUE;
+ }
+ }
+}
+
+
+/**
+ * intercept node here before it goes to taxonomy.module
+ *
+ * This is where the duplicate code was. I get around this by calling
+ * taxonomy_get_terms in the save function.
+ *
+ * What would be nice would be if taxonomy.module would put it's business
+ * in the $node object as it's passed along. Alas, it does not, so we have
+ * a choice between running through the tags twice, or hitting the database
+ * to find out the results of taxonomy_node_save.
+ *
+ * I'm implementing the latter, meaning no 'submit' processing of user terms.
+ *
+ * Instead we just do a little switcharoo on the form arrays
+ */
+function taxonomy_user_node_submit(&$node) {
+// Here we take the input value of any freetagging fields to preserve the
+// original user input for use in our taxonomy_user_node_save function.
+ $node->taxonomy_user_tags = $node->taxonomy['tags'];
+
+// Now we append the "hidden" tags (those by other users) to the
+// $node->taxonomy['tags'] elements, so that taxonomy_node_save will save
+// them all into term_node.
+ if ($node->taxonomy_user_tags_others) {
+ foreach($node->taxonomy_user_tags_others as $vid => $terms) {
+ foreach($terms as $term) {
+ $node->taxonomy['tags'][$vid] .= $node->taxonomy['tags'][$vid] ? ', '.$term['name'] : $term['name'];
+ }
+ }
+ }
+}
+
+/**
+ * delete all term/user associations for a given node
+ */
+function taxonomy_user_node_delete($nid, $uid = NULL) {
+ if ($uid) {
+ db_query('DELETE FROM {term_node_user} WHERE nid = %d AND uid = %d', $nid, $uid);
+ }
+ else {
+ db_query('DELETE FROM {term_node_user} WHERE nid = %d', $nid);
+ }
+}
+
+/**
+ * Renders user taxonomy for a given node
+ */
+function taxonomy_user_node_view(&$node) {
+ drupal_add_js(drupal_get_path('module', 'taxonomy_user').'/taxonomy_user.js');
+ if (!is_array($node->taxonomy_user)) {
+ return;
+ }
+
+ // this needs to change to the new $node->content style
+
+ // TU_SHOW_LINKS_INLINE options needs to get a settings page implemented....
+ $tagpos = variable_get('taxonomy_user_tag_pos', TU_POS_BOTTOM);
+ if (($tagpos == TU_POS_TOP) || ($tagpos == TU_POS_BOTTOM)) {
+ // take out those terms from taxonomy link list, that are already
+ // in taxonomy user
+ if (is_array($node->taxonomy)) {
+ foreach($node->taxonomy_user as $term) {
+ if (array_key_exists($term->tid, $node->taxonomy)) {
+ unset($node->taxonomy[$term->tid]);
+ }
+ }
+ }
+ $themed_links = theme('taxonomy_user_inline_link', $node);
+ if (isset($node->teaser)) {
+ if ($tagpos == TU_POS_TOP) {
+ $node->teaser = $themed_links.$node->teaser;
+ }
+ else {
+ $node->teaser = $node->teaser.$themed_links;
+ }
+ }
+ if (isset($node->body)) {
+ if ($tagpos == TU_POS_TOP) {
+ $node->body = $themed_links.$node->body;
+ }
+ else {
+ $node->body = $node->body.$themed_links;
+ }
+ }
+ }
+ $result = db_query("SELECT v.vid, v.name FROM {vocabulary_node_types} vt INNER JOIN {vocabulary} v on vt.vid = v.vid WHERE vt.type = '%s'", $node->type);
+ while ($vocab = db_fetch_object($result)) {
+ if (variable_get('taxonomy_user_vocab_'.$vocab->vid, FALSE)) {
+ $node->content['user_taxonomy_add_terms'][] = array(
+ '#value' => ''. l('Add '. $vocab->name, 'taxonomy_user/tag/'. $vocab->vid, array('class' => 'taxonomy_user_addlink', 'id' => 'TU_LINK'. $node->nid)) . '
',
+ '#weight' => 11,
+ );
+ }
+ }
+ return $node;
+}
+
+/**
+ * Load user taxonomy for a given node
+ */
+function taxonomy_user_node_load(&$node) {
+
+ $node->taxonomy_user = array();
+ if ($uterms = taxonomy_user_load(array('nid' => $node->nid))) {
+ global $user;
+ foreach ($uterms as $uterm) {
+ // do not user $uterm->tid as key, two users could have the tagged with the same $uterm->tid!
+ $node->taxonomy_user[] = $uterm;
+ }
+ }
+}
+
+/**
+ * callback function for taxonomy_term_path()
+ */
+function taxonomy_user_term_path($term) {
+ global $user;
+ if ($term->uid == $user->uid) {
+ return 'taxonomy_user/term/'.$term->tid;
+ }
+ return 'taxonomy/term/'.$term->tid;
+}
+
+/**
+ * theme function for links
+ */
+function theme_taxonomy_user_inline_link($node) {
+ global $user;
+ if (count($node->taxonomy_user) != 0) {
+ $myterms = array();
+ $otherterms = array();
+ foreach ($node->taxonomy_user as $uterm) {
+ if ($uterm->uid == $user->uid) {
+ $myterms[] = l($uterm->name, taxonomy_term_path($uterm), array('rel' => 'tag', 'title' => strip_tags($uterm->description), 'class' => 'myterm'));
+ }
+ else {
+ $otherterms[$uterm->tid] = l($uterm->name, taxonomy_term_path($uterm), array('rel' => 'tag', 'title' => strip_tags($uterm->description), 'class' => 'otherterm'));
+ }
+ }
+ }
+ if (count($myterms)) {
+ $output = '';
+ $output .= '
'.t('My tags:').'
';
+ $output .= implode(' | ', $myterms);
+ $output .= '
';
+ if ($user->uid != 0) {
+ $output .= '
'.t('Other people tagged').':
';
+ }
+ else {
+ $output .= '
'.t('Tags').':
';
+ }
+ $output .= implode(' | ', $otherterms);
+ $output .= '