? .cvsignore ? privatemsg.kill_privatemsgapi.patch ? translations Index: privatemsg.module =================================================================== RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.module,v retrieving revision 1.70.2.30.2.91.2.16 diff -u -p -r1.70.2.30.2.91.2.16 privatemsg.module --- privatemsg.module 18 Feb 2009 01:36:46 -0000 1.70.2.30.2.91.2.16 +++ privatemsg.module 18 Feb 2009 13:23:08 -0000 @@ -8,12 +8,6 @@ define('THREADED', 0); -function privatemsg_init() { - privatemsg_setup_includes(); -} -function privatemsg_setup_includes() { - require_once(drupal_get_path('module', 'privatemsg') .'/privatemsgapi/privatemsgapi.inc'); -} /** * Implementation of hook_perm(). */ @@ -409,7 +403,6 @@ function privatemsg_mark_as_read($pmid, */ function privatemsg_unread_count($account = NULL) { static $counts = array(); - privatemsg_setup_includes(); if (!$account || $account->uid == 0) { global $user; $account = $user; @@ -1292,3 +1285,138 @@ function privatemsg_get_link($recipient, return 'messages/new/'. $recipient->uid; } + +/** + * Privatemsg load single msg api + * + */ +function _privatemsg_load($pmid, $account = NULL) { + if (empty($account)) { + global $user; + $account = drupal_clone($user); + } + + $query = _privatemsg_assemble_query('load', $pmid, $account); + + $result = db_query($query['query']); + $message = db_fetch_array($result); + $message['user'] = $account; + $returned = module_invoke_all('privatemsg_message_load', $message); + if (!empty($returned)) { + $message = array_merge_recursive($returned, $message); + } + return $message; +} + +function _privatemsg_assemble_query($query) { + + // Modules will be allowed to choose the prefix for the querybuilder, but if there is not one supplied, 'privatemsg' will be taken by default. + if (is_array($query)) { + $query_id = $query[0]; + $query_group = $query[1]; + } + else { + $query_id = $query; + $query_group = 'privatemsg'; + } + + $SELECT = array(); + $INNER_JOIN = array(); + $WHERE = array(); + $GROUP_BY = array(); + $ORDER_BY = array(); + $QUERY_ARGS = array(); + $primary_table = ''; + + $fragments = array( + 'select' => $SELECT, + 'inner_join' => $INNER_JOIN, + 'where' => $WHERE, + 'group_by' => $GROUP_BY, + 'order_by' => $ORDER_BY, + 'query_args' => $QUERY_ARGS, + 'primary_table' => $primary_table, + ); + + /** + * Begin: dynamic arguments + */ + $args = func_get_args(); + unset($args[0]); + //we do the merge because we call call_user_func_array and not drupal_alter + //this is necessary because otherwise we would not be able to use $args correctly (otherwise it doesnt unfold) + $alterargs = array(&$fragments); + $query_function = $query_group .'_sql_'. $query_id; + if (!empty($args)) { + $alterargs = array_merge($alterargs, $args); + } + /** + * END: Dynamic arguments + */ + if (!function_exists($query_function)) { + drupal_set_message(t('Query function %function does not exist', array('%function' => $query_function)), 'error'); + return FALSE; + } + call_user_func_array($query_function, $alterargs); + + array_unshift($alterargs, $query_function); + call_user_func_array('drupal_alter', $alterargs); + + $SELECT = $fragments['select']; + $INNER_JOIN = $fragments['inner_join']; + $WHERE = $fragments['where']; + $GROUP_BY = $fragments['group_by']; + $ORDER_BY = $fragments['order_by']; + $QUERY_ARGS = $fragments['query_args']; + $primary_table = $fragments['primary_table']; + + if (empty($primary_table)) { + $primary_table = '{privatemsg} pm'; + } + + // Perform the whole query assembly only if we have something to select. + if (!empty($SELECT)) { + $str_select = implode(", ", $SELECT); + $query = "SELECT {$str_select} FROM ". $primary_table; + + // Also build a count query which can be passed to pager_query to get a "page count" as that does not play well with queries including "GROUP BY". + // In most cases, "COUNT(*)" is enough to get the count query, but in queries involving a GROUP BY, we want a count of the number of groups we have, not the count of elements inside each group. + // So we test if there is GROUP BY and if there is, count the number of distinct groups. If not, we go the normal wal and do a plain COUNT(*). + if (!empty($GROUP_BY)) { + // PostgreSQL does not support COUNT(sometextfield, someintfield), so I'm only using the first one + // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used. + $str_group_by_count = current($GROUP_BY); + $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table; + } + else { + $count = "SELECT COUNT(*) FROM ". $primary_table; + } + + if (!empty($INNER_JOIN)) { + $str_inner_join = implode(' ', $INNER_JOIN); + $query .= " {$str_inner_join}"; + $count .= " {$str_inner_join}"; + } + if (!empty($WHERE)) { + $str_where = '('. implode(') AND (', $WHERE) .')'; + $query .= " WHERE {$str_where}"; + $count .= " WHERE {$str_where}"; + } + if (!empty($GROUP_BY)) { + $str_group_by = ' GROUP BY '. implode(", ", $GROUP_BY) ; + $query .= " {$str_group_by}"; + } + if (!empty($ORDER_BY)) { + $str_order_by = ' ORDER BY '. implode(", ", $ORDER_BY) ; + $query .= " {$str_order_by}"; + } + if (!empty($QUERY_ARGS)) { + _db_query_callback($QUERY_ARGS, TRUE); + $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); + _db_query_callback($QUERY_ARGS, TRUE); + $count = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $count); + } + return array('query' => $query, 'count' => $count); + } + return FALSE; +} Index: privatemsgapi/privatemsgapi.inc =================================================================== RCS file: privatemsgapi/privatemsgapi.inc diff -N privatemsgapi/privatemsgapi.inc --- privatemsgapi/privatemsgapi.inc 18 Feb 2009 01:36:46 -0000 1.8.2.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,190 +0,0 @@ - $user ) { - $values[] = "(%d, %d)"; - $replacement[] = $gid; - $replacement[] = $uid; - } - - $query .= implode(", ", $values); - db_query($query, $replacement); -} - -/** - * Privatemsg load single msg api - * - */ -function _privatemsg_load($pmid, $account = NULL) { - if (empty($account)) { - global $user; - $account = drupal_clone($user); - } - - $query = _privatemsg_assemble_query('load', $pmid, $account); - - $result = db_query($query['query']); - $message = db_fetch_array($result); - $message['user'] = $account; - $returned = module_invoke_all('privatemsg_message_load', $message); - if (!empty($returned)) { - $message = array_merge_recursive($returned, $message); - } - return $message; -} - -function _privatemsg_assemble_query($query) { - - // Modules will be allowed to choose the prefix for the querybuilder, but if there is not one supplied, 'privatemsg' will be taken by default. - if (is_array($query)) { - $query_id = $query[0]; - $query_group = $query[1]; - } - else { - $query_id = $query; - $query_group = 'privatemsg'; - } - - $SELECT = array(); - $INNER_JOIN = array(); - $WHERE = array(); - $GROUP_BY = array(); - $ORDER_BY = array(); - $QUERY_ARGS = array(); - $primary_table = ''; - - $fragments = array( - 'select' => $SELECT, - 'inner_join' => $INNER_JOIN, - 'where' => $WHERE, - 'group_by' => $GROUP_BY, - 'order_by' => $ORDER_BY, - 'query_args' => $QUERY_ARGS, - 'primary_table' => $primary_table, - ); - - /** - * Begin: dynamic arguments - */ - $args = func_get_args(); - unset($args[0]); - //we do the merge because we call call_user_func_array and not drupal_alter - //this is necessary because otherwise we would not be able to use $args correctly (otherwise it doesnt unfold) - $alterargs = array(&$fragments); - $query_function = $query_group .'_sql_'. $query_id; - if (!empty($args)) { - $alterargs = array_merge($alterargs, $args); - } - /** - * END: Dynamic arguments - */ - if (!function_exists($query_function)) { - drupal_set_message(t('Query function %function does not exist', array('%function' => $query_function)), 'error'); - return FALSE; - } - call_user_func_array($query_function, $alterargs); - - array_unshift($alterargs, $query_function); - call_user_func_array('drupal_alter', $alterargs); - - $SELECT = $fragments['select']; - $INNER_JOIN = $fragments['inner_join']; - $WHERE = $fragments['where']; - $GROUP_BY = $fragments['group_by']; - $ORDER_BY = $fragments['order_by']; - $QUERY_ARGS = $fragments['query_args']; - $primary_table = $fragments['primary_table']; - - if (empty($primary_table)) { - $primary_table = '{privatemsg} pm'; - } - - // Perform the whole query assembly only if we have something to select. - if (!empty($SELECT)) { - $str_select = implode(", ", $SELECT); - $query = "SELECT {$str_select} FROM ". $primary_table; - - // Also build a count query which can be passed to pager_query to get a "page count" as that does not play well with queries including "GROUP BY". - // In most cases, "COUNT(*)" is enough to get the count query, but in queries involving a GROUP BY, we want a count of the number of groups we have, not the count of elements inside each group. - // So we test if there is GROUP BY and if there is, count the number of distinct groups. If not, we go the normal wal and do a plain COUNT(*). - if (!empty($GROUP_BY)) { - // PostgreSQL does not support COUNT(sometextfield, someintfield), so I'm only using the first one - // Works fine for thread_id/list but may generate an error when a more complex GROUP BY is used. - $str_group_by_count = current($GROUP_BY); - $count = "SELECT COUNT(DISTINCT {$str_group_by_count}) FROM ". $primary_table; - } - else { - $count = "SELECT COUNT(*) FROM ". $primary_table; - } - - if (!empty($INNER_JOIN)) { - $str_inner_join = implode(' ', $INNER_JOIN); - $query .= " {$str_inner_join}"; - $count .= " {$str_inner_join}"; - } - if (!empty($WHERE)) { - $str_where = '('. implode(') AND (', $WHERE) .')'; - $query .= " WHERE {$str_where}"; - $count .= " WHERE {$str_where}"; - } - if (!empty($GROUP_BY)) { - $str_group_by = ' GROUP BY '. implode(", ", $GROUP_BY) ; - $query .= " {$str_group_by}"; - } - if (!empty($ORDER_BY)) { - $str_order_by = ' ORDER BY '. implode(", ", $ORDER_BY) ; - $query .= " {$str_order_by}"; - } - if (!empty($QUERY_ARGS)) { - _db_query_callback($QUERY_ARGS, TRUE); - $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); - _db_query_callback($QUERY_ARGS, TRUE); - $count = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $count); - } - return array('query' => $query, 'count' => $count); - } - return FALSE; -}