'. t('There are currently no posts in this category.') .'
'; } return $output; } /** + * Parses a comma or plus separated string of category IDs. + * + * @param $str_cids + * A string of category IDs, separated by plus or comma. + * comma (,) means AND + * plus (+) means OR + * + * @return an associative array with an operator key (either 'and' + * or 'or') and a cid key containing an array of the category IDs. + */ +function category_categories_parse_string($str_cids) { + $categories = array(); + if (preg_match('/^([0-9]+[+ ])+[0-9]+$/', $str_cids)) { + $categories['operator'] = 'or'; + // The '+' character in a query string may be parsed as ' '. + $categories['cids'] = preg_split('/[+ ]/', $str_cids); + } + else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str_cids)) { + $categories['operator'] = 'and'; + $categories['cids'] = explode(',', $str_cids); + } + return $categories; +} + +/** * Generates various representation of a cateogry page with * all descendants and prints the requested representation to output. * @@ -1064,7 +1101,7 @@ function category_get_form($is_cat = TRU $body_text = ''; if (isset($node->body)) { - if (!(module_exist('category_display') && $node->body_is_desc)) { + if (!(module_exists('category_display') && $node->body_is_desc)) { $body_text = $node->body; } } @@ -1099,7 +1136,7 @@ function category_get_form($is_cat = TRU '#description' => ($is_cat ? t('A description of the category. Generally seen by users as title text, when hovering over a link to the category.') : t('A description of the container; can be used by modules.')), ); - $activeselect = module_exist('activeselect'); + $activeselect = module_exists('activeselect'); $activeselect_type = ($activeselect ? 'activeselect' : 'select'); if ($is_cat) { @@ -1159,7 +1196,7 @@ function category_get_form($is_cat = TRU '#type' => 'checkboxes', '#title' => t('Types'), '#default_value' => $node->nodes ? $node->nodes : array(), - '#options' => node_get_types(), + '#options' => node_get_types('names'), '#description' => t('A list of node types you want to associate with categories in this container.'), ); $form['catinfo']['hierarchy'] = array( @@ -1167,20 +1204,20 @@ function category_get_form($is_cat = TRU '#title' => t('Hierarchy'), '#default_value' => isset($node->hierarchy) ? $node->hierarchy : 1, '#options' => array(0 => t('Disabled'), 1 => t('Single'), 2 => t('Multiple')), - '#description' => t('Allows a tree-like hierarchy between categories within a container. Depending on your distant parent configuration, this may also allow a hierarchy between categories and containers regardless of their parent container. Be aware that the multiple option refers to multiple parents, as opposed to multiple levels of hierarchy.', array('%help-url' => url('admin/help/category', NULL, 'hierarchy'))), + '#description' => t('Allows a tree-like hierarchy between categories within a container. Depending on your distant parent configuration, this may also allow a hierarchy between categories and containers regardless of their parent container. Be aware that the multiple option refers to multiple parents, as opposed to multiple levels of hierarchy.', array('!help-url' => url('admin/help/category', NULL, 'hierarchy'))), '#required' => TRUE, ); $form['catinfo']['has_relations'] = array( '#type' => 'checkbox', '#title' => t('Related terms'), '#default_value' => isset($node->has_relations) ? $node->has_relations : 0, - '#description' => t('Allows relations between arbitrary categories or containers.', array('%help-url' => url('admin/help/category'))), + '#description' => t('Allows relations between arbitrary categories or containers.', array('!help-url' => url('admin/help/category'))), ); $form['catinfo']['has_synonyms'] = array( '#type' => 'checkbox', '#title' => t('Synonyms'), '#default_value' => isset($node->has_synonyms) ? $node->has_synonyms : 0, - '#description' => t('Allows synonyms for a category or container, such as misspellings and acronyms.', array('%help-url' => url('admin/help/category'))), + '#description' => t('Allows synonyms for a category or container, such as misspellings and acronyms.', array('!help-url' => url('admin/help/category'))), ); $form['catinfo']['tags'] = array( '#type' => 'checkbox', @@ -1250,7 +1287,7 @@ function category_get_form($is_cat = TRU if ($hierarchy == 1 || $activeselect) { $form['catinfo']['parents'] = _category_category_select(t('Parent'), $parents, $default_parent, t('Parent category or container. Containers are marked with an asterisk (*).'), 0, $blank, $exclude); } - elseif ($hierarchy == 2) { + elseif ($hierarchy == 2) { $form['catinfo']['parents'] = _category_category_select(t('Parents'), $parents, $default_parent, t('Parent categories or containers. Containers are marked with an asterisk (*).'), ($activeselect ? 0 : 1), $blank, $exclude); } @@ -1359,13 +1396,13 @@ function category_get_wrapper_status($ty static $taxonomy_status, $book_status; if (!isset($taxonomy_status)) { - $taxonomy_status = module_exist('taxonomy') && !menu_get_item(NULL, 'admin/taxonomy'); + $taxonomy_status = module_exists('taxonomy') && !menu_get_item(NULL, 'admin/content/taxonomy'); if ($check_db) { $taxonomy_status = $taxonomy_status && variable_get('taxonomy_maintain_db', 1); } } if (!isset($book_status)) { - $book_status = module_exist('book') && !menu_get_item(NULL, 'admin/node/book'); + $book_status = module_exists('book') && !menu_get_item(NULL, 'admin/content/book'); if ($check_db) { $book_status = $book_status && variable_get('book_maintain_db', 1); } @@ -1493,15 +1530,6 @@ function _category_get_depth($cid) { } } -function _category_depth($depth, $graphic = '--') { - for ($n = 0; $n < $depth; $n++) { - $result .= $graphic; - } - return $result; -} - - - /** * Helper for category_category_count_nodes(). */ Index: category.info =================================================================== RCS file: category.info diff -N category.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ category.info 27 Dec 2006 07:57:21 -0000 @@ -0,0 +1,4 @@ +; $Id$ +name = Category +description = Allows you to structure your site and categorize content. +package = Category Index: category.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category.install,v retrieving revision 1.10 diff -u -p -r1.10 category.install --- category.install 14 Apr 2006 13:52:03 -0000 1.10 +++ category.install 27 Dec 2006 07:57:22 -0000 @@ -204,3 +204,23 @@ function category_update_8() { return $ret; } + +/** + * Drupal 5.0 updates + */ +function category_update_9() { + // Node types may no longer contain hyphens. + $ret[] = update_sql("UPDATE {node} SET type = 'category_cat' WHERE type = 'category-cat'"); + $ret[] = update_sql("UPDATE {node} SET type = 'category_cont' WHERE type = 'category-cont'"); + + // Some of our variables need to be renamed. + $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'category_nodeapi_%_containers'"); + while ($row = db_fetch_array($result)) { + // Determine the new name of the variable + $name = preg_replace('/^category_nodeapi_(.*)_containers$/','category_nodeapi_containers_$1', $row['name']); + // Change the name. + $ret[] = update_sql("UPDATE {variable} SET name = '%s' WHERE name = '%s'", $name, $row['name']); + } + + return $ret; +} Index: category.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category.module,v retrieving revision 1.123 diff -u -p -r1.123 category.module --- category.module 24 Nov 2006 05:22:31 -0000 1.123 +++ category.module 27 Dec 2006 07:57:24 -0000 @@ -6,23 +6,19 @@ * Allows users to structure their site and organize content with categories. */ +require_once dirname(drupal_get_filename('module', 'category')) . '/category.inc'; + /** * Implementation of hook_help(). */ function category_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Allows you to structure your site and categorize content.'); - case 'admin/category': + case 'admin/content/category': return t('The category module allows you to structure your site and to categorize content: you can create multiple containers (types of categorizations) that contain a tree of categories; you can assign content to your categories; and you can give your categories their own content (such as a description).
'); case 'admin/help#category': return t('The category module allows you to structure your site and to categorize content: you can create multiple containers (types of categorizations) that contain a tree of categories; you can assign content to your categories; and you can give your categories their own content (such as a description).
'); - case 'node/add#category-cat': - return t("Categories are used to structure your site, and to categorize content. You can create a category as the child of a container, or of another category. You can assign content to one or more categories."); - case 'node/add#category-cont': - return t("A container is usually the root of a category tree, but can also be created as the child of another container, or of a category. Containers are used for describing a particular way of classifying content."); - case 'admin/settings/category': - return t('Settings controlling the behaviour of categories and containers on this site. As well as settings for the category module itself, settings for other modules in the category package can also be configured here. Only global settings are controlled here: most settings are controlled on a per-container or per-category basis, and are instead configured on the add/edit category/container pages. See the categories page for actual categories and containers.
', array('%category' => url('admin/category'))); + case 'admin/content/category/settings': + return t('Settings controlling the behaviour of categories and containers on this site. As well as settings for the category module itself, settings for other modules in the category package can also be configured here. Only global settings are controlled here: most settings are controlled on a per-container or per-category basis, and are instead configured on the add/edit category/container pages. See the list page for actual categories and containers.
', array('!category' => url('admin/content/category'))); } } @@ -30,14 +26,22 @@ function category_help($section) { * Implementation of hook_node_info(). */ function category_node_info() { - $base_types = variable_get('category_base_nodetypes', array('category-cat' => 'category-cat', 'category-cont' => 'category-cont')); + $base_types = variable_get('category_base_nodetypes', array('category_cat' => 'category_cat', 'category_cont' => 'category_cont')); $types_list = array(); - if ($base_types['category-cont']) { - $types_list['category-cont'] = array('name' => t('container'), 'base' => 'category'); + if ($base_types['category_cont']) { + $types_list['category_cont'] = array( + 'name' => t('Container'), + 'module' => 'category', + 'description' => t("A container is usually the root of a category tree, but can also be created as the child of another container, or of a category. Containers are used for describing a particular way of classifying content."), + ); } - if ($base_types['category-cat']) { - $types_list['category-cat'] = array('name' => t('category'), 'base' => 'category'); + if ($base_types['category_cat']) { + $types_list['category_cat'] = array( + 'name' => t('Category'), + 'module' => 'category', + 'description' => t("Categories are used to structure your site, and to categorize content. You can create a category as the child of a container, or of another category. You can assign content to one or more categories."), + ); } return $types_list; @@ -47,16 +51,16 @@ function category_node_info() { * Implementation of hook_perm(). */ function category_perm() { - $base_types = variable_get('category_base_nodetypes', array('category-cat' => 'category-cat', 'category-cont' => 'category-cont')); + $base_types = variable_get('category_base_nodetypes', array('category_cat' => 'category_cat', 'category_cont' => 'category_cont')); $perms_list = array(); - if ($base_types['category-cat']) { + if ($base_types['category_cat']) { $perms_list[] = 'create categories'; } - if ($base_types['category-cont']) { + if ($base_types['category_cont']) { $perms_list[] = 'create containers'; } - if ($base_types['category-cat'] || $base_types['category-cont']) { + if ($base_types['category_cat'] || $base_types['category_cont']) { $perms_list[] = 'edit all categories'; $perms_list[] = 'edit own categories'; } @@ -66,24 +70,16 @@ function category_perm() { } /** - * Implementation of hook_init(). - * - */ -function category_init() { - require_once dirname(drupal_get_filename('module', 'category')) . '/category.inc'; -} - -/** * Implementation of hook_menu(). */ function category_menu($may_cache) { $items = array(); - $base_types = variable_get('category_base_nodetypes', array('category-cat' => 'category-cat', 'category-cont' => 'category-cont')); + $base_types = variable_get('category_base_nodetypes', array('category_cat' => 'category_cat', 'category_cont' => 'category_cont')); if ($may_cache) { $items[] = array( 'path' => 'category', - 'title' => t('categories'), + 'title' => t('Categories'), 'callback' => 'category_category_page', 'access' => user_access('access content'), 'type' => MENU_CALLBACK, @@ -94,71 +90,67 @@ function category_menu($may_cache) { 'access' => user_access('access content'), 'type' => MENU_CALLBACK); $items[] = array( - 'path' => 'admin/category', - 'title' => t('categories'), + 'path' => 'admin/content/category', + 'title' => t('Categories'), + 'description' => t('Create containers and categories to categorize your content.'), 'callback' => 'category_admin', 'access' => user_access('administer categories'), ); $items[] = array( - 'path' => 'admin/category/list', - 'title' => t('list'), + 'path' => 'admin/content/category/list', + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/list/container', - 'title' => t('containers'), + 'path' => 'admin/content/category/list/container', + 'title' => t('Containers'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/add', - 'title' => t('add container'), + 'path' => 'admin/content/category/add', + 'title' => t('Add container'), 'callback' => 'category_admin', 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -6, ); - if ($base_types['category-cat']) { - $items[] = array( - 'path' => 'node/add/category-cat', - 'title' => t('category'), - 'access' => _category_privileged('create categories'), - ); - } - if ($base_types['category-cont']) { - $items[] = array( - 'path' => 'node/add/category-cont', - 'title' => t('container'), - 'access' => _category_privileged('create containers'), - ); - } + $items[] = array( + 'path' => 'admin/content/category/settings', + 'title' => t('Settings'), + 'callback' => 'drupal_get_form', + 'callback arguments' => 'category_admin_settings', + 'access' => user_access('administer categories'), + 'type' => MENU_LOCAL_TASK, + 'weight' => -3, + ); $items[] = array('path' => 'category/autocomplete', - 'title' => t('autocomplete category'), + 'title' => t('Autocomplete category'), 'callback' => 'category_autocomplete', 'access' => user_access('access content'), 'type' => MENU_CALLBACK, ); $items[] = array('path' => 'category/activeselect', - 'title' => t('activeselect category'), + 'title' => t('Activeselect category'), 'callback' => 'category_activeselect', 'access' => user_access('access content'), 'type' => MENU_CALLBACK, ); $items[] = array('path' => 'category/wrapper', - 'title' => t('category wrappers'), + 'title' => t('Category wrappers'), 'callback' => 'category_wrapper', 'access' => user_access('administer site configuration'), 'type' => MENU_CALLBACK, ); } else { - if (arg(0) == 'admin' && arg(1) == 'category' && is_numeric(arg(2))) { - $nid = arg(2); + if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'category' && is_numeric(arg(3))) { + $nid = arg(3); $node = node_load($nid); $items[] = array( - 'path' => 'admin/category/' . $nid, + 'path' => 'admin/content/category/' . $nid, 'title' => $node->admin_title, 'callback' => 'category_admin', 'access' => user_access('administer categories'), @@ -166,22 +158,22 @@ function category_menu($may_cache) { ); $items[] = array( - 'path' => 'admin/category/' . $nid . '/list', - 'title' => t('list'), + 'path' => 'admin/content/category/' . $nid . '/list', + 'title' => t('List'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/' . $nid . '/list/category', - 'title' => t('categories'), + 'path' => 'admin/content/category/' . $nid . '/list/category', + 'title' => t('Categories'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/' . $nid . '/add', - 'title' => t('add category'), + 'path' => 'admin/content/category/' . $nid . '/add', + 'title' => t('Add category'), 'callback' => 'category_admin', 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, @@ -194,7 +186,7 @@ function category_menu($may_cache) { if ($is_cat) { $items[] = array( 'path' => "node/$nid/feed", - 'title' => t('feed'), + 'title' => t('Feed'), 'callback' => 'category_feed', 'type' => MENU_CALLBACK, ); @@ -213,7 +205,7 @@ function category_access($op, $node) { if ($op == 'create') { $type = $node; - if ($type == 'category-cont') { + if ($type == 'category_cont') { return _category_privileged('create containers'); } else { @@ -228,7 +220,7 @@ function category_access($op, $node) { // of that page waiting for approval. That is, only updates that // don't overwrite the current or pending information are allowed. - if ((_category_privileged('edit all') && !$node->moderate) || ($node->uid == $user->uid && user_access('edit own categories'))) { + if (_category_privileged('edit all') || ($node->uid == $user->uid && user_access('edit own categories'))) { return TRUE; } else { @@ -244,20 +236,26 @@ function category_access($op, $node) { * print lists of categories associated with a node. Themes can print category * links with: * - * if (module_exist('category')) { + * if (module_exists('category')) { * $this->links(category_link('categories', $node)); * } */ -function category_link($type, $node = NULL, $main = NULL) { +function category_link($type, $node = NULL, $teaser = FALSE) { $links = array(); if ($type == 'node' && isset($node->parents)) { - if (!$main && ($node->type != 'category-cat' || $node->hierarchy)) { + if (!$teaser && ($node->type != 'category_cat' || $node->hierarchy)) { if (_category_privileged('create categories')) { - $links[] = l(t('add child category'), "node/add/category-cat/parent/$node->nid"); + $links['category_add_category'] = array( + 'title' => t('Add child category'), + 'href' => "node/add/category-cat/parent/$node->nid", + ); } if (_category_privileged('create containers')) { - $links[] = l(t('add child container'), "node/add/category-cont/parent/$node->nid"); + $links['category_add_container'] = array( + 'title' => t('Add child container'), + 'href' => "node/add/category-cont/parent/$node->nid", + ); } } } @@ -266,8 +264,12 @@ function category_link($type, $node = NU $links = array(); if (isset($node->category) && is_array($node->category)) { foreach ($node->category as $category) { - if (!module_exist('category_display') || ($category->cid && ($cat_node = node_load($category->cid)) && $cat_node->nodelinks)) { - $links[] = l($category->title, category_category_path($category), array('rel' => 'tag', 'title' => strip_tags($category->description))); + if (!module_exists('category_display') || ($category->cid && ($cat_node = node_load($category->cid)) && $cat_node->nodelinks)) { + $links['category_cat_'. $category->cid] = array( + 'title' => $category->title, + 'href' => category_category_path($category), + 'attributes' => array('rel' => 'tag', 'title' => strip_tags($category->description)), + ); } } } @@ -277,9 +279,9 @@ function category_link($type, $node = NU } /** - * Implementation of hook_settings(). + * Settings form. */ -function category_settings() { +function category_admin_settings() { $form = array(); // select options $distant = array( @@ -306,7 +308,9 @@ function category_settings() { '#type' => 'item', '#title' => t('Taxonomy wrapper status'), '#value' => theme('category_wrapper_status', 'taxonomy', $taxonomy_status), - '#description' => ''. t('You can install and uninstall the taxonomy and book wrapper modules using the links below. It is very important that you have taxonomy or book (original or wrapper, whichever is installed) enabled on the %module-admin-page before performing an install or uninstall. Additionally, you should make sure that your web server has write permission on the file system, or the scripts may be denied access to copy and rename the necessary files.', array('%module-admin-page' => l(t('module administration page'), 'admin/modules'))). '
'. t('When performing an install, the scripts will rename your existing taxonomy or book module file to modulename.module.old. It will then copy the appropriate modulename.module.copyme file from the wrappers/ directory (in your category package) to the location where the old module file was, and will rename the copied file to modulename.module. The reverse will happen when performing an uninstall. The script will determine the correct location of all necessary files automatically, based on the existing locations of those files.'). '
'. t('After the operation that you invoke is completed, you will be returned to this page.'). '
', + '#description' => ''. t('You can install and uninstall the taxonomy and book wrapper modules using the links below. It is very important that you have taxonomy or book (original or wrapper, whichever is installed) enabled on the module administration page before performing an install or uninstall. Additionally, you should make sure that your web server has write permission on the file system, or the scripts may be denied access to copy and rename the necessary files.', array('!module-admin-page' => url('admin/build/modules'))) .'
' + .''. t('When performing an install, the scripts will rename your existing taxonomy or book module file to modulename.module.old. It will then copy the appropriate modulename.module.copyme file from the wrappers/ directory (in your category package) to the location where the old module file was, and will rename the copied file to modulename.module. The reverse will happen when performing an uninstall. The script will determine the correct location of all necessary files automatically, based on the existing locations of those files.') .'
'. t('After the operation that you invoke is completed, you will be returned to this page.') .'
', ); // Node type settings @@ -319,15 +323,15 @@ function category_settings() { $form['nodetype']['category_allow_nodetypes'] = array( '#type' => 'checkboxes', '#title' => t('Allow other content types to be'), - '#default_value' => variable_get('category_allow_nodetypes', array('category-cat' => 0, 'category-cont' => 0)), - '#options' => array('category-cat' => t('Categories'), 'category-cont' => t('Containers')), + '#default_value' => variable_get('category_allow_nodetypes', array('category_cat' => 0, 'category_cont' => 0)), + '#options' => array('category_cat' => t('Categories'), 'category_cont' => t('Containers')), '#description' => t('Allows category or container behavior to be assigned to other content types. When enabled, each content type (except for category and container) receives a new setting allowing it to be a category or a container. When switched on for a particular content type, all nodes of that type receive the new behavior.') ); $form['nodetype']['category_base_nodetypes'] = array( '#type' => 'checkboxes', '#title' => t('Provide these content types'), - '#default_value' => variable_get('category_base_nodetypes', array('category-cat' => 'category-cat', 'category-cont' => 'category-cont')), - '#options' => array('category-cat' => t('Category'), 'category-cont' => t('Container')), + '#default_value' => variable_get('category_base_nodetypes', array('category_cat' => 'category_cat', 'category_cont' => 'category_cont')), + '#options' => array('category_cat' => t('Category'), 'category_cont' => t('Container')), '#description' => t('Provides a built-in content type for creating categories, and a built-in content type for creating containers. Do not disable either of these unless you have allowed other content types to be categories or containers, and you have set other content types to have category or container behavior; otherwise, you will have not be able to create categories or containers.') ); @@ -356,7 +360,7 @@ function category_settings() { $form['buttons']['#weight'] = 10; - return $form; + return system_settings_form($form); } /** @@ -366,7 +370,7 @@ function category_load($node, $type = NU global $user; $type = category_node_get_type($node, $type); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; $category = category_get_category($node->nid); unset($category->cid); @@ -437,7 +441,7 @@ function category_update($node, $type = $node->module = $node->module ? $node->module : 'category'; $type = category_node_get_type($node, $type); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; $data_exists = (db_result(db_query('SELECT COUNT(*) FROM {category} WHERE cid = %d', $node->nid)) > 0); if ($data_exists) { @@ -528,7 +532,7 @@ function category_update($node, $type = */ function category_delete(&$node, $type = NULL) { $type = category_node_get_type($node, $type); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; db_query('DELETE FROM {category} WHERE cid = %d', $node->nid); db_query('DELETE FROM {category_hierarchy} WHERE cid = %d', $node->nid); @@ -550,8 +554,8 @@ function category_delete(&$node, $type = * Implementation of hook_form(). */ function category_form(&$node) { - $parent_cont = arg(4); - $is_cat = $node->type == 'category-cat'; + $parent_cont = arg(5); + $is_cat = $node->type == 'category_cat'; if (is_numeric($parent_cont)) { $category = category_get_category($parent_cont); @@ -597,7 +601,7 @@ function category_category_legacy($op, & switch ($op) { case 'import_taxonomy_form': case 'import_book_form': - $note = ''. t('Note:') .''; + $note = t('Note:'); unset($items['catinfo']['description']); unset($items['catinfo']['cnid']); @@ -606,7 +610,7 @@ function category_category_legacy($op, & unset($items['catinfo']['weight']); unset($items['catinfo']['depth']); - $items['catinfo']['parents']['#description'] .= ''; - if (module_exist($type)) { - $status_string = $status ? (''. t('installed'). '') : (''. t('not installed'). ''); - $output .= '
'. t('The %type wrapper is currently %status-string.', array('%type' => $type, '%status-string' => $status_string)). "\n";
-
- $install_string = $status ? t('Uninstall now') : t('Install now');
- $op = $status ? 'uninstall' : 'install';
- $output .= '
'. (l($install_string, t('category/wrapper/%type/%op', array('%type' => $type, '%op' => $op)))). ".
'. t('The @type wrapper is currently not installed.', array('@type' => $type)). "\n";
+ $output .= '
'. l(t('Install now'), "category/wrapper/$type/install");
+ }
}
else {
- $status_string = ''. t('not enabled'). '';
- $output .= '
'. t('The %type module (original or wrapper) is currently %status-string. You must enable it on the %module-admin-page before you can perform an install or an uninstall.', array('%type' => $type, '%status-string' => $status_string, '%module-admin-page' => l(t('module administration page'), 'admin/modules'))). "
\n"; + $output .= t('The !type module (original or wrapper) is currently not enabled. You must enable it on the module administration page before you can perform an install or an uninstall.', array('!type' => $type, '!module-admin-page' => url('admin/modules'))). "\n"; } - + $output .= ''; return $output; } @@ -1810,7 +1846,9 @@ function _category_category_select_optio foreach ($tree as $category) { // Boolean blasphemy has been cleaned up and moved to separate function if (_category_category_select_check_category($category, $container, $cnid, $exclude)) { - $options[$category->cid] = _category_depth($category->depth, '-') . ($category->cnid ? $category->title : $category->admin_title) . ($category->cnid ? '' : ' *'); + $choice = new stdClass(); + $choice->option = array($category->cid => str_repeat('-', $category->depth) . ($category->cnid ? $category->title : $category->admin_title) . ($category->cnid ? '' : ' *')); + $options[] = $choice; } } if (!$blank && !$value && !$multiple && !$default_set) { @@ -1913,7 +1951,7 @@ function _category_node_select_options($ if ($tree) { foreach ($tree as $category) { if (!in_array($category->cid, $exclude) && node_access('view', node_load($category->cid))) { - $options[$category->cid] = _category_depth($category->depth, '-') . $category->title; + $options[$category->cid] = str_repeat('-', $category->depth) . $category->title; } } if (!$blank && !$value) { @@ -1942,7 +1980,7 @@ function _category_node_select_options($ * specified node type. */ function _category_type_allowed_container($type, $cnid) { - $cont_list = variable_get('category_nodeapi_'. $type .'_containers', array(0 => 'all')); + $cont_list = variable_get('category_nodeapi_containers_'. $type, array(0 => 'all')); if (empty($cont_list) || !is_array($cont_list)) { return TRUE; @@ -1971,3 +2009,11 @@ function _category_type_allowed_containe // except' is selected, it is allowed. return $all_except; } + +/** + * Implementation of hook_simpletest(). + */ +function category_simpletest() { + return array_keys(file_scan_directory( + drupal_get_path('module', 'category'). '/tests', '\.test$')); +} Index: category_display/category_display.info =================================================================== RCS file: category_display/category_display.info diff -N category_display/category_display.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ category_display/category_display.info 27 Dec 2006 07:57:24 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category display +description = Allows additional output to be displayed and toggled for category and container nodes. +package = Category +dependencies = category Index: category_display/category_display.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category_display/category_display.module,v retrieving revision 1.32 diff -u -p -r1.32 category_display.module --- category_display/category_display.module 13 Nov 2006 13:19:37 -0000 1.32 +++ category_display/category_display.module 27 Dec 2006 07:57:24 -0000 @@ -12,8 +12,6 @@ */ function category_display_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Allows additional output to be displayed and toggled for category and container nodes. Requires the category module.'); case 'admin/help#category_display': return t('The category display module allows additional output to be displayed and toggled for category and container nodes.
This module requires the category module.
'); } @@ -27,7 +25,7 @@ function category_display_nodeapi(&$node case 'load': if (category_is_cat_or_cont($node->nid)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { return (array)category_display_cont_load($node->nid, $node); } @@ -57,7 +55,7 @@ function category_display_nodeapi(&$node } elseif (category_is_cat_or_cont($node->nid, TRUE)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_display_cont_update($node); } @@ -66,7 +64,7 @@ function category_display_nodeapi(&$node case 'delete': if (category_is_cat_or_cont($node->nid)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_display_cont_delete($node->nid); } @@ -159,7 +157,10 @@ function category_display_category($op, return $form; break; case 'view': - return theme('category_display_navigation', $node); + return array( + '#value' => theme('category_display_navigation', $node), + '#weight' => 5 + ); } } @@ -333,7 +334,7 @@ function theme_category_display_navigati $navlinks = FALSE; $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if ($node->toc_for_cats && ($is_cat || !$node->hidden_cont)) { $show_toc = TRUE; } @@ -378,13 +379,13 @@ function theme_category_display_navigati } if (isset($toc) || isset($links)) { - theme_add_style(drupal_get_path('module', 'category_display'). '/category_display.css'); + drupal_add_css(drupal_get_path('module', 'category_display'). '/category_display.css'); $output .= ''; } @@ -421,7 +422,7 @@ function _category_display_navlinks($nid if ($nid) { $node = node_load($nid); $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if ($node->navlinks) { if ($is_cat || !$node->hidden_cont) { $dist_check = FALSE; Index: category_export/category_export.info =================================================================== RCS file: category_export/category_export.info diff -N category_export/category_export.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ category_export/category_export.info 27 Dec 2006 07:57:24 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category export +description = Allows category trees to be exported as printer-friendly HTML. +package = Category +dependencies = category Index: category_export/category_export.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category_export/category_export.module,v retrieving revision 1.9 diff -u -p -r1.9 category_export.module --- category_export/category_export.module 13 May 2006 14:28:36 -0000 1.9 +++ category_export/category_export.module 27 Dec 2006 07:57:24 -0000 @@ -11,9 +11,7 @@ */ function category_export_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Allows category trees to be exported as printer-friendly HTML. Requires the category module.'); - case 'admin/help#category_menu': + case 'admin/help#category_export': return t('The category export module allows category trees to be exported as printer-friendly HTML. Users with the \'view printer-friendly categories\' permission will see a \'view printer-friendly version\' link on category pages, which they can click to access the printer-friendly HTML. This module requires the category module.
'); } } @@ -26,7 +24,7 @@ function category_export_nodeapi(&$node, case 'load': if (category_is_cat_or_cont($node->nid)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { return (array)category_export_cont_load($node->nid); } @@ -56,7 +54,7 @@ function category_export_nodeapi(&$node, } elseif (category_is_cat_or_cont($node->nid, TRUE)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_export_cont_update($node); } @@ -64,7 +62,7 @@ function category_export_nodeapi(&$node, break; case 'delete': $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_export_cont_delete($node->nid); } @@ -195,9 +193,11 @@ function category_export_link($type, $no if ($type == 'node' && isset($node->parents)) { if (!$main && isset($node->export_types) && in_array('html', $node->export_types)) { if (user_access('see printer-friendly categories')) { - $links[] = l(t('printer-friendly version'), - 'category/export/html/'. $node->nid, - array('title' => t('Show a printer-friendly version of this category and its sub-pages.'))); + $links['category_export_html'] = array( + 'title' => t('printer-friendly version'), + 'href' => 'category/export/html/'. $node->nid, + 'attributes' => array('title' => t('Show a printer-friendly version of this category and its sub-pages.')) + ); } } } Index: category_legacy/category_legacy.info =================================================================== RCS file: category_legacy/category_legacy.info diff -N category_legacy/category_legacy.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ category_legacy/category_legacy.info 27 Dec 2006 07:57:24 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category legacy +description = Allows you to convert your taxonomy and book data into category data, and vice versa. +package = Category +dependencies = category Index: category_legacy/category_legacy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category_legacy/category_legacy.module,v retrieving revision 1.27 diff -u -p -r1.27 category_legacy.module --- category_legacy/category_legacy.module 17 Sep 2006 14:57:02 -0000 1.27 +++ category_legacy/category_legacy.module 27 Dec 2006 07:57:26 -0000 @@ -12,25 +12,23 @@ */ function category_legacy_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Allows you to convert your taxonomy and book data into category data, and vice versa. Requires the category module.'); - case 'admin/help#category_menu': + case 'admin/help#category_legacy': return t('The category legacy module lets you import vocabularies and terms from the taxonomy module, and books from the book module. These are then converted into containers and categories. You can also export containers and categories back to the taxonomy and book modules. It is strongly recommended that you back up all existing taxonomy and book data on your site, before performing any operations using this module.
This module requires the category module.
'); case 'admin/category/legacy': $output = ''. t('Select the vocabularies that you wish to import. Only vocabularies that do not already have equivalent containers are listed. A vocabulary is defined as legacy (and therefore appears on this list) only if no container can be found with the same ID, and with the same title.'). '
'; $output .= ''. t('For each vocabulary that you select, the vocabulary and all its terms will be imported into the category system. Vocabularies will become containers, and terms will become categories. Vocabularies and terms have their own vocabulary and term IDs, whereas categories and containers use the more standard node IDs; therefore, in order to avoid any possible conflict in sequencing, everything that you import will be given a new node ID, and will lose its old vocabulary or term ID.'). '
'; $output .= ''. t('Warning: all vocabularies and terms that you import will be deleted from the taxonomy database tables! If you have the taxonomy wrapper installed, then they will all be re-inserted, and will be untouched except for having new IDs, to match your newly imported categories and containers. If you have any doubts, you should enable the \'backup all selected data\' option before proceeding.'). '
'; return $output; - case 'admin/category/legacy/import/book': + case 'admin/content/category/legacy/import/book': $output = ''. t('Select the books that you wish to import. Only books that do not already have equivalent containers are listed. A book is defined as legacy (and therefore appears on this list) only if no container can be found with the same ID, and with the same title.'). '
'; $output .= ''. t('For each book that you select, the book and all its children will be imported into the category system. Root book pages will become containers, and all child pages will become categories. The node IDs for each book page will be preserved during the import, and will remain unchanged once the book pages are transformed into categories and containers.'). '
'; return $output; - case 'admin/category/legacy/export': + case 'admin/content/category/legacy/export': $output = ''. t('Select the containers that you wish to export. Only containers that do not already have equivalent vocabularies are listed. A container is defined as legacy (and therefore appears on this list) only if no vocabulary can be found with the same ID, and with the same title.'). '
'; $output .= ''. t('For each container that you select, the container and all its categories will be exported to the taxonomy system. Containers will become vocabularies, and categories will become terms. Vocabularies and terms have their own vocabulary and term IDs, whereas categories and containers use the more standard node IDs; therefore, in order to avoid any possible conflict in sequencing, everything that you export will be given a new vocabulary or term ID, and will lose its old node ID.'). '
'; $output .= ''. t('Warning: all containers and categories that you export will be deleted from the category database tables! Additionally, because the category system holds more data fields than the taxonomy system, any fields that do not have an equivalent in the taxonomy system will be lost. If you have any doubts, you should enable the \'backup all selected data\' option before proceeding.'). '
'; return $output; - case 'admin/category/legacy/export/book': + case 'admin/content/category/legacy/export/book': $output = ''. t('Select the containers that you wish to export. Only containers that do not already have equivalent books are listed. A container is defined as legacy (and therefore appears on this list) only if no book can be found with the same ID, and with the same title.'). '
'; $output .= ''. t('For each container that you select, the container and all its categories will be exported to the book system. Containers will become root book pages, and all categories will become child pages. The node IDs for each container and category will be preserved during the export, and will remain unchanged once the categories and containers are transformed into book pages.'). '
'; $output .= ''. t('Warning: because the category system holds more data fields than the book system, any fields that do not have an equivalent in the book system will be lost. If you have any doubts, you should enable the \'backup all selected data\' option before proceeding.'). '
'; @@ -46,48 +44,54 @@ function category_legacy_menu($may_cache if ($may_cache) { $items[] = array( - 'path' => 'admin/category/legacy', - 'title' => t('category legacy'), - 'callback' => 'category_legacy_import', + 'path' => 'admin/content/category/legacy', + 'title' => t('Category legacy'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_legacy_import_taxonomy_form'), 'access' => user_access('administer categories'), ); $items[] = array( - 'path' => 'admin/category/legacy/import', - 'title' => t('import'), + 'path' => 'admin/content/category/legacy/import', + 'title' => t('Import'), + 'callback arguments' => array('category_legacy_import_taxonomy_form'), 'access' => user_access('administer categories'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/legacy/import/taxonomy', - 'title' => t('taxonomy'), + 'path' => 'admin/content/category/legacy/import/taxonomy', + 'title' => t('Taxonomy'), + 'callback arguments' => array('category_legacy_import_taxonomy_form'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/legacy/import/book', - 'title' => t('book'), + 'path' => 'admin/content/category/legacy/import/book', + 'title' => t('Book'), + 'callback arguments' => array('category_legacy_import_book_form'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -6, ); $items[] = array( - 'path' => 'admin/category/legacy/export', - 'title' => t('export'), - 'callback' => 'category_legacy_export', + 'path' => 'admin/content/category/legacy/export', + 'title' => t('Export'), + 'callback arguments' => array('category_legacy_export_taxonomy_form'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -6, ); $items[] = array( - 'path' => 'admin/category/legacy/export/taxonomy', - 'title' => t('taxonomy'), + 'path' => 'admin/content/category/legacy/export/taxonomy', + 'title' => t('Taxonomy'), + 'callback arguments' => array('category_legacy_export_taxonomy_form'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); $items[] = array( - 'path' => 'admin/category/legacy/export/book', - 'title' => t('book'), + 'path' => 'admin/content/category/legacy/export/book', + 'title' => t('Book'), + 'callback arguments' => array('category_legacy_export_book_form'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -6, @@ -97,7 +101,7 @@ function category_legacy_menu($may_cache if (category_legacy_get_term_path_status()) { $items[] = array( 'path' => 'taxonomy/term', - 'title' => t('taxonomy term'), + 'title' => t('Taxonomy term'), 'callback' => 'category_legacy_term_page', 'access' => user_access('access content'), 'type' => MENU_CALLBACK, @@ -112,6 +116,29 @@ function category_legacy_menu($may_cache } /** + * Implementation of hook_forms(). + */ +function category_legacy_forms() { + $forms['category_legacy_import_book_form'] = array( + 'callback' => 'category_legacy_import_form_build', + 'callback arguments' => array('book'), + ); + $forms['category_legacy_import_taxonomy_form'] = array( + 'callback' => 'category_legacy_import_form_build', + 'callback arguments' => array('taxonomy'), + ); + $forms['category_legacy_export_book_form'] = array( + 'callback' => 'category_legacy_export_form_build', + 'callback arguments' => array('book'), + ); + $forms['category_legacy_export_taxonomy_form'] = array( + 'callback' => 'category_legacy_export_form_build', + 'callback arguments' => array('taxonomy'), + ); + return $forms; +} + +/** * Implementation of hook_nodeapi(). */ function category_legacy_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { @@ -119,7 +146,7 @@ function category_legacy_nodeapi(&$node, case 'delete': if (category_is_cat_or_cont($node->nid)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if ($is_cat) { category_legacy_map_delete($node->nid); } @@ -175,7 +202,7 @@ function category_legacy_category_legacy } } - if (module_exist('path')) { + if (module_exists('path')) { if ($edit['change_old_aliases']) { $paths = category_legacy_get_path_cache(); foreach ($paths as $path) { @@ -213,7 +240,7 @@ function category_legacy_category_legacy } } - if (module_exist('path')) { + if (module_exists('path')) { if ($edit['change_old_aliases']) { $paths = category_legacy_get_path_cache(); foreach ($paths as $path) { @@ -245,7 +272,7 @@ function category_legacy_category_legacy /** * Menu callback; displays the screen for importing taxonomy or book data. */ -function category_legacy_import($arg1 = 'import', $import_type = 'taxonomy') { +function category_legacy_import_form_build($import_type, $arg1 = 'import') { $form = array(); if ($import_type == 'taxonomy') { @@ -293,12 +320,12 @@ function category_legacy_import($arg1 = ); $alias_paths = array( - '%taxonomy-path' => theme('placeholder', 'taxonomy/term/x'), - '%category-path' => theme('placeholder', 'node/y'), - '%taxonomy-rss' => theme('placeholder', 'taxonomy/term/x/0/feed'), - '%category-rss' => theme('placeholder', 'node/y/feed'), - '%taxonomy-query' => theme('placeholder', 'taxonomy/term/x+y'), - '%category-query' => theme('placeholder', 'category/x+y'), + '%taxonomy-path' => 'taxonomy/term/x', + '%category-path' => 'node/y', + '%taxonomy-rss' => 'taxonomy/term/x/0/feed', + '%category-rss' => 'node/y/feed', + '%taxonomy-query' => 'taxonomy/term/x+y', + '%category-query' => 'category/x+y', ); $form['category_legacy']['redirect_old_paths'] = array( '#type' => 'radios', @@ -308,7 +335,7 @@ function category_legacy_import($arg1 = '#required' => TRUE, ); - if (module_exist('path')) { + if (module_exists('path')) { $form['category_legacy']['change_old_aliases'] = array( '#type' => 'radios', '#title' => t('Change existing legacy path aliases'), @@ -339,7 +366,7 @@ function category_legacy_import($arg1 = ); } - return drupal_get_form('category_legacy_import_'. $import_type, $form); + return $form; } /** @@ -352,7 +379,7 @@ function category_legacy_import($arg1 = * @return * A themed form for display. */ -function theme_category_legacy_import_taxonomy($form) { +function theme_category_legacy_import_taxonomy_form($form) { $output = ''; $vocabularies = category_legacy_get_old_vocabularies(); @@ -361,7 +388,7 @@ function theme_category_legacy_import_ta $rows = array(); while ($data = db_fetch_object($result)) { - $rows[] = array(array('data' => form_render($form['vocabulary'][$data->vid]), 'align' => 'center'), $data->name, array('data' => $data->vid, 'align' => 'center'), array('data' => $data->tid_count, 'align' => 'center')); + $rows[] = array(array('data' => drupal_render($form['vocabulary'][$data->vid]), 'align' => 'center'), $data->name, array('data' => $data->vid, 'align' => 'center'), array('data' => $data->tid_count, 'align' => 'center')); } if (empty($rows)) { @@ -372,7 +399,7 @@ function theme_category_legacy_import_ta $output .= theme('pager', NULL, 50, 0); if (!empty($vocabularies)) { - $output .= form_render($form); + $output .= drupal_render($form); } return $output; @@ -388,7 +415,7 @@ function theme_category_legacy_import_ta * @return * A themed form for display. */ -function theme_category_legacy_import_book($form) { +function theme_category_legacy_import_book_form($form) { $output = ''; $books = category_legacy_get_old_books(); @@ -397,7 +424,7 @@ function theme_category_legacy_import_bo $rows = array(); while ($data = db_fetch_object($result)) { - $rows[] = array(array('data' => form_render($form['books'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->child_count, 'align' => 'center')); + $rows[] = array(array('data' => drupal_render($form['books'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->child_count, 'align' => 'center')); } if (empty($rows)) { @@ -408,13 +435,13 @@ function theme_category_legacy_import_bo $output .= theme('pager', NULL, 50, 0); if (!empty($books)) { - $output .= form_render($form); + $output .= drupal_render($form); } return $output; } -function category_legacy_import_taxonomy_validate($form_id, $form_values) { +function category_legacy_import_taxonomy_form_validate($form_id, $form_values) { $vocabs_selected = FALSE; if (isset($form_values['vocabulary']) && is_array($form_values['vocabulary'])) { @@ -431,7 +458,7 @@ function category_legacy_import_taxonomy } } -function category_legacy_import_book_validate($form_id, $form_values) { +function category_legacy_import_book_form_validate($form_id, $form_values) { $books_selected = FALSE; if (isset($form_values['books']) && is_array($form_values['books'])) { @@ -452,7 +479,7 @@ function category_legacy_import_book_val * Control function for all actions that occur after the user submits the * taxonomy import form. */ -function category_legacy_import_taxonomy_submit($form_id, $form_values) { +function category_legacy_import_taxonomy_form_submit($form_id, $form_values) { $vocabularies = array(); $legacy_map = array(); @@ -529,7 +556,7 @@ function category_legacy_import_taxonomy * Control function for all actions that occur after the user submits the * book import form. */ -function category_legacy_import_book_submit($form_id, $form_values) { +function category_legacy_import_book_form_submit($form_id, $form_values) { $books = array(); // Build all book data in one big nested array @@ -573,7 +600,7 @@ function category_legacy_import_book_sub /** * Menu callback; displays the screen for exporting category data to taxonomy or book. */ -function category_legacy_export($export_type = 'taxonomy') { +function category_legacy_export_form_build($export_type) { $form = array(); $categories = category_legacy_get_old_containers($export_type); @@ -608,14 +635,14 @@ function category_legacy_export($export_ '#required' => TRUE, ); - if (module_exist('path')) { + if (module_exists('path')) { $alias_paths = array( - '%taxonomy-path' => theme('placeholder', 'taxonomy/term/x'), - '%category-path' => theme('placeholder', 'node/y'), - '%taxonomy-rss' => theme('placeholder', 'taxonomy/term/x/0/feed'), - '%category-rss' => theme('placeholder', 'node/y/feed'), - '%taxonomy-query' => theme('placeholder', 'taxonomy/term/x+y'), - '%category-query' => theme('placeholder', 'category/x+y'), + '%taxonomy-path' => 'taxonomy/term/x', + '%category-path' => 'node/y', + '%taxonomy-rss' => 'taxonomy/term/x/0/feed', + '%category-rss' => 'node/y/feed', + '%taxonomy-query' => 'taxonomy/term/x+y', + '%category-query' => 'category/x+y', ); $form['category_legacy']['redirect_old_paths'] = array( '#type' => 'radios', @@ -659,7 +686,7 @@ function category_legacy_export($export_ ); } - return drupal_get_form('category_legacy_export_'. $export_type, $form); + return $form; } /** @@ -672,7 +699,7 @@ function category_legacy_export($export_ * @return * A themed form for display. */ -function theme_category_legacy_export_taxonomy($form) { +function theme_category_legacy_export_form_taxonomy_form($form) { $output = ''; $containers = category_legacy_get_old_containers('taxonomy'); @@ -681,7 +708,7 @@ function theme_category_legacy_export_ta $rows = array(); while ($data = db_fetch_object($result)) { - $rows[] = array(array('data' => form_render($form['categories'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->cid_count, 'align' => 'center')); + $rows[] = array(array('data' => drupal_render($form['categories'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->cid_count, 'align' => 'center')); } if (empty($rows)) { @@ -692,7 +719,7 @@ function theme_category_legacy_export_ta $output .= theme('pager', NULL, 50, 0); if (!empty($containers)) { - $output .= form_render($form); + $output .= drupal_render($form); } return $output; @@ -708,7 +735,7 @@ function theme_category_legacy_export_ta * @return * A themed form for display. */ -function theme_category_legacy_export_book($form) { +function theme_category_legacy_export_book_form($form) { $output = ''; $containers = category_legacy_get_old_containers('book'); @@ -717,7 +744,7 @@ function theme_category_legacy_export_bo $rows = array(); while ($data = db_fetch_object($result)) { - $rows[] = array(array('data' => form_render($form['categories'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->cid_count, 'align' => 'center')); + $rows[] = array(array('data' => drupal_render($form['categories'][$data->nid]), 'align' => 'center'), $data->title, array('data' => $data->nid, 'align' => 'center'), array('data' => $data->cid_count, 'align' => 'center')); } if (empty($rows)) { @@ -728,13 +755,13 @@ function theme_category_legacy_export_bo $output .= theme('pager', NULL, 50, 0); if (!empty($containers)) { - $output .= form_render($form); + $output .= drupal_render($form); } return $output; } -function category_legacy_export_taxonomy_validate($form_id, $form_values) { +function category_legacy_export_taxonomy_form_validate($form_id, $form_values) { $containers_selected = FALSE; if (isset($form_values['categories']) && is_array($form_values['categories'])) { @@ -751,7 +778,7 @@ function category_legacy_export_taxonomy } } -function category_legacy_export_book_validate($form_id, $form_values) { +function category_legacy_export_book_form_validate($form_id, $form_values) { $containers_selected = FALSE; if (isset($form_values['categories']) && is_array($form_values['categories'])) { @@ -772,7 +799,7 @@ function category_legacy_export_book_val * Control function for all actions that occur after the user submits the * taxonomy export form. */ -function category_legacy_export_taxonomy_submit($form_id, $form_values) { +function category_legacy_export_taxonomy_form_submit($form_id, $form_values) { $containers = array(); $legacy_map = array(); @@ -842,7 +869,7 @@ function category_legacy_export_taxonomy * Control function for all actions that occur after the user submits the * book export form. */ -function category_legacy_export_book_submit($form_id, $form_values) { +function category_legacy_export_book_form_submit($form_id, $form_values) { $containers = array(); // Build all category data in one big nested array @@ -1192,7 +1219,7 @@ function category_legacy_build_container $node->title = $node->name; unset($node->name); - $node->type = 'category-cont'; + $node->type = 'category_cont'; $node->has_relations = $node->relations; unset($node->relations); if ($node->module == 'taxonomy') { @@ -1217,7 +1244,7 @@ function category_legacy_build_container function category_legacy_build_container_from_book($book) { $node = (object) $book; - $node->type = 'category-cont'; + $node->type = 'category_cont'; $node->module = 'category'; $node->help = ''; $node->description = ''; @@ -1301,7 +1328,7 @@ function category_legacy_build_category_ $node->title = $node->name; unset($node->name); - $node->type = 'category-cat'; + $node->type = 'category_cat'; $node->cnid = $cnid; db_query('UPDATE {node} SET type = \'%s\' WHERE nid = %d', $node->type, $node->nid); @@ -1343,7 +1370,7 @@ function category_legacy_build_category_ function category_legacy_build_category_from_book($book, $cnid) { $node = (object) $book; - $node->type = 'category-cat'; + $node->type = 'category_cat'; $node->cnid = $cnid; $node->parents = array($node->parent); @@ -1449,7 +1476,6 @@ function _category_legacy_build_node($no // Force defaults $node_options = variable_get('node_options_'. $node->type, array('status', 'promote')); $node->status = in_array('status', $node_options); - $node->moderate = in_array('moderate', $node_options); $node->promote = in_array('promote', $node_options); $node->sticky = in_array('sticky', $node_options); $node->revision = in_array('revision', $node_options); Index: category_menu/category_menu.info =================================================================== RCS file: category_menu/category_menu.info diff -N category_menu/category_menu.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ category_menu/category_menu.info 27 Dec 2006 07:57:26 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category menu +description = Creates and manages a set of menu items that correspond to your site's category hierarchy. +package = Category +dependencies = category Index: category_menu/category_menu.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/category_menu/category_menu.module,v retrieving revision 1.37 diff -u -p -r1.37 category_menu.module --- category_menu/category_menu.module 14 Nov 2006 06:14:50 -0000 1.37 +++ category_menu/category_menu.module 27 Dec 2006 07:57:27 -0000 @@ -11,8 +11,6 @@ */ function category_menu_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Creates and manages a set of menu items that correspond to your site\'s category hierarchy. Requires the category module.'); case 'admin/help#category_menu': return t('The category menu module creates and manages a set of menu items that correspond to your site\'s category hierarchy. These menu items are static rather than dynamic, so that you can add other menu items (such as module index pages) as children using the menu module. Breadcrumbs for category and container pages (and, optionally, assigned node pages) will reflect the managed menu items. You can also display the menu as a block on your site.
This module requires the category module.
'); } Index: contrib/cac_lite/cac_lite.info =================================================================== RCS file: contrib/cac_lite/cac_lite.info diff -N contrib/cac_lite/cac_lite.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ contrib/cac_lite/cac_lite.info 27 Dec 2006 07:57:27 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category access control lite +description = Simple access control based on categories. +package = Category +dependencies = category Index: contrib/cac_lite/cac_lite.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/contrib/cac_lite/cac_lite.module,v retrieving revision 1.6 diff -u -p -r1.6 cac_lite.module --- contrib/cac_lite/cac_lite.module 6 Nov 2006 01:29:59 -0000 1.6 +++ contrib/cac_lite/cac_lite.module 27 Dec 2006 07:57:27 -0000 @@ -1,11 +1,11 @@ '.t('This module allows you to restrict access to site content. It uses a simple scheme based on Categories (the Category module, not the Taxonomy module), Users and Roles. It uses the node_access table and other features built into Drupal to hide content from unauthorized users.')."\n"; $output .= ''.t('While this module has been designed to be as simple as possible to use, there are several steps required to set it up.')."
\n"; $output .= "'.t('Currently, this module works with view grants only (no update or delete grants).')."
\n"; return $output; break; - } + } } @@ -95,9 +92,9 @@ function cac_lite_menu($may_cache) { if ($may_cache) { - $items[] = array('path' => 'admin/access/cac_lite', + $items[] = array('path' => 'admin/access/cac_lite', 'title' => t('cac_lite'), - 'callback' => 'cac_lite_admin_settings', + 'callback' => 'cac_lite_admin_settings', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK, 'weight' => 1, // after 'roles' tab @@ -109,10 +106,10 @@ function cac_lite_menu($may_cache) { ); $items[] = array('path' => 'admin/access/cac_lite/roles', 'title' => t('access by role'), - 'callback' => 'cac_lite_admin_settings_defaults', + 'callback' => 'cac_lite_admin_settings_defaults', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK - ); + ); } @@ -126,7 +123,7 @@ function cac_lite_admin_settings() { $options[$key] = $value->title; } - $form['cac_lite_containers'] = + $form['cac_lite_containers'] = array('#type' => 'select', '#title' => 'Containers', '#default_value' => variable_get('cac_lite_containers', null), @@ -148,19 +145,19 @@ function cac_lite_admin_settings_default if (count($cids)) { $all_defaults = variable_get('cac_lite_default_grants', array()); - $form['cac_lite_default_grants'] = + $form['cac_lite_default_grants'] = array('#tree' => true); foreach ($roles as $rid => $role_name) { - $form['cac_lite_default_grants'][$rid] = + $form['cac_lite_default_grants'][$rid] = array('#type' => 'fieldset', '#tree' => true, '#title' => t('Access for %role', array('%role' => $role_name)), - // '#description' => t('Users of the \'%role\' role will have these privileges in addition to rights you grant them individually.', array('%role' => $role_name)), + // '#description' => t('Users of the \'%role\' role will have these privileges in addition to rights you grant them individually.', array('%role' => $role_name)), ); $defaults = $all_defaults[$rid]; foreach ($cids as $vid) { $v = category_get_category($vid); - $form['cac_lite_default_grants'][$rid][$vid] = + $form['cac_lite_default_grants'][$rid][$vid] = _category_node_select($v->title, $defaults[$vid], $vid, @@ -175,7 +172,7 @@ function cac_lite_admin_settings_default return $output; } else { - print theme('page', + print theme('page', t('First select vocabularies on the cac_lite settings page.')); } } @@ -190,7 +187,7 @@ function cac_lite_user($op, $edit, $acco global $user; if (!user_access('administer_cac_lite')) return; - + switch ($op) { case 'categories': return array(array('name' => 'cac_lite', @@ -205,7 +202,7 @@ function cac_lite_user($op, $edit, $acco if (count($vids)) { foreach ($vids as $vid) { $v = category_get_category($vid); - $form['cac_lite']['cac_lite'][$vid] = + $form['cac_lite']['cac_lite'][$vid] = _category_node_select($v->title, $account->cac_lite[$vid], $vid, @@ -214,10 +211,10 @@ function cac_lite_user($op, $edit, $acco '<'.t('none').'>'); } } - $form['cac_lite'][0] = + $form['cac_lite'][0] = array('#type' => 'markup', - '#value' => ''.t('You may grant this user view access to any of the terms below. These grants are in addition to %grant_per_role_link.', - array('%grant_per_role_link' => l(t('access granted to the user by virtue of his/her roles'), 'admin/access/cac_lite/roles'))) . "
\n", + '#value' => ''.t('You may grant this user view access to any of the terms below. These grants are in addition to !grant_per_role_link.', + array('!grant_per_role_link' => l(t('access granted to the user by virtue of his/her roles'), 'admin/access/cac_lite/roles'))) . "
\n", '#weight' => -1); $form['cac_lite']['cac_lite']['#tree'] = true; return $form; @@ -275,7 +272,7 @@ function _cac_lite_node_save(&$node) { $node->nid, $node->nid, 'cac_lite', - 1, 0, 0); + 1, 0, 0); $access_restricted = true; } @@ -296,7 +293,7 @@ function _cac_lite_node_save(&$node) { $node->nid, $cid, 'cac_lite', - 1, 0, 0); + 1, 0, 0); $access_restricted = true; } } @@ -323,7 +320,7 @@ function _cac_lite_node_save(&$node) { $node->nid, $gid, 'cac_lite', - 1, 0, 0); + 1, 0, 0); $access_restricted = true; } } @@ -339,8 +336,8 @@ function _cac_lite_node_save(&$node) { $node->nid, 0, // gid = 0 means all users access 'cac_lite', - 1, 0, 0); - + 1, 0, 0); + } } } @@ -362,7 +359,7 @@ function _cac_lite_user_tids(&$account) $grants = array_merge($grants, $tids); } } - + // add default grants in addition to user-specific grants $defaults = variable_get('cac_lite_default_grants', array()); foreach ($account->roles as $rid => $role_name) { @@ -372,11 +369,11 @@ function _cac_lite_user_tids(&$account) } } } - + // grant id 0 is reserved for nodes which were not given a grant id when they were created. By adding 0 to the grant id, we let the user view those nodes. // TODO: make this behavior configurable, to play nicely with other node_access modules which may be installed $grants[] = 0; - + return $grants; } @@ -387,9 +384,9 @@ function cac_lite_node_grants(&$account, $all = array(0); else $all = array(-1); - + $grants = _cac_lite_user_tids($account); - + // TODO: differentiate between view, update, delete return array('all' => $all, // this disables the default setting (view all) 'cac_lite' => $grants); @@ -420,7 +417,7 @@ function cac_lite_db_rewrite_sql($query, // making this clause probably unnecessary. Worth looking into // later. For now I do not want to change working code. $join = "LEFT JOIN {category} ca_c ON $primary_table.cid = ca_c.cid"; - $where = "($primary_table.cid IN (". implode(', ', $tids) .") OR ca_c.cnid NOT IN (". implode(',', $vids) ."))"; + $where = "($primary_table.cid IN (". implode(', ', $tids) .") OR ca_c.cnid NOT IN (". implode(',', $vids) ."))"; // Categories are also nodes. So we need a clause that inspects // the node_access table to see if the user can see these Index: contrib/category_bulkedit/category_bulkedit.info =================================================================== RCS file: contrib/category_bulkedit/category_bulkedit.info diff -N contrib/category_bulkedit/category_bulkedit.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ contrib/category_bulkedit/category_bulkedit.info 27 Dec 2006 07:57:27 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category bulk edit +description = Provides an interface for editing multiple categories or containers at once. +package = Category +dependencies = category Index: contrib/category_bulkedit/category_bulkedit.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/contrib/category_bulkedit/category_bulkedit.module,v retrieving revision 1.9 diff -u -p -r1.9 category_bulkedit.module --- contrib/category_bulkedit/category_bulkedit.module 10 Jul 2006 05:44:58 -0000 1.9 +++ contrib/category_bulkedit/category_bulkedit.module 27 Dec 2006 07:57:28 -0000 @@ -15,8 +15,6 @@ */ function category_bulkedit_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Provides an interface for editing multiple categories or containers at once. Requires the category module.'); case 'admin/category/bulkedit': return _category_bulkedit_set_help_text(); } @@ -35,8 +33,9 @@ function category_bulkedit_menu($may_cac if ($may_cache) { $items[] = array( 'path' => 'admin/category/bulkedit', - 'title' => t('bulk edit'), - 'callback' => 'category_bulkedit_form', + 'title' => t('Bulk edit'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_bulkedit_form'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => 8, @@ -47,9 +46,9 @@ function category_bulkedit_menu($may_cac $nid = arg(2); $items[] = array( 'path' => 'admin/category/'. $nid .'/bulkedit', - 'title' => t('bulk edit'), - 'callback' => 'category_bulkedit_form', - 'callback arguments' => array('category-cat', $nid), + 'title' => t('Bulk edit'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_bulkedit_form', 'category_cat', $nid), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => 8, @@ -65,7 +64,7 @@ function category_bulkedit_menu($may_cac * We set the 'real' #required attribute values here, but the final value of * #required attributes is handled by category_bulkedit_pre_render(). */ -function category_bulkedit_form($type = 'category-cont', $cnid = NULL) { +function category_bulkedit_form($type = 'category_cont', $cnid = NULL) { global $form_values; $form = array(); $is_cat = is_numeric(arg(2)); @@ -76,7 +75,7 @@ function category_bulkedit_form($type = // Category / container selection, page 1 $list_items = array(); - if ($type == 'category-cont') { + if ($type == 'category_cont') { $containers = category_get_containers(); foreach ($containers as $value) { $list_items[$value->cid] = $value->admin_title; @@ -151,7 +150,7 @@ function category_bulkedit_form($type = '#weight' => 45 ); - return drupal_get_form('category_bulkedit_form' ,$form); + return $form; } /* @@ -171,15 +170,15 @@ function theme_category_bulkedit_form($f if (!empty($elements)) { foreach ($elements as $key) { $row = array(); - $row[] = array('data' => form_render($form['bulkedit'][$key]), 'align' => 'center'); - $row[] = form_render($form['titles'][$key]); - $row[] = array('data' => form_render($form['nids'][$key]), 'align' => 'center'); + $row[] = array('data' => drupal_render($form['bulkedit'][$key]), 'align' => 'center'); + $row[] = drupal_render($form['titles'][$key]); + $row[] = array('data' => drupal_render($form['nids'][$key]), 'align' => 'center'); $rows[] = $row; } } else { - $rows[] = array(array('data' => t('No %items available', array('%items' => $is_cat ? t('categories') : t('containers'))), 'colspan' => 3)); + $rows[] = array(array('data' => t('No @items available', array('@items' => $is_cat ? t('categories') : t('containers'))), 'colspan' => 3)); unset($form['submit']); } @@ -194,10 +193,10 @@ function theme_category_bulkedit_form($f if (!empty($elements)) { foreach ($elements as $key) { $row = array(); - $row[] = array('data' => form_render($form['bulkedit_fields'][$key]), 'align' => 'center'); - $row[] = form_render($form['field_titles'][$key]); - $row[] = form_render($form['field_types'][$key]); - $row[] = form_render($form['field_groups'][$key]); + $row[] = array('data' => drupal_render($form['bulkedit_fields'][$key]), 'align' => 'center'); + $row[] = drupal_render($form['field_titles'][$key]); + $row[] = drupal_render($form['field_types'][$key]); + $row[] = drupal_render($form['field_groups'][$key]); $rows[] = $row; } @@ -212,7 +211,7 @@ function theme_category_bulkedit_form($f $content .= theme('table', $header, $rows); } elseif (in_array($form['page']['#value'], array(4))) { - theme_add_style(drupal_get_path('module', 'category_bulkedit'). '/category_bulkedit.css'); + drupal_add_css(drupal_get_path('module', 'category_bulkedit'). '/category_bulkedit.css'); // Nodes to be edited - display $rows = array(); @@ -229,14 +228,14 @@ function theme_category_bulkedit_form($f $items_formatted = array(); foreach ($items as $key => $value) { - $item_formatted = form_render($form['titles'][$key]); + $item_formatted = drupal_render($form['titles'][$key]); if (isset($form['titles'][$key])) { $items_formatted[] = $item_formatted; } } unset($form['titles']); - $item_output = ''. t('%items to be bulk edited:', array('%items' => ($is_cat ? t('Categories') : t('Containers')))). "
\n"; + $item_output = ''. t('@items to be bulk edited:', array('@items' => ($is_cat ? t('Categories') : t('Containers')))). "
\n"; $count = 0; while ($count < $num_lists) { @@ -274,12 +273,12 @@ function theme_category_bulkedit_form($f if (!empty($fields)) { foreach ($fields as $key => $value) { $row = array(); - $row[] = form_render($form['field_titles'][$key]); + $row[] = drupal_render($form['field_titles'][$key]); $form[$key]['#theme'] = 'category_bulkedit_field_preview'; theme('category_bulkedit_field_preview', $form[$key], TRUE); $form[$key]['#type'] = 'markup'; $form[$key]['#value'] = NULL; - $row[] = check_plain(form_render($form[$key])); + $row[] = check_plain(drupal_render($form[$key])); $rows[] = $row; } unset($form['field_titles']); @@ -297,7 +296,7 @@ function theme_category_bulkedit_form($f $content .= ''. t('When you click the run bulk edit button below, the bulk edit will be performed. The operation may take some time to complete, so please be patient and do not interrupt the process. This operation is irreversible, and it will potentially affect a large amount of data on your site. Please ensure that you have thoroughly checked all the information displayed on this page before proceeding.'). "
\n"; } - $content .= form_render($form); + $content .= drupal_render($form); _category_bulkedit_set_help_text($form['page']['#value'], $is_cat); @@ -410,7 +409,7 @@ function category_bulkedit_custom_valida } if (!$items_selected) { - form_set_error('bulkedit', t('You must select at least one %item.', array('%item' => ($is_cat ? t('category') : t('container'))))); + form_set_error('bulkedit', t('You must select at least one @item.', array('@item' => ($is_cat ? t('category') : t('container'))))); } } elseif ($form_values['page'] == 2 ) { @@ -537,7 +536,7 @@ function category_bulkedit_custom_submit } } - drupal_set_message(t('%count %items were successfully bulk edited.', array('%count' => $saved_count, '%items' => ($is_cat ? t('categories') : t('containers'))))); + drupal_set_message(t('%count @items were successfully bulk edited.', array('%count' => $saved_count, '@items' => ($is_cat ? t('categories') : t('containers'))))); return 'admin/category'. ($is_cat ? '/'. arg(2) : ''); } @@ -831,15 +830,15 @@ function _category_bulkedit_set_help_tex switch ($page) { case 1: - $output = t('Step 1: %item selection. Please select the %items that you wish to bulk edit, by ticking the relevant check boxes in the table below.', array('%item' => $item_type, '%items' => $item_type_plural)); + $output = t('Step 1: @item selection. Please select the @items that you wish to bulk edit, by ticking the relevant check boxes in the table below.', array('@item' => $item_type, '@items' => $item_type_plural)); break; case 2: - $output = t('Step 2: field selection. Please select the fields that you wish to bulk edit for your chosen %items, by ticking the relevant check boxes in the table below.', array('%items' => $item_type_plural)); + $output = t('Step 2: field selection. Please select the fields that you wish to bulk edit for your chosen @items, by ticking the relevant check boxes in the table below.', array('@items' => $item_type_plural)); break; case 3: - $output = t('Step 3: field selection. Please select the fields that you wish to bulk edit for your chosen %items, by ticking the relevant check boxes in the table below.', array('%items' => $item_type_plural)); + $output = t('Step 3: field selection. Please select the fields that you wish to bulk edit for your chosen @items, by ticking the relevant check boxes in the table below.', array('@items' => $item_type_plural)); break; case 4: Index: contrib/category_outliner/category_outliner.info =================================================================== RCS file: contrib/category_outliner/category_outliner.info diff -N contrib/category_outliner/category_outliner.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ contrib/category_outliner/category_outliner.info 27 Dec 2006 07:57:28 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category outliner +description = Provides an administrative interface for easily editing and re-arranging categories. +package = Category +dependencies = category Index: contrib/category_outliner/category_outliner.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/contrib/category_outliner/category_outliner.module,v retrieving revision 1.2 diff -u -p -r1.2 category_outliner.module --- contrib/category_outliner/category_outliner.module 17 May 2006 12:56:31 -0000 1.2 +++ contrib/category_outliner/category_outliner.module 27 Dec 2006 07:57:28 -0000 @@ -12,8 +12,6 @@ */ function category_outliner_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Provides an administrative interface for easily editing and re-arranging categories. Requires the category module.'); case 'admin/category/list/orphan': return t('Categories in a site are like a tree. As they are edited, reorganized and removed, children might be left with no link to the rest of the structure. Such categories are referred to as "orphans". On this page, administrators can review their site for orphans and reattach those categories as desired.
'); } @@ -27,40 +25,44 @@ function category_outliner_menu($may_cac if ($may_cache) { $items[] = array( - 'path' => 'admin/category/list/outline', - 'title' => t('outline'), - 'callback' => 'category_outliner_outline', + 'path' => 'admin/content/category/list/outline', + 'title' => t('Outline'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_outliner_outline'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -3, ); $items[] = array( - 'path' => 'admin/category/list/orphan', - 'title' => t('orphans'), - 'callback' => 'category_outliner_orphan', + 'path' => 'admin/content/category/list/orphan', + 'title' => t('Orphans'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_outliner_orphan'), 'type' => MENU_LOCAL_TASK, 'access' => user_access('administer categories'), 'weight' => 0, ); } else { - if (arg(0) == 'admin' && arg(1) == 'category' && is_numeric(arg(2))) { - $nid = arg(2); + if (arg(0) == 'admin' && arg(2) == 'category' && is_numeric(arg(3))) { + $nid = arg(3); $node = node_load($nid); $items[] = array( - 'path' => 'admin/category/' . $nid . '/list/outline', - 'title' => t('outline'), - 'callback' => 'category_outliner_outline', + 'path' => 'admin/content/category/' . $nid . '/list/outline', + 'title' => t('Outline'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_outliner_outline'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => -3, ); $items[] = array( - 'path' => 'admin/category/' . $nid . '/list/orphan', - 'title' => t('orphans'), - 'callback' => 'category_outliner_orphan', + 'path' => 'admin/content/category/' . $nid . '/list/orphan', + 'title' => t('Orphans'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('category_outliner_orphan'), 'access' => user_access('administer categories'), 'type' => MENU_LOCAL_TASK, 'weight' => 0, @@ -77,11 +79,11 @@ function category_outliner_menu($may_cac */ function category_outliner_outline() { $tree = array(); - if (!is_numeric(arg(2))) { + if (!is_numeric(arg(3))) { $tree = category_get_tree(0); } else { - $tree = category_get_tree(arg(2)); + $tree = category_get_tree(arg(3)); } if (count($tree) > 0) { @@ -92,22 +94,22 @@ function category_outliner_outline() { '#type' => 'submit', '#value' => t('Save categories and containers'), ); - - return drupal_get_form('category_outliner_outline', $form); } else { - return ''. t('There are no containers or categories.') .'
'; + $form = array('#value' => ''. t('There are no containers or categories.') .'
'); } + + return $form; } /** * Menu callback; displays a listing of all orphaned categories. */ function category_outliner_orphan() { - $is_cont = is_numeric(arg(2)); + $is_cont = is_numeric(arg(3)); $container_sql = $is_cont ? 'AND c.cnid = %d' : ''; - $result = db_query(db_rewrite_sql('SELECT c.*, n.title, c2.cid AS parent_cid FROM {category} c INNER JOIN {node} n ON c.cid = n.nid INNER JOIN {category_hierarchy} ch ON c.cid = ch.cid LEFT JOIN {category} c2 ON ch.parent = c2.cid WHERE ch.parent != 0 '. $container_sql), arg(2)); + $result = db_query(db_rewrite_sql('SELECT c.*, n.title, c2.cid AS parent_cid FROM {category} c INNER JOIN {node} n ON c.cid = n.nid INNER JOIN {category_hierarchy} ch ON c.cid = ch.cid LEFT JOIN {category} c2 ON ch.parent = c2.cid WHERE ch.parent != 0 '. $container_sql), arg(3)); $categories = array(); $non_orphans = array(); @@ -141,12 +143,12 @@ function category_outliner_orphan() { '#type' => 'submit', '#value' => t('Save categories and containers'), ); - - return drupal_get_form('category_outliner_outline', $form); } else { - return ''. t('There are no orphan categories or containers.') .'
'; + $form = array('#value' => ''. t('There are no containers or categories.') .'
'); } + + return $form; } function category_outliner_outline_submit($form_id, $form_values) { @@ -158,11 +160,11 @@ function category_outliner_outline_submi $node->weight = $row['weight']; node_save($node); - watchdog('content', t('%type: updated %title.', array('%type' => theme('placeholder', t('category')), '%title' => theme('placeholder', $node->title))), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); + watchdog('content', t('%type: updated %title.', array('%type' => t('category'), '%title' => $node->title)), WATCHDOG_NOTICE, l(t('view'), 'node/'. $node->nid)); } } - if (arg(3) == 'outline' || arg(4) == 'outline') { + if (arg(4) == 'outline' || arg(5) == 'outline') { // Updating entire category outline. drupal_set_message(t('Updated categories and containers.')); } @@ -190,8 +192,8 @@ function theme_category_outliner_table($ $nid = $form[$key]['nid']['#value']; $rows[] = array( - 'The category pathauto module allows you to generate URL aliases that conform to your site\'s category structure.
This module requires the category module and the pathauto module.
'); } Index: contrib/category_transform/category_transform.info =================================================================== RCS file: contrib/category_transform/category_transform.info diff -N contrib/category_transform/category_transform.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ contrib/category_transform/category_transform.info 27 Dec 2006 07:57:29 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category transform +description = Allows nodes of any type to be transformed into categories or containers. +package = Category +dependencies = category Index: contrib/category_transform/category_transform.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/contrib/category_transform/category_transform.module,v retrieving revision 1.4 diff -u -p -r1.4 category_transform.module --- contrib/category_transform/category_transform.module 17 May 2006 11:32:12 -0000 1.4 +++ contrib/category_transform/category_transform.module 27 Dec 2006 07:57:29 -0000 @@ -7,16 +7,6 @@ */ /** - * Implementation of hook_help(). - */ -function category_transform_help($section) { - switch ($section) { - case 'admin/modules#description': - return t('Allows nodes of any type to be transformed into categories or containers. Requires the category module.'); - } -} - -/** * Implementation of hook_perm(). */ function category_transform_perm() { @@ -45,7 +35,7 @@ function category_transform_menu($may_ca if (empty($category) || $category->cnid) { $items[] = array( 'path' => "node/$nid/category-cat", - 'title' => t('category'), + 'title' => t('Category'), 'callback' => 'category_transform_outline', 'callback arguments' => array(arg(1)), 'access' => _category_transform_privileged('transform categories'), @@ -58,7 +48,7 @@ function category_transform_menu($may_ca if (empty($category) || !$category->cnid) { $items[] = array( 'path' => "node/$nid/category-cont", - 'title' => t('container'), + 'title' => t('Container'), 'callback' => 'category_transform_outline', 'callback arguments' => array(arg(1)), 'access' => _category_transform_privileged('transform containers'), @@ -86,9 +76,9 @@ function category_transform_category($op '#collapsible' => TRUE, '#collapsed' => TRUE, ); - $options = node_get_types(); - unset($options['category-cat']); - unset($options['category-cont']); + $options = node_get_types('names'); + unset($options['category_cat']); + unset($options['category_cont']); $form['category_transform']['category_transform_node_types_cat'] = array( '#type' => 'checkboxes', '#title' => t('Node types that can be transformed into categories'), @@ -117,14 +107,14 @@ function category_transform_category($op * @param $node * The node being outlined. * @param $type - * The category type the node is being transformed into (either category-cat - * or category-cont). + * The category type the node is being transformed into (either category_cat + * or category_cont). * * @return - * The form as rendered by drupal_get_form(). + * The form to be rendered by drupal_get_form(). */ function category_transform_outline_form($node, $type) { - $form = category_get_form(($type == 'category-cat'), $node, FALSE); + $form = category_get_form(($type == 'category_cat'), $node, FALSE); if (category_is_cat_or_cont($node->nid)) { $form['update'] = array('#type' => 'submit', '#value' => t('Update category outline')); @@ -134,8 +124,7 @@ function category_transform_outline_form $form['add'] = array('#type' => 'submit', '#value' => t('Add to category outline')); } - drupal_set_title(check_plain($node->title)); - return drupal_get_form('category_transform_outline', $form); + return $form; } /** @@ -147,13 +136,16 @@ function category_transform_outline($nid $node = node_load($nid); if ($node->nid) { - $type = category_node_get_type($node, arg(2)); + $arg_cat = arg(2) == 'category-cat' ? 'category_cat' : 'category_cont'; + $type = category_node_get_type($node, $arg_cat); $category = category_load($node, $type); foreach ($category as $key => $value) { $node->$key = $value; } - $output = category_transform_outline_form($node, $type); + drupal_set_title(check_plain($node->title)); + + $output = drupal_get_form('category_transform_outline_form', $node, $type); } return $output; @@ -162,7 +154,7 @@ function category_transform_outline($nid /** * Implementation of hook_form_submit(). */ -function category_transform_outline_submit($form_id, &$form_values) { +function category_transform_outline_form_submit($form_id, &$form_values) { $op = $_POST['op']; $node = node_load(arg(1)); @@ -173,7 +165,7 @@ function category_transform_outline_subm $form_values['parents'] = array($form_values['parents']); } if (empty($form_values['parents'][0])) { - if ($type == 'category-cat') { + if ($type == 'category_cat') { $form_values['parents'][0] = $form_values['parent'] = $form_values['cnid']; } else { Index: contrib/category_views/category_views.info =================================================================== RCS file: contrib/category_views/category_views.info diff -N contrib/category_views/category_views.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ contrib/category_views/category_views.info 27 Dec 2006 07:57:29 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Category views +description = Renders node listings on category pages using a view. +package = Category +dependencies = category views Index: contrib/category_views/category_views.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/contrib/category_views/category_views.module,v retrieving revision 1.5 diff -u -p -r1.5 category_views.module --- contrib/category_views/category_views.module 13 May 2006 14:28:36 -0000 1.5 +++ contrib/category_views/category_views.module 27 Dec 2006 07:57:29 -0000 @@ -11,8 +11,7 @@ */ function category_views_help($section) { switch ($section) { - case 'admin/modules#description': - return t('Renders node listings on category pages using a view. Requires the category module and the views module.'); + case 'admin/help#category_views': return t('The category_views module renders node listings on category pages using a view. It requires the category module and the views module to be installed.
'); } } @@ -25,7 +24,7 @@ function category_views_nodeapi(&$node, case 'load': if (category_is_cat_or_cont($node->nid)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { return (array)category_views_cont_load($node->nid); } @@ -55,7 +54,7 @@ function category_views_nodeapi(&$node, } elseif (category_is_cat_or_cont($node->nid, TRUE)) { $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_views_cont_update($node); } @@ -63,7 +62,7 @@ function category_views_nodeapi(&$node, break; case 'delete': $type = category_node_get_type($node); - $is_cat = $type == 'category-cat'; + $is_cat = $type == 'category_cat'; if (!$is_cat) { category_views_cont_delete($node->nid); } @@ -95,7 +94,7 @@ function category_views_category($op, $n '#default_value' => isset($node->view_for_cats) ? $node->view_for_cats : 0, '#options' => $view_list, '#multiple' => FALSE, - '#description' => t('The view to use for rendering listings of assigned nodes, in this container and its categories. If you do not check either of the \'show view on\' boxes below, then it makes no difference whether or not you select a view here. Conversely, if you leave this setting at its default value (<none>), then it makes no difference whether or not you check either of the boxes below. If there are no views available, or if the currently available views are not adequate, you can %create-view (warning: clicking this link may cause you to leave this page, and to lose whatever information you have entered so far).', array('%create-view' => l(t('create a new view'), 'admin/views/add'))), + '#description' => t('The view to use for rendering listings of assigned nodes, in this container and its categories. If you do not check either of the \'show view on\' boxes below, then it makes no difference whether or not you select a view here. Conversely, if you leave this setting at its default value (<none>), then it makes no difference whether or not you check either of the boxes below. If there are no views available, or if the currently available views are not adequate, you can !create-view (warning: clicking this link may cause you to leave this page, and to lose whatever information you have entered so far).', array('!create-view' => l(t('create a new view'), 'admin/views/add'))), ); $form['category_views']['view_display'] = array( '#type' => 'checkboxes', @@ -229,10 +228,10 @@ function category_views_is_visible($node } if ($node->view_for_cats) { - if ($type == 'category-cont' && $node->view_display['cont']) { + if ($type == 'category_cont' && $node->view_display['cont']) { return TRUE; } - elseif ($type == 'category-cat' && $node->view_display['cat']) { + elseif ($type == 'category_cat' && $node->view_display['cat']) { return TRUE; } } Index: wrappers/book.info.copyme =================================================================== RCS file: wrappers/book.info.copyme diff -N wrappers/book.info.copyme --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wrappers/book.info.copyme 27 Dec 2006 07:57:29 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Book +description = Wrapper module to provide a compatibility layer between the book module and the category module. +package = Category +dependencies = category Index: wrappers/book.module.copyme =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/wrappers/book.module.copyme,v retrieving revision 1.5 diff -u -p -r1.5 book.module.copyme --- wrappers/book.module.copyme 31 May 2006 13:24:34 -0000 1.5 +++ wrappers/book.module.copyme 27 Dec 2006 07:57:29 -0000 @@ -70,13 +70,6 @@ function book_submit(&$node) { } /** - * Implementation of hook_validate(). - */ -function book_validate($node) { - node_validate_title($node); -} - -/** * Given a node, this function returns an array of 'book node' objects * representing the path in the book tree from the root to the * parent of the given node. @@ -242,9 +235,7 @@ function book_category($op, $node = NULL function book_help($section) { switch ($section) { case 'admin/help#book': - return t('This is a wrapper module to provide a compatibility layer between the book module and the category module. Modules that depend on the book module should function correctly with this wrapper module enabled, as it routes all book requests to the category API, and converts category data types into book data types. The book module user interface is not available with this wrapper module: you should use the category module user interface instead. For further assistance, see the category module help page.
', array('%category' => url('admin/help', NULL, 'category'))); - case 'admin/modules#description': - return t('Wrapper module to provide a compatibility layer between the book module and the category module. Requires the category module.'); + return t('This is a wrapper module to provide a compatibility layer between the book module and the category module. Modules that depend on the book module should function correctly with this wrapper module enabled, as it routes all book requests to the category API, and converts category data types into book data types. The book module user interface is not available with this wrapper module: you should use the category module user interface instead. For further assistance, see the category module help page.
', array('!category' => url('admin/help', NULL, 'category'))); } } @@ -254,13 +245,13 @@ function _book_book_into_category(&$node while (!$cnid && ($parent_node = node_load($parent))) { if (category_is_cat_or_cont($parent_node->nid)) { $type = category_node_get_type($parent_node); - if ($type == 'category-cont') { + if ($type == 'category_cont') { $cnid = $parent_node->nid; } } } $node->cnid = $cnid; - $node->type = $cnid ? 'category-cat' : 'category-cont'; + $node->type = $cnid ? 'category-cat' : 'category_cont'; $node->parents = $node->parent ? array($node->parent) : array(); } Index: wrappers/taxonomy.info.copyme =================================================================== RCS file: wrappers/taxonomy.info.copyme diff -N wrappers/taxonomy.info.copyme --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wrappers/taxonomy.info.copyme 27 Dec 2006 07:57:29 -0000 @@ -0,0 +1,5 @@ +; $Id$ +name = Taxonomy +description = Wrapper module to provide a compatibility layer between the taxonomy module and the category module. +package = Category +dependencies = category Index: wrappers/taxonomy.module.copyme =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/category/wrappers/taxonomy.module.copyme,v retrieving revision 1.25 diff -u -p -r1.25 taxonomy.module.copyme --- wrappers/taxonomy.module.copyme 6 Nov 2006 04:28:14 -0000 1.25 +++ wrappers/taxonomy.module.copyme 27 Dec 2006 07:57:30 -0000 @@ -14,11 +14,15 @@ * print lists of terms associated with a node. Themes can print taxonomy * links with: * - * if (module_exist('taxonomy')) { + * if (module_exists('taxonomy')) { * $this->links(taxonomy_link('taxonomy terms', $node)); * } */ function taxonomy_link($type, $node = NULL) { + if (!isset($node) || $type == 'node') { + return array(); + } + if ($type == 'taxonomy terms') { $type = 'categories'; if (isset($node->taxonomy) && is_array($node->taxonomy)) { @@ -35,11 +39,16 @@ function taxonomy_link($type, $node = NU } } } - elseif ($type == 'node') { - return array(); + + $links = category_link($type, $node); + + // We call this hook again because some modules and themes call taxonomy_link('taxonomy terms') directly + foreach (module_implements('link_alter') as $module) { + $function = $module .'_link_alter'; + $function($node, $links); } - return category_link($type, $node); + return $links; } /** @@ -49,7 +58,7 @@ function taxonomy_menu($may_cache) { $items = array(); if ($may_cache) { - if (!module_exist('category_legacy')) { + if (!module_exists('category_legacy')) { $items[] = array('path' => 'taxonomy/term', 'title' => t('taxonomy term'), 'callback' => 'taxonomy_term_page', 'access' => user_access('access content'), @@ -132,7 +141,7 @@ function taxonomy_save_vocabulary(&$edit if (!$only_legacy) { $node->title = $edit['name']; $node->nid = $edit['vid']; - $node->type = 'category-cont'; + $node->type = 'category_cont'; $node->description = $edit['description']; $node->help = $edit['help'] ? $edit['help'] : ''; $node->multiple = $edit['multiple']; @@ -146,7 +155,6 @@ function taxonomy_save_vocabulary(&$edit // Force defaults $node_options = variable_get('node_options_'. $node->type, array('status', 'promote')); $node->status = in_array('status', $node_options); - $node->moderate = in_array('moderate', $node_options); $node->promote = in_array('promote', $node_options); $node->sticky = in_array('sticky', $node_options); $node->revision = in_array('revision', $node_options); @@ -273,7 +281,6 @@ function taxonomy_save_term(&$edit, $onl // Force defaults $node_options = variable_get('node_options_'. $node->type, array('status', 'promote')); $node->status = in_array('status', $node_options); - $node->moderate = in_array('moderate', $node_options); $node->promote = in_array('promote', $node_options); $node->sticky = in_array('sticky', $node_options); $node->revision = in_array('revision', $node_options); @@ -590,6 +597,20 @@ function taxonomy_node_delete($nid) { } /** + * Implementation of hook_node_type(). + */ +function taxonomy_node_type($op, $info) { + if (variable_get('taxonomy_maintain_db', 1)) { + if ($op == 'update' && !empty($info->old_type) && $info->type != $info->old_type) { + db_query("UPDATE {vocabulary_node_types} SET type = '%s' WHERE type = '%s'", $info->type, $info->old_type); + } + elseif ($op == 'delete') { + db_query("DELETE FROM {vocabulary_node_types} WHERE type = '%s'", $info->type); + } + } +} + +/** * Find all term objects related to a given term ID. */ function taxonomy_get_related($tid, $key = 'tid') { @@ -778,10 +799,6 @@ function taxonomy_get_term($tid) { return _taxonomy_category_into_term($category); } -function _taxonomy_depth($depth, $graphic = '--') { - return _category_depth($depth, $graphic); -} - /** * Finds all nodes that match selected taxonomy conditions. * @@ -862,6 +879,14 @@ function taxonomy_nodeapi(&$node, $op, $ } } +function taxonomy_terms_parse_string($str_tids) { + $terms = category_categories_parse_string($str_tids); + $terms['tids'] = $terms['cids']; + unset($terms['cids']); + + return $terms; +} + /** * Place assigned categories in the form as taxonomy terms. */ @@ -891,9 +916,7 @@ function taxonomy_rss_item($node) { function taxonomy_help($section) { switch ($section) { case 'admin/help#taxonomy': - return t('This is a wrapper module to provide a compatibility layer between the taxonomy module and the category module. Modules that depend on the taxonomy module should function correctly with this wrapper module enabled, as it routes all taxonomy requests to the category API, and converts category data types into taxonomy data types. The taxonomy module user interface is not available with this wrapper module: you should use the category module user interface instead. For further assistance, see the category module help page.
', array('%category' => url('admin/help', NULL, 'category'))); - case 'admin/modules#description': - return t('Wrapper module to provide a compatibility layer between the taxonomy module and the category module. Requires the category module.'); + return t('This is a wrapper module to provide a compatibility layer between the taxonomy module and the category module. Modules that depend on the taxonomy module should function correctly with this wrapper module enabled, as it routes all taxonomy requests to the category API, and converts category data types into taxonomy data types. The taxonomy module user interface is not available with this wrapper module: you should use the category module user interface instead. For further assistance, see the category module help page.
', array('!category' => url('admin/help', NULL, 'category'))); } } @@ -935,7 +958,7 @@ function _taxonomy_confirm_del_term($tid $form['tid'] = array('#type' => 'hidden', '#value' => $tid); return confirm_form('term_confirm_delete', $form, t('Are you sure you want to delete the term %title?', - array('%title' => theme('placeholder', $term->name))), + array('%title' => $term->name)), 'admin/category', t('This action cannot be undone.'), t('Delete'),