';
- foreach (element_children($form['titles']) as $key) {
+ foreach (element_children($form['titles']) as $key) {
// set a reference so that the drupal_render gets remembered.
unset($elem);
$elem = &$form['titles'][$key];
@@ -170,9 +175,9 @@ function theme_user_titles_settings_form
/**
* Validate the user titles setting form
*/
-function user_titles_settings_form_validate($form_id, $form_values, $form) {
+function user_titles_settings_form_validate($form, &$form_state) {
$used_posts = array();
- foreach ($form_values['titles'] as $id => $title) {
+ foreach ($form_state['values']['titles'] as $id => $title) {
// if no title and no value, this is a deletion and we'll skip valiation on it.
if (empty($title['value']) && empty($title['title'])) {
continue;
@@ -194,7 +199,7 @@ function user_titles_settings_form_valid
*/
function user_titles_settings_form_submit($form_id, $form_values) {
$titles = array();
- foreach ($form_values['titles'] as $id => $title) {
+ foreach ($form_values['values']['titles'] as $id => $title) {
if (empty($title['value']) && empty($title['title'])) {
continue;
}
@@ -202,13 +207,14 @@ function user_titles_settings_form_submi
}
user_titles_set_titles($titles);
- // If they change the allowed types, wipe the existing counts so each one will be fresh.
+ // If they change the allowed types, rebuild the existing counts so each one will be fresh.
$types = user_titles_get_allowed_types();
- if ($types != $form_values['types']) {
- db_query("TRUNCATE {user_titles_posts}");
+
+ if ($types != array_keys(array_filter($form_values['values']['types']))) {
+ user_titles_set_allowed_types(array_keys(array_filter($form_values['values']['types'])));
+ user_titles_rebuild_counts();
}
- user_titles_set_allowed_types(array_keys(array_filter($form_values['types'])));
drupal_set_message(t('The configuration has been updated.'));
}
@@ -216,12 +222,12 @@ function user_titles_settings_form_submi
* Implementation of hook_nodeapi
*/
function user_titles_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
- if ($op == 'insert' || $op == 'delete') {
- $allowed_types = user_titles_get_allowed_types();
- if (in_array($node->type, $allowed_types)) {
- $inc = ($op == 'insert') ? 1 : -1;
- db_query("REPLACE INTO {user_titles_posts} (uid, posts) VALUES (%d, %d)", $node->uid, user_titles_get_posts($node->uid) + $inc);
- }
+ switch ($op) {
+ case 'insert':
+ $allowed_types = user_titles_get_allowed_types();
+ if (in_array($node->type, $allowed_types)) {
+ db_query("REPLACE INTO {user_titles_posts} (uid, posts) VALUES (%d, %d)", $node->uid, user_titles_get_posts($node->uid) + 1);
+ }
}
}
@@ -229,11 +235,12 @@ function user_titles_nodeapi(&$node, $op
* Implementation of hook_comment.
*/
function user_titles_comment($a1, $op) {
- if ($op == 'insert' || $op == 'delete') {
- $a1 = (object)$a1; // sometimes an array is passed in
- $uid = $a1->uid;
- $inc = ($op == 'insert') ? 1 : -1;
- db_query("REPLACE INTO {user_titles_posts} (uid, posts) VALUES (%d, %d)", $uid, user_titles_get_posts($uid) + $inc);
+ if ($op == 'insert') {
+ $node = node_load($a1['nid']);
+ $allowed_types = user_titles_get_allowed_types();
+ if (in_array($node->type, $allowed_types)) {
+ db_query("REPLACE INTO {user_titles_posts} (uid, posts) VALUES (%d, %d)", $a1['uid'], user_titles_get_posts($a1['uid']) + 1);
+ }
}
}
@@ -319,10 +326,21 @@ function user_titles_update_post_count($
$allowed_types = user_titles_get_allowed_types();
if ($allowed_types) {
$types = implode("','", $allowed_types);
- $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE uid = %d AND type IN ('$types')", $uid));
+ /*
+ $count = db_result(db_query("SELECT COUNT(*) FROM {node} WHERE uid = %d AND type IN ('%s')", $uid, $types));
if (module_exists('comment')) {
$count += db_result(db_query("SELECT COUNT(*) FROM {comments} WHERE uid = %d", $uid));
}
+ */
+ if (module_exists('comment')) {
+ $count = db_result(db_query("SELECT (COUNT(DISTINCT n.nid) + COUNT(DISTINCT c.cid)) FROM {node} n INNER JOIN {comments} c ON c.nid = n.nid WHERE n.type IN ('%s') AND (n.uid = %d OR c.uid = %d) GROUP BY n.uid, c.uid ORDER BY n.uid, c.uid",
+ $types, $uid, $uid));
+ }
+ else {
+ $count = db_result(db_query($user_node_count_query = "SELECT COUNT(DISTINCT n.nid) FROM {node} n WHERE n.type IN ('%s') AND n.uid = %d GROUP BY n.uid ORDER BY n.uid",
+ $types, $uid));
+ }
+
}
else {
$count = 0;
@@ -352,14 +370,12 @@ function user_titles_set_allowed_types($
*/
function user_titles_get_titles() {
$query = db_query("SELECT title, value, tid FROM {user_titles} ORDER BY value DESC");
- if(db_num_rows($query)) {
- while($r = db_fetch_array($query)) {
- $result[] = $r;
- }
- }
- else {
- $result = array();
+
+ $result = array();
+ while ($r = db_fetch_array($query)) {
+ $result[] = $r;
}
+
return $result;
}
@@ -368,9 +384,10 @@ function user_titles_get_titles() {
*/
function user_titles_set_titles($titles) {
db_query("TRUNCATE {user_titles}");
- foreach($titles as $title) {
- if($title['tid'] == 'new') {
- $title['tid'] = db_next_id("{user_titles}_tid");
+ foreach ($titles as $title) {
+ if ($title['tid'] == 'new') {
+ $title['tid'] = db_result(db_query('SELECT MAX(tid) AS tid FROM {user_titles}')) + 1;
+ //$title['tid'] = db_last_insert_id("user_titles", "tid");
}
db_query("INSERT INTO {user_titles} (title, value, tid) VALUES ('%s', %d, %d)", $title['title'], $title['value'], $title['tid']);
}
@@ -400,11 +417,11 @@ function user_titles_user($op, $edit, &$
}
$form['user_titles']['current_title'] = array(
- '#value' => '
' . t('Current user title:') . ' ' . filter_xss_admin($title) . '
',
+ '#value' => '
'. t('Current user title:') .' '. filter_xss_admin($title) .'
',
);
if (isset($title_info['title']) && empty($title_info['tid'])) {
- $default_title_info = user_titles_get_title(user_titles_get_posts($user->uid));
+ $default_title_info = user_titles_get_title(user_titles_get_posts($uid));
if (!isset($default_title_info['title'])) {
$default_title = t('No title set');
}
@@ -412,7 +429,7 @@ function user_titles_user($op, $edit, &$
$default_title = $default_title_info['title'];
}
$form['user_titles']['default_title'] = array(
- '#value' => '
' . t('Default user title:') . ' ' . filter_xss_admin($default_title) . '
',
+ '#value' => '
'. t('Default user title:') .' '. filter_xss_admin($default_title) .'
',
);
}
@@ -435,3 +452,51 @@ function user_titles_user($op, $edit, &$
}
}
}
+
+function user_titles_rebuild_counts() {
+ db_query('TRUNCATE TABLE {user_titles_posts}');
+
+ $types = user_titles_get_allowed_types();
+ foreach ($types as $id => $type) {
+ $types[$id] = "'". $type ."'";
+ }
+ $types_clause = implode(',', $types);
+
+ if ($types_clause != '') {
+ $user_counts = array();
+
+ if (module_exists('comment')) {
+ $user_comment_count_query = "SELECT c.uid, COUNT(c.cid) AS user_content_count FROM {node} n INNER JOIN {comments} c ON c.nid = n.nid WHERE n.type IN ($types_clause) GROUP BY c.uid ORDER BY c.uid";
+
+ $result = db_query($user_comment_count_query);
+ while ($row = db_fetch_array($result)) {
+ $user_counts[$row['uid']] += $row['user_content_count'];
+ }
+ }
+
+ $user_node_count_query = "SELECT n.uid, COUNT(n.nid) AS user_content_count FROM {node} n WHERE n.type IN ($types_clause) GROUP BY n.uid ORDER BY n.uid";
+
+ $result = db_query($user_node_count_query);
+ while ($row = db_fetch_array($result)) {
+ $user_counts[$row['uid']] += $row['user_content_count'];
+ }
+
+ foreach ($user_counts as $uid => $user_content_count) {
+ $user_node_count_insert_query = db_query("INSERT INTO {user_titles_posts}(uid,posts) VALUES(%d,%d)",
+ $uid, $user_content_count);
+ }
+
+ drupal_set_message(t("Users' post counts have been rebuilt."));
+ }
+ else {
+ drupal_set_message(t("Users' post counts were cleared. Select one or more content types to allow your users to advance."));
+ }
+}
+
+function user_titles_preprocess_node(&$variables) {
+ $variables['user_title'] = user_titles_get_user_title($variables['node']->uid);
+}
+
+function user_titles_preprocess_comment(&$variables) {
+ $variables['user_title'] = user_titles_get_user_title($variables['comment']->uid);
+}